Support fixup for dynamic class const name

This is new in PHP 8.3.
nikic · Feb 26, 2023 · e9416a0 · e9416a0
1 parent 7b4a8c1
commit e9416a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/PhpParser/PrettyPrinterAbstract.php b/lib/PhpParser/PrettyPrinterAbstract.php
@@ -1238,7 +1238,10 @@ protected function initializeFixupMap(): void {
             Expr\FuncCall::class => ['name' => self::FIXUP_CALL_LHS],
             Expr\StaticCall::class => ['class' => self::FIXUP_STATIC_DEREF_LHS],
             Expr\ArrayDimFetch::class => ['var' => self::FIXUP_DEREF_LHS],
-            Expr\ClassConstFetch::class => ['class' => self::FIXUP_STATIC_DEREF_LHS],
+            Expr\ClassConstFetch::class => [
+                'class' => self::FIXUP_STATIC_DEREF_LHS,
+                'name' => self::FIXUP_BRACED_NAME,
+            ],
             Expr\New_::class => ['class' => self::FIXUP_NEW],
             Expr\MethodCall::class => [
                 'var' => self::FIXUP_DEREF_LHS,

diff --git a/test/code/formatPreservation/fixup.test b/test/code/formatPreservation/fixup.test
@@ -47,6 +47,7 @@ $x instanceof Foo;
 Foo :: bar;
 Foo :: $bar;
 Foo :: bar();
+Foo :: bar;
 -----
 $stmts[0]->expr->name = new Expr\Variable('a');
 $stmts[1]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
@@ -64,6 +65,7 @@ $stmts[10]->expr->class = new Scalar\String_('Foo');
 $stmts[11]->expr->class = new Expr\ConstFetch(new Node\Name('FOO'));
 $stmts[12]->expr->class = new Expr\ConstFetch(new Node\Name('FOO'));
 $stmts[13]->expr->class = new Expr\ConstFetch(new Node\Name('FOO'));
+$stmts[14]->expr->name = new Expr\Variable('bar');
 -----
 <?php
 $a ();
@@ -80,3 +82,4 @@ $x instanceof ('Foo');
 (FOO) :: bar;
 (FOO) :: $bar;
 (FOO) :: bar();
+Foo :: {$bar};