Merge pull request #927 from Engerim/controller_invoke

Add support for invokable controller

Author: lsmith77

EventListener/ParamFetcherListener.php

@@ -51,8 +51,14 @@ public function onKernelController(FilterControllerEvent $event)
         $request = $event->getRequest();
         $paramFetcher = $this->container->get('fos_rest.request.param_fetcher');
 
-        $paramFetcher->setController($event->getController());
-        $attributeName = $this->getAttributeName($event->getController());
+        $controller = $event->getController();
+
+        if (is_callable($controller) && method_exists($controller, '__invoke')) {
+            $controller = array($controller, '__invoke');
+        }
+
+        $paramFetcher->setController($controller);
+        $attributeName = $this->getAttributeName($controller);
         $request->attributes->set($attributeName, $paramFetcher);
 
         if ($this->setParamsAsAttributes) {

Tests/EventListener/ParamFetcherListenerTest.php

@@ -97,6 +97,36 @@ public function testSettingParamFetcherByTypehint($actionName, $expectedAttribut
         $this->assertSame($this->paramFetcher, $request->attributes->get($expectedAttribute));
     }
 
+    /**
+     * Tests that the ParamFetcher can be injected in a invokable controller.
+     */
+    public function testSettingParamFetcherForInvokable()
+    {
+        $request = new Request();
+
+        $event = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $event->expects($this->atLeastOnce())
+            ->method('getRequest')
+            ->will($this->returnValue($request));
+
+        $controller = new ParamFetcherController();
+
+        $event->expects($this->atLeastOnce())
+            ->method('getController')
+            ->will($this->returnValue($controller));
+
+        $this->paramFetcher->expects($this->once())
+            ->method('all')
+            ->will($this->returnValue(array()));
+
+        $this->paramFetcherListener->onKernelController($event);
+
+        $this->assertSame($this->paramFetcher, $request->attributes->get('pfInvokable'));
+    }
+
     public function setParamFetcherByTypehintProvider()
     {
         return array(

Tests/Fixtures/Controller/ParamFetcherController.php

@@ -28,4 +28,10 @@ public function byTypeAction(ParamFetcher $pf)
      */
     public function notProvidedAction()
     {}
+
+    /**
+     * Make sure the ParamFetcher can be set for controller which are used as invokable
+     */
+    public function __invoke(ParamFetcher $pfInvokable)
+    {}
 }