[DeadCode] Remove parent lookup on RemoveUnusedPrivateMethodRector (#…

…4005)
rectorphp · May 28, 2023 · 95d3dc9 · 95d3dc9
1 parent cc6dc93
commit 95d3dc9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/rules/DeadCode/NodeAnalyzer/IsClassMethodUsedAnalyzer.php b/rules/DeadCode/NodeAnalyzer/IsClassMethodUsedAnalyzer.php
@@ -35,13 +35,8 @@ public function __construct(
     ) {
     }
 
-    public function isClassMethodUsed(ClassMethod $classMethod, Scope $scope): bool
+    public function isClassMethodUsed(Class_ $class, ClassMethod $classMethod, Scope $scope): bool
     {
-        $class = $this->betterNodeFinder->findParentType($classMethod, Class_::class);
-        if (! $class instanceof Class_) {
-            return true;
-        }
-
         $classMethodName = $this->nodeNameResolver->getName($classMethod);
 
         // 1. direct normal calls

diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php
@@ -66,27 +66,35 @@ public function run()
      */
     public function getNodeTypes(): array
     {
-        return [ClassMethod::class];
+        return [Class_::class];
     }
 
     /**
-     * @param ClassMethod $node
+     * @param Class_ $node
      */
     public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
-        if ($this->shouldSkip($node)) {
+        if ($this->hasDynamicMethodCallOnFetchThis($node)) {
             return null;
         }
 
-        if ($this->isClassMethodUsedAnalyzer->isClassMethodUsed($node, $scope)) {
-            return null;
-        }
+        $hasChanged = false;
+        foreach ($node->getMethods() as $classMethod) {
+            if ($this->shouldSkip($classMethod)) {
+                continue;
+            }
 
-        if ($this->hasDynamicMethodCallOnFetchThis($node)) {
-            return null;
+            if ($this->isClassMethodUsedAnalyzer->isClassMethodUsed($node, $classMethod, $scope)) {
+                continue;
+            }
+
+            $this->removeNode($classMethod);
+            $hasChanged = true;
         }
 
-        $this->removeNode($node);
+        if ($hasChanged) {
+            return $node;
+        }
 
         return null;
     }
@@ -124,16 +132,11 @@ private function shouldSkip(ClassMethod $classMethod): bool
         return $classReflection->hasMethod(MethodName::CALL);
     }
 
-    private function hasDynamicMethodCallOnFetchThis(ClassMethod $classMethod): bool
+    private function hasDynamicMethodCallOnFetchThis(Class_ $class): bool
     {
-        $class = $this->betterNodeFinder->findParentType($classMethod, Class_::class);
-        if (! $class instanceof Class_) {
-            return false;
-        }
-
-        foreach ($class->getMethods() as $method) {
+        foreach ($class->getMethods() as $classMethod) {
             $isFound = (bool) $this->betterNodeFinder->findFirst(
-                (array) $method->getStmts(),
+                (array) $classMethod->getStmts(),
                 function (Node $subNode): bool {
                     if (! $subNode instanceof MethodCall) {
                         return false;