Allow the user to typehint using ParamFetcherInterface

Author: Ian Phillips

EventListener/ParamFetcherListener.php

@@ -77,7 +77,7 @@ public function onKernelController(FilterControllerEvent $event)
     /**
      * Determines which attribute the ParamFetcher should be injected as.
      *
-     * @param array $controller The controller action an an "array" callable.
+     * @param array $controller The controller action as an "array" callable.
      *
      * @return string
      */
@@ -109,7 +109,7 @@ private function isParamFetcherType(\ReflectionParameter $controllerParam)
         if (null === $type) {
             return false;
         }
-
-        return 'FOS\\RestBundle\\Request\\ParamFetcher' === $type->getName();
+        $fetcherInterface = 'FOS\\RestBundle\\Request\\ParamFetcherInterface';
+        return $type->implementsInterface($fetcherInterface);
     }
 }

Tests/EventListener/ParamFetcherListenerTest.php

@@ -138,6 +138,9 @@ public function setParamFetcherByTypehintProvider()
             // the parameter name is.
             array('byTypeAction', 'pf'),
 
+            // The user can typehint using ParamFetcherInterface, too.
+            array('byInterfaceAction', 'pfi'),
+
             // If there is no controller argument for the ParamFetcher, it
             // should be injected as the default name.
             array('notProvidedAction', 'paramFetcher'),

Tests/Fixtures/Controller/ParamFetcherController.php

@@ -3,6 +3,7 @@
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
 use FOS\RestBundle\Request\ParamFetcher;
+use FOS\RestBundle\Request\ParamFetcherInterface;
 
 /**
  * Fixture for testing whether the ParamFetcher can be injected into
@@ -22,6 +23,13 @@ public function byNameAction($paramFetcher)
     public function byTypeAction(ParamFetcher $pf)
     {}
 
+    /**
+     * Make sure the ParamFetcher can be injected if the typehint is for
+     * the interface.
+     */
+    public function byInterfaceAction(ParamFetcherInterface $pfi)
+    {}
+
     /**
      * Make sure the ParamFetcher can be set as a request attribute even if
      * there is no controller parameter to receive it.