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 5ed67fb6cfd7bdb79ac993797123f25e78d61d11 

5ed67fb6cf Cleanup RenameForeachValueVariableToMatchExprVariableRector (#4453)
This commit is contained in:
Tomas Votruba 2023-07-09 11:25:27 +00:00
parent a319accada
commit 50857a197a
10 changed files with 17 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php
View File

@ -3,16 +3,12 @@
declare (strict_types=1);
namespace Rector\CodeQuality\NodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Foreach_;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
final class ForeachAnalyzer
{
/**
@ -20,27 +16,9 @@ final class ForeachAnalyzer
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @readonly
* @var \Rector\CodeQuality\NodeAnalyzer\VariableNameUsedNextAnalyzer
*/
private $variableNameUsedNextAnalyzer;
public function __construct(NodeComparator $nodeComparator, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, \Rector\CodeQuality\NodeAnalyzer\VariableNameUsedNextAnalyzer $variableNameUsedNextAnalyzer)
public function __construct(NodeComparator $nodeComparator)
{
$this->nodeComparator = $nodeComparator;
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->variableNameUsedNextAnalyzer = $variableNameUsedNextAnalyzer;
}
/**
* Matches$
@ -71,20 +49,4 @@ final class ForeachAnalyzer
}
return $onlyStatement->var->var;
}
public function isValueVarUsed(Foreach_ $foreach, string $singularValueVarName) : bool
{
$isUsedInStmts = (bool) $this->betterNodeFinder->findFirst($foreach->stmts, function (Node $node) use($singularValueVarName) : bool {
if (!$node instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node, $singularValueVarName);
});
if ($isUsedInStmts) {
return \true;
}
if ($this->variableNameUsedNextAnalyzer->isValueVarUsedNext($foreach, $singularValueVarName)) {
return \true;
}
return $this->variableNameUsedNextAnalyzer->isValueVarUsedNext($foreach, (string) $this->nodeNameResolver->getName($foreach->valueVar));
}
}

37
rules/CodeQuality/NodeAnalyzer/VariableNameUsedNextAnalyzer.php
View File

@ -1,37 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\CodeQuality\NodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Foreach_;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
final class VariableNameUsedNextAnalyzer
{
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeNameResolver = $nodeNameResolver;
}
public function isValueVarUsedNext(Foreach_ $foreach, string $valueVarName) : bool
{
return (bool) $this->betterNodeFinder->findFirstNext($foreach, function (Node $node) use($valueVarName) : bool {
if (!$node instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node, $valueVarName);
});
}
}

12
rules/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector.php
View File

@ -6,7 +6,6 @@ namespace Rector\Naming\Rector\Foreach_;
use PhpParser\Node;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Foreach_;
use Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Rector\Naming\ExpectedNameResolver\InflectorSingularResolver;
@ -22,20 +21,14 @@ final class RenameForeachValueVariableToMatchExprVariableRector extends Abstract
* @var \Rector\Naming\ExpectedNameResolver\InflectorSingularResolver
*/
private $inflectorSingularResolver;
/**
* @readonly
* @var \Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer
*/
private $foreachAnalyzer;
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
public function __construct(InflectorSingularResolver $inflectorSingularResolver, ForeachAnalyzer $foreachAnalyzer, PropertyFetchAnalyzer $propertyFetchAnalyzer)
public function __construct(InflectorSingularResolver $inflectorSingularResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer)
{
$this->inflectorSingularResolver = $inflectorSingularResolver;
$this->foreachAnalyzer = $foreachAnalyzer;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
}
public function getRuleDefinition() : RuleDefinition
@ -100,7 +93,8 @@ CODE_SAMPLE
if ($singularValueVarName === $valueVarName) {
return null;
}
if ($this->foreachAnalyzer->isValueVarUsed($node, $singularValueVarName)) {
$alreadyUsedVariable = $this->betterNodeFinder->findVariableOfName($node->stmts, $singularValueVarName);
if ($alreadyUsedVariable instanceof Variable) {
return null;
}
return $this->processRename($node, $valueVarName, $singularValueVarName);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'd706d342846639545e2a19eadd618fac31751417';
public const PACKAGE_VERSION = '5ed67fb6cfd7bdb79ac993797123f25e78d61d11';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-07-09 11:03:00';
public const RELEASE_DATE = '2023-07-09 11:21:20';
/**
* @var int
*/

9
src/Exception/StopSearchException.php
View File

@ -1,9 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Core\Exception;
use Exception;
final class StopSearchException extends Exception
{
}

100
src/PhpParser/Node/BetterNodeFinder.php
View File

@ -7,24 +7,16 @@ use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Case_;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Declare_;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\Return_;
use PhpParser\NodeFinder;
use PhpParser\NodeTraverser;
use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
use Rector\Core\Exception\StopSearchException;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\Core\Provider\CurrentFileProvider;
use Rector\Core\ValueObject\Application\File;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
@ -49,22 +41,16 @@ final class BetterNodeFinder
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
*/
private $classAnalyzer;
/**
* @readonly
* @var \Rector\Core\Provider\CurrentFileProvider
*/
private $currentFileProvider;
/**
* @readonly
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
*/
private $simpleCallableNodeTraverser;
public function __construct(NodeFinder $nodeFinder, NodeNameResolver $nodeNameResolver, ClassAnalyzer $classAnalyzer, CurrentFileProvider $currentFileProvider, SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
public function __construct(NodeFinder $nodeFinder, NodeNameResolver $nodeNameResolver, ClassAnalyzer $classAnalyzer, SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
{
$this->nodeFinder = $nodeFinder;
$this->nodeNameResolver = $nodeNameResolver;
$this->classAnalyzer = $classAnalyzer;
$this->currentFileProvider = $currentFileProvider;
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
}
/**
@ -174,35 +160,6 @@ final class BetterNodeFinder
{
return $this->nodeFinder->findFirst($nodes, $filter);
}
/**
* @deprecated Use node traversing instead
*
* @param callable(Node $node): bool $filter
*/
public function findFirstNext(Node $node, callable $filter) : ?Node
{
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
$newStmts = $this->resolveNewStmts($parentNode);
try {
$foundNode = $this->findFirstInlinedNext($node, $filter, $newStmts, $parentNode);
} catch (StopSearchException $exception) {
return null;
}
// we found what we need
if ($foundNode instanceof Node) {
return $foundNode;
}
if ($parentNode instanceof Return_ || $parentNode instanceof FunctionLike) {
return null;
}
if ($parentNode instanceof Node) {
if ($parentNode instanceof FileWithoutNamespace || $parentNode instanceof Namespace_) {
return null;
}
return $this->findFirstNext($parentNode, $filter);
}
return null;
}
/**
* @template T of Node
* @param array<class-string<T>>|class-string<T> $types
@ -335,61 +292,6 @@ final class BetterNodeFinder
{
return $node instanceof StmtsAwareInterface || $node instanceof ClassLike || $node instanceof Declare_;
}
/**
* Only search in next Node/Stmt
*
* @param Stmt[] $newStmts
* @param callable(Node $node): bool $filter
*/
private function findFirstInlinedNext(Node $node, callable $filter, array $newStmts, ?Node $parentNode) : ?Node
{
if (!$parentNode instanceof Node) {
$nextNode = $this->resolveNextNodeFromFile($newStmts, $node);
} elseif ($node instanceof Stmt) {
if (!$this->isAllowedParentNode($parentNode)) {
return null;
}
$currentStmtKey = $node->getAttribute(AttributeKey::STMT_KEY);
/** @var StmtsAwareInterface|ClassLike|Declare_ $parentNode */
$nextNode = $parentNode->stmts[$currentStmtKey + 1] ?? null;
} else {
$nextNode = $this->resolveNextNode($node);
}
if (!$nextNode instanceof Node) {
return null;
}
if ($nextNode instanceof Return_ && !$nextNode->expr instanceof Expr && !$parentNode instanceof Case_) {
throw new StopSearchException();
}
$found = $this->findFirst($nextNode, $filter);
if ($found instanceof Node) {
return $found;
}
return $this->findFirstInlinedNext($nextNode, $filter, $newStmts, $parentNode);
}
/**
* @return Stmt[]
*/
private function resolveNewStmts(?Node $parentNode) : array
{
if (!$parentNode instanceof Node) {
// on __construct(), $file not yet a File object
$file = $this->currentFileProvider->getFile();
return $file instanceof File ? $file->getNewStmts() : [];
}
return [];
}
/**
* @param Stmt[] $newStmts
*/
private function resolveNextNodeFromFile(array $newStmts, Node $node) : ?Node
{
if (!$node instanceof Namespace_ && !$node instanceof FileWithoutNamespace) {
return null;
}
$currentStmtKey = $node->getAttribute(AttributeKey::STMT_KEY);
return $newStmts[$currentStmtKey + 1] ?? null;
}
/**
* @template T of Node
* @param \PhpParser\Node|mixed[] $nodes

2
vendor/autoload.php vendored
View File

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

2
vendor/composer/autoload_classmap.php vendored
View File

@ -1359,7 +1359,6 @@ return array(
'Rector\\CodeQuality\\NodeAnalyzer\\ForeachAnalyzer' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\LocalPropertyAnalyzer' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableDimFetchAssignResolver' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableNameUsedNextAnalyzer' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/VariableNameUsedNextAnalyzer.php',
'Rector\\CodeQuality\\NodeFactory\\MissingPropertiesFactory' => $baseDir . '/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php',
'Rector\\CodeQuality\\NodeFactory\\PropertyTypeDecorator' => $baseDir . '/rules/CodeQuality/NodeFactory/PropertyTypeDecorator.php',
'Rector\\CodeQuality\\NodeManipulator\\ExprBoolCaster' => $baseDir . '/rules/CodeQuality/NodeManipulator/ExprBoolCaster.php',
@ -1554,7 +1553,6 @@ return array(
'Rector\\Core\\Exception\\Reflection\\InvalidPrivatePropertyTypeException' => $baseDir . '/src/Exception/Reflection/InvalidPrivatePropertyTypeException.php',
'Rector\\Core\\Exception\\Reflection\\MissingPrivatePropertyException' => $baseDir . '/src/Exception/Reflection/MissingPrivatePropertyException.php',
'Rector\\Core\\Exception\\ShouldNotHappenException' => $baseDir . '/src/Exception/ShouldNotHappenException.php',
'Rector\\Core\\Exception\\StopSearchException' => $baseDir . '/src/Exception/StopSearchException.php',
'Rector\\Core\\Exception\\VersionException' => $baseDir . '/src/Exception/VersionException.php',
'Rector\\Core\\FileSystem\\FileAndDirectoryFilter' => $baseDir . '/src/FileSystem/FileAndDirectoryFilter.php',
'Rector\\Core\\FileSystem\\FilePathHelper' => $baseDir . '/src/FileSystem/FilePathHelper.php',

10
vendor/composer/autoload_real.php vendored
View File

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

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit8fd9100642750c440892cc90b725b580
class ComposerStaticInit254cae883b5130533f2a276e2c3139d3
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1611,7 +1611,6 @@ class ComposerStaticInit8fd9100642750c440892cc90b725b580
'Rector\\CodeQuality\\NodeAnalyzer\\ForeachAnalyzer' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\LocalPropertyAnalyzer' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableDimFetchAssignResolver' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableNameUsedNextAnalyzer' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/VariableNameUsedNextAnalyzer.php',
'Rector\\CodeQuality\\NodeFactory\\MissingPropertiesFactory' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php',
'Rector\\CodeQuality\\NodeFactory\\PropertyTypeDecorator' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeFactory/PropertyTypeDecorator.php',
'Rector\\CodeQuality\\NodeManipulator\\ExprBoolCaster' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeManipulator/ExprBoolCaster.php',
@ -1806,7 +1805,6 @@ class ComposerStaticInit8fd9100642750c440892cc90b725b580
'Rector\\Core\\Exception\\Reflection\\InvalidPrivatePropertyTypeException' => __DIR__ . '/../..' . '/src/Exception/Reflection/InvalidPrivatePropertyTypeException.php',
'Rector\\Core\\Exception\\Reflection\\MissingPrivatePropertyException' => __DIR__ . '/../..' . '/src/Exception/Reflection/MissingPrivatePropertyException.php',
'Rector\\Core\\Exception\\ShouldNotHappenException' => __DIR__ . '/../..' . '/src/Exception/ShouldNotHappenException.php',
'Rector\\Core\\Exception\\StopSearchException' => __DIR__ . '/../..' . '/src/Exception/StopSearchException.php',
'Rector\\Core\\Exception\\VersionException' => __DIR__ . '/../..' . '/src/Exception/VersionException.php',
'Rector\\Core\\FileSystem\\FileAndDirectoryFilter' => __DIR__ . '/../..' . '/src/FileSystem/FileAndDirectoryFilter.php',
'Rector\\Core\\FileSystem\\FilePathHelper' => __DIR__ . '/../..' . '/src/FileSystem/FilePathHelper.php',
@ -3070,9 +3068,9 @@ class ComposerStaticInit8fd9100642750c440892cc90b725b580
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit8fd9100642750c440892cc90b725b580::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8fd9100642750c440892cc90b725b580::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8fd9100642750c440892cc90b725b580::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit254cae883b5130533f2a276e2c3139d3::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit254cae883b5130533f2a276e2c3139d3::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit254cae883b5130533f2a276e2c3139d3::$classMap;
}, null, ClassLoader::class);
}