[DeadCode] Skip private methods used as callables on RemoveUnusedPrivateMethodParameterRector

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/remove_with_array_callable_of_other_class.php.inc

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class RemoveWithArrayCallableOfOtherClass
+{
+    public function run()
+    {
+        $this->format('unused', 'value');
+
+        return [\DateTime::class, 'format'];
+    }
+
+    private function format(string $unused, string $value): string
+    {
+        return $value;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class RemoveWithArrayCallableOfOtherClass
+{
+    public function run()
+    {
+        $this->format('value');
+
+        return [\DateTime::class, 'format'];
+    }
+
+    private function format(string $value): string
+    {
+        return $value;
+    }
+}
+
+?>

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_array_callable_dynamic_method.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithArrayCallableDynamicMethod
+{
+    public function run(string $method)
+    {
+        return [$this, $method];
+    }
+
+    private function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_array_callable_in_property_default.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithArrayCallableInPropertyDefault
+{
+    public array $callback = [self::class, 'validate'];
+
+    private static function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_array_callable_required_constructor_param.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithArrayCallableRequiredConstructorParam
+{
+    public function __construct(private string $name)
+    {
+    }
+
+    public function run()
+    {
+        return [self::class, 'validate'];
+    }
+
+    private static function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_array_callable_self_class.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithArrayCallableSelfClass
+{
+    public static function run()
+    {
+        return [self::class, 'validate'];
+    }
+
+    private static function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_array_callable_static_class.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithArrayCallableStaticClass
+{
+    public static function run()
+    {
+        return [static::class, 'validate'];
+    }
+
+    private static function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_array_callable_this.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithArrayCallableThis
+{
+    public function run()
+    {
+        return [$this, 'validate'];
+    }
+
+    private function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_first_class_callable_self.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithFirstClassCallableSelf
+{
+    public static function run()
+    {
+        return self::validate(...);
+    }
+
+    private static function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_first_class_callable_self_in_instance_method.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithFirstClassCallableSelfInInstanceMethod
+{
+    public function run()
+    {
+        return self::validate(...);
+    }
+
+    private function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/skip_with_first_class_callable_static.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+final class SkipWithFirstClassCallableStatic
+{
+    public static function run()
+    {
+        return static::validate(...);
+    }
+
+    private static function validate(string $attribute, mixed $value): bool
+    {
+        return $value === true;
+    }
+}

rules/DeadCode/NodeManipulator/PrivateMethodParamRemover.php

@@ -5,6 +5,7 @@
 namespace Rector\DeadCode\NodeManipulator;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
@@ -16,9 +17,13 @@
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
+use Rector\NodeCollector\NodeAnalyzer\ArrayCallableMethodMatcher;
+use Rector\NodeCollector\ValueObject\ArrayCallable;
+use Rector\NodeCollector\ValueObject\ArrayCallableDynamicMethod;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\Node\BetterNodeFinder;
+use Rector\PHPStan\ScopeFetcher;
 
 final readonly class PrivateMethodParamRemover
 {
@@ -29,6 +34,7 @@ public function __construct(
         private BetterNodeFinder $betterNodeFinder,
         private NodeNameResolver $nodeNameResolver,
         private NodeTypeResolver $nodeTypeResolver,
+        private ArrayCallableMethodMatcher $arrayCallableMethodMatcher,
     ) {
     }
 
@@ -73,6 +79,11 @@ private function removeCallerArgs(Class_ $class, ClassMethod $classMethod, array
             return false;
         }
 
+        // the code receiving the callable decides how many arguments it passes
+        if ($this->isUsedAsArrayCallable($class, $classMethod)) {
+            return false;
+        }
+
         $keysArg = array_keys($paramsToRemove);
 
         $classObjectType = new ObjectType((string) $this->nodeNameResolver->getName($class));
@@ -112,6 +123,33 @@ private function removeCallerArgs(Class_ $class, ClassMethod $classMethod, array
         return true;
     }
 
+    private function isUsedAsArrayCallable(Class_ $class, ClassMethod $classMethod): bool
+    {
+        $scope = ScopeFetcher::fetch($class);
+        $methodName = $this->nodeNameResolver->getName($classMethod);
+
+        /** @var Array_[] $arrays */
+        $arrays = $this->betterNodeFinder->findInstanceOf($class, Array_::class);
+
+        foreach ($arrays as $array) {
+            $arrayCallable = $this->arrayCallableMethodMatcher->match($array, $scope, $methodName);
+            if ($arrayCallable instanceof ArrayCallableDynamicMethod) {
+                return true;
+            }
+
+            if (! $arrayCallable instanceof ArrayCallable) {
+                continue;
+            }
+
+            if ($this->nodeNameResolver->isName($class, $arrayCallable->getClass())
+                && $this->nodeNameResolver->isName($classMethod, $arrayCallable->getMethod())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param int[] $keysArg
      */

src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -382,10 +382,6 @@ private function nodeScopeResolverProcessNodes(
 
     private function processCallLike(CallLike $callLike, MutatingScope $mutatingScope): void
     {
-        if ($callLike->isFirstClassCallable()) {
-            return;
-        }
-
         if ($callLike instanceof StaticCall) {
             $callLike->class->setAttribute(AttributeKey::SCOPE, $mutatingScope);
             $callLike->name->setAttribute(AttributeKey::SCOPE, $mutatingScope);
@@ -398,6 +394,10 @@ private function processCallLike(CallLike $callLike, MutatingScope $mutatingScop
             $callLike->class->setAttribute(AttributeKey::SCOPE, $mutatingScope);
         }
 
+        if ($callLike->isFirstClassCallable()) {
+            return;
+        }
+
         foreach ($callLike->getArgs() as $arg) {
             $arg->value->setAttribute(AttributeKey::SCOPE, $mutatingScope);
         }