[FrameworkBundle]: use __invoke function if no method is defined in routing configuration

rjwebdev · Ruben Jacobs · commit 881a02f583bb · 2019-05-06T08:35:35.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -43,7 +43,14 @@ protected function createController($controller)
             @trigger_error(sprintf('Referencing controllers with %s is deprecated since Symfony 4.1. Use %s instead.', $deprecatedNotation, $controller), E_USER_DEPRECATED);
         }
 
-        return parent::createController($controller);
+        if (\is_object($resolvedController) && method_exists($resolvedController, '__invoke')) {
+            $resolvedController = [
+                $this->configureController($resolvedController),
+                '__invoke',
+            ];
+        }
+
+        return $resolvedController;
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -24,6 +24,24 @@
 
 class ControllerResolverTest extends ContainerControllerResolverTest
 {
+    public function testGetControllerWithServiceWithoutMethod()
+    {
+        class_exists(AbstractControllerTest::class);
+
+        $dummyController = new DummyController();
+        $container = new Container();
+        $container->set('app.index_controller', $dummyController);
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'app.index_controller');
+
+        $controller = $resolver->getController($request);
+
+        $this->assertSame($container, $controller[0]->getContainer());
+        $this->assertSame('__invoke', $controller[1]);
+    }
+
     public function testGetControllerOnContainerAware()
     {
         $resolver = $this->createControllerResolver();
@@ -230,6 +248,10 @@ public function getContainer()
         return $this->container;
     }
 
+    public function __invoke()
+    {
+    }
+
     public function fooAction()
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,14 @@ protected function createController($controller)`
`43`	`43`	`@trigger_error(sprintf('Referencing controllers with %s is deprecated since Symfony 4.1. Use %s instead.', $deprecatedNotation, $controller), E_USER_DEPRECATED);`
`44`	`44`	`}`
`45`	`45`
`46`		`- return parent::createController($controller);`
	`46`	`+ if (\is_object($resolvedController) && method_exists($resolvedController, '__invoke')) {`
	`47`	`+ $resolvedController = [`
	`48`	`+ $this->configureController($resolvedController),`
	`49`	`+ '__invoke',`
	`50`	`+ ];`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ return $resolvedController;`
`47`	`54`	`}`
`48`	`55`
`49`	`56`	`/**`