Allow variadic controller parameters to be resolved.

symfony · fabpot · Mar 1, 2016 · Sep 13, 2015 · Mar 1, 2016 · Mar 1, 2016
commit f39afc85db19a1599a203056a6b0b0f31058da4b
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -117,9 +117,14 @@ protected function doGetArguments(Request $request, $controller, array $paramete
    {
        $attributes = $request->attributes->all();
        $arguments = array();
+        $variadicAvailable = method_exists('\ReflectionMethod', 'isVariadic');
        foreach ($parameters as $param) {
            if (array_key_exists($param->name, $attributes)) {
-                $arguments[] = $attributes[$param->name];
+                if ($variadicAvailable && $param->isVariadic() && is_array($attributes[$param->name])) {
+                    $arguments = array_merge($arguments, array_values($attributes[$param->name]));
+                } else {
+                    $arguments[] = $attributes[$param->name];
+                }
            } elseif ($param->getClass() && $param->getClass()->isInstance($request)) {
                $arguments[] = $request;
            } elseif ($param->isDefaultValueAvailable()) {

diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\Controller;

 use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
 use Symfony\Component\HttpFoundation\Request;

 class ControllerResolverTest extends \PHPUnit_Framework_TestCase
@@ -196,6 +197,22 @@ public function testGetArguments()
        $this->assertEquals(array($request), $resolver->getArguments($request, $controller), '->getArguments() injects the request');
    }

+    /**
+     * @requires PHP 5.6
+     */
+    public function testGetVariadicArguments()
+    {
+        $resolver = new ControllerResolver();
+
+        $request = Request::create('/');
+        $param1 = new \stdClass();
+        $param2 = new \stdClass();
+        $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));
+    }
+
    public function testCreateControllerCanReturnAnyCallable()
    {
        $mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));

diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
+
+class VariadicController
+{
+    public function action($foo,...$bar)
+    {
+    }
+}