Merge pull request #478 from tystr/typehinted-controller-arg-route-fix

Revert the changes to how typehinted controller arguments are handled when using automatic route generation
FriendsOfSymfony · Jun 17, 2013 · a1b45da · a1b45da
2 parents 6e11a63 + 030669f
commit a1b45da
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/Routing/Loader/Reader/RestActionReader.php b/Routing/Loader/Reader/RestActionReader.php
@@ -270,7 +270,7 @@ private function getHttpMethodAndResourcesFromMethod(\ReflectionMethod $method,
     }
 
     /**
-     * Returns readable arguments from method. Typehinted arguments are ignored.
+     * Returns readable arguments from method.
      *
      * @param \ReflectionMethod $method
      *
@@ -281,12 +281,29 @@ private function getMethodArguments(\ReflectionMethod $method)
         // ignore all query params
         $params = $this->paramReader->getParamsFromMethod($method);
 
+        // ignore type hinted arguments that are or extend from:
+        // * Symfony\Component\HttpFoundation\Request
+        // * FOS\RestBundle\Request\QueryFetcher
+        $ignoreClasses = array(
+            'Symfony\Component\HttpFoundation\Request',
+            'FOS\RestBundle\Request\ParamFetcherInterface',
+        );
+
         $arguments = array();
         foreach ($method->getParameters() as $argument) {
-            if (isset($params[$argument->getName()]) || null !== $argument->getClass()) {
+            if (isset($params[$argument->getName()])) {
                 continue;
             }
 
+            $argumentClass = $argument->getClass();
+            if ($argumentClass) {
+                foreach ($ignoreClasses as $class) {
+                    if ($argumentClass->getName() === $class || $argumentClass->isSubclassOf($class)) {
+                        continue 2;
+                    }
+                }
+            }
+
             $arguments[] = $argument;
         }