Skip to content

[HttpKernel] Fix using MapRequestPayload on nullable arguments #62449

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
nicolas-grekas merged 1 commit into from
Nov 20, 2025
Merged

[HttpKernel] Fix using MapRequestPayload on nullable arguments #62449

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
10 changes: 5 additions & 5 deletions src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ private function mapQueryString(Request $request, string $type, MapQueryString $

private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object
{
if ('' === $data = $request->request->all() ?: $request->getContent()) {
return null;
}

if (null === $format = $request->getContentTypeFormat()) {
throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, 'Unsupported format.');
}
Expand All @@ -176,14 +180,10 @@ private function mapRequestPayload(Request $request, string $type, MapRequestPay
throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, \sprintf('Unsupported format, expects "%s", but "%s" given.', implode('", "', (array) $attribute->acceptFormat), $format));
}

if ($data = $request->request->all()) {
if (\is_array($data)) {
return $this->serializer->denormalize($data, $type, 'csv', $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
}

if ('' === $data = $request->getContent()) {
return null;
}

if ('form' === $format) {
throw new HttpException(Response::HTTP_BAD_REQUEST, 'Request payload contains invalid "form" data.');
}
Expand Down
22 changes: 22 additions & 0 deletions ...omponent/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,28 @@ public function testNullPayloadAndNotDefaultOrNullableArgument()
}
}

public function testRequestPayloadWithoutContentTypeOnNullableArgumentReturnsNull()
{
$validator = $this->createMock(ValidatorInterface::class);
$validator->expects($this->never())
->method('validate');

$resolver = new RequestPayloadValueResolver(new Serializer(), $validator);

$argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, true, [
MapRequestPayload::class => new MapRequestPayload(),
]);
$request = Request::create('/', 'POST');

$kernel = $this->createMock(HttpKernelInterface::class);
$arguments = $resolver->resolve($request, $argument);
$event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);

$resolver->onKernelControllerArguments($event);

$this->assertSame([null], $event->getArguments());
}

public function testQueryNullPayloadAndNotDefaultOrNullableArgument()
{
$validator = $this->createMock(ValidatorInterface::class);
Expand Down
Loading