Fix #94

yoanm · May 6, 2023 · 3b594ab · 3b594ab
1 parent 3b0fd12
commit 3b594ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/App/Creator/ResponseCreator.php b/src/App/Creator/ResponseCreator.php
@@ -26,7 +26,8 @@ public function createEmptyResponse(JsonRpcRequest $fromRequest = null) : JsonRp
                 ->setIsNotification($fromRequest->isNotification())
         ;
 
-        if (!is_null($fromRequest->getId())) {
+        // Notification response doesn't have any ID defined (notification request doesn't either)
+        if (!$fromRequest->isNotification()) {
             $response->setId($fromRequest->getId());
         }
 

diff --git a/tests/Functional/App/Creator/ResponseCreator/CreateResultResponseTest.php b/tests/Functional/App/Creator/ResponseCreator/CreateResultResponseTest.php
@@ -2,6 +2,7 @@
 namespace Tests\Functional\App\Creator\ResponseCreator;
 
 use Prophecy\PhpUnit\ProphecyTrait;
+use Yoanm\JsonRpcServer\Domain\Model\JsonRpcRequest;
 
 /**
  * @covers \Yoanm\JsonRpcServer\App\Creator\ResponseCreator
@@ -40,4 +41,17 @@ public function testShouldBindResultAndRequestParamToResponse()
         $this->assertSame($result, $response->getResult());
         $this->assertFromRequestBinding($fromRequest, $response);
     }
+
+
+
+    /**
+     * Bug fix: https://github.com/yoanm/php-jsonrpc-server-sdk/issues/94
+     */
+    public function testShouldConvertRequestWithZeroIdToResponseWithZeroId() {
+        $fromRequest = $this->createRequest(self::DEFAULT_METHOD, self::DEFAULT_JSONRPC, 0);
+
+        $response = $this->responseCreator->createEmptyResponse($fromRequest);
+
+        $this->assertSame(0, $response->getId());
+    }
 }