symfony
diff --git a/‎src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
+18-1Lines changed: 18 additions & 1 deletion b/‎src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
+18-1Lines changed: 18 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
+10Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
+10Lines changed: 10 additions & 0 deletions
@@ -112,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]) {
 
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+trait FooTrait
+{
+    public function doBar()
+    {
+        $baz = self::class;
+        if (true) {
+        }
+    }
+}
@@ -35,6 +35,16 @@ public function testLoad()
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooClass.php');
     }
 
+    /**
+     * @requires PHP 5.4
+     */
+    public function testLoadTraitWithClassConstant()
+    {
+        $this->reader->expects($this->never())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooTrait.php');
+    }
+
     /**
      * @requires PHP 5.6
      */