Support PHP 8.2 features

Author: TysonAndre

src/Node/Statement/ClassDeclaration.php

@@ -22,9 +22,12 @@ class ClassDeclaration extends StatementNode implements NamespacedNameInterface,
     /** @var AttributeGroup[]|null */
     public $attributes;
 
-    /** @var Token */
+    /** @var Token abstract/final/readonly modifier */
     public $abstractOrFinalModifier;
 
+    /** @var Token[] additional abstract/final/readonly modifiers */
+    public $modifiers;
+
     /** @var Token */
     public $classKeyword;
 
@@ -43,6 +46,7 @@ class ClassDeclaration extends StatementNode implements NamespacedNameInterface,
     const CHILD_NAMES = [
         'attributes',
         'abstractOrFinalModifier',
+        'modifiers',
         'classKeyword',
         'name',
         'classBaseClause',

src/Parser.php

@@ -557,10 +557,8 @@ private function parseStatementFn() {
                 // class-declaration
                 case TokenKind::FinalKeyword:
                 case TokenKind::AbstractKeyword:
-                    if (!$this->lookahead(TokenKind::ClassKeyword)) {
-                        $this->advanceToken();
-                        return new SkippedToken($token);
-                    }
+                case TokenKind::ReadonlyKeyword:
+                    // fallthrough
                 case TokenKind::ClassKeyword:
                     return $this->parseClassDeclaration($parentNode);
 
@@ -657,10 +655,20 @@ private function parseClassElementFn() {
         };
     }
 
+    /** @return Token[] */
+    private function parseClassModifiers(): array {
+        $modifiers = [];
+        while ($token = $this->eatOptional(TokenKind::AbstractKeyword, TokenKind::FinalKeyword, TokenKind::ReadonlyKeyword)) {
+            $modifiers[] = $token;
+        }
+        return $modifiers;
+    }
+
     private function parseClassDeclaration($parentNode) : Node {
         $classNode = new ClassDeclaration(); // TODO verify not nested
         $classNode->parent = $parentNode;
-        $classNode->abstractOrFinalModifier = $this->eatOptional(TokenKind::AbstractKeyword, TokenKind::FinalKeyword);
+        $classNode->abstractOrFinalModifier = $this->eatOptional(TokenKind::AbstractKeyword, TokenKind::FinalKeyword, TokenKind::ReadonlyKeyword);
+        $classNode->modifiers = $this->parseClassModifiers();
         $classNode->classKeyword = $this->eat1(TokenKind::ClassKeyword);
         $classNode->name = $this->eat($this->nameOrReservedWordTokens); // TODO should be any
         $classNode->name->kind = TokenKind::Name;
@@ -1036,6 +1044,7 @@ private function isStatementStart(Token $token) {
             case TokenKind::ClassKeyword:
             case TokenKind::AbstractKeyword:
             case TokenKind::FinalKeyword:
+            case TokenKind::ReadonlyKeyword:
 
             // interface-declaration
             case TokenKind::InterfaceKeyword:
@@ -3533,6 +3542,7 @@ private function isTraitMemberDeclarationStart($token) {
             case TokenKind::AbstractKeyword:
             case TokenKind::FinalKeyword:
             case TokenKind::ReadonlyKeyword:
+            case TokenKind::ConstKeyword:
 
             // method-declaration
             case TokenKind::FunctionKeyword:
@@ -3553,6 +3563,9 @@ private function parseTraitElementFn() {
 
             $token = $this->getCurrentToken();
             switch ($token->kind) {
+                case TokenKind::ConstKeyword:
+                    return $this->parseClassConstDeclaration($parentNode, $modifiers);
+
                 case TokenKind::FunctionKeyword:
                     return $this->parseMethodDeclaration($parentNode, $modifiers);