simplified code

fabpot · fabpot · commit 58714d0cf774 · 2016-03-01T11:58:16.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -117,10 +117,9 @@ 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)) {
-                if ($variadicAvailable && $param->isVariadic() && is_array($attributes[$param->name])) {
+                if (PHP_VERSION_ID >= 50600 && $param->isVariadic() && is_array($attributes[$param->name])) {
                     $arguments = array_merge($arguments, array_values($attributes[$param->name]));
                 } else {
                     $arguments[] = $attributes[$param->name];
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -205,12 +205,10 @@ 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));
+        $request->attributes->set('bar', array('foo', 'bar'));
         $controller = array(new VariadicController(), 'action');
-        $this->assertEquals(array('foo', $param1, $param2), $resolver->getArguments($request, $controller));
+        $this->assertEquals(array('foo', 'foo', 'bar'), $resolver->getArguments($request, $controller));
     }
 
     public function testCreateControllerCanReturnAnyCallable()
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php
@@ -4,7 +4,7 @@
 
 class VariadicController
 {
-    public function action($foo,...$bar)
+    public function action($foo, ...$bar)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class VariadicController`
`6`	`6`	`{`
`7`		`- public function action($foo,...$bar)`
	`7`	`+ public function action($foo, ...$bar)`
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`	`}`