Support readonly anonymous classes

nikic · Jul 30, 2023 · 05e84f7 · 05e84f7
1 parent 73ccbab
commit 05e84f7
Show file tree

Hide file tree

Showing 7 changed files with 467 additions and 421 deletions.
diff --git a/grammar/php7.y b/grammar/php7.y
@@ -949,8 +949,8 @@ expr:
 ;
 
 anonymous_class:
-      optional_attributes T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
-          { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
+      optional_attributes class_entry_type ctor_arguments extends_from implements_list '{' class_statement_list '}'
+          { $$ = array(Stmt\Class_[null, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
             $this->checkClass($$[0], -1); }
 ;
 

diff --git a/lib/PhpParser/Internal/PrintableNewAnonClassNode.php b/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
@@ -19,6 +19,8 @@ class PrintableNewAnonClassNode extends Expr
 {
     /** @var Node\AttributeGroup[] PHP attribute groups */
     public $attrGroups;
+    /** @var int Modifiers */
+    public $flags;
     /** @var Node\Arg[] Arguments */
     public $args;
     /** @var null|Node\Name Name of extended class */
@@ -29,11 +31,12 @@ class PrintableNewAnonClassNode extends Expr
     public $stmts;
 
     public function __construct(
-        array $attrGroups, array $args, Node\Name $extends = null, array $implements,
+        array $attrGroups, int $flags, array $args, Node\Name $extends = null, array $implements,
         array $stmts, array $attributes
     ) {
         parent::__construct($attributes);
         $this->attrGroups = $attrGroups;
+        $this->flags = $flags;
         $this->args = $args;
         $this->extends = $extends;
         $this->implements = $implements;
@@ -46,7 +49,7 @@ public static function fromNewNode(Expr\New_ $newNode) {
         // We don't assert that $class->name is null here, to allow consumers to assign unique names
         // to anonymous classes for their own purposes. We simplify ignore the name here.
         return new self(
-            $class->attrGroups, $newNode->args, $class->extends, $class->implements,
+            $class->attrGroups, $class->flags, $newNode->args, $class->extends, $class->implements,
             $class->stmts, $newNode->getAttributes()
         );
     }
@@ -56,6 +59,6 @@ public function getType() : string {
     }
 
     public function getSubNodeNames() : array {
-        return ['attrGroups', 'args', 'extends', 'implements', 'stmts'];
+        return ['attrGroups', 'flags', 'args', 'extends', 'implements', 'stmts'];
     }
 }
diff --git a/lib/PhpParser/Parser/Php7.php b/lib/PhpParser/Parser/Php7.php
diff --git a/lib/PhpParser/PrettyPrinterAbstract.php b/lib/PhpParser/PrettyPrinterAbstract.php
@@ -1510,6 +1510,7 @@ protected function initializeModifierChangeMap() {
             'Stmt_ClassMethod->flags' => \T_FUNCTION,
             'Stmt_Class->flags' => \T_CLASS,
             'Stmt_Property->flags' => \T_VARIABLE,
+            'Expr_PrintableNewAnonClass->flags' => \T_CLASS,
             'Param->flags' => \T_VARIABLE,
             //'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
         ];

diff --git a/test/code/formatPreservation/modifierChange.test b/test/code/formatPreservation/modifierChange.test
@@ -54,4 +54,15 @@ function test(
         = 'z',
     public T3 $z
         = 'x',
-) {}
+) {}
+-----
+<?php
+new class {};
+new readonly class {};
+-----
+$stmts[0]->expr->class->flags = Stmt\Class_::MODIFIER_READONLY;
+$stmts[1]->expr->class->flags = 0;
+-----
+<?php
+readonly class {};
+class {};
diff --git a/test/code/parser/stmt/class/readonlyAnonyous.test b/test/code/parser/stmt/class/readonlyAnonyous.test
@@ -0,0 +1,26 @@
+Readonly anonymous class
+-----
+<?php
+
+new readonly class {};
+-----
+!!php7
+array(
+    0: Stmt_Expression(
+        expr: Expr_New(
+            class: Stmt_Class(
+                attrGroups: array(
+                )
+                flags: MODIFIER_READONLY (64)
+                name: null
+                extends: null
+                implements: array(
+                )
+                stmts: array(
+                )
+            )
+            args: array(
+            )
+        )
+    )
+)
diff --git a/test/code/prettyPrinter/expr/anonymousClass.test b/test/code/prettyPrinter/expr/anonymousClass.test
@@ -10,7 +10,9 @@ new class($a) extends A {
         $this->a = $a;
     }
 };
+new readonly class {};
 -----
+!!php7
 new class
 {
 };
@@ -25,3 +27,6 @@ new class($a) extends A
         $this->a = $a;
     }
 };
+new readonly class
+{
+};