trackCallsOnMixed -> trackMixedAccess

README.md

@@ -151,7 +151,7 @@ class UserFacade
 ```neon
 parameters:
     shipmonkDeadCode:
-        trackCallsOnMixed: false
+        trackMixedAccess: false
 ```
 
 - If you want to check how many of those cases are present in your codebase, you can run PHPStan analysis with `-vvv` and you will see some diagnostics:

rules.neon

@@ -54,16 +54,20 @@ services:
         tags:
             - phpstan.collector
         arguments:
-            trackCallsOnMixed: %shipmonkDeadCode.trackCallsOnMixed%
+            trackMixedAccess: %shipmonkDeadCode.trackMixedAccess%
 
     -
-        class: ShipMonk\PHPStan\DeadCode\Collector\ClassDefinitionCollector
+        class: ShipMonk\PHPStan\DeadCode\Collector\ConstantFetchCollector
         tags:
             - phpstan.collector
+        arguments:
+            trackMixedAccess: %shipmonkDeadCode.trackMixedAccess%
+
     -
-        class: ShipMonk\PHPStan\DeadCode\Collector\ConstantFetchCollector
+        class: ShipMonk\PHPStan\DeadCode\Collector\ClassDefinitionCollector
         tags:
             - phpstan.collector
+
     -
         class: ShipMonk\PHPStan\DeadCode\Collector\EntrypointCollector
         tags:
@@ -78,12 +82,12 @@ services:
             - phpstan.diagnoseExtension
         arguments:
             reportTransitivelyDeadMethodAsSeparateError: %shipmonkDeadCode.reportTransitivelyDeadMethodAsSeparateError%
-            trackCallsOnMixed: %shipmonkDeadCode.trackCallsOnMixed%
+            trackMixedAccess: %shipmonkDeadCode.trackMixedAccess%
 
 
 parameters:
     shipmonkDeadCode:
-        trackCallsOnMixed: true
+        trackMixedAccess: true
         reportTransitivelyDeadMethodAsSeparateError: false
         entrypoints:
             vendor:
