Support NullSafeMethod calls in unused-code analysis (#5838)

* Support NullSafeMethod calls in unused-code analysis * fix phpstan
rectorphp · Apr 21, 2024 · 4cd2622 · 4cd2622
1 parent 068799f
commit 4cd2622
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/...r/ClassMethod/RemoveUnusedPrivateMethodRector/Fixture/keep_nullsafe_called_method.php.inc b/...r/ClassMethod/RemoveUnusedPrivateMethodRector/Fixture/keep_nullsafe_called_method.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector\Fixture;
+
+final class KeepNullSafeCalledMethod
+{
+    private function privateMethod():void {}
+
+    public function pubMethod() {
+        $this->getX()?->privateMethod();
+    }
+
+    public function getX(): KeepNullSafeCalledMethod|null {
+        return rand(0,1) ? new KeepNullSafeCalledMethod() : null;
+    }
+}
diff --git a/rules/DeadCode/NodeAnalyzer/CallCollectionAnalyzer.php b/rules/DeadCode/NodeAnalyzer/CallCollectionAnalyzer.php
@@ -5,6 +5,7 @@
 namespace Rector\DeadCode\NodeAnalyzer;
 
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -22,7 +23,7 @@ public function __construct(
     }
 
     /**
-     * @param StaticCall[]|MethodCall[] $calls
+     * @param StaticCall[]|MethodCall[]|NullsafeMethodCall[] $calls
      */
     public function isExists(array $calls, string $classMethodName, string $className): bool
     {
@@ -50,7 +51,7 @@ public function isExists(array $calls, string $classMethodName, string $classNam
         return false;
     }
 
-    private function isSelfStatic(MethodCall|StaticCall $call): bool
+    private function isSelfStatic(MethodCall|StaticCall|NullsafeMethodCall $call): bool
     {
         return $call instanceof StaticCall && $call->class instanceof Name && in_array(
             $call->class->toString(),
@@ -59,7 +60,7 @@ private function isSelfStatic(MethodCall|StaticCall $call): bool
         );
     }
 
-    private function shouldSkip(StaticCall|MethodCall $call, string $classMethodName): bool
+    private function shouldSkip(StaticCall|MethodCall|NullsafeMethodCall $call, string $classMethodName): bool
     {
         if (! $call->name instanceof Identifier) {
             return true;

diff --git a/rules/DeadCode/NodeAnalyzer/IsClassMethodUsedAnalyzer.php b/rules/DeadCode/NodeAnalyzer/IsClassMethodUsedAnalyzer.php
@@ -53,12 +53,17 @@ public function isClassMethodUsed(Class_ $class, ClassMethod $classMethod, Scope
             return true;
         }
 
-        // 2. direct static calls
+        // 2. direct null-safe calls
+        if ($this->isClassMethodCalledInLocalNullsafeMethodCall($class, $classMethodName)) {
+            return true;
+        }
+
+        // 3. direct static calls
         if ($this->isClassMethodUsedInLocalStaticCall($class, $classMethodName)) {
             return true;
         }
 
-        // 3. magic array calls!
+        // 4. magic array calls!
         if ($this->isClassMethodCalledInLocalArrayCall($class, $classMethod, $scope)) {
             return true;
         }
@@ -85,6 +90,15 @@ private function isClassMethodCalledInLocalMethodCall(Class_ $class, string $cla
         return $this->callCollectionAnalyzer->isExists($methodCalls, $classMethodName, $className);
     }
 
+    private function isClassMethodCalledInLocalNullsafeMethodCall(Class_ $class, string $classMethodName): bool
+    {
+        $className = (string) $this->nodeNameResolver->getName($class);
+
+        /** @var Node\Expr\NullsafeMethodCall[] $methodCalls */
+        $methodCalls = $this->betterNodeFinder->findInstanceOf($class, Node\Expr\NullsafeMethodCall::class);
+        return $this->callCollectionAnalyzer->isExists($methodCalls, $classMethodName, $className);
+    }
+
     private function isInArrayMap(Class_ $class, Array_ $array): bool
     {
         if (! $array->getAttribute(ArrayMapArgVisitor::ATTRIBUTE_NAME) instanceof Arg) {