[HttpKernel] fixed ControllerResolver when the controller is a class name with an __invoke() method

fabpot · fabpot · commit be031f54a16e · 2011-08-08T23:20:03.000+02:00
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);

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,14 @@ public function getController(Request $request)`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (is_array($controller) \|\| ((is_object($controller) \|\| false === strpos($controller, ':')) && method_exists($controller, '__invoke'))) {`
	`67`	`+ if (is_array($controller) \|\| (is_object($controller) && method_exists($controller, '__invoke'))) {`
`68`	`68`	`return $controller;`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ if (false === strpos($controller, ':') && method_exists($controller, '__invoke')) {`
	`72`	`+ return new $controller;`
	`73`	`+ }`
	`74`	`+`
`71`	`75`	`list($controller, $method) = $this->createController($controller);`
`72`	`76`
`73`	`77`	`if (!method_exists($controller, $method)) {`