Use psr7 request body instead of parsedBody

src/Server/Helper.php

@@ -32,6 +32,7 @@
 use function json_last_error_msg;
 use function sprintf;
 use function stripos;
+use const JSON_ERROR_NONE;
 
 /**
  * Contains functionality that could be re-used by various server implementations
@@ -83,7 +84,7 @@ public function parseHttpRequest(?callable $readRawBodyFn = null)
                     : $this->readRawBody();
                 $bodyParams = json_decode($rawBody ?: '', true);
 
-                if (json_last_error()) {
+                if (json_last_error() !== JSON_ERROR_NONE) {
                     throw new RequestError('Could not parse JSON: ' . json_last_error_msg());
                 }
 
@@ -535,12 +536,10 @@ public function parsePsrRequest(ServerRequestInterface $request)
             if (stripos($contentType[0], 'application/graphql') !== false) {
                 $bodyParams = ['query' => $request->getBody()->getContents()];
             } elseif (stripos($contentType[0], 'application/json') !== false) {
-                $bodyParams = $request->getParsedBody();
+                $bodyParams = json_decode($request->getBody()->getContents(), true);
 
-                if ($bodyParams === null) {
-                    throw new InvariantViolation(
-                        'PSR-7 request is expected to provide parsed body for "application/json" requests but got null'
-                    );
+                if (json_last_error() !== JSON_ERROR_NONE) {
+                    throw new RequestError('Could not parse JSON: ' . json_last_error_msg());
                 }
 
                 if (! is_array($bodyParams)) {

tests/Server/Psr7/PsrRequestStub.php

@@ -26,6 +26,10 @@ class PsrRequestStub implements ServerRequestInterface
     /** @var mixed[] */
     public $parsedBody;
 
+    public function __construct() {
+        $this->body = new PsrStreamStub();
+    }
+
     /**
      * Retrieves the HTTP protocol version as a string.
      *

tests/Server/Psr7/PsrStreamStub.php

@@ -13,7 +13,7 @@
  */
 class PsrStreamStub implements StreamInterface
 {
-    public $content;
+    public $content = "";
 
     /**
      * Reads all data from the stream into a string, from the beginning to end.

tests/Server/RequestParsingTest.php

@@ -414,25 +414,11 @@ public function testFailsParsingInvalidRawJsonRequestPsr() : void
     {
         $body = 'not really{} a json';
 
-        $this->expectException(InvariantViolation::class);
-        $this->expectExceptionMessage('PSR-7 request is expected to provide parsed body for "application/json" requests but got null');
+        $this->expectException(RequestError::class);
+        $this->expectExceptionMessage('Could not parse JSON: Syntax error');
         $this->parsePsrRequest('application/json', $body);
     }
 
-    public function testFailsParsingNonPreParsedPsrRequest() : void
-    {
-        try {
-            $this->parsePsrRequest('application/json', json_encode(null));
-            self::fail('Expected exception not thrown');
-        } catch (InvariantViolation $e) {
-            // Expecting parsing exception to be thrown somewhere else:
-            self::assertEquals(
-                'PSR-7 request is expected to provide parsed body for "application/json" requests but got null',
-                $e->getMessage()
-            );
-        }
-    }
-
     /**
      * There is no equivalent for psr request, because it should throw
      */

tests/Server/StandardServerTest.php

@@ -55,7 +55,7 @@ private function parseRawRequest($contentType, $content, $method = 'POST')
 
     public function testSimplePsrRequestExecution() : void
     {
-        $body = ['query' => '{f1}'];
+        $body = json_encode(['query' => '{f1}']);
 
         $expected = [
             'data' => ['f1' => 'f1'],
@@ -65,12 +65,12 @@ public function testSimplePsrRequestExecution() : void
         $this->assertPsrRequestEquals($expected, $request);
     }
 
-    private function preparePsrRequest($contentType, $parsedBody)
+    private function preparePsrRequest($contentType, $body)
     {
         $psrRequest                          = new PsrRequestStub();
         $psrRequest->headers['content-type'] = [$contentType];
         $psrRequest->method                  = 'POST';
-        $psrRequest->parsedBody              = $parsedBody;
+        $psrRequest->body->content           = $body;
 
         return $psrRequest;
     }
@@ -94,10 +94,10 @@ private function executePsrRequest($psrRequest)
 
     public function testMultipleOperationPsrRequestExecution() : void
     {
-        $body = [
+        $body = json_encode([
             'query'         => 'query firstOp {fieldWithPhpError} query secondOp {f1}',
             'operationName' => 'secondOp',
-        ];
+        ]);
 
         $expected = [
             'data' => ['f1' => 'f1'],