Skip to content

Leverage Request::getPayload() to populate the parsed body of PSR-7 requests #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Leverage Request::getPayload() to populate the parsed body of PSR-7 requests #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion Factory/PsrHttpFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
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;
Expand All @@ -27,6 +28,7 @@
* Builds Psr\HttpMessage instances using a PSR-17 implementation.
*
* @author Antonio J. García Lagar <aj@garcialagar.es>
* @author Aurélien Pillevesse <aurelienpillevesse@hotmail.fr>
*/
class PsrHttpFactory implements HttpMessageFactoryInterface
{
Expand Down Expand Up @@ -67,12 +69,28 @@ public function createRequest(Request $symfonyRequest)

$body = $this->streamFactory->createStreamFromResource($symfonyRequest->getContent(true));

if (method_exists(Request::class, 'getContentTypeFormat')) {
$format = $symfonyRequest->getContentTypeFormat();
} else {
$format = $symfonyRequest->getContentType();
}

if (method_exists(Request::class, 'getPayload') && 'json' === $format) {
try {
$parsedBody = $symfonyRequest->getPayload()->all();
} catch (JsonException $e) {
$parsedBody = [];
}
} else {
$parsedBody = $symfonyRequest->request->all();
}

$request = $request
->withBody($body)
->withUploadedFiles($this->getFiles($symfonyRequest->files->all()))
->withCookieParams($symfonyRequest->cookies->all())
->withQueryParams($symfonyRequest->query->all())
->withParsedBody($symfonyRequest->request->all())
->withParsedBody($parsedBody)
;

foreach ($symfonyRequest->attributes->all() as $key => $value) {
Expand Down
49 changes: 49 additions & 0 deletions Tests/Factory/PsrHttpFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
/**
* @author Kévin Dunglas <dunglas@gmail.com>
* @author Antonio J. García Lagar <aj@garcialagar.es>
* @author Aurélien Pillevesse <aurelienpillevesse@hotmail.fr>
*/
class PsrHttpFactoryTest extends TestCase
{
Expand Down Expand Up @@ -243,4 +244,52 @@ public function testUploadErrNoFile()
$this->assertSame(\UPLOAD_ERR_NO_FILE, $uploadedFiles['f1']->getError());
$this->assertSame(\UPLOAD_ERR_NO_FILE, $uploadedFiles['f2']->getError());
}

public function testJsonContent()
{
if (!method_exists(Request::class, 'getPayload')) {
$this->markTestSkipped();
}

$headers = [
'HTTP_HOST' => 'http_host.fr',
'CONTENT_TYPE' => 'application/json',
];
$request = new Request([], [], [], [], [], $headers, '{"city":"Paris","country":"France"}');
$psrRequest = $this->factory->createRequest($request);

$this->assertSame(['city' => 'Paris', 'country' => 'France'], $psrRequest->getParsedBody());
}

public function testEmptyJsonContent()
{
if (!method_exists(Request::class, 'getPayload')) {
$this->markTestSkipped();
}

$headers = [
'HTTP_HOST' => 'http_host.fr',
'CONTENT_TYPE' => 'application/json',
];
$request = new Request([], [], [], [], [], $headers, '{}');
$psrRequest = $this->factory->createRequest($request);

$this->assertSame([], $psrRequest->getParsedBody());
}

public function testWrongJsonContent()
{
if (!method_exists(Request::class, 'getPayload')) {
$this->markTestSkipped();
}

$headers = [
'HTTP_HOST' => 'http_host.fr',
'CONTENT_TYPE' => 'application/json',
];
$request = new Request([], [], [], [], [], $headers, '{"city":"Paris"');
$psrRequest = $this->factory->createRequest($request);

$this->assertSame([], $psrRequest->getParsedBody());
}
}