Skip to content

Bump nikic/php-parser to ^5.6.2 and Fix AttributeGroupNewLiner for already has new line #7531

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

Merged
samsonasik merged 5 commits into from
Oct 22, 2025
Merged

Bump nikic/php-parser to ^5.6.2 and Fix AttributeGroupNewLiner for already has new line #7531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
707bd56
Bump nikic/php-parser to ^5.6.2 and Fix AttributeGroupNewLiner for al…
samsonasik Oct 22, 2025
cb3f65e
clean up
samsonasik Oct 22, 2025
a13d7a6
clean up
samsonasik Oct 22, 2025
9660ad6
clean up
samsonasik Oct 22, 2025
6af5c8a
comment
samsonasik Oct 22, 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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"doctrine/inflector": "^2.1",
"illuminate/container": "^11.46",
"nette/utils": "^4.0",
"nikic/php-parser": "^5.6.1",
"nikic/php-parser": "^5.6.2",
"ondram/ci-detector": "^4.2",
"phpstan/phpdoc-parser": "^2.3",
"phpstan/phpstan": "^2.1.26",
Expand Down
2 changes: 1 addition & 1 deletion ...pertyAssignToConstructorPromotionRector/Fixture/do_not_remove_parameter_attribute.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromo
final class DoNotRemoveParameterAttribute
{
public function __construct(
#[\SensitiveParameter]private string $password
#[\SensitiveParameter] private string $password
)
{
}
Expand Down
11 changes: 9 additions & 2 deletions rules/Php81/NodeManipulator/AttributeGroupNewLiner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,15 @@ public function newLine(File $file, Node $node): void
break;
}

if (trim($oldTokens[$startTokenPos + $iteration + 1]->text ?? '') === '') {
$space = ltrim($oldTokens[$startTokenPos + $iteration + 1]->text ?? '', "\r\n");
$nextTokenText = $oldTokens[$startTokenPos + $iteration + 1]->text ?? '';
if (trim($nextTokenText) === '') {
// when trimmed is empty string, but original text contains new line
// no need to add another new line
if (str_contains($nextTokenText, "\n") || str_contains($nextTokenText, "\r")) {
break;
}

$space = ltrim($nextTokenText, "\r\n");
} elseif (trim($oldTokens[$startTokenPos - 1]->text ?? '') === '') {
$space = ltrim($oldTokens[$startTokenPos - 1]->text ?? '', "\r\n");
} else {
Expand Down