Skip to content

Commit 26eaa9d

Browse files
committed
make RenameMethodRector use ClassReflection
1 parent bc7b3a9 commit 26eaa9d

2 files changed

Lines changed: 35 additions & 7 deletions

File tree

‎rules/Renaming/Rector/MethodCall/RenameMethodRector.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
use PhpParser\Node\Stmt\ClassMethod;
1616
use PhpParser\Node\Stmt\Interface_;
1717
use PhpParser\Node\Stmt\Trait_;
18-
use PHPStan\Analyser\Scope;
1918
use PHPStan\Reflection\ClassReflection;
2019
use PHPStan\Reflection\ReflectionProvider;
2120
use Rector\Contract\Rector\ConfigurableRectorInterface;
2221
use Rector\NodeManipulator\ClassManipulator;
23-
use Rector\PHPStan\ScopeFetcher;
2422
use Rector\Rector\AbstractRector;
2523
use Rector\Reflection\ReflectionResolver;
2624
use Rector\Renaming\Contract\MethodCallRenameInterface;
@@ -87,8 +85,8 @@ public function getNodeTypes(): array
8785
public function refactor(Node $node): ?Node
8886
{
8987
if ($node instanceof Class_ || $node instanceof Trait_ || $node instanceof Interface_) {
90-
$scope = ScopeFetcher::fetch($node);
91-
return $this->refactorClass($node, $scope);
88+
$classReflection = $this->getClassReflection($node);
89+
return $this->refactorClass($node, $classReflection);
9290
}
9391

9492
return $this->refactorMethodCallAndStaticCall($node);
@@ -169,10 +167,8 @@ private function shouldKeepForParentInterface(
169167
*/
170168
private function refactorClass(
171169
Class_|Trait_|Interface_ $classOrInterface,
172-
Scope $scope
170+
ClassReflection $classReflection
173171
): Class_|Trait_|Interface_|null {
174-
$classReflection = $scope->getClassReflection();
175-
176172
$hasChanged = false;
177173

178174
foreach ($classOrInterface->getMethods() as $classMethod) {

‎src/PhpParser/NodeTraverser/RectorNodeTraverser.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpParser\Node;
99
use PhpParser\Node\Expr;
1010
use PhpParser\Node\Stmt;
11+
use PhpParser\Node\Stmt\Class_;
1112
use PhpParser\NodeVisitor;
1213
use Rector\Application\RectorRegistry;
1314
use Rector\Rector\RectorRunner;
@@ -77,6 +78,10 @@ private function traverseNode(Node $node, File $file): void
7778

7879
$this->traverseNode($subNode, $file);
7980

81+
// a descendant removal (e.g. an emptied method body) can make a Class_ rule
82+
// newly apply; re-offer the class once, now that its children are settled
83+
$node->{$name} = $subNode = $this->reRunClassRectors($subNode, $file);
84+
8085
if ($this->stopTraversal) {
8186
break;
8287
}
@@ -126,6 +131,10 @@ private function traverseArray(array $nodes, File $file): array
126131
}
127132

128133
$this->traverseNode($node, $file);
134+
135+
// re-offer a Class_ after descendant removals settle (see traverseNode)
136+
$nodes[$i] = $node = $this->reRunClassRectors($node, $file);
137+
129138
if ($this->stopTraversal) {
130139
break;
131140
}
@@ -140,6 +149,29 @@ private function traverseArray(array $nodes, File $file): array
140149
return $nodes;
141150
}
142151

152+
/**
153+
* Re-run Class_ rules once, after its children are traversed, so a rule whose
154+
* precondition is only met by a descendant removal still fires in a single pass.
155+
*/
156+
private function reRunClassRectors(Node $node, File $file): Node
157+
{
158+
if (! $node instanceof Class_) {
159+
return $node;
160+
}
161+
162+
foreach ($this->rectorRegistry->forNodeAndFile($node, $file) as $currentNodeVisitor) {
163+
$return = $this->rectorRunner->run($currentNodeVisitor, $node);
164+
if (! $return instanceof Node) {
165+
continue;
166+
}
167+
168+
$this->ensureReplacementReasonable($node, $return);
169+
$node = $return;
170+
}
171+
172+
return $node;
173+
}
174+
143175
private function ensureReplacementReasonable(Node $old, Node $new): void
144176
{
145177
if ($old instanceof Stmt) {

0 commit comments

Comments
 (0)