Merge pull request #10 from phan/attributes-on-global-constants

Attributes on global constants

Author: rlerdorf

TOLERANT_TODO.md

@@ -72,8 +72,14 @@ Monitor RFCs merged into php-src and mirror the token/grammar changes:
     - `final readonly string $prop` - With readonly
     - `public readonly final string $prop` - All modifiers combined
   - Tested in `tests/cases/parser85/final-promotion-*.php` (5 comprehensive tests)
-- **Attributes on constants / extended attribute targets**: verify attributes on constants and traits are preserved.
-- **Extend `#[\Override]` to properties / `#[\NoDiscard]` / `#[\DelayedTargetValidation]`**: attributes already parse, but add regression coverage to ensure tolerant does not misclassify their targets.
+- **Extended attribute targets** (`#[Deprecated] const FOO = 1;`): ✅ **COMPLETE**
+  - Added support for attributes on global constants (PHP 8.5+)
+  - Updated Parser.php to include `TokenKind::ConstKeyword` in allowed attribute targets
+  - Added `attributes` field to `ConstDeclaration` node
+  - Added `ConstDeclaration` to instanceof check for attaching attributes
+  - Verified attributes on class constants still work correctly
+  - Verified `#[Override]` on properties works correctly (PHP 8.5+)
+  - Tested in `tests/cases/parser85/attributes-*.php` and `tests/cases/parser85/override-on-property.php`
 - Track any additional keywords (`with`, operator tokens, etc.) and update `TokenKind.php` / `TokenStringMaps.php` accordingly.
 
 ### Diagnostics & Node Mapping
@@ -111,23 +117,22 @@ Recommended sample inputs for AST diffs (update as new fixtures are added):
 | Pipe operator | `tests/cases/parser85/pipe-operator-*.php` | 8.5 | ✅ | `php ~/phan/tools/dump_ast.php --json …` | `php tools/PrintTolerantAst.php …`, `php ~/phan/internal/dump_fallback_ast.php --php-ast …` |
 | Clone with modifications | `tests/cases/parser85/clone-*.php` | 8.5 | ✅ | (run after `sudo newphp 85`) | same as above |
 | Final property promotion | `tests/cases/parser85/final-promotion-*.php` | 8.5 | ✅ | (run after `sudo newphp 85`) | same as above |
+| Extended attribute targets | `tests/cases/parser85/attributes-*.php`, `tests/cases/parser85/override-on-property.php` | 8.5 | ✅ | (run after `sudo newphp 85`) | same as above |
 
 ## Completed Work Summary
 
 As of October 2025, the tolerant parser now has full support for:
 
 - **PHP 8.3**: Dynamic class constant fetch, typed class constants (including union types)
 - **PHP 8.4**: Property hooks (with modifiers and edge cases), asymmetric visibility, new without parenthesis, deprecation fixes
-- **PHP 8.5**: Pipe operator, clone with property modifications, final property promotion
+- **PHP 8.5**: Pipe operator, clone with property modifications, final property promotion, extended attribute targets
 
-**Test Coverage**: 31,463 tests passing across all PHP versions (8.1-8.5)
+**Test Coverage**: 31,468 tests passing across all PHP versions (8.1-8.5)
 **CI Configuration**: Updated to test on PHP 8.1, 8.2, 8.3, 8.4, 8.5.0RC1-cli
 
 ## Next Steps
 
-Remaining PHP 8.5 features to implement:
-
-1. **Extended attribute targets** - Verify attributes work on new targets (constants, properties, etc.)
+All major PHP 8.3, 8.4, and 8.5 features are now implemented! ✅
 
 Additional tasks:
 

src/Node/Statement/ConstDeclaration.php

@@ -11,6 +11,9 @@
 use Microsoft\PhpParser\Token;
 
 class ConstDeclaration extends StatementNode {
+    /** @var array|null */
+    public $attributes;
+
     /** @var Token */
     public $constKeyword;
 
@@ -21,6 +24,7 @@ class ConstDeclaration extends StatementNode {
     public $semicolon;
 
     const CHILD_NAMES = [
+        'attributes',
         'constKeyword',
         'constElements',
         'semicolon'

src/Parser.php

@@ -758,8 +758,8 @@ private function parseAttributeStatement($parentNode) {
             // 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::ReadonlyKeyword, TokenKind::ClassKeyword, TokenKind::TraitKeyword, TokenKind::InterfaceKeyword, TokenKind::AbstractKeyword, TokenKind::FinalKeyword, TokenKind::FunctionKeyword, TokenKind::FnKeyword, TokenKind::EnumKeyword], true) ||
+            // Classlikes, anonymous functions, global functions, arrow functions, and global constants (PHP 8.5+) can have attributes.
+            if (in_array($this->token->kind, [TokenKind::ReadonlyKeyword, TokenKind::ClassKeyword, TokenKind::TraitKeyword, TokenKind::InterfaceKeyword, TokenKind::AbstractKeyword, TokenKind::FinalKeyword, TokenKind::FunctionKeyword, TokenKind::FnKeyword, TokenKind::EnumKeyword, TokenKind::ConstKeyword], true) ||
                 $this->token->kind === TokenKind::StaticKeyword && $this->lookahead([TokenKind::FunctionKeyword, TokenKind::FnKeyword])) {
                 $statement = $this->parseStatement($parentNode);
             } else {
@@ -778,6 +778,7 @@ private function parseAttributeStatement($parentNode) {
             $statement instanceof InterfaceDeclaration ||
             $statement instanceof ClassConstDeclaration ||
             $statement instanceof PropertyDeclaration ||
+            $statement instanceof ConstDeclaration ||
             $statement instanceof MissingDeclaration ||
             $statement instanceof MissingMemberDeclaration) {
 

tests/cases/parser/constDeclaration1.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5

tests/cases/parser/constDeclaration10.php.tree

@@ -18,6 +18,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5

tests/cases/parser/constDeclaration2.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5

tests/cases/parser/constDeclaration3.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5

tests/cases/parser/constDeclaration4.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5

tests/cases/parser/constDeclaration5.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5

tests/cases/parser/constDeclaration8.php.tree

@@ -13,6 +13,7 @@
             },
             {
                 "ConstDeclaration": {
+                    "attributes": null,
                     "constKeyword": {
                         "kind": "ConstKeyword",
                         "textLength": 5