Merge pull request #11 from phan/php83-override-and-static-initializers

Add some tests for verification

Author: rlerdorf

TOLERANT_TODO.md

@@ -18,8 +18,8 @@ All major PHP 8.3 features are implemented and tested:
 
 - **Dynamic class constant fetch** (`Foo::{expr}`): ✅ **COMPLETE** - verified via `tests/samples/dynamic_class_const.php`
 - **Typed class constants**: ✅ **COMPLETE** - including union types (`const int|string VALUE = 3`), tested in `tests/cases/parser/classConstDeclaration*.php`
-- **`#[\Override]` attribute**: attributes already parse, but we should add fixtures to verify tolerant preserves them on methods.
-- **Arbitrary static variable initialisers**: while this is largely semantic, tolerant should accept the new grammar in function-level `static` declarations and update diagnostics if necessary.
+- **`#[\Override]` attribute**: ✅ **COMPLETE** - fixtures added to verify tolerant preserves them on methods, tested in `tests/cases/parser/override-attribute-methods.php`
+- **Arbitrary static variable initialisers**: ✅ **COMPLETE** - tolerant accepts the new grammar for function-level `static` declarations with arbitrary expressions, tested in `tests/cases/parser/static-variable-initializers.php`
 
 ### PHP 8.4 ✅
 
@@ -111,6 +111,8 @@ Recommended sample inputs for AST diffs (update as new fixtures are added):
 | --- | --- | --- | --- | --- | --- |
 | Dynamic class const fetch | `tests/samples/dynamic_class_const.php` | 8.3 | ✅ | `php ~/phan/tools/dump_ast.php --json …` | `php tools/PrintTolerantAst.php …` + `php ~/phan/internal/dump_fallback_ast.php --php-ast …` |
 | Typed class constants | `tests/cases/parser/classConstDeclaration*.php` | 8.3 | ✅ | (run after `sudo newphp 83+`) | same as above |
+| #[\Override] attribute | `tests/cases/parser/override-attribute-methods.php` | 8.3 | ✅ | (run after `sudo newphp 83+`) | same as above |
+| Arbitrary static initializers | `tests/cases/parser/static-variable-initializers.php` | 8.3 | ✅ | (run after `sudo newphp 83+`) | same as above |
 | Property hooks | `tests/samples/property_hooks.php`, `tests/cases/parser/propertyHook*.php` | 8.4 | ✅ | (run after `sudo newphp 84`) | same as above |
 | Asymmetric visibility | `tests/cases/parser84/asymetrical-visiblity.php` | 8.4 | ✅ | (run after `sudo newphp 84`) | same as above |
 | New without parenthesis | `tests/cases/parser84/new-without-parenthesis.php` | 8.4 | ✅ | (run after `sudo newphp 84`) | same as above |
@@ -123,19 +125,15 @@ Recommended sample inputs for AST diffs (update as new fixtures are added):
 
 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.3**: Dynamic class constant fetch, typed class constants (including union types), #[\Override] attribute on methods, arbitrary static variable initializers
 - **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, extended attribute targets
 
-**Test Coverage**: 31,468 tests passing across all PHP versions (8.1-8.5)
+**Test Coverage**: 31,516 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
 
-All major PHP 8.3, 8.4, and 8.5 features are now implemented! ✅
+All major PHP 8.3, 8.4, and 8.5 features are now fully implemented and tested! ✅
 
-Additional tasks:
-
-4. Run Phan's fallback parser tests (`./tests/run_test __FakeSelfFallbackTest`) to verify parity with php-ast
-5. Add fixtures for `#[\Override]` attribute on methods
-6. Test arbitrary static variable initializers
+The tolerant parser is feature-complete for PHP 8.1-8.5 with comprehensive test coverage.

tests/cases/parser/override-attribute-methods.php

@@ -0,0 +1,63 @@
+<?php
+// PHP 8.3+ #[\Override] attribute on methods
+
+class BaseClass {
+    public function baseMethod(): void {}
+
+    protected function protectedMethod(): string {
+        return 'base';
+    }
+
+    public static function staticMethod(): int {
+        return 1;
+    }
+}
+
+class ChildClass extends BaseClass {
+    // Override on public method
+    #[\Override]
+    public function baseMethod(): void {
+        // implementation
+    }
+
+    // Override on protected method
+    #[\Override]
+    protected function protectedMethod(): string {
+        return 'child';
+    }
+
+    // Override on static method
+    #[\Override]
+    public static function staticMethod(): int {
+        return 2;
+    }
+
+    // Multiple attributes including Override
+    #[\Override]
+    #[\Deprecated]
+    public function deprecatedOverride(): void {}
+}
+
+// Override in interface implementation
+interface TestInterface {
+    public function interfaceMethod(): void;
+}
+
+class ImplementingClass implements TestInterface {
+    #[\Override]
+    public function interfaceMethod(): void {
+        // implementation
+    }
+}
+
+// Override with abstract methods
+abstract class AbstractBase {
+    abstract public function abstractMethod(): void;
+}
+
+class ConcreteClass extends AbstractBase {
+    #[\Override]
+    public function abstractMethod(): void {
+        // implementation
+    }
+}

tests/cases/parser/override-attribute-methods.php.diag

@@ -0,0 +1 @@
+[]