Merge pull request microsoft#409 from phpactor/readonly-attr

bugfix: Support attributes on readonly classes
TysonAndre · Jan 29, 2024 · 4fd2db9 · 4fd2db9
2 parents 8781df1 + c660589
commit 4fd2db9
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 1 deletion.
diff --git a/src/Parser.php b/src/Parser.php
@@ -755,7 +755,7 @@ private function parseAttributeStatement($parentNode) {
             $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, TokenKind::EnumKeyword], true) ||
+            if (in_array($this->token->kind, [TokenKind::ReadonlyKeyword, TokenKind::ClassKeyword, TokenKind::TraitKeyword, TokenKind::InterfaceKeyword, TokenKind::AbstractKeyword, TokenKind::FinalKeyword, TokenKind::FunctionKeyword, TokenKind::FnKeyword, TokenKind::EnumKeyword], true) ||
                 $this->token->kind === TokenKind::StaticKeyword && $this->lookahead([TokenKind::FunctionKeyword, TokenKind::FnKeyword])) {
                 $statement = $this->parseStatement($parentNode);
             } else {

diff --git a/tests/cases/parser81/readonly_class_attribute.php b/tests/cases/parser81/readonly_class_attribute.php
@@ -0,0 +1,2 @@
+<?php
+#[Foobar]readonly class A {}
diff --git a/tests/cases/parser81/readonly_class_attribute.php.diag b/tests/cases/parser81/readonly_class_attribute.php.diag
@@ -0,0 +1 @@
+[]
diff --git a/tests/cases/parser81/readonly_class_attribute.php.tree b/tests/cases/parser81/readonly_class_attribute.php.tree
@@ -0,0 +1,91 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ClassDeclaration": {
+                    "attributes": [
+                        {
+                            "AttributeGroup": {
+                                "startToken": {
+                                    "kind": "AttributeToken",
+                                    "textLength": 2
+                                },
+                                "attributes": {
+                                    "AttributeElementList": {
+                                        "children": [
+                                            {
+                                                "Attribute": {
+                                                    "name": {
+                                                        "QualifiedName": {
+                                                            "globalSpecifier": null,
+                                                            "relativeSpecifier": null,
+                                                            "nameParts": [
+                                                                {
+                                                                    "kind": "Name",
+                                                                    "textLength": 6
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    "openParen": null,
+                                                    "argumentExpressionList": null,
+                                                    "closeParen": null
+                                                }
+                                            }
+                                        ]
+                                    }
+                                },
+                                "endToken": {
+                                    "kind": "CloseBracketToken",
+                                    "textLength": 1
+                                }
+                            }
+                        }
+                    ],
+                    "abstractOrFinalModifier": {
+                        "kind": "ReadonlyKeyword",
+                        "textLength": 8
+                    },
+                    "modifiers": [],
+                    "classKeyword": {
+                        "kind": "ClassKeyword",
+                        "textLength": 5
+                    },
+                    "name": {
+                        "kind": "Name",
+                        "textLength": 1
+                    },
+                    "classBaseClause": null,
+                    "classInterfaceClause": null,
+                    "classMembers": {
+                        "ClassMembersNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "textLength": 1
+                            },
+                            "classMemberDeclarations": [],
+                            "closeBrace": {
+                                "kind": "CloseBraceToken",
+                                "textLength": 1
+                            }
+                        }
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}