mirror of https://github.com/rectorphp/rector.git
Updated Rector to commit 7d69fc226cab739ec6c47b09bfdd784a24445fe1
7d69fc226c
[DeadCode] Skip $this instanceof in Trait on RemoveAlwaysTrueIfConditionRector (#5817)
This commit is contained in:
parent
76a58d63f0
commit
f2cac5e2a0
|
@ -3,6 +3,7 @@
|
||||||
declare (strict_types=1);
|
declare (strict_types=1);
|
||||||
namespace Rector\DeadCode\NodeAnalyzer;
|
namespace Rector\DeadCode\NodeAnalyzer;
|
||||||
|
|
||||||
|
use PHPStan\Type\ObjectType;
|
||||||
use PhpParser\Node;
|
use PhpParser\Node;
|
||||||
use PhpParser\Node\Expr\ArrayDimFetch;
|
use PhpParser\Node\Expr\ArrayDimFetch;
|
||||||
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
|
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
|
||||||
|
@ -10,8 +11,11 @@ use PhpParser\Node\Expr\BinaryOp\BooleanOr;
|
||||||
use PhpParser\Node\Expr\PropertyFetch;
|
use PhpParser\Node\Expr\PropertyFetch;
|
||||||
use PhpParser\Node\Expr\StaticPropertyFetch;
|
use PhpParser\Node\Expr\StaticPropertyFetch;
|
||||||
use PhpParser\Node\Expr\Variable;
|
use PhpParser\Node\Expr\Variable;
|
||||||
|
use PHPStan\Reflection\ClassReflection;
|
||||||
use Rector\NodeAnalyzer\ExprAnalyzer;
|
use Rector\NodeAnalyzer\ExprAnalyzer;
|
||||||
|
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||||
use Rector\PhpParser\Node\BetterNodeFinder;
|
use Rector\PhpParser\Node\BetterNodeFinder;
|
||||||
|
use Rector\Reflection\ReflectionResolver;
|
||||||
final class SafeLeftTypeBooleanAndOrAnalyzer
|
final class SafeLeftTypeBooleanAndOrAnalyzer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
@ -24,10 +28,22 @@ final class SafeLeftTypeBooleanAndOrAnalyzer
|
||||||
* @var \Rector\NodeAnalyzer\ExprAnalyzer
|
* @var \Rector\NodeAnalyzer\ExprAnalyzer
|
||||||
*/
|
*/
|
||||||
private $exprAnalyzer;
|
private $exprAnalyzer;
|
||||||
public function __construct(BetterNodeFinder $betterNodeFinder, ExprAnalyzer $exprAnalyzer)
|
/**
|
||||||
|
* @readonly
|
||||||
|
* @var \Rector\Reflection\ReflectionResolver
|
||||||
|
*/
|
||||||
|
private $reflectionResolver;
|
||||||
|
/**
|
||||||
|
* @readonly
|
||||||
|
* @var \Rector\NodeTypeResolver\NodeTypeResolver
|
||||||
|
*/
|
||||||
|
private $nodeTypeResolver;
|
||||||
|
public function __construct(BetterNodeFinder $betterNodeFinder, ExprAnalyzer $exprAnalyzer, ReflectionResolver $reflectionResolver, NodeTypeResolver $nodeTypeResolver)
|
||||||
{
|
{
|
||||||
$this->betterNodeFinder = $betterNodeFinder;
|
$this->betterNodeFinder = $betterNodeFinder;
|
||||||
$this->exprAnalyzer = $exprAnalyzer;
|
$this->exprAnalyzer = $exprAnalyzer;
|
||||||
|
$this->reflectionResolver = $reflectionResolver;
|
||||||
|
$this->nodeTypeResolver = $nodeTypeResolver;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @param \PhpParser\Node\Expr\BinaryOp\BooleanAnd|\PhpParser\Node\Expr\BinaryOp\BooleanOr $booleanAnd
|
* @param \PhpParser\Node\Expr\BinaryOp\BooleanAnd|\PhpParser\Node\Expr\BinaryOp\BooleanOr $booleanAnd
|
||||||
|
@ -40,9 +56,20 @@ final class SafeLeftTypeBooleanAndOrAnalyzer
|
||||||
if ($hasNonTypedFromParam) {
|
if ($hasNonTypedFromParam) {
|
||||||
return \false;
|
return \false;
|
||||||
}
|
}
|
||||||
// get type from Property and ArrayDimFetch is unreliable
|
$hasPropertyFetchOrArrayDimFetch = (bool) $this->betterNodeFinder->findFirst($booleanAnd->left, static function (Node $node) : bool {
|
||||||
return !(bool) $this->betterNodeFinder->findFirst($booleanAnd->left, static function (Node $node) : bool {
|
|
||||||
return $node instanceof PropertyFetch || $node instanceof StaticPropertyFetch || $node instanceof ArrayDimFetch;
|
return $node instanceof PropertyFetch || $node instanceof StaticPropertyFetch || $node instanceof ArrayDimFetch;
|
||||||
});
|
});
|
||||||
|
// get type from Property and ArrayDimFetch is unreliable
|
||||||
|
if ($hasPropertyFetchOrArrayDimFetch) {
|
||||||
|
return \false;
|
||||||
|
}
|
||||||
|
// skip trait this
|
||||||
|
$classReflection = $this->reflectionResolver->resolveClassReflection($booleanAnd);
|
||||||
|
if ($classReflection instanceof ClassReflection && $classReflection->isTrait()) {
|
||||||
|
return !(bool) $this->betterNodeFinder->findFirst($booleanAnd->left, function (Node $node) : bool {
|
||||||
|
return $this->nodeTypeResolver->getType($node) instanceof ObjectType;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return \true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
||||||
* @api
|
* @api
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public const PACKAGE_VERSION = '879a36b44d6b43e4c4d268a3d7e96e0830cac478';
|
public const PACKAGE_VERSION = '7d69fc226cab739ec6c47b09bfdd784a24445fe1';
|
||||||
/**
|
/**
|
||||||
* @api
|
* @api
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public const RELEASE_DATE = '2024-04-12 03:53:43';
|
public const RELEASE_DATE = '2024-04-12 16:17:16';
|
||||||
/**
|
/**
|
||||||
* @var int
|
* @var int
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue