Skip to content

Commit 60017cb

Browse files
committed
handle param new line before
1 parent e8b6950 commit 60017cb

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ final class OverrideAndSensitiveParameter extends Foo
2323
final class OverrideAndSensitiveParameter extends Foo
2424
{
2525
#[\Override]
26-
public function run(#[\SensitiveParameter]
26+
public function run(
27+
#[\SensitiveParameter]
2728
bool $param) {
2829
if ($this->isTrue($param)) {
2930
return 5;

rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,17 @@ public function refactor(Node $node): ?Node
120120
(string) $oldTokens[$attrGroup->getEndTokenPos() + 1],
121121
"\n"
122122
)) {
123-
// add new line
123+
if ($node instanceof Param) {
124+
if (isset($oldTokens[$attrGroup->getStartTokenPos() - 1]) && ! str_contains(
125+
(string) $oldTokens[$attrGroup->getStartTokenPos() - 1],
126+
"\n"
127+
)) {
128+
// add new line before
129+
$oldTokens[$attrGroup->getStartTokenPos() - 1]->text .= "\n ";
130+
}
131+
}
132+
133+
// add new line after
124134
$oldTokens[$attrGroup->getEndTokenPos() + 1]->text = "\n" . $oldTokens[$attrGroup->getEndTokenPos() + 1]->text;
125135
$this->isDowngraded = true;
126136
}

0 commit comments

Comments
 (0)