[Routing] Finish annotation loader taking a class constant as a beginning of a class name

nicolas-grekas · nicolas-grekas · commit 8d4f35d12cc6 · 2016-05-29T12:13:06.000+02:00
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
@@ -96,8 +96,6 @@ protected function findClass($file)
             $token = $tokens[$i];
 
             if (!isset($token[1])) {
-                $class = false;
-
                 continue;
             }
 
@@ -114,7 +112,24 @@ protected function findClass($file)
             }
 
             if (T_CLASS === $token[0]) {
-                $class = true;
+                // Skip usage of ::class constant
+                $isClassConstant = false;
+                for ($j = $i - 1; $j > 0; --$j) {
+                    if (!isset($tokens[$j][1])) {
+                        break;
+                    }
+
+                    if (T_DOUBLE_COLON === $tokens[$j][0]) {
+                        $isClassConstant = true;
+                        break;
+                    } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
+                        break;
+                    }
+                }
+
+                if (!$isClassConstant) {
+                    $class = true;
+                }
             }
 
             if (T_NAMESPACE === $token[0]) {
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
@@ -10,4 +10,4 @@ public function doBar()
         if (true) {
         }
     }
-}
+}
