Skip to content

[BUGFIX] Ensure proper reprint with attributes for finalized classes #4585

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
Jul 23, 2023
Merged

[BUGFIX] Ensure proper reprint with attributes for finalized classes #4585

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
21 changes: 21 additions & 0 deletions ...n/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/class_with_attribute.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
Copy link
Copy Markdown
Member

@samsonasik samsonasik Jul 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, the namespace need to be changed based on the test namespace, I will change that :)

Copy link
Copy Markdown
Contributor Author

@cngJo cngJo Jul 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah damit, totally missed that. Thank you for taking care of that.

Copy link
Copy Markdown
Member

@samsonasik samsonasik Jul 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#4586


#[SomeAttribute]
class ClassWithAttribute
{
}

?>
-----
<?php

namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;

#[SomeAttribute]
final class ClassWithAttribute
{
}

?>
6 changes: 6 additions & 0 deletions rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Rector\Core\Rector\AbstractRector;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Privatization\NodeManipulator\VisibilityManipulator;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand Down Expand Up @@ -100,6 +101,11 @@ public function refactor(Node $node): ?Node
return null;
}

if ($node->attrGroups !== []) {
// improve reprint with correct newline
$node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
}

$this->visibilityManipulator->makeFinal($node);

return $node;
Expand Down