[HttpKernel] fixed ControllerResolver when the controller is a class …

…name with an __invoke() method
symfony · Aug 8, 2011 · be031f5 · be031f5
1 parent e136718
commit be031f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -64,10 +64,14 @@ public function getController(Request $request)
             return false;
         }
 
-        if (is_array($controller) || ((is_object($controller) || false === strpos($controller, ':')) && method_exists($controller, '__invoke'))) {
+        if (is_array($controller) || (is_object($controller) && method_exists($controller, '__invoke'))) {
             return $controller;
         }
 
+        if (false === strpos($controller, ':') && method_exists($controller, '__invoke')) {
+            return new $controller;
+        }
+
         list($controller, $method) = $this->createController($controller);
 
         if (!method_exists($controller, $method)) {

diff --git a/tests/Symfony/Tests/Component/HttpKernel/Controller/ControllerResolverTest.php b/tests/Symfony/Tests/Component/HttpKernel/Controller/ControllerResolverTest.php
@@ -39,6 +39,10 @@ public function testGetController()
         $controller = $resolver->getController($request);
         $this->assertSame($this, $controller);
 
+        $request->attributes->set('_controller', 'Symfony\Tests\Component\HttpKernel\ControllerResolverTest');
+        $controller = $resolver->getController($request);
+        $this->assertInstanceOf('Symfony\Tests\Component\HttpKernel\ControllerResolverTest', $controller);
+
         $request->attributes->set('_controller', array($this, 'controllerMethod1'));
         $controller = $resolver->getController($request);
         $this->assertSame(array($this, 'controllerMethod1'), $controller);