RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2025-02-06 07:49:24 +03:00
Code Issues Projects Releases Wiki Activity

Support non pre-parsed PSR-7 request body

Browse Source 
Because PSR-7 specification only specify that `getParsedBody()` **may**
return the parsed body for `application/json`, we cannot assume that it
is always the case. So if the value returned parsed body is an empty array,
it means we should try to parse it ourselves (`null` would mean no body at
all according to spec).

With this modification we try to used given parsed body, but fallback on
trying to parse the body if necessary. This leave the door open to custom
implementation of parsing if needed, while making it easier to use out of
the box.
This commit is contained in:
Adrien Crivelli 2017-11-26 19:57:32 +09:00
parent eaadae4a5b
commit 11c9429fab
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Server/Helper.php
View File

@ -499,6 +499,10 @@ class Helper
Utils::printSafeJson($bodyParams) Utils::printSafeJson($bodyParams)
); );
} }
if (empty($bodyParams)) {
$bodyParams = json_decode($request->getBody(), true);
}
} else { } else {
$bodyParams = $request->getParsedBody(); $bodyParams = $request->getParsedBody();

17
tests/Server/StandardServerTest.php
View File

@ -47,15 +47,17 @@ class StandardServerTest extends TestCase
'query' => '{f1}' 'query' => '{f1}'
]); ]);
$request = $this->preparePsrRequest('application/json', $body);
$expected = [ $expected = [
'data' => [ 'data' => [
'f1' => 'f1' 'f1' => 'f1'
] ]
]; ];
$this->assertPsrRequestEquals($expected, $request); $preParsedRequest = $this->preparePsrRequest('application/json', $body, true);
$this->assertPsrRequestEquals($expected, $preParsedRequest);
$notPreParsedRequest = $this->preparePsrRequest('application/json', $body, false);
$this->assertPsrRequestEquals($expected, $notPreParsedRequest);
} }
private function executePsrRequest($psrRequest) private function executePsrRequest($psrRequest)
@ -73,21 +75,20 @@ class StandardServerTest extends TestCase
return $result; return $result;
} }
private function preparePsrRequest($contentType, $content, $method = 'POST') private function preparePsrRequest($contentType, $content, $preParseBody)
{ {
$psrRequestBody = new PsrStreamStub(); $psrRequestBody = new PsrStreamStub();
$psrRequestBody->content = $content; $psrRequestBody->content = $content;
$psrRequest = new PsrRequestStub(); $psrRequest = new PsrRequestStub();
$psrRequest->headers['content-type'] = [$contentType]; $psrRequest->headers['content-type'] = [$contentType];
$psrRequest->method = $method; $psrRequest->method = 'POST';
$psrRequest->body = $psrRequestBody; $psrRequest->body = $psrRequestBody;
if ($contentType === 'application/json') { if ($preParseBody && $contentType === 'application/json') {
$parsedBody = json_decode($content, true); $parsedBody = json_decode($content, true);
$parsedBody = $parsedBody === false ? null : $parsedBody;
} else { } else {
$parsedBody = null; $parsedBody = [];
} }
$psrRequest->parsedBody = $parsedBody; $psrRequest->parsedBody = $parsedBody;