Updated Rector to commit 6923113ff2994cfb0c76298c7dc7d038655fbc95

6923113ff2 [DeadCode] Skip used by trait on RemoveUnusedPrivateMethodRector (#4770)

rules/DeadCode/NodeAnalyzer/IsClassMethodUsedAnalyzer.php

@@ -3,13 +3,17 @@
 declare (strict_types=1);
 namespace Rector\DeadCode\NodeAnalyzer;
 
+use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
+use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Trait_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Parser\ArrayMapArgVisitor;
 use PHPStan\Reflection\ClassReflection;
@@ -155,12 +159,41 @@ final class IsClassMethodUsedAnalyzer
             return \false;
         }
         $traits = $this->astResolver->parseClassReflectionTraits($classReflection);
+        $className = $classReflection->getName();
         foreach ($traits as $trait) {
-            $method = $trait->getMethod($classMethodName);
-            if (!$method instanceof ClassMethod) {
-                continue;
+            if ($this->isUsedByTrait($trait, $classMethodName, $className)) {
+                return \true;
+            }
+        }
+        return \false;
+    }
+    private function isUsedByTrait(Trait_ $trait, string $classMethodName, string $className) : bool
+    {
+        foreach ($trait->getMethods() as $classMethod) {
+            if ($classMethod->name->toString() === $classMethodName) {
+                return \true;
+            }
+            /**
+             * Trait can't detect class type, so it rely on "this" or "self" or "static" or "ClassName::methodName()" usage...
+             */
+            $callMethod = $this->betterNodeFinder->findFirstInFunctionLikeScoped($classMethod, function (Node $subNode) use($className, $classMethodName) : bool {
+                if ($subNode instanceof MethodCall) {
+                    return $this->nodeNameResolver->isName($subNode->var, 'this') && $this->nodeNameResolver->isName($subNode->name, $classMethodName);
+                }
+                if (!$subNode instanceof StaticCall) {
+                    return \false;
+                }
+                if (!$subNode->class instanceof Name) {
+                    return \false;
+                }
+                if ($subNode->class->isSpecialClassName() || $subNode->class->toString() === $className) {
+                    return $this->nodeNameResolver->isName($subNode->name, $classMethodName);
+                }
+                return \false;
+            });
+            if ($callMethod instanceof CallLike) {
+                return \true;
             }
-            return \true;
         }
         return \false;
     }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'd88803add852dade958647efa5c2c24fb452b8af';
+    public const PACKAGE_VERSION = '6923113ff2994cfb0c76298c7dc7d038655fbc95';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-08-11 14:24:20';
+    public const RELEASE_DATE = '2023-08-11 13:26:31';
     /**
      * @var int
      */

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit0cda80ad03dd3d7bb1010d688980ff73::getLoader();
+return ComposerAutoloaderInit4a2c618e0d0ff3f8d159db9a10c0f3e0::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit0cda80ad03dd3d7bb1010d688980ff73
+class ComposerAutoloaderInit4a2c618e0d0ff3f8d159db9a10c0f3e0
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInit0cda80ad03dd3d7bb1010d688980ff73
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit0cda80ad03dd3d7bb1010d688980ff73', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4a2c618e0d0ff3f8d159db9a10c0f3e0', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit0cda80ad03dd3d7bb1010d688980ff73', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4a2c618e0d0ff3f8d159db9a10c0f3e0', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit4a2c618e0d0ff3f8d159db9a10c0f3e0::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit4a2c618e0d0ff3f8d159db9a10c0f3e0::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73
+class ComposerStaticInit4a2c618e0d0ff3f8d159db9a10c0f3e0
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -2959,9 +2959,9 @@ class ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit0cda80ad03dd3d7bb1010d688980ff73::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4a2c618e0d0ff3f8d159db9a10c0f3e0::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4a2c618e0d0ff3f8d159db9a10c0f3e0::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit4a2c618e0d0ff3f8d159db9a10c0f3e0::$classMap;
 
         }, null, ClassLoader::class);
     }