mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-01-17 21:38:22 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 656ec58c31fe3a2cdf23c6f9ae331d7078251cfb

Browse Source 
656ec58c31 [DeadCode] Use existing detectCallExpr() in SideEffectNodeDetector::detect() (#5937)
This commit is contained in:
Tomas Votruba 2024-06-02 10:06:03 +00:00
parent e1b3f1a772
commit 06731a0a0c
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
rules/DeadCode/SideEffect/SideEffectNodeDetector.php
View File

@ -8,69 +8,46 @@ use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Expr\NullsafeMethodCall;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Scalar\Encapsed;
use PHPStan\Analyser\Scope;
use PHPStan\Type\ConstantType;
use PHPStan\Type\ObjectType;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\PhpParser\Node\BetterNodeFinder;
final class SideEffectNodeDetector
{
/**
* @readonly
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
/**
* @readonly
* @var \Rector\DeadCode\SideEffect\PureFunctionDetector
*/
private $pureFunctionDetector;
/**
* @var array<class-string<Expr>>
* @readonly
* @var \Rector\PhpParser\Node\BetterNodeFinder
*/
private const SIDE_EFFECT_NODE_TYPES = [Encapsed::class, New_::class, Concat::class, PropertyFetch::class];
private $betterNodeFinder;
/**
* @var array<class-string<Expr>>
*/
private const CALL_EXPR_SIDE_EFFECT_NODE_TYPES = [MethodCall::class, New_::class, NullsafeMethodCall::class, StaticCall::class];
public function __construct(NodeTypeResolver $nodeTypeResolver, \Rector\DeadCode\SideEffect\PureFunctionDetector $pureFunctionDetector)
public function __construct(\Rector\DeadCode\SideEffect\PureFunctionDetector $pureFunctionDetector, BetterNodeFinder $betterNodeFinder)
{
$this->nodeTypeResolver = $nodeTypeResolver;
$this->pureFunctionDetector = $pureFunctionDetector;
$this->betterNodeFinder = $betterNodeFinder;
}
public function detect(Expr $expr, Scope $scope) : bool
{
if ($expr instanceof Assign) {
return \true;
}
foreach (self::SIDE_EFFECT_NODE_TYPES as $sideEffectNodeType) {
if ($expr instanceof $sideEffectNodeType) {
return \false;
}
}
$exprStaticType = $this->nodeTypeResolver->getType($expr);
if ($exprStaticType instanceof ConstantType) {
return \false;
}
if ($expr instanceof FuncCall) {
return !$this->pureFunctionDetector->detect($expr, $scope);
}
if ($expr instanceof Variable || $expr instanceof ArrayDimFetch) {
$variable = $this->resolveVariable($expr);
// variables don't have side effects
return !$variable instanceof Variable;
}
return \true;
return (bool) $this->betterNodeFinder->findFirst($expr, function (Node $subNode) use($scope) : bool {
return $this->detectCallExpr($subNode, $scope);
});
}
public function detectCallExpr(Node $node, Scope $scope) : bool
{
@ -90,6 +67,11 @@ final class SideEffectNodeDetector
if ($node instanceof FuncCall) {
return !$this->pureFunctionDetector->detect($node, $scope);
}
if ($node instanceof Variable || $node instanceof ArrayDimFetch) {
$variable = $this->resolveVariable($node);
// variables don't have side effects
return !$variable instanceof Variable;
}
return \false;
}
private function isPhpParser(New_ $new) : bool

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'c237f2792eb6fefe4f72387070121ca089a6fc2e';
public const PACKAGE_VERSION = '656ec58c31fe3a2cdf23c6f9ae331d7078251cfb';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-06-02 09:54:29';
public const RELEASE_DATE = '2024-06-02 17:02:24';
/**
* @var int
*/