From 6229150252e4495fc5d2028711235aa2c5c6569d Mon Sep 17 00:00:00 2001
From: Albin Kerouaton <albin.kerouanton@knplabs.com>
Date: Sun, 13 Sep 2015 17:34:02 +0200
Subject: [PATCH] [HttpKernel] Allow variadic controller parameters to be
 resolved.

| 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`.
---
 .../Controller/ControllerResolver.php           |  7 ++++++-
 .../Tests/Controller/ControllerResolverTest.php | 17 +++++++++++++++++
 .../Fixtures/Controller/VariadicController.php  | 10 ++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php

diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index 3ab8b1ce117a7..6ef4be5a19a45 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -123,9 +123,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
index 07bdd0ec7092e..f5502c6f96fa5 100644
--- 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
new file mode 100644
index 0000000000000..ebca5c4c1d075
--- /dev/null
+++ 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)
+    {
+    }
+}