+ */
+class RegisterArgumentResolversPass implements CompilerPassInterface
+{
+ /**
+ * @var string
+ */
+ private $managerService;
+
+ /**
+ * @var string
+ */
+ private $resolverTag;
+
+ public function __construct($managerService = 'argument_resolver.manager', $resolverTag = 'kernel.argument_resolver')
+ {
+ $this->managerService = $managerService;
+ $this->resolverTag = $resolverTag;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function process(ContainerBuilder $container)
+ {
+ if (!$container->hasDefinition($this->managerService) && !$container->hasAlias($this->managerService)) {
+ return;
+ }
+
+ $definition = $container->findDefinition($this->managerService);
+
+ foreach ($container->findTaggedServiceIds($this->resolverTag) as $id => $resolvers) {
+ $definition->addMethodCall('add', array(new Reference($id)));
+ }
+ }
+}
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 82ffa95d71208..12b81149acc0e 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\HttpKernel;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverManager;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
@@ -37,22 +39,25 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
{
protected $dispatcher;
protected $resolver;
+ protected $argumentResolver;
protected $requestStack;
/**
* Constructor.
*
- * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
- * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance
- * @param RequestStack $requestStack A stack for master/sub requests
+ * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
+ * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance
+ * @param RequestStack $requestStack A stack for master/sub requests
+ * @param ArgumentResolverManager $argumentResolver An ArgumentResolverManager instance
*
* @api
*/
- public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null)
+ public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null, ArgumentResolverManager $argumentResolver = null)
{
$this->dispatcher = $dispatcher;
$this->resolver = $resolver;
$this->requestStack = $requestStack ?: new RequestStack();
+ $this->argumentResolver = $argumentResolver;
}
/**
@@ -141,7 +146,7 @@ private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
$controller = $event->getController();
// controller arguments
- $arguments = $this->resolver->getArguments($request, $controller);
+ $arguments = $this->getArgumentResolver()->getArguments($request, $controller);
// call controller
$response = call_user_func_array($controller, $arguments);
@@ -290,4 +295,19 @@ private function varToString($var)
return (string) $var;
}
+
+ /**
+ * @return ArgumentResolverManager
+ */
+ protected function getArgumentResolver()
+ {
+ if (null === $this->argumentResolver) {
+ // to keep BC
+ $this->argumentResolver = new ArgumentResolverManager();
+ $this->argumentResolver->add(new ArgumentResolver\RequestArgumentResolver());
+ $this->argumentResolver->add(new ArgumentResolver\RequestAttributesArgumentResolver());
+ }
+
+ return $this->argumentResolver;
+ }
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverManagerTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverManagerTest.php
new file mode 100644
index 0000000000000..0ad048c551e78
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverManagerTest.php
@@ -0,0 +1,132 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Controller;
+
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverManager;
+
+class ArgumentResolverManagerTest extends \PHPUnit_Framework_TestCase
+{
+ protected $manager;
+ protected $resolver1;
+ protected $resolver2;
+ protected $request;
+
+ public function setUp()
+ {
+ $this->resolver1 = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
+ $this->resolver2 = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
+
+ $this->manager = new ArgumentResolverManager();
+ $this->manager->add($this->resolver1);
+ $this->manager->add($this->resolver2);
+
+ $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ }
+
+ public function testGetArgumentsWithoutControllerParameters()
+ {
+ $this->assertArguments(array(), function () { });
+ }
+
+ public function testGetArgumentsFirstResolverAccepts()
+ {
+ $this->promiseResolverToMatch($this->resolver1, 'resolved_value');
+
+ $this->assertArguments(array('resolved_value'), $this->getControllerWithOneParameter());
+ }
+
+ public function testGetArgumentsSecondResolverAccepts()
+ {
+ $this->promiseResolverToNotMatch($this->resolver1);
+ $this->promiseResolverToMatch($this->resolver2, 'resolved_value');
+
+ $this->assertArguments(array('resolved_value'), $this->getControllerWithOneParameter());
+ }
+
+ /**
+ * @expectedException RuntimeException
+ */
+ public function testGetArgumentsFailsIfNoResolverAccepts()
+ {
+ $this->promiseResolverToNotMatch($this->resolver1);
+ $this->promiseResolverToNotMatch($this->resolver2);
+
+ $this->manager->getArguments($this->request, $this->getControllerWithOneParameter());
+ }
+
+ public function testGetArgumentResolvingMultipleParameters()
+ {
+ $this->resolver1->expects($this->any())
+ ->method('supports')
+ ->will($this->onConsecutiveCalls(false, true, true));
+ $this->resolver1->expects($this->any())
+ ->method('resolve')
+ ->will($this->onConsecutiveCalls('1st resolved by 1', '2nd resolved by 1'));
+
+ $this->resolver2->expects($this->any())
+ ->method('supports')
+ ->will($this->onConsecutiveCalls(true, false, true));
+ $this->resolver2->expects($this->any())
+ ->method('resolve')
+ ->will($this->onConsecutiveCalls('1st resolved by 2', '2nd resolved by 2'));
+
+ $this->assertArguments(
+ array('1st resolved by 2', '1st resolved by 1', '2nd resolved by 1'),
+ function ($a, $b, $c) { }
+ );
+ }
+
+ public function testControllerWithOneOptionalParameterWhichDoesNotMatch()
+ {
+ $this->promiseResolverToNotMatch($this->resolver1);
+ $this->promiseResolverToNotMatch($this->resolver2);
+
+ $this->assertArguments(array('default'), function ($a = 'default') { });
+ }
+
+ public function testControllerWithOneOptionalParameterWhichDoesMatch()
+ {
+ $this->promiseResolverToMatch($this->resolver1, 'resolved by 1');
+ $this->promiseResolverToNotMatch($this->resolver2);
+
+ $this->assertArguments(array('resolved by 1'), function ($a = 'default') { });
+ }
+
+ public function testControllerWithOneParameterWithNullDefault()
+ {
+ $this->promiseResolverToNotMatch($this->resolver1);
+ $this->promiseResolverToNotMatch($this->resolver2);
+
+ $this->assertArguments(array(null), function ($a = null) { });
+ }
+
+ private function assertArguments(array $expected, $controller)
+ {
+ $this->assertEquals($expected, $this->manager->getArguments($this->request, $controller));
+ }
+
+ private function promiseResolverToMatch($resolver, $return)
+ {
+ $resolver->expects($this->any())->method('supports')->will($this->returnValue(true));
+ $resolver->expects($this->any())->method('resolve')->will($this->returnValue($return));
+ }
+
+ private function promiseResolverToNotMatch($resolver)
+ {
+ $resolver->expects($this->any())->method('supports')->will($this->returnValue(false));
+ }
+
+ private function getControllerWithOneParameter()
+ {
+ return function ($a) { };
+ }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
index 4b886ee10977d..ba78109af9cb0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -52,9 +52,9 @@ public function testGetControllerWithObjectAndMethod()
$resolver = $this->createControllerResolver();
$request = Request::create('/');
- $request->attributes->set('_controller', array($this, 'controllerMethod1'));
+ $request->attributes->set('_controller', array($this, 'controllerMethod'));
$controller = $resolver->getController($request);
- $this->assertSame(array($this, 'controllerMethod1'), $controller);
+ $this->assertSame(array($this, 'controllerMethod'), $controller);
}
public function testGetControllerWithClassAndMethod()
@@ -62,9 +62,9 @@ public function testGetControllerWithClassAndMethod()
$resolver = $this->createControllerResolver();
$request = Request::create('/');
- $request->attributes->set('_controller', array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'));
+ $request->attributes->set('_controller', array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'staticControllerMethod'));
$controller = $resolver->getController($request);
- $this->assertSame(array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'), $controller);
+ $this->assertSame(array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'staticControllerMethod'), $controller);
}
public function testGetControllerWithObjectAndMethodAsString()
@@ -72,7 +72,7 @@ public function testGetControllerWithObjectAndMethodAsString()
$resolver = $this->createControllerResolver();
$request = Request::create('/');
- $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::controllerMethod1');
+ $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::controllerMethod');
$controller = $resolver->getController($request);
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller[0], '->getController() returns a PHP callable');
}
@@ -132,67 +132,6 @@ public function getUndefinedControllers()
);
}
- public function testGetArguments()
- {
- $resolver = $this->createControllerResolver();
-
- $request = Request::create('/');
- $controller = array(new self(), 'testGetArguments');
- $this->assertEquals(array(), $resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $controller = array(new self(), 'controllerMethod1');
- $this->assertEquals(array('foo'), $resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $controller = array(new self(), 'controllerMethod2');
- $this->assertEquals(array('foo', null), $resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
-
- $request->attributes->set('bar', 'bar');
- $this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $controller = function ($foo) {};
- $this->assertEquals(array('foo'), $resolver->getArguments($request, $controller));
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $controller = function ($foo, $bar = 'bar') {};
- $this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller));
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $controller = new self();
- $this->assertEquals(array('foo', null), $resolver->getArguments($request, $controller));
- $request->attributes->set('bar', 'bar');
- $this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller));
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $request->attributes->set('foobar', 'foobar');
- $controller = 'Symfony\Component\HttpKernel\Tests\Controller\some_controller_function';
- $this->assertEquals(array('foo', 'foobar'), $resolver->getArguments($request, $controller));
-
- $request = Request::create('/');
- $request->attributes->set('foo', 'foo');
- $request->attributes->set('foobar', 'foobar');
- $controller = array(new self(), 'controllerMethod3');
-
- try {
- $resolver->getArguments($request, $controller);
- $this->fail('->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
- } catch (\Exception $e) {
- $this->assertInstanceOf('\RuntimeException', $e, '->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
- }
-
- $request = Request::create('/');
- $controller = array(new self(), 'controllerMethod5');
- $this->assertEquals(array($request), $resolver->getArguments($request, $controller), '->getArguments() injects the request');
- }
-
public function testCreateControllerCanReturnAnyCallable()
{
$mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));
@@ -212,23 +151,11 @@ public function __invoke($foo, $bar = null)
{
}
- public function controllerMethod1($foo)
- {
- }
-
- protected function controllerMethod2($foo, $bar = null)
- {
- }
-
- protected function controllerMethod3($foo, $bar = null, $foobar)
- {
- }
-
- protected static function controllerMethod4()
+ public function controllerMethod($foo)
{
}
- protected function controllerMethod5(Request $request)
+ protected static function staticControllerMethod()
{
}
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
index c2cafc37b8cfa..5931086c60ea7 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -96,9 +96,11 @@ public function testAddListenerNested()
protected function getHttpKernel($dispatcher, $controller)
{
$resolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');
- $resolver->expects($this->once())->method('getController')->will($this->returnValue($controller));
- $resolver->expects($this->once())->method('getArguments')->will($this->returnValue(array()));
+ $resolver->expects($this->any())->method('getController')->will($this->returnValue($controller));
- return new HttpKernel($dispatcher, $resolver);
+ $argumentResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverManager');
+ $argumentResolver->expects($this->any())->method('getArguments')->will($this->returnValue(array()));
+
+ return new HttpKernel($dispatcher, $resolver, null, $argumentResolver);
}
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
index 0b110d4a21b2f..73416da86132f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
@@ -42,7 +42,7 @@ public function testHandle($type)
$dispatcher = new EventDispatcher();
$resolver = $this->getResolverMockFor($controller, $request);
$stack = new RequestStack();
- $kernel = new ContainerAwareHttpKernel($dispatcher, $container, $resolver, $stack);
+ $kernel = new ContainerAwareHttpKernel($dispatcher, $container, $resolver, $stack, $this->getArgumentsResolverMockFor($controller, $request));
$actual = $kernel->handle($request, $type);
@@ -67,7 +67,7 @@ public function testVerifyRequestStackPushPopDuringHandle($type)
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
$dispatcher = new EventDispatcher();
$resolver = $this->getResolverMockFor($controller, $request);
- $kernel = new ContainerAwareHttpKernel($dispatcher, $container, $resolver, $stack);
+ $kernel = new ContainerAwareHttpKernel($dispatcher, $container, $resolver, $stack, $this->getArgumentsResolverMockFor($controller, $request));
$kernel->handle($request, $type);
}
@@ -95,7 +95,7 @@ public function testHandleRestoresThePreviousRequestOnException($type)
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
$resolver = $this->getResolverMockFor($controller, $request);
$stack = new RequestStack();
- $kernel = new ContainerAwareHttpKernel($dispatcher, $container, $resolver, $stack);
+ $kernel = new ContainerAwareHttpKernel($dispatcher, $container, $resolver, $stack, $this->getArgumentsResolverMockFor($controller, $request));
try {
$kernel->handle($request, $type);
@@ -118,16 +118,21 @@ public function getProviderTypes()
private function getResolverMockFor($controller, $request)
{
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
- $resolver->expects($this->once())
+ $resolver->expects($this->any())
->method('getController')
->with($request)
->will($this->returnValue($controller));
- $resolver->expects($this->once())
+
+ return $resolver;
+ }
+
+ private function getArgumentsResolverMockFor($controller, $request)
+ {
+ $resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ArgumentsResolverManager');
+ $resolver->expects($this->any())
->method('getArguments')
->with($request, $controller)
->will($this->returnValue(array()));
-
- return $resolver;
}
private function expectsSetRequestWithAt($container, $with, $at)
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index 4e487a478a600..cddda31189e4f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -144,7 +144,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
{
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
$resolver
- ->expects($this->once())
+ ->expects($this->any())
->method('getController')
->will($this->returnValue(function () {
ob_start();
@@ -152,13 +152,15 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
throw new \RuntimeException();
}))
;
- $resolver
- ->expects($this->once())
+
+ $argumentResolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverManager');
+ $argumentResolver
+ ->expects($this->any())
->method('getArguments')
->will($this->returnValue(array()))
;
- $kernel = new HttpKernel(new EventDispatcher(), $resolver);
+ $kernel = new HttpKernel(new EventDispatcher(), $resolver, null, $argumentResolver);
$renderer = new InlineFragmentRenderer($kernel);
// simulate a main request with output buffering
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy