Commitef03b6d

committed

Don't rely on Request::getPayload() to populate the parsed body

1 parent3c62b81 commitef03b6dCopy full SHA for ef03b6d

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`usePsr\Http\Message\UploadedFileInterface;`
`21`	`21`	`useSymfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;`
`22`	`22`	`useSymfony\Component\HttpFoundation\BinaryFileResponse;`
`23`		`-useSymfony\Component\HttpFoundation\Exception\JsonException;`
`24`	`23`	`useSymfony\Component\HttpFoundation\File\UploadedFile;`
`25`	`24`	`useSymfony\Component\HttpFoundation\Request;`
`26`	`25`	`useSymfony\Component\HttpFoundation\Response;`
`@@ -79,11 +78,11 @@ public function createRequest(Request $symfonyRequest)`
`79`	`78`	`$format =$symfonyRequest->getContentType();`
`80`	`79`	`}`
`81`	`80`
`82`		`-if (method_exists(Request::class,'getPayload') &&'json' ===$format) {`
`83`		`-try {`
`84`		`-$parsedBody =$symfonyRequest->getPayload()->all();`
`85`		`-}catch (JsonException$e) {`
`86`		`-$parsedBody =[];`
	`81`	`+if ('json' ===$format) {`
	`82`	`+$parsedBody =json_decode($symfonyRequest->getContent(),true,512, \JSON_BIGINT_AS_STRING);`
	`83`	`+`
	`84`	`+if (!\is_array($parsedBody)) {`
	`85`	`+$parsedBody =null;`
`87`	`86`	`}`
`88`	`87`	`}else {`
`89`	`88`	`$parsedBody =$symfonyRequest->request->all();`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,6 @@ public function testWrongJsonContent()`
`293`	`293`	`$request =newRequest([], [], [], [], [],$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`	`}`

Comments

(0)