octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-27 05:03:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 6daf93e54524b24be9b2d79edca98d97b6c2ae32

Browse Source 
6daf93e545 [NodeAnalyzer] Remove find first previous on CallAnalyzer (#4434)
This commit is contained in:
Tomas Votruba 2023-07-07 16:13:45 +00:00
parent 4666787179
commit 811311089b
6 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php
View File

@ -13,6 +13,7 @@ use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Return_;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\FunctionReflection;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Type\MixedType;
use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
use Rector\Core\NodeAnalyzer\CallAnalyzer;
@ -42,11 +43,17 @@ final class SimplifyUselessVariableRector extends AbstractScopeAwareRector
* @var \Rector\Core\NodeAnalyzer\CallAnalyzer
*/
private $callAnalyzer;
public function __construct(AssignAndBinaryMap $assignAndBinaryMap, VariableAnalyzer $variableAnalyzer, CallAnalyzer $callAnalyzer)
/**
* @readonly
* @var \PHPStan\Reflection\ReflectionProvider
*/
private $reflectionProvider;
public function __construct(AssignAndBinaryMap $assignAndBinaryMap, VariableAnalyzer $variableAnalyzer, CallAnalyzer $callAnalyzer, ReflectionProvider $reflectionProvider)
{
$this->assignAndBinaryMap = $assignAndBinaryMap;
$this->variableAnalyzer = $variableAnalyzer;
$this->callAnalyzer = $callAnalyzer;
$this->reflectionProvider = $reflectionProvider;
}
public function getRuleDefinition() : RuleDefinition
{
@ -149,7 +156,7 @@ CODE_SAMPLE
if ($this->variableAnalyzer->isStaticOrGlobal($variable)) {
return \true;
}
if ($this->callAnalyzer->isNewInstance($previousNode->var)) {
if ($this->callAnalyzer->isNewInstance($previousNode->var, $this->reflectionProvider)) {
return \true;
}
return $this->variableAnalyzer->isUsedByReference($variable);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '83a9221d6baa56dc6fc009db45db18f8b4ea63c8';
public const PACKAGE_VERSION = '6daf93e54524b24be9b2d79edca98d97b6c2ae32';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-07-07 17:29:51';
public const RELEASE_DATE = '2023-07-07 23:08:13';
/**
* @var int
*/

45
src/NodeAnalyzer/CallAnalyzer.php
View File

@ -3,9 +3,7 @@
declare (strict_types=1);
namespace Rector\Core\NodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Clone_;
@ -14,34 +12,26 @@ use PhpParser\Node\Expr\New_;
use PhpParser\Node\Expr\NullsafeMethodCall;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Stmt\If_;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Type\ObjectType;
use Rector\NodeTypeResolver\NodeTypeResolver;
use RectorPrefix202307\Symfony\Contracts\Service\Attribute\Required;
final class CallAnalyzer
{
/**
* @readonly
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
/**
* @var array<class-string<Expr>>
*/
private const OBJECT_CALL_TYPES = [MethodCall::class, NullsafeMethodCall::class, StaticCall::class];
/**
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $betterNodeFinder;
public function __construct(NodeComparator $nodeComparator)
{
$this->nodeComparator = $nodeComparator;
}
private $nodeTypeResolver;
/**
* @required
*/
public function autowire(BetterNodeFinder $betterNodeFinder) : void
public function autowire(NodeTypeResolver $nodeTypeResolver) : void
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeTypeResolver = $nodeTypeResolver;
}
public function isObjectCall(Expr $expr) : bool
{
@ -72,19 +62,20 @@ final class CallAnalyzer
}
return \false;
}
public function isNewInstance(Expr $expr) : bool
public function isNewInstance(Expr $expr, ReflectionProvider $reflectionProvider) : bool
{
if ($expr instanceof Clone_ || $expr instanceof New_) {
return \true;
}
return (bool) $this->betterNodeFinder->findFirstPrevious($expr, function (Node $node) use($expr) : bool {
if (!$node instanceof Assign) {
return \false;
}
if (!$this->nodeComparator->areNodesEqual($node->var, $expr)) {
return \false;
}
return $node->expr instanceof Clone_ || $node->expr instanceof New_;
});
$type = $this->nodeTypeResolver->getType($expr);
if (!$type instanceof ObjectType) {
return \false;
}
$className = $type->getClassName();
if (!$reflectionProvider->hasClass($className)) {
return \false;
}
$classReflection = $reflectionProvider->getClass($className);
return $classReflection->getNativeReflection()->isInstantiable();
}
}

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit722937324b2c6e4834f6eedd0d66e51a
class ComposerAutoloaderInitd6b1e04b58199092f6cb30dfac43e3ec
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit722937324b2c6e4834f6eedd0d66e51a
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit722937324b2c6e4834f6eedd0d66e51a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitd6b1e04b58199092f6cb30dfac43e3ec', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit722937324b2c6e4834f6eedd0d66e51a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitd6b1e04b58199092f6cb30dfac43e3ec', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitd6b1e04b58199092f6cb30dfac43e3ec::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitd6b1e04b58199092f6cb30dfac43e3ec::$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 ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a
class ComposerStaticInitd6b1e04b58199092f6cb30dfac43e3ec
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3081,9 +3081,9 @@ class ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit722937324b2c6e4834f6eedd0d66e51a::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd6b1e04b58199092f6cb30dfac43e3ec::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd6b1e04b58199092f6cb30dfac43e3ec::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd6b1e04b58199092f6cb30dfac43e3ec::$classMap;
}, null, ClassLoader::class);
}