Force custom descendant detection for cases where PHPStan cannot do that properly (Scope->resolveTypeByName)

Author: janedbal

src/Collector/MethodCallCollector.php

@@ -113,17 +113,24 @@ private function registerMethodCall(
         $methodNames = $this->getMethodName($methodCall, $scope);
 
         if ($methodCall instanceof New_) {
-            if ($methodCall->class instanceof Expr || $methodCall->class instanceof Name) {
+            if ($methodCall->class instanceof Expr) {
                 $callerType = $scope->getType($methodCall);
+                $possibleDescendantCall = null;
+
+            } elseif ($methodCall->class instanceof Name) {
+                $callerType = $scope->resolveTypeByName($methodCall->class);
+                $possibleDescendantCall = $methodCall->class->toString() === 'static';
+
             } else {
                 return;
             }
         } else {
             $callerType = $scope->getType($methodCall->var);
+            $possibleDescendantCall = null;
         }
 
         foreach ($methodNames as $methodName) {
-            foreach ($this->getDeclaringTypesWithMethod($methodName, $callerType, TrinaryLogic::createNo()) as $methodRef) {
+            foreach ($this->getDeclaringTypesWithMethod($methodName, $callerType, TrinaryLogic::createNo(), $possibleDescendantCall) as $methodRef) {
                 $this->registerUsage(
                     new ClassMethodUsage(
                         $this->usageOriginDetector->detectOrigin($scope),
@@ -145,12 +152,15 @@ private function registerStaticCall(
 
         if ($staticCall->class instanceof Expr) {
             $callerType = $scope->getType($staticCall->class);
+            $possibleDescendantCall = null;
+
         } else {
-            $callerType = $scope->resolveTypeByName($staticCall->class); // broken in PHPStan, the type here is marked as NOT final
+            $callerType = $scope->resolveTypeByName($staticCall->class);
+            $possibleDescendantCall = $staticCall->class->toString() === 'static';
         }
 
         foreach ($methodNames as $methodName) {
-            foreach ($this->getDeclaringTypesWithMethod($methodName, $callerType, TrinaryLogic::createYes()) as $methodRef) {
+            foreach ($this->getDeclaringTypesWithMethod($methodName, $callerType, TrinaryLogic::createYes(), $possibleDescendantCall) as $methodRef) {
                 $this->registerUsage(
                     new ClassMethodUsage(
                         $this->usageOriginDetector->detectOrigin($scope),
@@ -249,7 +259,8 @@ private function getMethodName(CallLike $call, Scope $scope): array
     private function getDeclaringTypesWithMethod(
         string $methodName,
         Type $type,
-        TrinaryLogic $isStaticCall
+        TrinaryLogic $isStaticCall,
+        ?bool $isPossibleDescendant = null
     ): array
     {
         $typeNoNull = TypeCombinator::removeNull($type); // remove null to support nullsafe calls
@@ -259,7 +270,8 @@ private function getDeclaringTypesWithMethod(
         $result = [];
 
         foreach ($classReflections as $classReflection) {
-            $result[] = new ClassMethodRef($classReflection->getName(), $methodName, !$classReflection->isFinal());
+            $possibleDescendant = $isPossibleDescendant ?? !$classReflection->isFinal();
+            $result[] = new ClassMethodRef($classReflection->getName(), $methodName, $possibleDescendant);
         }
 
         if ($this->trackMixedAccess) {

tests/Rule/data/methods/array-map-1.php

@@ -12,6 +12,7 @@ public function __construct()
         [$this, 'method4'];
         [self::class, 'method5'];
         ['static', 'method6']; // https://github.com/phpstan/phpstan/issues/11594
+        [new self(), 'method7'];
     }
 
     public function method1(string $foo): void {} // error: Unused DeadMap\ArrayMapTest::method1
@@ -20,6 +21,7 @@ public function method3(): void {}
     public function method4(): void {}
     public static function method5(): void {}
     public static function method6(): void {} // error: Unused DeadMap\ArrayMapTest::method6
+    public function method7(): void {}
 }
 
 class Child extends ArrayMapTest {
@@ -29,6 +31,7 @@ public function method3(): void {}
     public function method4(): void {}
     public static function method5(): void {} // should be reported (https://github.com/phpstan/phpstan-src/pull/3372)
     public static function method6(): void {} // error: Unused DeadMap\Child::method6
+    public function method7(): void {} // error: Unused DeadMap\Child::method7
 
 }
 

tests/Rule/data/methods/clone.php

@@ -6,6 +6,10 @@ class CloneClass1 {
     public function __clone() {}
 }
 
+class CloneClassChild extends CloneClass1 {
+    public function __clone() {} // error: Unused DeadClone\CloneClassChild::__clone
+}
+
 class CloneClass2 {
     public function __clone() {} // error: Unused DeadClone\CloneClass2::__clone
 }