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

Updated Rector to commit 794bc8b5484e3eafcc91f85d443f665565c4ad44

Browse Source 
794bc8b548 Remove PARENT_NODE from ForeachItemsAssignToEmptyArrayToAssignRector (#3958)
This commit is contained in:
Tomas Votruba 2023-05-25 09:21:23 +00:00
parent 2a39baa0c1
commit f7d28cee5d
10 changed files with 70 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php
View File

@ -1,53 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\NodeNestingScope\NodeFinder;
use PhpParser\Node;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNestingScope\ValueObject\ControlStructure;
final class ScopeAwareNodeFinder
{
/**
* @var bool
*/
private $isBreakingNodeFoundFirst = \false;
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(BetterNodeFinder $betterNodeFinder)
{
$this->betterNodeFinder = $betterNodeFinder;
}
/**
* @api
* Find node based on $callable or null, when the nesting scope is broken
* @param callable(Node $node): bool $callable
* @param array<class-string<Node>> $allowedTypes
*/
public function findParent(Node $node, callable $callable, array $allowedTypes) : ?Node
{
/** @var array<class-string<Node>> $parentNestingBreakTypes */
$parentNestingBreakTypes = \array_diff(ControlStructure::BREAKING_SCOPE_NODE_TYPES, $allowedTypes);
$this->isBreakingNodeFoundFirst = \false;
$foundNode = $this->betterNodeFinder->findFirstPrevious($node, function (Node $node) use($callable, $parentNestingBreakTypes) : bool {
if ($callable($node)) {
return \true;
}
foreach ($parentNestingBreakTypes as $parentNestingBreakType) {
if (!$node instanceof $parentNestingBreakType) {
continue;
}
$this->isBreakingNodeFoundFirst = \true;
return \true;
}
return \false;
});
if ($this->isBreakingNodeFoundFirst) {
return null;
}
return $foundNode;
}
}

5
packages/NodeNestingScope/ValueObject/ControlStructure.php
View File

@ -5,7 +5,6 @@ namespace Rector\NodeNestingScope\ValueObject;
use PhpParser\Node;
use PhpParser\Node\Expr\Match_;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Case_;
use PhpParser\Node\Stmt\Catch_;
@ -19,10 +18,6 @@ use PhpParser\Node\Stmt\Switch_;
use PhpParser\Node\Stmt\While_;
final class ControlStructure
{
/**
* @var array<class-string<Node>>
*/
public const BREAKING_SCOPE_NODE_TYPES = [For_::class, Foreach_::class, If_::class, While_::class, Do_::class, Else_::class, ElseIf_::class, Catch_::class, Case_::class, FunctionLike::class];
/**
* These situations happens only if condition is met
* @var array<class-string<Node>>

28
packages/ReadWrite/NodeFinder/NodeUsageFinder.php
View File

@ -4,13 +4,9 @@ declare (strict_types=1);
namespace Rector\ReadWrite\NodeFinder;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Foreach_;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder;
use Rector\NodeTypeResolver\Node\AttributeKey;
final class NodeUsageFinder
{
@ -24,22 +20,10 @@ final class NodeUsageFinder
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @readonly
* @var \Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder
*/
private $scopeAwareNodeFinder;
/**
* @readonly
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, ScopeAwareNodeFinder $scopeAwareNodeFinder, NodeComparator $nodeComparator)
public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->scopeAwareNodeFinder = $scopeAwareNodeFinder;
$this->nodeComparator = $nodeComparator;
}
/**
* @param Node[] $nodes
@ -65,14 +49,4 @@ final class NodeUsageFinder
return $assignedTo === null;
});
}
public function findPreviousForeachNodeUsage(Foreach_ $foreach, Expr $expr) : ?Node
{
return $this->scopeAwareNodeFinder->findParent($foreach, function (Node $node) use($expr) : bool {
// skip itself
if ($node === $expr) {
return \false;
}
return $this->nodeComparator->areNodesEqual($node, $expr);
}, [Foreach_::class]);
}
}

88
rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php
View File

@ -3,16 +3,18 @@
declare (strict_types=1);
namespace Rector\CodeQuality\Rector\Foreach_;
use PhpParser\Node\Stmt;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Foreach_;
use PHPStan\Analyser\Scope;
use Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer;
use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
use Rector\Core\Rector\AbstractScopeAwareRector;
use Rector\NodeNestingScope\ValueObject\ControlStructure;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\ReadWrite\NodeFinder\NodeUsageFinder;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -20,19 +22,13 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
*/
final class ForeachItemsAssignToEmptyArrayToAssignRector extends AbstractScopeAwareRector
{
/**
* @readonly
* @var \Rector\ReadWrite\NodeFinder\NodeUsageFinder
*/
private $nodeUsageFinder;
/**
* @readonly
* @var \Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer
*/
private $foreachAnalyzer;
public function __construct(NodeUsageFinder $nodeUsageFinder, ForeachAnalyzer $foreachAnalyzer)
public function __construct(ForeachAnalyzer $foreachAnalyzer)
{
$this->nodeUsageFinder = $nodeUsageFinder;
$this->foreachAnalyzer = $foreachAnalyzer;
}
public function getRuleDefinition() : RuleDefinition
@ -68,50 +64,78 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [Foreach_::class];
return [StmtsAwareInterface::class];
}
/**
* @param Foreach_ $node
* @param StmtsAwareInterface $node
*/
public function refactorWithScope(Node $node, Scope $scope) : ?Node
{
if ($this->shouldSkip($node, $scope)) {
if ($node->stmts === null) {
return null;
}
$assignVariable = $this->foreachAnalyzer->matchAssignItemsOnlyForeachArrayVariable($node);
if (!$assignVariable instanceof Expr) {
return null;
$emptyArrayVariables = [];
foreach ($node->stmts as $key => $stmt) {
$variableName = $this->matchEmptyArrayVariableAssign($stmt);
if (\is_string($variableName)) {
$emptyArrayVariables[] = $variableName;
}
if (!$stmt instanceof Foreach_) {
continue;
}
if ($this->shouldSkip($stmt, $emptyArrayVariables)) {
continue;
}
$assignVariable = $this->foreachAnalyzer->matchAssignItemsOnlyForeachArrayVariable($stmt);
if (!$assignVariable instanceof Expr) {
continue;
}
$directAssign = new Assign($assignVariable, $stmt->expr);
$node->stmts[$key] = new Expression($directAssign);
return $node;
}
return new Assign($assignVariable, $node->expr);
return null;
}
private function shouldSkip(Foreach_ $foreach, Scope $scope) : bool
/**
* @param string[] $emptyArrayVariables
*/
private function shouldSkip(Foreach_ $foreach, array $emptyArrayVariables) : bool
{
$assignVariable = $this->foreachAnalyzer->matchAssignItemsOnlyForeachArrayVariable($foreach);
if (!$assignVariable instanceof Expr) {
return \true;
}
$foreachedExprType = $this->getType($foreach->expr);
// only arrays, not traversable/iterable
if (!$foreachedExprType->isArray()->yes()) {
return \true;
}
if ($this->shouldSkipAsPartOfOtherLoop($foreach)) {
return \true;
}
$node = $this->nodeUsageFinder->findPreviousForeachNodeUsage($foreach, $assignVariable);
if (!$node instanceof Node) {
return \true;
}
$previousDeclarationParentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
if (!$previousDeclarationParentNode instanceof Assign) {
return \true;
}
// must be empty array, otherwise it will false override
$defaultValue = $this->valueResolver->getValue($previousDeclarationParentNode->expr);
if ($defaultValue !== []) {
return \true;
}
$type = $scope->getType($foreach->expr);
return !$type->isArray()->yes();
return !$this->isNames($assignVariable, $emptyArrayVariables);
}
private function shouldSkipAsPartOfOtherLoop(Foreach_ $foreach) : bool
{
$foreachParent = $this->betterNodeFinder->findParentByTypes($foreach, ControlStructure::LOOP_NODES);
return $foreachParent instanceof Node;
}
private function matchEmptyArrayVariableAssign(Stmt $stmt) : ?string
{
if (!$stmt instanceof Expression) {
return null;
}
if (!$stmt->expr instanceof Assign) {
return null;
}
$assign = $stmt->expr;
if (!$assign->var instanceof Variable) {
return null;
}
// must be assign of empty array
if (!$this->valueResolver->isValue($assign->expr, [])) {
return null;
}
return $this->getName($assign->var);
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '179b5cba82257fd1d310301679a1913db458809e';
public const PACKAGE_VERSION = '794bc8b5484e3eafcc91f85d443f665565c4ad44';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-24 19:44:06';
public const RELEASE_DATE = '2023-05-25 09:16:36';
/**
* @var int
*/

2
src/Kernel/RectorKernel.php
View File

@ -15,7 +15,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v30';
private const CACHE_KEY = 'v31';
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1947,7 +1947,6 @@ return array(
'Rector\\NodeNameResolver\\NodeNameResolver\\VariableNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/VariableNameResolver.php',
'Rector\\NodeNameResolver\\Regex\\RegexPatternDetector' => $baseDir . '/packages/NodeNameResolver/Regex/RegexPatternDetector.php',
'Rector\\NodeNestingScope\\ContextAnalyzer' => $baseDir . '/packages/NodeNestingScope/ContextAnalyzer.php',
'Rector\\NodeNestingScope\\NodeFinder\\ScopeAwareNodeFinder' => $baseDir . '/packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php',
'Rector\\NodeNestingScope\\ParentScopeFinder' => $baseDir . '/packages/NodeNestingScope/ParentScopeFinder.php',
'Rector\\NodeNestingScope\\ScopeNestingComparator' => $baseDir . '/packages/NodeNestingScope/ScopeNestingComparator.php',
'Rector\\NodeNestingScope\\ValueObject\\ControlStructure' => $baseDir . '/packages/NodeNestingScope/ValueObject/ControlStructure.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit1196db29f81134b3b253351d2128b6cb
class ComposerAutoloaderInitcbaa9abc947ed42092c0b6aa69071d6d
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit1196db29f81134b3b253351d2128b6cb
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit1196db29f81134b3b253351d2128b6cb', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitcbaa9abc947ed42092c0b6aa69071d6d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit1196db29f81134b3b253351d2128b6cb', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitcbaa9abc947ed42092c0b6aa69071d6d', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit1196db29f81134b3b253351d2128b6cb::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitcbaa9abc947ed42092c0b6aa69071d6d::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit1196db29f81134b3b253351d2128b6cb::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitcbaa9abc947ed42092c0b6aa69071d6d::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit1196db29f81134b3b253351d2128b6cb
class ComposerStaticInitcbaa9abc947ed42092c0b6aa69071d6d
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2189,7 +2189,6 @@ class ComposerStaticInit1196db29f81134b3b253351d2128b6cb
'Rector\\NodeNameResolver\\NodeNameResolver\\VariableNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/VariableNameResolver.php',
'Rector\\NodeNameResolver\\Regex\\RegexPatternDetector' => __DIR__ . '/../..' . '/packages/NodeNameResolver/Regex/RegexPatternDetector.php',
'Rector\\NodeNestingScope\\ContextAnalyzer' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ContextAnalyzer.php',
'Rector\\NodeNestingScope\\NodeFinder\\ScopeAwareNodeFinder' => __DIR__ . '/../..' . '/packages/NodeNestingScope/NodeFinder/ScopeAwareNodeFinder.php',
'Rector\\NodeNestingScope\\ParentScopeFinder' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ParentScopeFinder.php',
'Rector\\NodeNestingScope\\ScopeNestingComparator' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ScopeNestingComparator.php',
'Rector\\NodeNestingScope\\ValueObject\\ControlStructure' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ValueObject/ControlStructure.php',
@ -3097,9 +3096,9 @@ class ComposerStaticInit1196db29f81134b3b253351d2128b6cb
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit1196db29f81134b3b253351d2128b6cb::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1196db29f81134b3b253351d2128b6cb::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1196db29f81134b3b253351d2128b6cb::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitcbaa9abc947ed42092c0b6aa69071d6d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitcbaa9abc947ed42092c0b6aa69071d6d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitcbaa9abc947ed42092c0b6aa69071d6d::$classMap;
}, null, ClassLoader::class);
}