diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow variadic controller parameters to be resolved.

Browse Source
This commit is contained in:
Albin Kerouaton 2015-09-13 17:34:02 +02:00 committed by Fabien Potencier
parent 2a811427c0
commit f39afc85db
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
View File

@ -117,9 +117,14 @@ class ControllerResolver implements ControllerResolverInterface
{
$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()) {

17
src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
View File

@ -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 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
$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'));

10
src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php Normal file
View File

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