Skip to content

[HttpKernel] Fix #[MapUploadedFile] handling for optional file uploads #60483

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
Jun 27, 2025
Merged

[HttpKernel] Fix #[MapUploadedFile] handling for optional file uploads #60483

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
6 changes: 5 additions & 1 deletion 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 @@ -232,6 +232,10 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,

private function mapUploadedFile(Request $request, ArgumentMetadata $argument, MapUploadedFile $attribute): UploadedFile|array|null
{
return $request->files->get($attribute->name ?? $argument->getName(), []);
if (!($files = $request->files->get($attribute->name ?? $argument->getName(), [])) && ($argument->isNullable() || $argument->hasDefaultValue())) {
return null;
}

return $files;
}
}
60 changes: 60 additions & 0 deletions .../Component/HttpKernel/Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,66 @@ static function () {},
$resolver->onKernelControllerArguments($event);
}

/**
* @dataProvider provideContext
*/
public function testShouldAllowEmptyWhenNullable(RequestPayloadValueResolver $resolver, Request $request)
{
$attribute = new MapUploadedFile();
$argument = new ArgumentMetadata(
'qux',
UploadedFile::class,
false,
false,
null,
true,
[$attribute::class => $attribute]
);
/** @var HttpKernelInterface&MockObject $httpKernel */
$httpKernel = $this->createMock(HttpKernelInterface::class);
$event = new ControllerArgumentsEvent(
$httpKernel,
static function () {},
$resolver->resolve($request, $argument),
$request,
HttpKernelInterface::MAIN_REQUEST
);
$resolver->onKernelControllerArguments($event);
$data = $event->getArguments()[0];

$this->assertNull($data);
}

/**
* @dataProvider provideContext
*/
public function testShouldAllowEmptyWhenHasDefaultValue(RequestPayloadValueResolver $resolver, Request $request)
{
$attribute = new MapUploadedFile();
$argument = new ArgumentMetadata(
'qux',
UploadedFile::class,
false,
true,
'default-value',
false,
[$attribute::class => $attribute]
);
/** @var HttpKernelInterface&MockObject $httpKernel */
$httpKernel = $this->createMock(HttpKernelInterface::class);
$event = new ControllerArgumentsEvent(
$httpKernel,
static function () {},
$resolver->resolve($request, $argument),
$request,
HttpKernelInterface::MAIN_REQUEST
);
$resolver->onKernelControllerArguments($event);
$data = $event->getArguments()[0];

$this->assertSame('default-value', $data);
}

public static function provideContext(): iterable
{
$resolver = new RequestPayloadValueResolver(
Expand Down
Loading