-
-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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.
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
[HttpKernel] Fix variadic TypeError for #[MapUploadedFile]
#54901
base: 7.1
Are you sure you want to change the base?
[HttpKernel] Fix variadic TypeError for #[MapUploadedFile]
#54901
Conversation
#[MapUploadedFile]
Failing tests seem unrelated |
@@ -170,7 +170,11 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo | |||
}; | |||
} | |||
|
|||
$arguments[$i] = $payload; | |||
if ($argument->metadata->isVariadic() && \is_array($payload)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if the payload is not an array, we should throw a 422 instead, don't you think?
we should also use array_is_list so that we don't map to named arguments by mistake
@@ -170,7 +170,11 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo | |||
}; | |||
} | |||
|
|||
$arguments[$i] = $payload; | |||
if ($argument->metadata->isVariadic() && \is_array($payload)) { | |||
array_splice($arguments, $i, 1, $payload); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could we use array_merge instead? that might be more readable
This PR fixes a bug introduced in #49978 where using
#[MapUploadedFile]
with a variadic argument causes aTypeError
:(Bug fix taken from #54817)