diff --git a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc b/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc deleted file mode 100644 index 9636c1b7..00000000 --- a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc +++ /dev/null @@ -1,45 +0,0 @@ -isTrue($param)) { - return 5; - } - - return '10'; - } - - private function isTrue($value) { - return $value === true; - } -} - -?> ------ -isTrue($param)) { - return 5; - } - - return '10'; - } - - private function isTrue($value) { - return $value === true; - } -} - -?> \ No newline at end of file diff --git a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc b/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc deleted file mode 100644 index f54849e4..00000000 --- a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc +++ /dev/null @@ -1,22 +0,0 @@ -isTrue($param)) { - return 5; - } - - return '10'; - } - - private function isTrue($value) { - return $value === true; - } -} diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php index a6f1a527..c20e2f00 100644 --- a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php +++ b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php @@ -34,13 +34,7 @@ final class DowngradeAttributeToAnnotationRector extends AbstractRector implemen /** * @var string[] */ - private const SKIPPED_ATTRIBUTES = [ - 'Attribute', - 'ReturnTypeWillChange', - 'AllowDynamicProperties', - 'Override', - 'SensitiveParameter', - ]; + private const SKIPPED_ATTRIBUTES = ['Attribute', 'ReturnTypeWillChange', 'AllowDynamicProperties']; /** * @var DowngradeAttributeToAnnotation[] @@ -120,15 +114,7 @@ public function refactor(Node $node): ?Node (string) $oldTokens[$attrGroup->getEndTokenPos() + 1], "\n" )) { - if ($node instanceof Param && (isset($oldTokens[$attrGroup->getStartTokenPos() - 1]) && ! str_contains( - (string) $oldTokens[$attrGroup->getStartTokenPos() - 1], - "\n" - ))) { - // add new line before - $oldTokens[$attrGroup->getStartTokenPos() - 1]->text .= "\n"; - } - - // add new line after + // add new line $oldTokens[$attrGroup->getEndTokenPos() + 1]->text = "\n" . $oldTokens[$attrGroup->getEndTokenPos() + 1]->text; $this->isDowngraded = true; }