octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-28 23:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 5a9cb5081596ba3242f4260e5d89b9943fc0f49a

Browse Source 
5a9cb50815 [Naming] Skip old value used in next foreach on RenameForeachValueVariableToMatchExprVariableRector (#2897)
This commit is contained in:
Tomas Votruba 2022-09-02 18:47:27 +00:00
parent e84e1d4a08
commit bc0f1fa350
9 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php
View File

@ -129,15 +129,6 @@ final class ForAnalyzer
return $this->nodeNameResolver->isName($arrayDimFetch->dim, $keyValueName);
});
}
public function isValueVarUsedNext(For_ $for, string $iteratedVariableSingle) : bool
{
return (bool) $this->betterNodeFinder->findFirstNext($for, function (Node $node) use($iteratedVariableSingle) : bool {
if (!$node instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node, $iteratedVariableSingle);
});
}
/**
* @param Expr[] $condExprs
*/

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

@ -42,13 +42,19 @@ final class ForeachAnalyzer
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(NodeComparator $nodeComparator, \Rector\CodeQuality\NodeAnalyzer\ForAnalyzer $forAnalyzer, NodeNameResolver $nodeNameResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, BetterNodeFinder $betterNodeFinder)
/**
* @readonly
* @var \Rector\CodeQuality\NodeAnalyzer\VariableNameUsedNextAnalyzer
*/
private $variableNameUsedNextAnalyzer;
public function __construct(NodeComparator $nodeComparator, \Rector\CodeQuality\NodeAnalyzer\ForAnalyzer $forAnalyzer, NodeNameResolver $nodeNameResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, BetterNodeFinder $betterNodeFinder, \Rector\CodeQuality\NodeAnalyzer\VariableNameUsedNextAnalyzer $variableNameUsedNextAnalyzer)
{
$this->nodeComparator = $nodeComparator;
$this->forAnalyzer = $forAnalyzer;
$this->nodeNameResolver = $nodeNameResolver;
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->betterNodeFinder = $betterNodeFinder;
$this->variableNameUsedNextAnalyzer = $variableNameUsedNextAnalyzer;
}
/**
* Matches$
@ -116,11 +122,9 @@ final class ForeachAnalyzer
if ($isUsedInStmts) {
return \true;
}
return (bool) $this->betterNodeFinder->findFirstNext($foreach, function (Node $node) use($singularValueVarName) : bool {
if (!$node instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node, $singularValueVarName);
});
if ($this->variableNameUsedNextAnalyzer->isValueVarUsedNext($foreach, $singularValueVarName)) {
return \true;
}
return $this->variableNameUsedNextAnalyzer->isValueVarUsedNext($foreach, (string) $this->nodeNameResolver->getName($foreach->valueVar));
}
}

41
rules/CodeQuality/NodeAnalyzer/VariableNameUsedNextAnalyzer.php Normal file
View File

@ -0,0 +1,41 @@
<?php
declare (strict_types=1);
namespace Rector\CodeQuality\NodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\For_;
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;
}
/**
* @param \PhpParser\Node\Stmt\For_|\PhpParser\Node\Stmt\Foreach_ $for
*/
public function isValueVarUsedNext($for, string $valueVarName) : bool
{
return (bool) $this->betterNodeFinder->findFirstNext($for, function (Node $node) use($valueVarName) : bool {
if (!$node instanceof Variable) {
return \false;
}
return $this->nodeNameResolver->isName($node, $valueVarName);
});
}
}

13
rules/CodeQuality/Rector/For_/ForToForeachRector.php
View File

