Improves parsing of attributes (#461)

relies on checking Node\Attribute instead o $node->attrGroups

Author: micheleorselli

src/Analyzer/FileVisitor.php

@@ -11,11 +11,10 @@
 
 class FileVisitor extends NodeVisitorAbstract
 {
-    /** @var ClassDescriptionBuilder */
-    private $classDescriptionBuilder;
+    private ClassDescriptionBuilder $classDescriptionBuilder;
 
-    /** @var array */
-    private $classDescriptions = [];
+    /** @var array<ClassDescription> */
+    private array $classDescriptions = [];
 
     public function __construct(ClassDescriptionBuilder $classDescriptionBuilder)
     {
@@ -50,13 +49,6 @@ public function enterNode(Node $node): void
             if ($node->isAbstract()) {
                 $this->classDescriptionBuilder->setAbstract(true);
             }
-
-            foreach ($node->attrGroups as $attributeGroup) {
-                foreach ($attributeGroup->attrs as $attribute) {
-                    $this->classDescriptionBuilder
-                        ->addAttribute($attribute->name->toString(), $attribute->getLine());
-                }
-            }
         }
 
         if ($node instanceof Node\Stmt\Enum_ && null !== $node->namespacedName) {
@@ -67,13 +59,6 @@ public function enterNode(Node $node): void
                 $this->classDescriptionBuilder
                     ->addInterface($interface->toString(), $interface->getLine());
             }
-
-            foreach ($node->attrGroups as $attributeGroup) {
-                foreach ($attributeGroup->attrs as $attribute) {
-                    $this->classDescriptionBuilder
-                        ->addAttribute($attribute->name->toString(), $attribute->getLine());
-                }
-            }
         }
 
         /**
@@ -197,13 +182,6 @@ public function enterNode(Node $node): void
 
             $this->classDescriptionBuilder->setClassName($node->namespacedName->toCodeString());
             $this->classDescriptionBuilder->setInterface(true);
-
-            foreach ($node->attrGroups as $attributeGroup) {
-                foreach ($attributeGroup->attrs as $attribute) {
-                    $this->classDescriptionBuilder
-                        ->addAttribute($attribute->name->toString(), $attribute->getLine());
-                }
-            }
         }
 
         if ($node instanceof Node\Stmt\Trait_) {
@@ -213,13 +191,6 @@ public function enterNode(Node $node): void
 
             $this->classDescriptionBuilder->setClassName($node->namespacedName->toCodeString());
             $this->classDescriptionBuilder->setTrait(true);
-
-            foreach ($node->attrGroups as $attributeGroup) {
-                foreach ($attributeGroup->attrs as $attribute) {
-                    $this->classDescriptionBuilder
-                        ->addAttribute($attribute->name->toString(), $attribute->getLine());
-                }
-            }
         }
 
         if ($node instanceof Node\Stmt\ClassMethod) {
@@ -229,6 +200,15 @@ public function enterNode(Node $node): void
                     ->addDependency(new ClassDependency($returnType->toString(), $returnType->getLine()));
             }
         }
+
+        if ($node instanceof Node\Attribute) {
+            $nodeName = $node->name;
+
+            if ($nodeName instanceof Node\Name\FullyQualified) {
+                $this->classDescriptionBuilder
+                    ->addAttribute($node->name->toString(), $node->getLine());
+            }
+        }
     }
 
     public function getClassDescriptions(): array

tests/Unit/Analyzer/FileVisitorTest.php

@@ -511,6 +511,68 @@ enum Enum
         );
     }
 
+    public function test_it_should_parse_interface_attributes(): void
+    {
+        $code = <<< 'EOF'
+        <?php
+
+        namespace Root\Cars;
+
+        use Bar\FooAttr;
+
+        #[FooAttr('bar')]
+        interface AnInterface
+        {
+            #[Baz]
+            public function foo(): string;
+        }
+        EOF;
+
+        $fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
+        $fp->parse($code, 'relativePathName');
+
+        $cd = $fp->getClassDescriptions();
+
+        self::assertEquals(
+            [
+                FullyQualifiedClassName::fromString('Bar\\FooAttr'),
+                FullyQualifiedClassName::fromString('Root\\Cars\\Baz'),
+            ],
+            $cd[0]->getAttributes()
+        );
+    }
+
+    public function test_it_should_parse_traits_attributes(): void
+    {
+        $code = <<< 'EOF'
+        <?php
+
+        namespace Root\Cars;
+
+        use Bar\FooAttr;
+
+        #[FooAttr('bar')]
+        trait ATrait
+        {
+            #[Baz]
+            public function foo(): string { return 'foo'; }
+        }
+        EOF;
+
+        $fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
+        $fp->parse($code, 'relativePathName');
+
+        $cd = $fp->getClassDescriptions();
+
+        self::assertEquals(
+            [
+                FullyQualifiedClassName::fromString('Bar\\FooAttr'),
+                FullyQualifiedClassName::fromString('Root\\Cars\\Baz'),
+            ],
+            $cd[0]->getAttributes()
+        );
+    }
+
     public function test_it_parse_docblocks(): void
     {
         $code = <<< 'EOF'