mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-28 23:10:51 +00:00
Updated Rector to commit b1b48bceab3cf56858ebe565a22bba74458a497f
b1b48bceab
[DeadCode] Skip if cond use variable from @param doc on RemoveAlwaysTrueIfConditionRector (#3402)
This commit is contained in:
parent
2c4708affb
commit
3689432167
|
@ -7,10 +7,12 @@ use PhpParser\Node;
|
|||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\PropertyFetch;
|
||||
use PhpParser\Node\Expr\StaticPropertyFetch;
|
||||
use PhpParser\Node\Expr\Variable;
|
||||
use PhpParser\Node\Stmt;
|
||||
use PhpParser\Node\Stmt\If_;
|
||||
use PHPStan\Reflection\ClassReflection;
|
||||
use PHPStan\Type\Constant\ConstantBooleanType;
|
||||
use Rector\Core\NodeAnalyzer\ExprAnalyzer;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
|
@ -25,9 +27,15 @@ final class RemoveAlwaysTrueIfConditionRector extends AbstractRector
|
|||
* @var \Rector\Core\Reflection\ReflectionResolver
|
||||
*/
|
||||
private $reflectionResolver;
|
||||
public function __construct(ReflectionResolver $reflectionResolver)
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\NodeAnalyzer\ExprAnalyzer
|
||||
*/
|
||||
private $exprAnalyzer;
|
||||
public function __construct(ReflectionResolver $reflectionResolver, ExprAnalyzer $exprAnalyzer)
|
||||
{
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
$this->exprAnalyzer = $exprAnalyzer;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
|
@ -87,12 +95,26 @@ CODE_SAMPLE
|
|||
if ($this->shouldSkipPropertyFetch($node->cond)) {
|
||||
return null;
|
||||
}
|
||||
if ($this->shouldSkipFromParam($node->cond)) {
|
||||
return null;
|
||||
}
|
||||
if ($node->stmts === []) {
|
||||
$this->removeNode($node);
|
||||
return null;
|
||||
}
|
||||
return $node->stmts;
|
||||
}
|
||||
private function shouldSkipFromParam(Expr $expr) : bool
|
||||
{
|
||||
/** @var Variable[] $variables */
|
||||
$variables = $this->betterNodeFinder->findInstancesOf($expr, [Variable::class]);
|
||||
foreach ($variables as $variable) {
|
||||
if ($this->exprAnalyzer->isNonTypedFromParam($variable)) {
|
||||
return \true;
|
||||
}
|
||||
}
|
||||
return \false;
|
||||
}
|
||||
private function shouldSkipPropertyFetch(Expr $expr) : bool
|
||||
{
|
||||
/** @var PropertyFetch[]|StaticPropertyFetch[] $propertyFetches */
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '0.15.18';
|
||||
public const PACKAGE_VERSION = 'b1b48bceab3cf56858ebe565a22bba74458a497f';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-02-22 11:02:35';
|
||||
public const RELEASE_DATE = '2023-02-22 18:44:57';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInitad21f005615323d0989d9de7265c2c9f::getLoader();
|
||||
return ComposerAutoloaderInitcee583d2c4f8807da2eed5074c9c2a75::getLoader();
|
||||
|
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInitad21f005615323d0989d9de7265c2c9f
|
||||
class ComposerAutoloaderInitcee583d2c4f8807da2eed5074c9c2a75
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInitad21f005615323d0989d9de7265c2c9f
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInitad21f005615323d0989d9de7265c2c9f', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInitcee583d2c4f8807da2eed5074c9c2a75', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitad21f005615323d0989d9de7265c2c9f', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitcee583d2c4f8807da2eed5074c9c2a75', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitad21f005615323d0989d9de7265c2c9f::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitcee583d2c4f8807da2eed5074c9c2a75::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInitad21f005615323d0989d9de7265c2c9f::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInitcee583d2c4f8807da2eed5074c9c2a75::$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
8
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInitad21f005615323d0989d9de7265c2c9f
|
||||
class ComposerStaticInitcee583d2c4f8807da2eed5074c9c2a75
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3126,9 +3126,9 @@ class ComposerStaticInitad21f005615323d0989d9de7265c2c9f
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitad21f005615323d0989d9de7265c2c9f::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitad21f005615323d0989d9de7265c2c9f::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitad21f005615323d0989d9de7265c2c9f::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitcee583d2c4f8807da2eed5074c9c2a75::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitcee583d2c4f8807da2eed5074c9c2a75::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitcee583d2c4f8807da2eed5074c9c2a75::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user