[Routing] Support the "attribute" type (alias of "annotation") in annotation loaders

Author: fancyweb

CHANGELOG.md

@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `getMissingParameters` and `getRouteName` methods on `MissingMandatoryParametersException`
  * Allow using UTF-8 parameter names
+ * Support the `attribute` type (alias of `annotation`) in annotation loaders
 
 5.3
 ---

Loader/AnnotationClassLoader.php

@@ -237,7 +237,7 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g
      */
     public function supports(mixed $resource, string $type = null): bool
     {
-        return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || 'annotation' === $type);
+        return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || \in_array($type, ['annotation', 'attribute'], true));
     }
 
     /**

Loader/AnnotationDirectoryLoader.php

@@ -69,7 +69,7 @@ function (\SplFileInfo $current) {
      */
     public function supports(mixed $resource, string $type = null): bool
     {
-        if ('annotation' === $type) {
+        if (\in_array($type, ['annotation', 'attribute'], true)) {
             return true;
         }
 

Loader/AnnotationFileLoader.php

@@ -67,7 +67,7 @@ public function load(mixed $file, string $type = null): ?RouteCollection
      */
     public function supports(mixed $resource, string $type = null): bool
     {
-        return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'annotation' === $type);
+        return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || \in_array($type, ['annotation', 'attribute'], true));
     }
 
     /**

Tests/Loader/AnnotationClassLoaderTest.php

@@ -46,6 +46,7 @@ public function provideTestSupportsChecksResource()
     public function testSupportsChecksTypeIfSpecified()
     {
         $this->assertTrue($this->loader->supports('class', 'annotation'), '->supports() checks the resource type if specified');
+        $this->assertTrue($this->loader->supports('class', 'attribute'), '->supports() checks the resource type if specified');
         $this->assertFalse($this->loader->supports('class', 'foo'), '->supports() checks the resource type if specified');
     }
 

Tests/Loader/AnnotationDirectoryLoaderTest.php

@@ -78,6 +78,7 @@ public function testSupports()
         $this->assertFalse($this->loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
 
         $this->assertTrue($this->loader->supports($fixturesDir, 'annotation'), '->supports() checks the resource type if specified');
+        $this->assertTrue($this->loader->supports($fixturesDir, 'attribute'), '->supports() checks the resource type if specified');
         $this->assertFalse($this->loader->supports($fixturesDir, 'foo'), '->supports() checks the resource type if specified');
     }
 

Tests/Loader/AnnotationFileLoaderTest.php

@@ -83,6 +83,7 @@ public function testSupports()
         $this->assertFalse($this->loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
 
         $this->assertTrue($this->loader->supports($fixture, 'annotation'), '->supports() checks the resource type if specified');
+        $this->assertTrue($this->loader->supports($fixture, 'attribute'), '->supports() checks the resource type if specified');
         $this->assertFalse($this->loader->supports($fixture, 'foo'), '->supports() checks the resource type if specified');
     }