Merge pull request microsoft#342 from TysonAndre/anonymous-class-attributes

Also handle attributes in `new #[MyAttr] class {...}`, traits, interfaces

Author: roblourens

src/Node/Expression/ObjectCreationExpression.php

@@ -6,6 +6,7 @@
 
 namespace Microsoft\PhpParser\Node\Expression;
 
+use Microsoft\PhpParser\Node\AttributeGroup;
 use Microsoft\PhpParser\Node\ClassBaseClause;
 use Microsoft\PhpParser\Node\ClassInterfaceClause;
 use Microsoft\PhpParser\Node\ClassMembersNode;
@@ -19,6 +20,9 @@ class ObjectCreationExpression extends Expression {
     /** @var Token */
     public $newKeword;
 
+    /** @var AttributeGroup[]|null optional attributes of an anonymous class. */
+    public $attributes;
+
     /** @var QualifiedName|Variable|Token */
     public $classTypeDesignator;
 
@@ -41,7 +45,8 @@ class ObjectCreationExpression extends Expression {
     public $classMembers;
 
     const CHILD_NAMES = [
-        'newKeword', // TODO
+        'newKeword',
+        'attributes',
         'classTypeDesignator',
         'openParen',
         'argumentExpressionList',

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',

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'

src/Parser.php

@@ -711,6 +711,12 @@ private function parseAttributeStatement($parentNode) {
         if ($parentNode instanceof ClassMembersNode) {
             // Create a class element or a MissingMemberDeclaration
             $statement = $this->parseClassElementFn()($parentNode);
+        } elseif ($parentNode instanceof TraitMembers) {
+            // Create a trait element or a MissingMemberDeclaration
+            $statement = $this->parseTraitElementFn()($parentNode);
+        } elseif ($parentNode instanceof InterfaceMembers) {
+            // Create an interface element or a MissingMemberDeclaration
+            $statement = $this->parseInterfaceElementFn()($parentNode);
         } else {
             // Classlikes, anonymous functions, global functions, and arrow functions can have attributes. Global constants cannot.
             if (in_array($this->token->kind, [TokenKind::ClassKeyword, TokenKind::TraitKeyword, TokenKind::InterfaceKeyword, TokenKind::AbstractKeyword, TokenKind::FinalKeyword, TokenKind::FunctionKeyword, TokenKind::FnKeyword], true) ||
@@ -726,6 +732,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 ||
@@ -3088,6 +3096,12 @@ private function parseObjectCreationExpression($parentNode) {
         // TODO - add tests for this scenario
         $oldIsParsingObjectCreationExpression = $this->isParsingObjectCreationExpression;
         $this->isParsingObjectCreationExpression = true;
+
+        if ($this->getCurrentToken()->kind === TokenKind::AttributeToken) {
+            // Attributes such as `new #[MyAttr] class` can only be used with anonymous class declarations.
+            // But handle this like $objectCreationExpression->classMembers and leave it up to the applications to detect the invalid combination.
+            $objectCreationExpression->attributes = $this->parseAttributeGroups($objectCreationExpression);
+        }
         $objectCreationExpression->classTypeDesignator =
             $this->eatOptional1(TokenKind::ClassKeyword) ??
             $this->parseExpression($objectCreationExpression);
@@ -3311,6 +3325,9 @@ private function parseInterfaceElementFn() {
                 case TokenKind::FunctionKeyword:
                     return $this->parseMethodDeclaration($parentNode, $modifiers);
 
+                case TokenKind::AttributeToken:
+                    return $this->parseAttributeStatement($parentNode);
+
                 default:
                     $missingInterfaceMemberDeclaration = new MissingMemberDeclaration();
                     $missingInterfaceMemberDeclaration->parent = $parentNode;
@@ -3491,6 +3508,9 @@ private function parseTraitElementFn() {
                 case TokenKind::UseKeyword:
                     return $this->parseTraitUseClause($parentNode);
 
+                case TokenKind::AttributeToken:
+                    return $this->parseAttributeStatement($parentNode);
+
                 default:
                     return $this->parseRemainingPropertyDeclarationOrMissingMemberDeclaration($parentNode, $modifiers);
             }

tests/cases/parser/callExpression14.php.tree

@@ -27,6 +27,7 @@
                                                 "kind": "NewKeyword",
                                                 "textLength": 3
                                             },
+                                            "attributes": null,
                                             "classTypeDesignator": {
                                                 "QualifiedName": {
                                                     "globalSpecifier": null,

tests/cases/parser/interfaceDeclaration1.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9

tests/cases/parser/interfaceDeclaration10.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9

tests/cases/parser/interfaceDeclaration11.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9

tests/cases/parser/interfaceDeclaration12.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9

tests/cases/parser/interfaceDeclaration13.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "InterfaceDeclaration": {
+                    "attributes": null,
                     "interfaceKeyword": {
                         "kind": "InterfaceKeyword",
                         "textLength": 9