octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 91ed251a8c450a776ec4b739c735b4bd6f9bf8d5 

91ed251a8c [DeadCode] Skip property fetch on cond as may be overridden on RemoveAlwaysTrueIfConditionRector (#5796)
This commit is contained in:
Tomas Votruba 2024-04-03 12:13:43 +00:00
parent a210882e56
commit 81fd362a59
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php
View File

@ -5,6 +5,7 @@ namespace Rector\DeadCode\Rector\If_;
use PhpParser\Node; use PhpParser\Node;
use PhpParser\Node\Expr; use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd; use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\PropertyFetch; use PhpParser\Node\Expr\PropertyFetch;
@ -14,13 +15,11 @@ use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Else_; use PhpParser\Node\Stmt\Else_;
use PhpParser\Node\Stmt\If_; use PhpParser\Node\Stmt\If_;
use PhpParser\NodeTraverser; use PhpParser\NodeTraverser;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\Constant\ConstantBooleanType; use PHPStan\Type\Constant\ConstantBooleanType;
use Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer; use Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer;
use Rector\NodeAnalyzer\ExprAnalyzer; use Rector\NodeAnalyzer\ExprAnalyzer;
use Rector\PhpParser\Node\BetterNodeFinder; use Rector\PhpParser\Node\BetterNodeFinder;
use Rector\Rector\AbstractRector; use Rector\Rector\AbstractRector;
use Rector\Reflection\ReflectionResolver;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/** /**
@ -28,11 +27,6 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
*/ */
final class RemoveAlwaysTrueIfConditionRector extends AbstractRector final class RemoveAlwaysTrueIfConditionRector extends AbstractRector
{ {
/**
* @readonly
* @var \Rector\Reflection\ReflectionResolver
*/
private $reflectionResolver;
/** /**
* @readonly * @readonly
* @var \Rector\NodeAnalyzer\ExprAnalyzer * @var \Rector\NodeAnalyzer\ExprAnalyzer
@ -48,9 +42,8 @@ final class RemoveAlwaysTrueIfConditionRector extends AbstractRector
* @var \Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer * @var \Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer
*/ */
private $safeLeftTypeBooleanAndOrAnalyzer; private $safeLeftTypeBooleanAndOrAnalyzer;
public function __construct(ReflectionResolver $reflectionResolver, ExprAnalyzer $exprAnalyzer, BetterNodeFinder $betterNodeFinder, SafeLeftTypeBooleanAndOrAnalyzer $safeLeftTypeBooleanAndOrAnalyzer) public function __construct(ExprAnalyzer $exprAnalyzer, BetterNodeFinder $betterNodeFinder, SafeLeftTypeBooleanAndOrAnalyzer $safeLeftTypeBooleanAndOrAnalyzer)
{ {
$this->reflectionResolver = $reflectionResolver;
$this->exprAnalyzer = $exprAnalyzer; $this->exprAnalyzer = $exprAnalyzer;
$this->betterNodeFinder = $betterNodeFinder; $this->betterNodeFinder = $betterNodeFinder;
$this->safeLeftTypeBooleanAndOrAnalyzer = $safeLeftTypeBooleanAndOrAnalyzer; $this->safeLeftTypeBooleanAndOrAnalyzer = $safeLeftTypeBooleanAndOrAnalyzer;
@ -113,7 +106,7 @@ CODE_SAMPLE
if (!$conditionStaticType->getValue()) { if (!$conditionStaticType->getValue()) {
return null; return null;
} }
if ($this->shouldSkipPropertyFetch($node->cond)) { if ($this->shouldSkipExpr($node->cond)) {
return null; return null;
} }
if ($this->shouldSkipFromParam($node->cond)) { if ($this->shouldSkipFromParam($node->cond)) {
@ -139,26 +132,9 @@ CODE_SAMPLE
} }
return \false; return \false;
} }
private function shouldSkipPropertyFetch(Expr $expr) : bool private function shouldSkipExpr(Expr $expr) : bool
{ {
/** @var PropertyFetch[]|StaticPropertyFetch[] $propertyFetches */ return (bool) $this->betterNodeFinder->findInstancesOf($expr, [PropertyFetch::class, StaticPropertyFetch::class, ArrayDimFetch::class]);
$propertyFetches = $this->betterNodeFinder->findInstancesOf($expr, [PropertyFetch::class, StaticPropertyFetch::class]);
foreach ($propertyFetches as $propertyFetch) {
$classReflection = $this->reflectionResolver->resolveClassReflectionSourceObject($propertyFetch);
if (!$classReflection instanceof ClassReflection) {
// cannot get parent Trait_ from Property Fetch
return \true;
}
$propertyName = (string) $this->nodeNameResolver->getName($propertyFetch);
if (!$classReflection->hasNativeProperty($propertyName)) {
continue;
}
$nativeProperty = $classReflection->getNativeProperty($propertyName);
if (!$nativeProperty->hasNativeType()) {
return \true;
}
}
return \false;
} }
private function refactorIfWithBooleanAnd(If_ $if) : ?If_ private function refactorIfWithBooleanAnd(If_ $if) : ?If_
{ {

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = 'e5037921c408b717756a3997e8111ae3729aef08'; public const PACKAGE_VERSION = '91ed251a8c450a776ec4b739c735b4bd6f9bf8d5';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2024-04-03 19:03:00'; public const RELEASE_DATE = '2024-04-03 19:11:18';
/** /**
* @var int * @var int
*/ */