Skip to content

Revert "Re-skip Override and SensitiveParameter part 3" #323

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 1 commit into from
Sep 8, 2025
Merged

Revert "Re-skip Override and SensitiveParameter part 3" #323

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
45 changes: 0 additions & 45 deletions ...s_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...oAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down Expand Up @@ -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;
}
Expand Down