code improved

Author: fenric

src/Loader/DescriptorDirectoryLoader.php

@@ -247,21 +247,12 @@ private function findDescriptors(string $resource) : array
                 continue;
             }
 
-            $reflection = new ReflectionClass($class);
-
-            if (8 === PHP_MAJOR_VERSION) {
-                $attribute = $reflection->getAttributes(AttributeRouteDescriptor::class)[0] ?? null;
-                if (isset($attribute)) {
-                    $descriptors[$class] = $attribute->newInstance();
-                    continue;
-                }
-            }
-
-            $annotation = $this->annotationReader->getClassAnnotation($reflection, AnnotationRouteDescriptor::class);
-            if (isset($annotation)) {
-                $descriptors[$class] = $annotation;
+            $descriptor = $this->extractDescriptor($class);
+            if (!isset($descriptor)) {
                 continue;
             }
+
+            $descriptors[$class] = $descriptor;
         }
 
         uasort($descriptors, function ($a, $b) {
@@ -271,6 +262,32 @@ private function findDescriptors(string $resource) : array
         return $descriptors;
     }
 
+    /**
+     * Extracts a descriptor from the given class
+     *
+     * @param string $class
+     *
+     * @return null|RouteDescriptorInterface
+     */
+    private function extractDescriptor(string $class) : ?RouteDescriptorInterface
+    {
+        $reflection = new ReflectionClass($class);
+
+        if (8 === PHP_MAJOR_VERSION) {
+            $attribute = $reflection->getAttributes(AttributeRouteDescriptor::class)[0] ?? null;
+            if (isset($attribute)) {
+                return $attribute->newInstance();
+            }
+        }
+
+        $annotation = $this->annotationReader->getClassAnnotation($reflection, AnnotationRouteDescriptor::class);
+        if (isset($annotation)) {
+            return $annotation;
+        }
+
+        return null;
+    }
+
     /**
      * Finds classes in the given resource
      *
@@ -300,7 +317,6 @@ private function findClasses(string $resource) : array
     private function findFiles(string $resource) : array
     {
         $flags = FilesystemIterator::CURRENT_AS_PATHNAME;
-
         $directory = new RecursiveDirectoryIterator($resource, $flags);
         $iterator = new RecursiveIteratorIterator($directory);
         $files = new RegexIterator($iterator, '/\.php$/');