Updated Rector to commit ced707e53e62a8a466508909e889990e52178c94

rectorphp/rector-src@ced707e [DeadCode] Use IsClassMethodUsedAnalyzer service on RemoveEmptyClassMethodRector (#6909)

Author: TomasVotruba

rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php

@@ -4,20 +4,16 @@
 namespace Rector\DeadCode\Rector\ClassMethod;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\PhpDoc\DeprecatedTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
+use Rector\DeadCode\NodeAnalyzer\IsClassMethodUsedAnalyzer;
 use Rector\DeadCode\NodeManipulator\ControllerClassMethodManipulator;
 use Rector\NodeAnalyzer\ParamAnalyzer;
-use Rector\NodeCollector\NodeAnalyzer\ArrayCallableMethodMatcher;
 use Rector\NodeManipulator\ClassMethodManipulator;
-use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\MethodName;
@@ -47,19 +43,14 @@ final class RemoveEmptyClassMethodRector extends AbstractRector
     /**
      * @readonly
      */
-    private BetterNodeFinder $betterNodeFinder;
-    /**
-     * @readonly
-     */
-    private ArrayCallableMethodMatcher $arrayCallableMethodMatcher;
-    public function __construct(ClassMethodManipulator $classMethodManipulator, ControllerClassMethodManipulator $controllerClassMethodManipulator, ParamAnalyzer $paramAnalyzer, PhpDocInfoFactory $phpDocInfoFactory, BetterNodeFinder $betterNodeFinder, ArrayCallableMethodMatcher $arrayCallableMethodMatcher)
+    private IsClassMethodUsedAnalyzer $isClassMethodUsedAnalyzer;
+    public function __construct(ClassMethodManipulator $classMethodManipulator, ControllerClassMethodManipulator $controllerClassMethodManipulator, ParamAnalyzer $paramAnalyzer, PhpDocInfoFactory $phpDocInfoFactory, IsClassMethodUsedAnalyzer $isClassMethodUsedAnalyzer)
     {
         $this->classMethodManipulator = $classMethodManipulator;
         $this->controllerClassMethodManipulator = $controllerClassMethodManipulator;
         $this->paramAnalyzer = $paramAnalyzer;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
-        $this->betterNodeFinder = $betterNodeFinder;
-        $this->arrayCallableMethodMatcher = $arrayCallableMethodMatcher;
+        $this->isClassMethodUsedAnalyzer = $isClassMethodUsedAnalyzer;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -133,16 +124,10 @@ private function shouldSkipNonFinalNonPrivateClassMethod(Class_ $class, ClassMet
     }
     private function shouldSkipClassMethod(Class_ $class, ClassMethod $classMethod) : bool
     {
-        $desiredClassMethodName = $this->getName($classMethod);
-        $className = (string) $this->getName($class);
         // is method called somewhere else in the class?
-        foreach ($class->getMethods() as $anotherClassMethod) {
-            if ($anotherClassMethod === $classMethod) {
-                continue;
-            }
-            if ($this->containsMethodCallOrArrayCallable($anotherClassMethod, $desiredClassMethodName, $className)) {
-                return \true;
-            }
+        $scope = ScopeFetcher::fetch($classMethod);
+        if ($this->isClassMethodUsedAnalyzer->isClassMethodUsed($class, $classMethod, $scope)) {
+            return \true;
         }
         if ($this->classMethodManipulator->isNamedConstructor($classMethod)) {
             return \true;
@@ -173,23 +158,4 @@ private function hasDeprecatedAnnotation(ClassMethod $classMethod) : bool
         }
         return $phpDocInfo->hasByType(DeprecatedTagValueNode::class);
     }
-    private function containsMethodCallOrArrayCallable(ClassMethod $anotherClassMethod, string $desiredClassMethodName, string $className) : bool
-    {
-        $scope = ScopeFetcher::fetch($anotherClassMethod);
-        return (bool) $this->betterNodeFinder->findFirst($anotherClassMethod, function (Node $node) use($desiredClassMethodName, $className, $scope) : bool {
-            if ($node instanceof Array_) {
-                return (bool) $this->arrayCallableMethodMatcher->match($node, $scope, $className);
-            }
-            if (!$node instanceof MethodCall) {
-                return \false;
-            }
-            if (!$node->var instanceof Variable) {
-                return \false;
-            }
-            if (!$this->isName($node->var, 'this')) {
-                return \false;
-            }
-            return $this->isName($node->name, $desiredClassMethodName);
-        });
-    }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'b68824a85e025a6e6806f605eb59874d412cc1b1';
+    public const PACKAGE_VERSION = 'ced707e53e62a8a466508909e889990e52178c94';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-05-19 21:16:40';
+    public const RELEASE_DATE = '2025-05-20 05:01:26';
     /**
      * @var int
      */