Skip to content

[HttpKernel] Fatal Error when using #[MapUploadedFile] with non-array/non-variadic argument #57824

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

Open
wants to merge 3 commits into
base: 7.1
Choose a base branch
from
Open

[HttpKernel] Fatal Error when using #[MapUploadedFile] with non-array/non-variadic argument #57824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5861123
[HttpKernel] Fix resolving of MapUploadedFile for non-array/non-varia…
melya Jul 24, 2024
2a99d2d
fixed usage of variadic uploaded-file
melya Jul 29, 2024
93d4190
review fixes
melya Aug 20, 2024
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
16 changes: 14 additions & 2 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 @@ -170,7 +170,14 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo
};
}

$arguments[$i] = $payload;
if ($argument->metadata->isVariadic()) {
if (!\is_array($payload) || !\array_is_list($payload)) {
throw HttpException::fromStatusCode($validationFailedCode);
}
\array_splice($arguments, $i, \count($payload), $payload);
} else {
$arguments[$i] = $payload;
}
}

$event->setArguments($arguments);
Expand Down Expand Up @@ -233,6 +240,11 @@ 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(), []);
$default = null;
if ($argument->isVariadic() || 'array' === $argument->getType()) {
$default = [];
}

return $request->files->get($attribute->name ?? $argument->getName(), $default);
}
}
62 changes: 60 additions & 2 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 @@ -68,7 +68,7 @@ public function testEmpty(RequestPayloadValueResolver $resolver, Request $reques
$attribute = new MapUploadedFile();
$argument = new ArgumentMetadata(
'qux',
UploadedFile::class,
'array',
false,
false,
null,
Expand All @@ -82,12 +82,70 @@ static function () {},
$request,
HttpKernelInterface::MAIN_REQUEST
);

$resolver->onKernelControllerArguments($event);
$data = $event->getArguments()[0];

$this->assertEmpty($data);
}

/**
* @dataProvider provideContext
*/
public function testNotNullableFile(RequestPayloadValueResolver $resolver, Request $request)
{
$attribute = new MapUploadedFile();
$argument = new ArgumentMetadata(
'qux',
UploadedFile::class,
false,
false,
null,
false,
[$attribute::class => $attribute]
);
$event = new ControllerArgumentsEvent(
$this->createMock(HttpKernelInterface::class),
static function () {},
$resolver->resolve($request, $argument),
$request,
HttpKernelInterface::MAIN_REQUEST
);

$this->expectException(HttpException::class);

$resolver->onKernelControllerArguments($event);
}

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

$resolver->onKernelControllerArguments($event);
$data = $event->getArguments()[0];

$this->assertNull($data);
}

/**
* @dataProvider provideContext
*/
Expand Down Expand Up @@ -269,7 +327,7 @@ static function () {},
$resolver->onKernelControllerArguments($event);

/** @var UploadedFile[] $data */
$data = $event->getArguments()[0];
$data = $event->getArguments();

$this->assertCount(2, $data);
$this->assertSame('file-small.txt', $data[0]->getFilename());
Expand Down