diff --git a/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php b/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php index de5aa0ce853..43029988bff 100644 --- a/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php +++ b/rules/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector.php @@ -7,6 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\Variable; use PhpParser\Node\FunctionLike; +use Rector\Core\Php\ReservedKeywordAnalyzer; use Rector\Core\Rector\AbstractRector; use Rector\DeadCode\NodeCollector\NodeByTypeAndPositionCollector; use Rector\DeadCode\NodeFinder\VariableUseFinder; @@ -32,11 +33,16 @@ final class RemoveOverriddenValuesRector extends \Rector\Core\Rector\AbstractRec * @var \Rector\DeadCode\NodeFinder\VariableUseFinder */ private $variableUseFinder; - public function __construct(\Rector\NodeNestingScope\ContextAnalyzer $contextAnalyzer, \Rector\DeadCode\NodeCollector\NodeByTypeAndPositionCollector $nodeByTypeAndPositionCollector, \Rector\DeadCode\NodeFinder\VariableUseFinder $variableUseFinder) + /** + * @var \Rector\Core\Php\ReservedKeywordAnalyzer + */ + private $reservedKeywordAnalyzer; + public function __construct(\Rector\NodeNestingScope\ContextAnalyzer $contextAnalyzer, \Rector\DeadCode\NodeCollector\NodeByTypeAndPositionCollector $nodeByTypeAndPositionCollector, \Rector\DeadCode\NodeFinder\VariableUseFinder $variableUseFinder, \Rector\Core\Php\ReservedKeywordAnalyzer $reservedKeywordAnalyzer) { $this->contextAnalyzer = $contextAnalyzer; $this->nodeByTypeAndPositionCollector = $nodeByTypeAndPositionCollector; $this->variableUseFinder = $variableUseFinder; + $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer; } public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition { @@ -112,7 +118,10 @@ CODE_SAMPLE return \false; } // simple variable only - return \is_string($node->name); + if (!\is_string($node->name)) { + return \false; + } + return !$this->reservedKeywordAnalyzer->isNativeVariable($node->name); }); } /** diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index f9e1763650a..ab5572f2c92 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'b4392749f4ab12077b8cadc6cc8745ad79dcdea8'; + public const PACKAGE_VERSION = '32ef12c2635d6c109d4b963ba4ea08e49d2b01c0'; /** * @var string */ - public const RELEASE_DATE = '2021-07-28 19:46:22'; + public const RELEASE_DATE = '2021-07-28 18:34:40'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210728\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index bddcf44fbe4..38804018d6f 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628::getLoader(); +return ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 57bf99db0d7..f14e9b6ebab 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628 +class ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit0ab70a27129bc57ba4671b41c1908628::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit0ab70a27129bc57ba4671b41c1908628::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire0ab70a27129bc57ba4671b41c1908628($fileIdentifier, $file); + composerRequirec121df7c8e2e2cd855dc7d10d13a9269($fileIdentifier, $file); } return $loader; } } -function composerRequire0ab70a27129bc57ba4671b41c1908628($fileIdentifier, $file) +function composerRequirec121df7c8e2e2cd855dc7d10d13a9269($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b6a26bae449..52a56aaab66 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit0ab70a27129bc57ba4671b41c1908628 +class ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3848,9 +3848,9 @@ class ComposerStaticInit0ab70a27129bc57ba4671b41c1908628 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit0ab70a27129bc57ba4671b41c1908628::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit0ab70a27129bc57ba4671b41c1908628::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit0ab70a27129bc57ba4671b41c1908628::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitc121df7c8e2e2cd855dc7d10d13a9269::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 9fdddd2349f..111fe47d270 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php'; if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) { spl_autoload_call('RectorPrefix20210728\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628', false) && !interface_exists('ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628', false) && !trait_exists('ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628', false)) { - spl_autoload_call('RectorPrefix20210728\ComposerAutoloaderInit0ab70a27129bc57ba4671b41c1908628'); +if (!class_exists('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', false) && !interface_exists('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', false) && !trait_exists('ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269', false)) { + spl_autoload_call('RectorPrefix20210728\ComposerAutoloaderInitc121df7c8e2e2cd855dc7d10d13a9269'); } if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { spl_autoload_call('RectorPrefix20210728\Doctrine\Inflector\Inflector'); @@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210728\print_node(...func_get_args()); } } -if (!function_exists('composerRequire0ab70a27129bc57ba4671b41c1908628')) { - function composerRequire0ab70a27129bc57ba4671b41c1908628() { - return \RectorPrefix20210728\composerRequire0ab70a27129bc57ba4671b41c1908628(...func_get_args()); +if (!function_exists('composerRequirec121df7c8e2e2cd855dc7d10d13a9269')) { + function composerRequirec121df7c8e2e2cd855dc7d10d13a9269() { + return \RectorPrefix20210728\composerRequirec121df7c8e2e2cd855dc7d10d13a9269(...func_get_args()); } } if (!function_exists('parseArgs')) {