mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-13 12:02:09 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 130f07b3da5cd6024b1e03265f75e70666a95473

Browse Source 
130f07b3da [DeadCode] Skip used by trait inside Closure on RemoveUnusedPrivateMethodRector (#4773)
This commit is contained in:
Tomas Votruba 2023-08-11 17:24:11 +00:00
parent 09bae2b903
commit 66f7957611
5 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
rules/DeadCode/NodeAnalyzer/IsClassMethodUsedAnalyzer.php
View File

@ -13,7 +13,9 @@ use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Trait_;
use PhpParser\NodeTraverser;
use PHPStan\Analyser\Scope;
use PHPStan\Parser\ArrayMapArgVisitor;
use PHPStan\Reflection\ClassReflection;
@ -25,6 +27,7 @@ use Rector\NodeCollector\NodeAnalyzer\ArrayCallableMethodMatcher;
use Rector\NodeCollector\ValueObject\ArrayCallable;
use Rector\NodeCollector\ValueObject\ArrayCallableDynamicMethod;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
final class IsClassMethodUsedAnalyzer
{
/**
@ -62,7 +65,12 @@ final class IsClassMethodUsedAnalyzer
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
public function __construct(NodeNameResolver $nodeNameResolver, AstResolver $astResolver, BetterNodeFinder $betterNodeFinder, ValueResolver $valueResolver, ArrayCallableMethodMatcher $arrayCallableMethodMatcher, \Rector\DeadCode\NodeAnalyzer\CallCollectionAnalyzer $callCollectionAnalyzer, ReflectionResolver $reflectionResolver)
/**
* @readonly
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
*/
private $simpleCallableNodeTraverser;
public function __construct(NodeNameResolver $nodeNameResolver, AstResolver $astResolver, BetterNodeFinder $betterNodeFinder, ValueResolver $valueResolver, ArrayCallableMethodMatcher $arrayCallableMethodMatcher, \Rector\DeadCode\NodeAnalyzer\CallCollectionAnalyzer $callCollectionAnalyzer, ReflectionResolver $reflectionResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->astResolver = $astResolver;
@ -71,6 +79,7 @@ final class IsClassMethodUsedAnalyzer
$this->arrayCallableMethodMatcher = $arrayCallableMethodMatcher;
$this->callCollectionAnalyzer = $callCollectionAnalyzer;
$this->reflectionResolver = $reflectionResolver;
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
}
public function isClassMethodUsed(Class_ $class, ClassMethod $classMethod, Scope $scope) : bool
{
@ -176,20 +185,20 @@ final class IsClassMethodUsedAnalyzer
/**
* 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);
$callMethod = null;
$this->simpleCallableNodeTraverser->traverseNodesWithCallable((array) $classMethod->stmts, function (Node $subNode) use($className, $classMethodName, &$callMethod) : ?int {
if ($subNode instanceof Class_ || $subNode instanceof Function_) {
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
if (!$subNode instanceof StaticCall) {
return \false;
if ($subNode instanceof MethodCall && $this->nodeNameResolver->isName($subNode->var, 'this') && $this->nodeNameResolver->isName($subNode->name, $classMethodName)) {
$callMethod = $subNode;
return NodeTraverser::STOP_TRAVERSAL;
}
if (!$subNode->class instanceof Name) {
return \false;
if ($this->isStaticCallMatch($subNode, $className, $classMethodName)) {
$callMethod = $subNode;
return NodeTraverser::STOP_TRAVERSAL;
}
if ($subNode->class->isSpecialClassName() || $subNode->class->toString() === $className) {
return $this->nodeNameResolver->isName($subNode->name, $classMethodName);
}
return \false;
return null;
});
if ($callMethod instanceof CallLike) {
return \true;
@ -197,4 +206,14 @@ final class IsClassMethodUsedAnalyzer
}
return \false;
}
private function isStaticCallMatch(Node $subNode, string $className, string $classMethodName) : bool
{
if (!$subNode instanceof StaticCall) {
return \false;
}
if (!$subNode->class instanceof Name) {
return \false;
}
return ($subNode->class->isSpecialClassName() || $subNode->class->toString() === $className) && $this->nodeNameResolver->isName($subNode->name, $classMethodName);
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '3243f1b482fb62949d4abbcd6090e59ede0eb0cf';
public const PACKAGE_VERSION = '130f07b3da5cd6024b1e03265f75e70666a95473';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-11 16:40:50';
public const RELEASE_DATE = '2023-08-12 00:20:38';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

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