perf: skip known-used private methods early

Author: alfredbez

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/Fixture/mixed_protected_and_unused_methods.php.inc

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class MixedProtectedAndUnusedMethods extends TestCase
+{
+    #[DataProvider('provideValues')]
+    public function testValue(int $value): void
+    {
+        self::assertSame($value, self::class::expectedValue());
+        $this->locallyUsed();
+    }
+
+    private static function provideValues(): array
+    {
+        return [[42]];
+    }
+
+    private static function expectedValue(): int
+    {
+        return 42;
+    }
+
+    private function unused(): void
+    {
+    }
+
+    private function locallyUsed(): void
+    {
+    }
+}
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class MixedProtectedAndUnusedMethods extends TestCase
+{
+    #[DataProvider('provideValues')]
+    public function testValue(int $value): void
+    {
+        self::assertSame($value, self::class::expectedValue());
+        $this->locallyUsed();
+    }
+
+    private static function provideValues(): array
+    {
+        return [[42]];
+    }
+
+    private static function expectedValue(): int
+    {
+        return 42;
+    }
+
+    private function locallyUsed(): void
+    {
+    }
+}

rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php

@@ -102,6 +102,7 @@ public function refactor(Node $node): ?Node
         // methods invoked via a class-string static call, e.g. self::class::sampleClass(),
         // are not seen by the usage analyzer
         $classStringCallMethodNames = $this->resolveClassStringStaticCallNames($node);
+        $scope = null;
 
         foreach ($node->stmts as $classStmtKey => $classStmt) {
             if (! $classStmt instanceof ClassMethod) {
@@ -113,24 +114,24 @@ public function refactor(Node $node): ?Node
             }
 
             $classMethod = $classStmt;
-            if ($this->hasDynamicMethodCallOnFetchThis($classStmt)) {
+            if ($this->isNames($classMethod, $dataProviderMethodNames)) {
                 continue;
             }
 
-            $scope = ScopeFetcher::fetch($node);
-            if ($this->shouldSkip($classStmt, $classReflection)) {
+            if ($this->isNames($classMethod, $classStringCallMethodNames)) {
                 continue;
             }
 
-            if ($this->isClassMethodUsedAnalyzer->isClassMethodUsed($node, $classStmt, $scope)) {
+            if ($this->hasDynamicMethodCallOnFetchThis($classStmt)) {
                 continue;
             }
 
-            if ($this->isNames($classMethod, $dataProviderMethodNames)) {
+            if ($this->shouldSkip($classStmt, $classReflection)) {
                 continue;
             }
 
-            if ($this->isNames($classMethod, $classStringCallMethodNames)) {
+            $scope ??= ScopeFetcher::fetch($node);
+            if ($this->isClassMethodUsedAnalyzer->isClassMethodUsed($node, $classStmt, $scope)) {
                 continue;
             }