Merge pull request #12 from DawidMazurek/allow-message-in-exceptions

Allow passing a message to JsonRpcException
DawidMazurek · Feb 24, 2018 · 90313d3 · 90313d3
2 parents a0c3391 + 692b634
commit 90313d3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/src/exception/InvalidParams.php b/src/exception/InvalidParams.php
@@ -8,8 +8,8 @@
 
 class InvalidParams extends JsonRpcException
 {
-    public function __construct()
+    public function __construct(string $message = '')
     {
-        parent::__construct("Invalid params", JsonRpcErrorCodes::INVALID_PARAMS);
+        parent::__construct("Invalid params: " . $message , JsonRpcErrorCodes::INVALID_PARAMS);
     }
 }
diff --git a/src/exception/InvalidRequest.php b/src/exception/InvalidRequest.php
@@ -8,8 +8,8 @@
 
 class InvalidRequest extends JsonRpcException
 {
-    public function __construct()
+    public function __construct(string $message = '')
     {
-        parent::__construct("Invalid request", JsonRpcErrorCodes::INVALID_REQUEST);
+        parent::__construct("Invalid request: " . $message, JsonRpcErrorCodes::INVALID_REQUEST);
     }
 }
diff --git a/src/exception/MethodNotFound.php b/src/exception/MethodNotFound.php
@@ -8,8 +8,8 @@
 
 class MethodNotFound extends JsonRpcException
 {
-    public function __construct()
+    public function __construct(string $message = '')
     {
-        parent::__construct("Method not found", JsonRpcErrorCodes::METHOD_NOT_FOUND);
+        parent::__construct("Method not found: " . $message, JsonRpcErrorCodes::METHOD_NOT_FOUND);
     }
 }
diff --git a/src/exception/ParseError.php b/src/exception/ParseError.php
@@ -8,8 +8,8 @@
 
 class ParseError extends JsonRpcException
 {
-    public function __construct()
+    public function __construct(string $message = '')
     {
-        parent::__construct("Parse error", JsonRpcErrorCodes::PARSE_ERROR);
+        parent::__construct("Parse error: " .$message , JsonRpcErrorCodes::PARSE_ERROR);
     }
 }
diff --git a/tests/unit/exception/InvalidParamsTest.php b/tests/unit/exception/InvalidParamsTest.php
@@ -14,8 +14,8 @@ class InvalidParamsTest extends TestCase
      */
     public function givesCorrectErrorInfo()
     {
-        $exception = new InvalidParams();
+        $exception = new InvalidParams('Missing param id');
         $this->assertEquals(JsonRpcErrorCodes::INVALID_PARAMS, $exception->getCode());
-        $this->assertEquals('Invalid params', $exception->getMessage());
+        $this->assertEquals('Invalid params: Missing param id', $exception->getMessage());
     }
 }
diff --git a/tests/unit/exception/InvalidRequestTest.php b/tests/unit/exception/InvalidRequestTest.php
@@ -14,8 +14,8 @@ class InvalidRequestTest extends TestCase
      */
     public function givesCorrectErrorInfo()
     {
-        $exception = new InvalidRequest();
+        $exception = new InvalidRequest('Request');
         $this->assertEquals(JsonRpcErrorCodes::INVALID_REQUEST, $exception->getCode());
-        $this->assertEquals('Invalid request', $exception->getMessage());
+        $this->assertEquals('Invalid request: Request', $exception->getMessage());
     }
 }
diff --git a/tests/unit/exception/MethodNotFoundTest.php b/tests/unit/exception/MethodNotFoundTest.php
@@ -14,8 +14,8 @@ class MethodNotFoundTest extends TestCase
      */
     public function givesCorrectErrorInfo()
     {
-        $exception = new MethodNotFound();
+        $exception = new MethodNotFound('sampleMethod');
         $this->assertEquals(JsonRpcErrorCodes::METHOD_NOT_FOUND, $exception->getCode());
-        $this->assertEquals('Method not found', $exception->getMessage());
+        $this->assertEquals('Method not found: sampleMethod', $exception->getMessage());
     }
 }
diff --git a/tests/unit/exception/ParseErrorTest.php b/tests/unit/exception/ParseErrorTest.php
@@ -5,16 +5,17 @@
 namespace DawidMazurek\JsonRpc\exception;
 
 use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use PHPUnit\Framework\TestCase;
 
-class ParseErrorTest
+class ParseErrorTest extends TestCase
 {
     /**
      * @test
      */
     public function givesCorrectErrorInfo()
     {
-        $exception = new ParseError();
+        $exception = new ParseError('Received empty body');
         $this->assertEquals(JsonRpcErrorCodes::PARSE_ERROR, $exception->getCode());
-        $this->assertEquals('parseError', $exception->getMessage());
+        $this->assertEquals('Parse error: Received empty body', $exception->getMessage());
     }
 }