Fix

Author: samsonasik

lib/PhpParser/Internal/TokenStream.php

@@ -220,12 +220,17 @@ public function getIndentationBefore(int $pos): int {
      *
      * @return string Code corresponding to token range, adjusted for indentation
      */
-    public function getTokenCode(int $from, int $to, int $indent): string {
+    public function getTokenCode(int $from, int $to, int $indent, bool $removeTrailingComma = false): string {
         $tokens = $this->tokens;
         $result = '';
         for ($pos = $from; $pos < $to; $pos++) {
             $token = $tokens[$pos];
             $id = $token->id;
+
+            if ($removeTrailingComma && $token->text === ',') {
+                $token->text = '';
+            }
+
             $text = $token->text;
             if ($id === \T_CONSTANT_ENCAPSED_STRING || $id === \T_ENCAPSED_AND_WHITESPACE) {
                 $result .= $text;

lib/PhpParser/PrettyPrinterAbstract.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\AssignOp;
 use PhpParser\Node\Expr\BinaryOp;
+use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Cast;
 use PhpParser\Node\IntersectionType;
 use PhpParser\Node\MatchArm;
@@ -764,7 +765,12 @@ protected function p(
             $pos = $subEndPos + 1;
         }
 
-        $result .= $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment);
+        if ($node instanceof CallLike && substr(trim($result), -3) === '...') {
+            $result .= $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment, true);
+        } else {
+            $result .= $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment);
+        }
+
         return $result;
     }
 

test/PhpParser/PrettyPrinterTest.php

@@ -312,7 +312,10 @@ public function testTrailingCommaArgToFirstClassCallable(): void {
         $traverser = new NodeTraverser(new NodeVisitor\CloningVisitor());
 
         $oldStmts = $parser->parse(<<<'CODE'
-            <?php strlen("test",);
+            <?php
+            strlen(
+                "test",
+            );
             CODE
         );
         $oldTokens = $parser->getTokens();
@@ -323,7 +326,10 @@ public function testTrailingCommaArgToFirstClassCallable(): void {
 
         $prettyPrinter = new PrettyPrinter\Standard();
         $expected = <<<'CODE'
-            <?php strlen(...);
+            <?php
+            strlen(
+                ...
+            );
             CODE;
 
         $this->assertEquals(