Skip to content

fix: Handle crash on mark readonly on attributed anonymous class #1179

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
samsonasik wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −1
Open

fix: Handle crash on mark readonly on attributed anonymous class #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions lib/PhpParser/PrettyPrinterAbstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,10 @@ protected function p(
}

[$printFn, $skipToken, $findToken] = $this->modifierChangeMap[$key];
if ($skipToken === \T_NEW && $pos !== $startPos) {
// Anonymous class attributes were printed, so we are already past "new".
$skipToken = \T_WHITESPACE;
}
$skipWSPos = $this->origTokens->skipRight($pos, $skipToken);
$result .= $this->origTokens->getTokenCode($pos, $skipWSPos, $indentAdjustment);
$result .= $this->$printFn($subNode);
Expand Down
19 changes: 18 additions & 1 deletion test/code/formatPreservation/modifierChange.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,21 @@ class X {
protected function m() {}
/** A */
protected function m2() {}
}
}
-----
<?php
new #[A] class {};
new #[A] readonly class {};
new class {};
-----
$stmts[0]->expr->class->flags = Modifiers::READONLY;
$stmts[1]->expr->class->flags = 0;
$stmts[2]->expr->class->flags = Modifiers::READONLY;
$stmts[2]->expr->class->attrGroups[] = new Node\AttributeGroup([
new Node\Attribute(new Node\Name('B'), []),
]);
-----
<?php
new #[A] readonly class {};
new #[A] class {};
new #[B] readonly class {};
Loading