don't process classes with the directory loader

xabbuh · xabbuh · commit ce557049aa47 · 2017-11-30T21:28:55.000+01:00
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
@@ -76,6 +76,15 @@ function (\SplFileInfo $current) {
      */
     public function supports($resource, $type = null)
     {
+        if ($type && 'annotation' !== $type) {
+            return false;
+        }
+
+        // classes are handled by the AnnotationClassLoader
+        if (preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource)) {
+            return false;
+        }
+
         if ('annotation' === $type) {
             return true;
         }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -74,6 +74,11 @@ public function testItSupportsAnyAnnotation()
         $this->assertTrue($this->loader->supports(__DIR__.'/../Fixtures/even-with-not-existing-folder', 'annotation'));
     }
 
+    public function testItDoesNotSupportAnnotatedControllerClasses()
+    {
+        $this->assertFalse($this->loader->supports('App\Controller\TestController', 'annotation'));
+    }
+
     public function testLoadFileIfLocatedResourceIsFile()
     {
         $this->reader->expects($this->exactly(1))->method('getClassAnnotation');

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,11 @@ public function testItSupportsAnyAnnotation()`
`74`	`74`	`$this->assertTrue($this->loader->supports(__DIR__.'/../Fixtures/even-with-not-existing-folder', 'annotation'));`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ public function testItDoesNotSupportAnnotatedControllerClasses()`
	`78`	`+ {`
	`79`	`+ $this->assertFalse($this->loader->supports('App\Controller\TestController', 'annotation'));`
	`80`	`+ }`
	`81`	`+`
`77`	`82`	`public function testLoadFileIfLocatedResourceIsFile()`
`78`	`83`	`{`
`79`	`84`	`$this->reader->expects($this->exactly(1))->method('getClassAnnotation');`