Skip to content

[perf] Avoid call refactor() twice on AbstractRector #8077

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

Closed
samsonasik wants to merge 1 commit into from
+8 −6
Closed

[perf] Avoid call refactor() twice on AbstractRector #8077

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
14 changes: 8 additions & 6 deletions src/Rector/AbstractRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,21 @@ final public function enterNode(Node $node): int|Node|null|array
// whether it would actually have changed anything. Only a skip that prevents a real change
// counts as used; the original node is left untouched, so the file stays skipped either way.
$skipMatch = $this->skipper->matchSkip($this, $filePath);
$nodeToRefactor = $skipMatch instanceof SkipMatch ? $this->cloneNode($node) : $node;

@TomasVotruba TomasVotruba Jun 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is quite hard to read.


// ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN
$originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $node;

$refactoredNodeOrState = $this->refactor($nodeToRefactor);

if ($skipMatch instanceof SkipMatch) {
if ($this->refactor($this->cloneNode($node)) !== null) {
if ($refactoredNodeOrState !== null) {
$this->skipper->markSkipUsed($skipMatch);
}

return null;
}

// ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN
$originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $node;

$refactoredNodeOrState = $this->refactor($node);

// nothing to change → continue
if ($refactoredNodeOrState === null) {
return null;
Expand Down
Loading