Support attributes on traits and interfaces

TysonAndre · TysonAndre · commit 6d546ce07a44 · 2020-09-10T20:44:26.000-04:00
They were already supported on ClassDeclaration.
The php runtime allows attributes on all classlikes,
including traits/interfaces.
diff --git a/src/Node/Statement/InterfaceDeclaration.php b/src/Node/Statement/InterfaceDeclaration.php
@@ -9,6 +9,7 @@
 use Microsoft\PhpParser\ClassLike;
 use Microsoft\PhpParser\NamespacedNameInterface;
 use Microsoft\PhpParser\NamespacedNameTrait;
+use Microsoft\PhpParser\Node\AttributeGroup;
 use Microsoft\PhpParser\Node\InterfaceBaseClause;
 use Microsoft\PhpParser\Node\InterfaceMembers;
 use Microsoft\PhpParser\Node\StatementNode;
@@ -17,6 +18,9 @@
 class InterfaceDeclaration extends StatementNode implements NamespacedNameInterface, ClassLike {
     use NamespacedNameTrait;
 
+    /** @var AttributeGroup[]|null */
+    public $attributes;
+
     /** @var Token */
     public $interfaceKeyword;
 
@@ -30,6 +34,7 @@ class InterfaceDeclaration extends StatementNode implements NamespacedNameInterf
     public $interfaceMembers;
 
     const CHILD_NAMES = [
+        'attributes',
         'interfaceKeyword',
         'name',
         'interfaceBaseClause',
diff --git a/src/Node/Statement/TraitDeclaration.php b/src/Node/Statement/TraitDeclaration.php
@@ -9,13 +9,17 @@
 use Microsoft\PhpParser\ClassLike;
 use Microsoft\PhpParser\NamespacedNameInterface;
 use Microsoft\PhpParser\NamespacedNameTrait;
+use Microsoft\PhpParser\Node\AttributeGroup;
 use Microsoft\PhpParser\Node\StatementNode;
 use Microsoft\PhpParser\Node\TraitMembers;
 use Microsoft\PhpParser\Token;
 
 class TraitDeclaration extends StatementNode implements NamespacedNameInterface, ClassLike {
     use NamespacedNameTrait;
 
+    /** @var AttributeGroup[]|null */
+    public $attributes;
+
     /** @var Token */
     public $traitKeyword;
 
@@ -26,6 +30,7 @@ class TraitDeclaration extends StatementNode implements NamespacedNameInterface,
     public $traitMembers;
 
     const CHILD_NAMES = [
+        'attributes',
         'traitKeyword',
         'name',
         'traitMembers'
diff --git a/src/Parser.php b/src/Parser.php
@@ -726,6 +726,8 @@ private function parseAttributeStatement($parentNode) {
 
         if ($statement instanceof FunctionLike ||
             $statement instanceof ClassDeclaration ||
+            $statement instanceof TraitDeclaration ||
+            $statement instanceof InterfaceDeclaration ||
             $statement instanceof ClassConstDeclaration ||
             $statement instanceof PropertyDeclaration ||
             $statement instanceof MissingDeclaration ||
diff --git a/tests/cases/parser/interfaceDeclaration1.php.tree b/tests/cases/parser/interfaceDeclaration1.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration10.php.tree b/tests/cases/parser/interfaceDeclaration10.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration11.php.tree b/tests/cases/parser/interfaceDeclaration11.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration12.php.tree b/tests/cases/parser/interfaceDeclaration12.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration13.php.tree b/tests/cases/parser/interfaceDeclaration13.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration14.php.tree b/tests/cases/parser/interfaceDeclaration14.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration15.php.tree b/tests/cases/parser/interfaceDeclaration15.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration16.php.tree b/tests/cases/parser/interfaceDeclaration16.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration2.php.tree b/tests/cases/parser/interfaceDeclaration2.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration3.php.tree b/tests/cases/parser/interfaceDeclaration3.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration4.php.tree b/tests/cases/parser/interfaceDeclaration4.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration5.php.tree b/tests/cases/parser/interfaceDeclaration5.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration7.php.tree b/tests/cases/parser/interfaceDeclaration7.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration8.php.tree b/tests/cases/parser/interfaceDeclaration8.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/interfaceDeclaration9.php.tree b/tests/cases/parser/interfaceDeclaration9.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9
diff --git a/tests/cases/parser/traits1.php.tree b/tests/cases/parser/traits1.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits10.php.tree b/tests/cases/parser/traits10.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits12.php.tree b/tests/cases/parser/traits12.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits13.php.tree b/tests/cases/parser/traits13.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits14.php.tree b/tests/cases/parser/traits14.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits15.php.tree b/tests/cases/parser/traits15.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits16.php.tree b/tests/cases/parser/traits16.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits17.php.tree b/tests/cases/parser/traits17.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits19.php.tree b/tests/cases/parser/traits19.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits2.php.tree b/tests/cases/parser/traits2.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits20.php.tree b/tests/cases/parser/traits20.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits3.php.tree b/tests/cases/parser/traits3.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits4.php.tree b/tests/cases/parser/traits4.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits5.php.tree b/tests/cases/parser/traits5.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits6.php.tree b/tests/cases/parser/traits6.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits7.php.tree b/tests/cases/parser/traits7.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser/traits9.php.tree b/tests/cases/parser/traits9.php.tree
@@ -13,6 +13,7 @@
             },
             {
                 "TraitDeclaration": {
+                    "attributes": null,
                     "traitKeyword": {
                         "kind": "TraitKeyword",
                         "textLength": 5
diff --git a/tests/cases/parser80/attributes15.php b/tests/cases/parser80/attributes15.php
@@ -0,0 +1,7 @@
+<?php
+#[Attr1]
+#[Attr2(2)]
+trait T1 { }
+
+#[Attr3]
+interface MyInterface { }
diff --git a/tests/cases/parser80/attributes15.php.diag b/tests/cases/parser80/attributes15.php.diag
@@ -0,0 +1 @@
+[]
diff --git a/tests/cases/parser80/attributes15.php.tree b/tests/cases/parser80/attributes15.php.tree

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"InterfaceDeclaration": {`
	`16`	`+ "attributes": null,`
`16`	`17`	`"interfaceKeyword": {`
`17`	`18`	`"kind": "InterfaceKeyword",`
`18`	`19`	`"textLength": 9`