call setContainer() for autowired controllers

xabbuh · xabbuh · commit 0fc8718e5359 · 2017-06-20T19:01:50.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -49,7 +49,13 @@ protected function createController($controller)
             $controller = $this->parser->parse($controller);
         }
 
-        return parent::createController($controller);
+        $resolvedController = parent::createController($controller);
+
+        if (1 === substr_count($controller, ':') && is_array($resolvedController) && $resolvedController[0] instanceof ContainerAwareInterface) {
+            $resolvedController[0]->setContainer($this->container);
+        }
+
+        return $resolvedController;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,13 @@ protected function createController($controller)`
`49`	`49`	`$controller = $this->parser->parse($controller);`
`50`	`50`	`}`
`51`	`51`
`52`		`- return parent::createController($controller);`
	`52`	`+ $resolvedController = parent::createController($controller);`
	`53`	`+`
	`54`	`+ if (1 === substr_count($controller, ':') && is_array($resolvedController) && $resolvedController[0] instanceof ContainerAwareInterface) {`
	`55`	`+ $resolvedController[0]->setContainer($this->container);`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ return $resolvedController;`
`53`	`59`	`}`
`54`	`60`
`55`	`61`	`/**`