Skip to content

Fix variadic trailing comma printer in format preserving printer - option #2 #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomasVotruba wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix variadic trailing comma printer in format preserving printer - option #2 #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccb61b2
remove trailing in printer
TomasVotruba Oct 27, 2025
6f8b234
improve test
TomasVotruba Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/PhpParser/PrettyPrinterAbstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,13 @@ protected function p(
$pos = $subEndPos + 1;
}

$result .= $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment);
$tokenCode = $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment);
if ($node instanceof Expr\CallLike && $node->isFirstClassCallable()) {
$tokenCode = str_replace(',', '', $tokenCode);
Comment thread
TomasVotruba marked this conversation as resolved.
Comment thread
TomasVotruba marked this conversation as resolved.
}

$result .= $tokenCode;

return $result;
}

Expand Down
38 changes: 38 additions & 0 deletions test/code/formatPreservation/args_to_variadic_remove_trailing_comma.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Replace args with VariadicPlaceholder should remove trailing comma
-----
<?php

strlen(
'test',
);

strlen('another',);

strlen(1, 2, 3, ) > strlen(1 , 2 , 3 ,);

strlen(
'multiple new lines'

,
);
-----
$stmts[0]->expr->args = [new Node\VariadicPlaceholder()];
$stmts[1]->expr->args = [new Node\VariadicPlaceholder()];
$stmts[2]->expr->right->args = [new Node\VariadicPlaceholder()];
$stmts[3]->expr->args = [new Node\VariadicPlaceholder()];
-----
<?php

strlen(
...
);

strlen(...);

strlen(1, 2, 3, ) > strlen(...);

strlen(
...


);