diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
index 6804ded30d0e5..31593b9b80506 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -78,6 +78,10 @@ protected function createController($controller)
*/
protected function instantiateController($class)
{
+ if ($this->container->has($class)) {
+ return $this->container->get($class);
+ }
+
$controller = parent::instantiateController($class);
if ($controller instanceof ContainerAwareInterface) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
index 76a3489fe1551..b4dc8ada555b6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -87,6 +87,8 @@ public function testGetControllerService()
public function testGetControllerInvokableService()
{
+ $invokableController = new InvokableController('bar');
+
$container = $this->createMockContainer();
$container->expects($this->once())
->method('has')
@@ -96,7 +98,7 @@ public function testGetControllerInvokableService()
$container->expects($this->once())
->method('get')
->with('foo')
- ->will($this->returnValue($this))
+ ->will($this->returnValue($invokableController))
;
$resolver = $this->createControllerResolver(null, null, $container);
@@ -105,7 +107,33 @@ public function testGetControllerInvokableService()
$controller = $resolver->getController($request);
- $this->assertInstanceOf(get_class($this), $controller);
+ $this->assertEquals($invokableController, $controller);
+ }
+
+ public function testGetControllerInvokableServiceWithClassNameAsName()
+ {
+ $invokableController = new InvokableController('bar');
+ $className = __NAMESPACE__.'\InvokableController';
+
+ $container = $this->createMockContainer();
+ $container->expects($this->once())
+ ->method('has')
+ ->with($className)
+ ->will($this->returnValue(true))
+ ;
+ $container->expects($this->once())
+ ->method('get')
+ ->with($className)
+ ->will($this->returnValue($invokableController))
+ ;
+
+ $resolver = $this->createControllerResolver(null, null, $container);
+ $request = Request::create('/');
+ $request->attributes->set('_controller', $className);
+
+ $controller = $resolver->getController($request);
+
+ $this->assertEquals($invokableController, $controller);
}
/**
@@ -178,3 +206,14 @@ public function __invoke()
{
}
}
+
+class InvokableController
+{
+ public function __construct($bar) // mandatory argument to prevent automatic instantiation
+ {
+ }
+
+ public function __invoke()
+ {
+ }
+}
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