bug #122 Don't rely on Request::getPayload() to populate the parsed body (nicolas-grekas)

derrabus · derrabus · commit 6410ddaa846a · 2023-07-26T13:50:20.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- Don't rely on Request::getPayload() to populate the parsed body That's just not needed and creates issues like #121 + fixes a bug with invalid jsons. Commits ------- ef03b6d Don't rely on Request::getPayload() to populate the parsed body
diff --git a/Factory/PsrHttpFactory.php b/Factory/PsrHttpFactory.php
@@ -20,7 +20,6 @@
 use Psr\Http\Message\UploadedFileInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\Exception\JsonException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -79,11 +78,11 @@ public function createRequest(Request $symfonyRequest)
             $format = $symfonyRequest->getContentType();
         }
 
-        if (method_exists(Request::class, 'getPayload') && 'json' === $format) {
-            try {
-                $parsedBody = $symfonyRequest->getPayload()->all();
-            } catch (JsonException $e) {
-                $parsedBody = [];
+        if ('json' === $format) {
+            $parsedBody = json_decode($symfonyRequest->getContent(), true, 512, \JSON_BIGINT_AS_STRING);
+
+            if (!\is_array($parsedBody)) {
+                $parsedBody = null;
             }
         } else {
             $parsedBody = $symfonyRequest->request->all();
diff --git a/Tests/Factory/PsrHttpFactoryTest.php b/Tests/Factory/PsrHttpFactoryTest.php
@@ -293,6 +293,6 @@ public function testWrongJsonContent()
         $request = new Request([], [], [], [], [], $headers, '{"city":"Paris"');
         $psrRequest = $this->factory->createRequest($request);
 
-        $this->assertSame([], $psrRequest->getParsedBody());
+        $this->assertNull($psrRequest->getParsedBody());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,6 @@ public function testWrongJsonContent()`
`293`	`293`	`$request = new Request([], [], [], [], [], $headers, '{"city":"Paris"');`
`294`	`294`	`$psrRequest = $this->factory->createRequest($request);`
`295`	`295`
`296`		`- $this->assertSame([], $psrRequest->getParsedBody());`
	`296`	`+ $this->assertNull($psrRequest->getParsedBody());`
`297`	`297`	`}`
`298`	`298`	`}`