Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6410dda

Browse files
committed
bug#122 Don't rely on Request::getPayload() to populate the parsed body (nicolas-grekas)
This PR was merged into the 2.3 branch.Discussion----------Don't rely on Request::getPayload() to populate the parsed bodyThat'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
2 parents3c62b81 +ef03b6d commit6410dda

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

‎Factory/PsrHttpFactory.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
usePsr\Http\Message\UploadedFileInterface;
2121
useSymfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
2222
useSymfony\Component\HttpFoundation\BinaryFileResponse;
23-
useSymfony\Component\HttpFoundation\Exception\JsonException;
2423
useSymfony\Component\HttpFoundation\File\UploadedFile;
2524
useSymfony\Component\HttpFoundation\Request;
2625
useSymfony\Component\HttpFoundation\Response;
@@ -79,11 +78,11 @@ public function createRequest(Request $symfonyRequest)
7978
$format =$symfonyRequest->getContentType();
8079
}
8180

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;
8786
}
8887
}else {
8988
$parsedBody =$symfonyRequest->request->all();

‎Tests/Factory/PsrHttpFactoryTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,6 @@ public function testWrongJsonContent()
293293
$request =newRequest([], [], [], [], [],$headers,'{"city":"Paris"');
294294
$psrRequest =$this->factory->createRequest($request);
295295

296-
$this->assertSame([],$psrRequest->getParsedBody());
296+
$this->assertNull($psrRequest->getParsedBody());
297297
}
298298
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp