Merge pull request #2 from loostro/widen-noroute-annotation

Widen noroute annotation

Author: therealmikz

Controller/Annotations/NoRoute.php

@@ -14,7 +14,7 @@
 /**
  * No Route annotation class
  * @Annotation
- * @Target("METHOD")
+ * @Target({"METHOD","CLASS"})
  */
 class NoRoute extends Route
 {

Routing/Loader/Reader/RestActionReader.php

@@ -235,9 +235,16 @@ private function isMethodReadable(\ReflectionMethod $method)
         if ('_' === substr($method->getName(), 0, 1)) {
             return false;
         }
-
-        // if method has NoRoute annotation - skip
-        if ($this->readMethodAnnotation($method, 'NoRoute')) {
+        
+        $hasNoRouteMethod = (bool) $this->readMethodAnnotation($method, 'NoRoute');
+        $hasNoRouteClass = (bool) $this->readClassAnnotation($method->getDeclaringClass(), 'NoRoute');
+        
+        $hasNoRoute = $hasNoRoute = $hasNoRouteMethod || $hasNoRouteClass;
+        // since NoRoute extends Route we need to exclude all the method NoRoute annotations
+        $hasRoute = (bool) $this->readMethodAnnotation($method, 'Route') && !$hasNoRouteMethod;
+        
+        // if method has NoRoute annotation and does not have Route annotation - skip
+        if ($hasNoRoute && !$hasRoute) {
             return false;
         }
 
@@ -426,6 +433,23 @@ private function readRouteAnnotation(\ReflectionMethod $reflection)
         }
     }
 
+    /**
+     * Reads class annotations.
+     *
+     * @param ReflectionClass $reflection     controller class
+     * @param string          $annotationName annotation name
+     *
+     * @return Annotation|null
+     */
+    private function readClassAnnotation(\ReflectionClass $reflection, $annotationName)
+    {
+        $annotationClass = "FOS\\RestBundle\\Controller\\Annotations\\$annotationName";
+
+        if ($annotation = $this->annotationReader->getClassAnnotation($reflection, $annotationClass)) {
+            return $annotation;
+        }
+    }
+
     /**
      * Reads method annotations.
      *

Routing/Loader/Reader/RestControllerReader.php

@@ -100,7 +100,7 @@ public function read(\ReflectionClass $reflection)
     }
 
     /**
-     * Reads
+     * Reads class annotations.
      *
      * @param ReflectionClass $reflection     controller class
      * @param string          $annotationName annotation name