Fix modifier change on anonymous class

Make sure the `new` keyword does not get dropped.

Author: nikic

lib/PhpParser/PrettyPrinterAbstract.php

@@ -166,8 +166,9 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter {
      * @var array<string, array{int|string|null, string, string}>
      */
     protected array $emptyListInsertionMap;
-    /** @var array<string, array{string, int}> Map from "{$class}->{$subNode}" to [$printFn, $token]
-     *       where $printFn is the function to print the modifiers and $token is the token before which
+    /** @var array<string, array{string, int, int}>
+     *       Map from "{$class}->{$subNode}" to [$printFn, $skipToken, $findToken] where $printFn is the function to
+     *       print the modifiers, $skipToken is the token to skip at the start and $findToken is the token before which
      *       the modifiers should be reprinted. */
     protected array $modifierChangeMap;
 
@@ -677,8 +678,8 @@ protected function p(
                     return $this->pFallback($fallbackNode, $precedence, $lhsPrecedence);
                 }
 
-                [$printFn, $findToken] = $this->modifierChangeMap[$key];
-                $skipWSPos = $this->origTokens->skipRightWhitespace($pos);
+                [$printFn, $skipToken, $findToken] = $this->modifierChangeMap[$key];
+                $skipWSPos = $this->origTokens->skipRight($pos, $skipToken);
                 $result .= $this->origTokens->getTokenCode($pos, $skipWSPos, $indentAdjustment);
                 $result .= $this->$printFn($subNode);
                 $pos = $this->origTokens->findRight($skipWSPos, $findToken);
@@ -1678,15 +1679,15 @@ protected function initializeModifierChangeMap(): void {
         }
 
         $this->modifierChangeMap = [
-            Stmt\ClassConst::class . '->flags' => ['pModifiers', \T_CONST],
-            Stmt\ClassMethod::class . '->flags' => ['pModifiers', \T_FUNCTION],
-            Stmt\Class_::class . '->flags' => ['pModifiers', \T_CLASS],
-            Stmt\Property::class . '->flags' => ['pModifiers', \T_VARIABLE],
-            PrintableNewAnonClassNode::class . '->flags' => ['pModifiers', \T_CLASS],
-            Param::class . '->flags' => ['pModifiers', \T_VARIABLE],
-            PropertyHook::class . '->flags' => ['pModifiers', \T_STRING],
-            Expr\Closure::class . '->static' => ['pStatic', \T_FUNCTION],
-            Expr\ArrowFunction::class . '->static' => ['pStatic', \T_FN],
+            Stmt\ClassConst::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_CONST],
+            Stmt\ClassMethod::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_FUNCTION],
+            Stmt\Class_::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_CLASS],
+            Stmt\Property::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_VARIABLE],
+            PrintableNewAnonClassNode::class . '->flags' => ['pModifiers', \T_NEW, \T_CLASS],
+            Param::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_VARIABLE],
+            PropertyHook::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_STRING],
+            Expr\Closure::class . '->static' => ['pStatic', \T_WHITESPACE, \T_FUNCTION],
+            Expr\ArrowFunction::class . '->static' => ['pStatic', \T_WHITESPACE, \T_FN],
             //Stmt\TraitUseAdaptation\Alias::class . '->newModifier' => 0, // TODO
         ];
 

test/code/formatPreservation/modifierChange.test

@@ -64,8 +64,8 @@ $stmts[0]->expr->class->flags = Modifiers::READONLY;
 $stmts[1]->expr->class->flags = 0;
 -----
 <?php
-readonly class {};
-class {};
+new readonly class {};
+new class {};
 -----
 <?php
 class X {