Skip to content

Commit 4bebf17

Browse files
authored
Revert " Re-skip Override and SensitiveParameter (#320)" (#321)
This reverts commit 57f45d4.
1 parent 57f45d4 commit 4bebf17

File tree

3 files changed

+2
-83
lines changed

3 files changed

+2
-83
lines changed

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@ final class DowngradeAttributeToAnnotationRector extends AbstractRector implemen
3434
/**
3535
* @var string[]
3636
*/
37-
private const SKIPPED_ATTRIBUTES = [
38-
'Attribute',
39-
'ReturnTypeWillChange',
40-
'AllowDynamicProperties',
41-
'Override',
42-
'SensitiveParameter',
43-
];
37+
private const SKIPPED_ATTRIBUTES = ['Attribute', 'ReturnTypeWillChange', 'AllowDynamicProperties'];
4438

4539
/**
4640
* @var DowngradeAttributeToAnnotation[]
@@ -120,15 +114,7 @@ public function refactor(Node $node): ?Node
120114
(string) $oldTokens[$attrGroup->getEndTokenPos() + 1],
121115
"\n"
122116
)) {
123-
if ($node instanceof Param && (isset($oldTokens[$attrGroup->getStartTokenPos() - 1]) && ! str_contains(
124-
(string) $oldTokens[$attrGroup->getStartTokenPos() - 1],
125-
"\n"
126-
))) {
127-
// add new line before
128-
$oldTokens[$attrGroup->getStartTokenPos() - 1]->text .= "\n";
129-
}
130-
131-
// add new line after
117+
// add new line
132118
$oldTokens[$attrGroup->getEndTokenPos() + 1]->text = "\n" . $oldTokens[$attrGroup->getEndTokenPos() + 1]->text;
133119
$this->isDowngraded = true;
134120
}

0 commit comments

Comments
 (0)