@ -14,6 +14,7 @@ use PhpParser\Node\Stmt\For_;
use PhpParser\Node\Stmt\Foreach_;
use Rector\CodeQuality\NodeAnalyzer\ForAnalyzer;
use Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer;
use Rector\CodeQuality\NodeAnalyzer\VariableNameUsedNextAnalyzer;
use Rector\CodeQuality\NodeFactory\ForeachFactory;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Rector\AbstractRector;
@ -64,12 +65,18 @@ final class ForToForeachRector extends AbstractRector
* @var \Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer
*/
private $foreachAnalyzer;
public function __construct(Inflector $inflector, ForAnalyzer $forAnalyzer, ForeachFactory $foreachFactory, ForeachAnalyzer $foreachAnalyzer)
/**
* @readonly
* @var \Rector\CodeQuality\NodeAnalyzer\VariableNameUsedNextAnalyzer
*/
private $variableNameUsedNextAnalyzer;
public function __construct(Inflector $inflector, ForAnalyzer $forAnalyzer, ForeachFactory $foreachFactory, ForeachAnalyzer $foreachAnalyzer, VariableNameUsedNextAnalyzer $variableNameUsedNextAnalyzer)
{
$this->inflector = $inflector;
$this->forAnalyzer = $forAnalyzer;
$this->foreachFactory = $foreachFactory;
$this->foreachAnalyzer = $foreachAnalyzer;
$this->variableNameUsedNextAnalyzer = $variableNameUsedNextAnalyzer;
}
public function getRuleDefinition() : RuleDefinition
{
@ -153,13 +160,13 @@ CODE_SAMPLE
if ($iteratedVariableSingle === $iteratedVariable) {
$iteratedVariableSingle = 'single' . \ucfirst($iteratedVariableSingle);
}
if (!$this->forAnalyzer->isValueVarUsedNext($for, $iteratedVariableSingle)) {
if (!$this->variableNameUsedNextAnalyzer->isValueVarUsedNext($for, $iteratedVariableSingle)) {
return $this->createForeachFromForWithIteratedVariableSingle($for, $iteratedVariableSingle);
}
if ($iteratedVariableSingle === $originalVariableSingle) {
return null;
}
if (!$this->forAnalyzer->isValueVarUsedNext($for, $originalVariableSingle)) {
if (!$this->variableNameUsedNextAnalyzer->isValueVarUsedNext($for, $originalVariableSingle)) {
return $this->createForeachFromForWithIteratedVariableSingle($for, $originalVariableSingle);
}
return null;

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'efc31c044beef561349e7b0ac9f8b4fbb112fa71';
public const PACKAGE_VERSION = '5a9cb5081596ba3242f4260e5d89b9943fc0f49a';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-09-02 13:55:06';
public const RELEASE_DATE = '2022-09-02 20:43:30';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1154,6 +1154,7 @@ return array(
'Rector\\CodeQuality\\NodeAnalyzer\\LocalPropertyAnalyzer' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\ReturnAnalyzer' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/ReturnAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableDimFetchAssignResolver' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableNameUsedNextAnalyzer' => $baseDir . '/rules/CodeQuality/NodeAnalyzer/VariableNameUsedNextAnalyzer.php',
'Rector\\CodeQuality\\NodeFactory\\ArrayFilterFactory' => $baseDir . '/rules/CodeQuality/NodeFactory/ArrayFilterFactory.php',
'Rector\\CodeQuality\\NodeFactory\\ForeachFactory' => $baseDir . '/rules/CodeQuality/NodeFactory/ForeachFactory.php',
'Rector\\CodeQuality\\NodeFactory\\MissingPropertiesFactory' => $baseDir . '/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit526f25df21c16ebf92ff765bc33d3cdb
class ComposerAutoloaderInit8a1ef35d2bec9d7095a2a044710e1715
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit526f25df21c16ebf92ff765bc33d3cdb
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit526f25df21c16ebf92ff765bc33d3cdb', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit8a1ef35d2bec9d7095a2a044710e1715', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit526f25df21c16ebf92ff765bc33d3cdb', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit8a1ef35d2bec9d7095a2a044710e1715', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit8a1ef35d2bec9d7095a2a044710e1715::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit8a1ef35d2bec9d7095a2a044710e1715::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire526f25df21c16ebf92ff765bc33d3cdb($fileIdentifier, $file);
composerRequire8a1ef35d2bec9d7095a2a044710e1715($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit526f25df21c16ebf92ff765bc33d3cdb
* @param string $file
* @return void
*/
function composerRequire526f25df21c16ebf92ff765bc33d3cdb($fileIdentifier, $file)
function composerRequire8a1ef35d2bec9d7095a2a044710e1715($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 ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb
class ComposerStaticInit8a1ef35d2bec9d7095a2a044710e1715
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1409,6 +1409,7 @@ class ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb
'Rector\\CodeQuality\\NodeAnalyzer\\LocalPropertyAnalyzer' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\ReturnAnalyzer' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/ReturnAnalyzer.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableDimFetchAssignResolver' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php',
'Rector\\CodeQuality\\NodeAnalyzer\\VariableNameUsedNextAnalyzer' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeAnalyzer/VariableNameUsedNextAnalyzer.php',
'Rector\\CodeQuality\\NodeFactory\\ArrayFilterFactory' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeFactory/ArrayFilterFactory.php',
'Rector\\CodeQuality\\NodeFactory\\ForeachFactory' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeFactory/ForeachFactory.php',
'Rector\\CodeQuality\\NodeFactory\\MissingPropertiesFactory' => __DIR__ . '/../..' . '/rules/CodeQuality/NodeFactory/MissingPropertiesFactory.php',
@ -3094,9 +3095,9 @@ class ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit526f25df21c16ebf92ff765bc33d3cdb::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit8a1ef35d2bec9d7095a2a044710e1715::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8a1ef35d2bec9d7095a2a044710e1715::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8a1ef35d2bec9d7095a2a044710e1715::$classMap;
}, null, ClassLoader::class);
}