QueryParam annotation widening

Author: therealmikz

Controller/Annotations/QueryParam.php

@@ -15,7 +15,7 @@
  * Represents a parameter that must be present in GET data.
  *
  * @Annotation
- * @Target("METHOD")
+ * @Target({"CLASS", "METHOD"})
  * @author Alexander <[email protected]>
  */
 class QueryParam extends Param

Request/ParamReader.php

@@ -44,16 +44,19 @@ public function read(\ReflectionClass $reflection, $method)
             throw new \InvalidArgumentException(sprintf("Class '%s' has no method '%s' method.", $reflection->getName(), $method));
         }
 
-        return $this->getParamsFromMethod($reflection->getMethod($method));
+        $methodParams = $this->getParamsFromMethod($reflection->getMethod($method));
+        $classParams = $this->getParamsFromClass($reflection);
+        return array_merge($methodParams, $classParams);
     }
-
+    
     /**
-     * {@inheritDoc}
+     * Fetches parameters from provided annotation array (fetched from annotationReader)
+     * 
+     * @param array $annotations
+     * @return \FOS\RestBundle\Controller\Annotations\Param
      */
-    public function getParamsFromMethod(\ReflectionMethod $method)
+    private function getParamsFromAnnotationArray(array $annotations)
     {
-        $annotations = $this->annotationReader->getMethodAnnotations($method);
-
         $params = array();
         foreach ($annotations as $annotation) {
             if ($annotation instanceof Param) {
@@ -63,4 +66,25 @@ public function getParamsFromMethod(\ReflectionMethod $method)
 
         return $params;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getParamsFromMethod(\ReflectionMethod $method)
+    {
+        $annotations = $this->annotationReader->getMethodAnnotations($method);
+
+        return $this->getParamsFromAnnotationArray($annotations);
+    }
+    
+    /**
+     * 
+     * {@inheritDoc}
+     */
+    public function getParamsFromClass(\ReflectionClass $class)
+    {
+        $annotations = $this->annotationReader->getClassAnnotations($class);
+        
+        return $this->getParamsFromAnnotationArray($annotations);
+    }
 }

Request/ParamReaderInterface.php

@@ -37,4 +37,12 @@ public function read(\ReflectionClass $reflection, $method);
      * @return array Param annotation objects of the method. Indexed by parameter name.
      */
     public function getParamsFromMethod(\ReflectionMethod $method);
+    
+    /**
+     * 
+     * @param \ReflectionClass $class
+     * 
+     * @return array Param annotation objects of the class. Indexed by parameter name.
+     */
+    public function getParamsFromClass(\ReflectionClass $class);
 }