@@ -101,7 +105,7 @@ parameters:
 
 parametersSchema:
     shipmonkDeadCode: structure([
-        trackCallsOnMixed: bool()
+        trackMixedAccess: bool()
         reportTransitivelyDeadMethodAsSeparateError: bool()
         entrypoints: structure([
             vendor: structure([

src/Collector/ConstantFetchCollector.php

@@ -38,9 +38,15 @@ class ConstantFetchCollector implements Collector
 
     private ReflectionProvider $reflectionProvider;
 
-    public function __construct(ReflectionProvider $reflectionProvider)
+    private bool $trackMixedAccess;
+
+    public function __construct(
+        ReflectionProvider $reflectionProvider,
+        bool $trackMixedAccess
+    )
     {
         $this->reflectionProvider = $reflectionProvider;
+        $this->trackMixedAccess = $trackMixedAccess;
     }
 
     public function getNodeType(): string
@@ -173,7 +179,7 @@ private function getDeclaringTypesWithConstant(
             }
         }
 
-        if ($result === []) { // TODO trackFetchesOnMixed
+        if ($this->trackMixedAccess && $result === []) {
             $result[] = null; // call over unknown type
         }
 

src/Collector/MethodCallCollector.php

@@ -38,11 +38,11 @@ class MethodCallCollector implements Collector
      */
     private array $callsBuffer = [];
 
-    private bool $trackCallsOnMixed;
+    private bool $trackMixedAccess;
 
-    public function __construct(bool $trackCallsOnMixed)
+    public function __construct(bool $trackMixedAccess)
     {
-        $this->trackCallsOnMixed = $trackCallsOnMixed;
+        $this->trackMixedAccess = $trackMixedAccess;
     }
 
     public function getNodeType(): string
@@ -261,7 +261,7 @@ private function getDeclaringTypesWithMethod(
             }
         }
 
-        if ($this->trackCallsOnMixed) {
+        if ($this->trackMixedAccess) {
             $canBeObjectCall = !$typeNoNull->isObject()->no() && !$isStaticCall->yes();
             $canBeClassStringCall = !$typeNoNull->isClassString()->no() && !$isStaticCall->no();
 

src/Rule/DeadCodeRule.php

@@ -89,7 +89,7 @@ class DeadCodeRule implements Rule, DiagnoseExtension
 
     private bool $reportTransitivelyDeadAsSeparateError;
 
-    private bool $trackCallsOnMixed;
+    private bool $trackMixedAccess;
 
     /**
      * memberKey => DeadMember
@@ -113,12 +113,12 @@ class DeadCodeRule implements Rule, DiagnoseExtension
     public function __construct(
         ClassHierarchy $classHierarchy,
         bool $reportTransitivelyDeadMethodAsSeparateError,
-        bool $trackCallsOnMixed
+        bool $trackMixedAccess
     )
     {
         $this->classHierarchy = $classHierarchy;
         $this->reportTransitivelyDeadAsSeparateError = $reportTransitivelyDeadMethodAsSeparateError;
-        $this->trackCallsOnMixed = $trackCallsOnMixed;
+        $this->trackMixedAccess = $trackMixedAccess;
     }
 
     public function getNodeType(): string
@@ -622,7 +622,7 @@ private function isNeverReportedAsDead(BlackMember $blackMember): bool
 
     public function print(Output $output): void
     {
-        if ($this->mixedMemberUses === [] || !$output->isDebug() || !$this->trackCallsOnMixed) {
+        if ($this->mixedMemberUses === [] || !$output->isDebug() || !$this->trackMixedAccess) {
             return;
         }
 

tests/Rule/DeadCodeRuleTest.php

@@ -41,7 +41,7 @@
 class DeadCodeRuleTest extends RuleTestCase
 {
 
-    private bool $trackMixedCalls = true;
+    private bool $trackMixedAccess = true;
 
     private bool $emitErrorsInGroups = true;
 
@@ -70,8 +70,8 @@ protected function getCollectors(): array
         return [
             new EntrypointCollector($this->getEntrypointProviders()),
             new ClassDefinitionCollector(),
-            new MethodCallCollector($this->trackMixedCalls),
-            new ConstantFetchCollector(self::createReflectionProvider()),
+            new MethodCallCollector($this->trackMixedAccess),
+            new ConstantFetchCollector(self::createReflectionProvider(), $this->trackMixedAccess),
         ];
     }
 
@@ -109,12 +109,14 @@ private function doTestDead($files, ?int $lowestPhpVersion = null): void
     public function testMixedCallsTracked(): void
     {
         $this->analyseFiles([__DIR__ . '/data/methods/mixed/tracked.php']);
+        $this->analyseFiles([__DIR__ . '/data/constants/mixed/tracked.php']);
     }
 
     public function testMixedCallsNotTracked(): void
     {
-        $this->trackMixedCalls = false;
+        $this->trackMixedAccess = false;
         $this->analyseFiles([__DIR__ . '/data/methods/mixed/untracked.php']);
+        $this->analyseFiles([__DIR__ . '/data/constants/mixed/untracked.php']);
     }
 
     public function testDiagnoseMixedCalls(): void
@@ -320,7 +322,7 @@ public static function provideFiles(): iterable
         yield 'const-function' => [__DIR__ . '/data/constants/constant-function.php'];
         yield 'const-dynamic' => [__DIR__ . '/data/constants/dynamic.php'];
         yield 'const-expr' => [__DIR__ . '/data/constants/expr.php'];
-        yield 'const-mixed' => [__DIR__ . '/data/constants/mixed.php'];
+        yield 'const-mixed' => [__DIR__ . '/data/constants/mixed/tracked.php'];
         yield 'const-override' => [__DIR__ . '/data/constants/override.php'];
         yield 'const-static' => [__DIR__ . '/data/constants/static.php'];
         yield 'const-traits-1' => [__DIR__ . '/data/constants/traits-1.php'];

tests/Rule/data/constants/mixed.php → tests/Rule/data/constants/mixed/tracked.php

@@ -56,10 +56,7 @@ function __construct($mixed, string $notClass, object $object, IFace $iface, int
 
     function testMethodExists(Iface $iface)
     {
-        if (method_exists($iface, 'someMethod')) {
-            echo $iface::SOME_CONST; // does not not mark Clazz
-        }
-
+        echo $iface::SOME_CONST; // does not not mark Clazz
         echo $iface::CONST6; // not defined on Iface, but should mark used on its implementations but not on unrelated Clazz
     }
 }

tests/Rule/data/constants/mixed/untracked.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types = 1);
+
+namespace DeadConstMixed2;
+
+
+class Clazz {
+
+    const CONST1 = 1; // error: Unused DeadConstMixed2\Clazz::CONST1
+    const CONST2 = 1; // error: Unused DeadConstMixed2\Clazz::CONST2
+    const CONST3 = 1; // error: Unused DeadConstMixed2\Clazz::CONST3
+    const CONST4 = 1; // error: Unused DeadConstMixed2\Clazz::CONST4
+    const CONST5 = 1;
+    const CONST6 = 1; // error: Unused DeadConstMixed2\Clazz::CONST6
+
+    const SOME_CONST = 1; // error: Unused DeadConstMixed2\Clazz::SOME_CONST
+
+}
+
+interface IFace {
+
+    const CONST1 = 1; // error: Unused DeadConstMixed2\IFace::CONST1
+    const CONST2 = 1; // error: Unused DeadConstMixed2\IFace::CONST2
+    const CONST3 = 1; // error: Unused DeadConstMixed2\IFace::CONST3
+    const CONST4 = 1;
+    const CONST5 = 1; // error: Unused DeadConstMixed2\IFace::CONST5
+
+}
+
+class Implementor implements IFace {
+
+    const CONST1 = 1; // error: Unused DeadConstMixed2\Implementor::CONST1
+    const CONST2 = 1; // error: Unused DeadConstMixed2\Implementor::CONST2
+    const CONST3 = 1; // error: Unused DeadConstMixed2\Implementor::CONST3
+    const CONST4 = 1;
+    const CONST5 = 1; // error: Unused DeadConstMixed2\Implementor::CONST5
+    const CONST6 = 1;
+
+}
+
+class Tester
+{
+    function __construct($mixed, string $notClass, object $object, IFace $iface, int|Clazz $maybeClass)
+    {
+        echo $mixed::CONST1; // may be valid
+
+        if (!$mixed instanceof Clazz) {
+            echo $mixed::CONST2; // ideally, should mark only IFace, not Clazz (not implemented)
+        }
+
+        echo $object::CONST3;
+        echo $iface::CONST4;
+        echo $maybeClass::CONST5; // mark only Clazz, not IFace
+
+        $this->testMethodExists();
+    }
+
+    function testMethodExists(Iface $iface)
+    {
+        echo $iface::SOME_CONST; // does not not mark Clazz
+        echo $iface::CONST6; // not defined on Iface, but should mark used on its implementations but not on unrelated Clazz
+    }
+}
+
+new Tester();