Skip to content

Avoid reprint whole ClassMethod on DowngradeReadonlyPropertyRector #325

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 2 commits into from
Sep 8, 2025
Merged

Avoid reprint whole ClassMethod on DowngradeReadonlyPropertyRector #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c410651
Avoid reprint on DowngradeReadonlyPropertyRector
samsonasik Sep 8, 2025
7da1c10
[ci-review] Rector Rectify
actions-user Sep 8, 2025
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
16 changes: 3 additions & 13 deletions rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Comments\NodeDocBlock\DocBlockUpdater;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Privatization\NodeManipulator\VisibilityManipulator;
use Rector\Rector\AbstractRector;
use Rector\ValueObject\MethodName;
Expand Down Expand Up @@ -102,17 +101,13 @@ public function refactor(Node $node): ?Node
return null;
}

$hasChangedDoc = false;
$hasChanged = false;
foreach ($node->params as $param) {
if (! $this->visibilityManipulator->isReadonly($param)) {
continue;
}

if ($this->addPhpDocTag($param)) {
$hasChangedDoc = true;
}

$this->addPhpDocTag($param);
$this->visibilityManipulator->removeReadonly($param);
$hasChanged = true;
}
Expand All @@ -121,23 +116,18 @@ public function refactor(Node $node): ?Node
return null;
}

if ($hasChangedDoc) {
$node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
}

return $node;
}

private function addPhpDocTag(Property|Param $node): bool
private function addPhpDocTag(Property|Param $node): void
{
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);

if ($phpDocInfo->hasByName(self::TAGNAME)) {
return false;
return;
}

$phpDocInfo->addPhpDocTagNode(new PhpDocTagNode('@' . self::TAGNAME, new GenericTagValueNode('')));
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
return true;
}
}
5 changes: 2 additions & 3 deletions rules/DowngradePhp85/Rector/Class_/DowngradeFinalPropertyPromotionRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,15 @@ public function refactor(Node $node): ?ClassMethod
return null;
}

private function addPhpDocTag(Property|Param $node): bool
private function addPhpDocTag(Property|Param $node): void
{
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);

if ($phpDocInfo->hasByName(self::TAGNAME)) {
return false;
return;
}

$phpDocInfo->addPhpDocTagNode(new PhpDocTagNode('@' . self::TAGNAME, new GenericTagValueNode('')));
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
return true;
}
}
10 changes: 4 additions & 6 deletions tests/Issues/DowngradeReadonlyClassPropertyToPhp80/Fixture/fixture.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ namespace Rector\Tests\Issues\DowngradeReadonlyClassPropertyToPhp80\Fixture;

final class Fixture
{
public function __construct(
/**
* @readonly
*/
public array $property
)
public function __construct(/**
* @readonly
*/
public array $property)
{
}
}
Expand Down