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

jakzal · jakzal · commit 43c7f9b5e95c · 2016-04-25T16:50:46.000+01:00
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
@@ -96,6 +96,8 @@ protected function findClass($file)
             $token = $tokens[$i];
 
             if (!isset($token[1])) {
+                $class = false;
+
                 continue;
             }
 
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+trait FooTrait
+{
+    public function doBar()
+    {
+        $baz = self::class;
+        if (true) {
+        }
+    }
+}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -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
      */

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ protected function findClass($file)`
`96`	`96`	`$token = $tokens[$i];`
`97`	`97`
`98`	`98`	`if (!isset($token[1])) {`
	`99`	`+ $class = false;`
	`100`	`+`
`99`	`101`	`continue;`
`100`	`102`	`}`
`101`	`103`