[HttpKernel] Fix variadic TypeError for #[MapUploadedFile]
#54901
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DjordyKoert
changed the title
#[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.
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.
could we use array_merge instead? that might be more readable
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a bug introduced in #49978 where using
#[MapUploadedFile]with a variadic argument causes aTypeError:(Bug fix taken from #54817)