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

Updated Rector to commit e04e51c25d95e3b2133adca5f01f8e7e002534af

Browse Source 
e04e51c25d [DeadCode][Php56] Handle infinite loop on RemoveUnusedVariableAssignRector+AddDefaultValueForUndefinedVariableRector (#3940)
This commit is contained in:
Tomas Votruba 2023-05-23 22:15:37 +00:00
parent 31acf8cd20
commit f7fccae5ba
6 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php
View File

@ -14,6 +14,7 @@ use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PHPStan\Analyser\Scope;
use Rector\Core\NodeAnalyzer\VariableAnalyzer;
use Rector\Core\Php\ReservedKeywordAnalyzer;
use Rector\Core\Rector\AbstractScopeAwareRector;
use Rector\DeadCode\SideEffect\SideEffectNodeDetector;
@ -35,10 +36,16 @@ final class RemoveUnusedVariableAssignRector extends AbstractScopeAwareRector
* @var \Rector\DeadCode\SideEffect\SideEffectNodeDetector
*/
private $sideEffectNodeDetector;
public function __construct(ReservedKeywordAnalyzer $reservedKeywordAnalyzer, SideEffectNodeDetector $sideEffectNodeDetector)
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\VariableAnalyzer
*/
private $variableAnalyzer;
public function __construct(ReservedKeywordAnalyzer $reservedKeywordAnalyzer, SideEffectNodeDetector $sideEffectNodeDetector, VariableAnalyzer $variableAnalyzer)
{
$this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
$this->sideEffectNodeDetector = $sideEffectNodeDetector;
$this->variableAnalyzer = $variableAnalyzer;
}
public function getRuleDefinition() : RuleDefinition
{
@ -186,6 +193,12 @@ CODE_SAMPLE
if ($this->reservedKeywordAnalyzer->isNativeVariable($variableName)) {
continue;
}
if ($this->variableAnalyzer->isStaticOrGlobal($assign->var)) {
continue;
}
if ($this->variableAnalyzer->isUsedByReference($assign->var)) {
continue;
}
$assignedVariableNamesByStmtPosition[$key] = $variableName;
}
return $assignedVariableNamesByStmtPosition;

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '5cd8ac7e0ef22955fc9db7ff6ac6c34e38217d85';
public const PACKAGE_VERSION = 'e04e51c25d95e3b2133adca5f01f8e7e002534af';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-23 23:50:06';
public const RELEASE_DATE = '2023-05-23 22:10:19';
/**
* @var int
*/

2
src/Kernel/RectorKernel.php
View File

@ -15,7 +15,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v23';
private const CACHE_KEY = 'v24';
/**
* @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 ComposerAutoloaderInitee70436f83d9a4d2f49501fb42c9bc48::getLoader();
return ComposerAutoloaderInitd1d2061199a1a4da697a421683536958::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48
class ComposerStaticInitd1d2061199a1a4da697a421683536958
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3106,9 +3106,9 @@ class ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd1d2061199a1a4da697a421683536958::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd1d2061199a1a4da697a421683536958::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd1d2061199a1a4da697a421683536958::$classMap;
}, null, ClassLoader::class);
}