Fix the injection of the container in invokable controllers

stof · stof · commit 36e09da4b9e7 · 2015-09-09T14:19:27.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -70,17 +70,20 @@ protected function createController($controller)
             }
         }
 
-        list($class, $method) = explode('::', $controller, 2);
+        return parent::createController($controller);
+    }
 
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
-        }
+    /**
+     * {@inheritdoc}
+     */
+    protected function instantiateController($class)
+    {
+        $controller = parent::instantiateController($class);
 
-        $controller = $this->instantiateController($class);
         if ($controller instanceof ContainerAwareInterface) {
             $controller->setContainer($this->container);
         }
 
-        return array($controller, $method);
+        return $controller;
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -33,6 +33,18 @@ public function testGetControllerOnContainerAware()
         $this->assertSame('testAction', $controller[1]);
     }
 
+    public function testGetControllerOnContainerAwareInvokable()
+    {
+        $resolver = $this->createControllerResolver();
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController');
+
+        $controller = $resolver->getController($request);
+
+        $this->assertInstanceOf('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController', $controller);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller->getContainer());
+    }
+
     public function testGetControllerWithBundleNotation()
     {
         $shortName = 'FooBundle:Default:test';
@@ -161,4 +173,8 @@ public function getContainer()
     public function testAction()
     {
     }
+
+    public function __invoke()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,17 +70,20 @@ protected function createController($controller)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- list($class, $method) = explode('::', $controller, 2);`
	`73`	`+ return parent::createController($controller);`
	`74`	`+ }`
`74`	`75`
`75`		`- if (!class_exists($class)) {`
`76`		`- throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));`
`77`		`- }`
	`76`	`+ /**`
	`77`	`+ * {@inheritdoc}`
	`78`	`+ */`
	`79`	`+ protected function instantiateController($class)`
	`80`	`+ {`
	`81`	`+ $controller = parent::instantiateController($class);`
`78`	`82`
`79`		`- $controller = $this->instantiateController($class);`
`80`	`83`	`if ($controller instanceof ContainerAwareInterface) {`
`81`	`84`	`$controller->setContainer($this->container);`
`82`	`85`	`}`
`83`	`86`
`84`		`- return array($controller, $method);`
	`87`	`+ return $controller;`
`85`	`88`	`}`
`86`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,18 @@ public function testGetControllerOnContainerAware()`
`33`	`33`	`$this->assertSame('testAction', $controller[1]);`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ public function testGetControllerOnContainerAwareInvokable()`
	`37`	`+ {`
	`38`	`+ $resolver = $this->createControllerResolver();`
	`39`	`+ $request = Request::create('/');`
	`40`	`+ $request->attributes->set('_controller', 'Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController');`
	`41`	`+`
	`42`	`+ $controller = $resolver->getController($request);`
	`43`	`+`
	`44`	`+ $this->assertInstanceOf('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController', $controller);`
	`45`	`+ $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller->getContainer());`
	`46`	`+ }`
	`47`	`+`
`36`	`48`	`public function testGetControllerWithBundleNotation()`
`37`	`49`	`{`
`38`	`50`	`$shortName = 'FooBundle:Default:test';`
`@@ -161,4 +173,8 @@ public function getContainer()`
`161`	`173`	`public function testAction()`
`162`	`174`	`{`
`163`	`175`	`}`
	`176`	`+`
	`177`	`+ public function __invoke()`
	`178`	`+ {`
	`179`	`+ }`
`164`	`180`	`}`