[HttpKernel] Allow variadic controller parameters to be resolved. #15777
Conversation
This file contains hidden or 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
| @@ -125,7 +125,11 @@ protected function doGetArguments(Request $request, $controller, array $paramete | |||
| $arguments = array(); | |||
| foreach ($parameters as $param) { | |||
| if (array_key_exists($param->name, $attributes)) { | |||
| $arguments[] = $attributes[$param->name]; | |||
| if ($param->isVariadic() && is_array($attributes[$param->name])) { | |||
There was a problem hiding this comment.
you first have to check if this method exists, as Symfony should also support PHP 5.3, 5.4 and 5.5.
|
you also need to handle the case of a variadic parameter not being passed, to avoid throwing an exception in such case (see how it is done in https://github.com/symfony/symfony/pull/15426/files for the serializer) |
| Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Variadic parameters in controller signature were not handled correctly by the `ControllerResolver`.
| $request->attributes->set('foo', 'foo'); | ||
| $request->attributes->set('bar', array($param1, $param2)); | ||
| $controller = array(new VariadicController(), 'action'); | ||
| $this->assertEquals(array('foo', $param1, $param2), $resolver->getArguments($request, $controller)); |
There was a problem hiding this comment.
Should be assertSame() as assertEquals() would not make a distinction between ['foo', $param1, $param2] and ['foo', $param1, $param1].
Also, consider using strings instead of stdClass here. In this case type doesn't matter and if we can make the test shorter, we should ;)
|
@NiR- Can you have a look at the comments and finish this PR? |
|
@NiR- Any news? |
fabpot
added a commit
that referenced
this pull request
Mar 1, 2016
This PR was merged into the 2.3 branch. Discussion ---------- Variadic controller params | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15777 | License | MIT Commits ------- bedcb15 simplified code f39afc8 Allow variadic controller parameters to be resolved.
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.
Variadic parameters in controller signature were not handled correctly by the
ControllerResolver.