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

rjwebdev · rjwebdev · commit 8bf1b4900221 · 2019-05-02T21:48:49.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -46,6 +46,13 @@ protected function createController($controller)
             $resolvedController[0] = $this->configureController($resolvedController[0]);
         }
 
+        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();
@@ -217,6 +235,10 @@ public function getContainer()
         return $this->container;
     }
 
+    public function __invoke()
+    {
+    }
+
     public function fooAction()
     {
     }
