Skip anonymous classes inside a trait when loading annotated routes

pierredup · pierredup · commit 91c878ef2b45 · 2018-01-15T22:40:06.000+02:00
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
@@ -107,22 +107,22 @@ protected function findClass($file)
             }
 
             if (T_CLASS === $token[0]) {
-                // Skip usage of ::class constant
-                $isClassConstant = false;
+                // Skip usage of ::class constant and anonymous classes
+                $isValidClass = true;
                 for ($j = $i - 1; $j > 0; --$j) {
                     if (!isset($tokens[$j][1])) {
                         break;
                     }
 
-                    if (T_DOUBLE_COLON === $tokens[$j][0]) {
-                        $isClassConstant = true;
+                    if (T_DOUBLE_COLON === $tokens[$j][0] || T_NEW === $tokens[$j][0]) {
+                        $isValidClass = false;
                         break;
                     } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
                         break;
                     }
                 }
 
-                if (!$isClassConstant) {
+                if ($isValidClass) {
                     $class = true;
                 }
             }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php b/src/Symfony/Component/Routing/Tests/Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Tests\Fixtures\OtherAnnotatedClasses;
+
+trait AnonymousClassInTrait
+{
+    public function test()
+    {
+        return new class() {
+            public function foo()
+            {
+            }
+        };
+    }
+}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -58,6 +58,17 @@ public function testLoadVariadic()
         $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');
     }
 
+    /**
+     * @requires PHP 7.0
+     */
+    public function testLoadAnonymousClass()
+    {
+        $this->reader->expects($this->never())->method('getClassAnnotation');
+        $this->reader->expects($this->never())->method('getMethodAnnotations');
+
+        $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php');
+    }
+
     public function testSupports()
     {
         $fixture = __DIR__.'/../Fixtures/annotated.php';

Original file line number	Diff line number	Diff line change
`@@ -107,22 +107,22 @@ protected function findClass($file)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (T_CLASS === $token[0]) {`
`110`		`- // Skip usage of ::class constant`
`111`		`- $isClassConstant = false;`
	`110`	`+ // Skip usage of ::class constant and anonymous classes`
	`111`	`+ $isValidClass = true;`
`112`	`112`	`for ($j = $i - 1; $j > 0; --$j) {`
`113`	`113`	`if (!isset($tokens[$j][1])) {`
`114`	`114`	`break;`
`115`	`115`	`}`
`116`	`116`
`117`		`- if (T_DOUBLE_COLON === $tokens[$j][0]) {`
`118`		`- $isClassConstant = true;`
	`117`	`+ if (T_DOUBLE_COLON === $tokens[$j][0] \|\| T_NEW === $tokens[$j][0]) {`
	`118`	`+ $isValidClass = false;`
`119`	`119`	`break;`
`120`	`120`	`} elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {`
`121`	`121`	`break;`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (!$isClassConstant) {`
	`125`	`+ if ($isValidClass) {`
`126`	`126`	`$class = true;`
`127`	`127`	`}`
`128`	`128`	`}`