Updated Rector to commit 32c0d7d1b7df03065d503d61d6424ebe019bc42b

32c0d7d1b7 [DeadCode][Naming] Handle null start token on use RemoveOverriddenValuesRector & RenameVariableToMatchNewTypeRector (#398)
This commit is contained in:
Tomas Votruba 2021-07-08 00:16:22 +00:00
parent 207c620c29
commit bd26221db6
6 changed files with 22 additions and 20 deletions

View File

@ -34,8 +34,10 @@ final class NodeByTypeAndPositionCollector
{ {
$nodesByTypeAndPosition = []; $nodesByTypeAndPosition = [];
foreach ($assignedVariables as $assignedVariable) { foreach ($assignedVariables as $assignedVariable) {
/** @var int $startTokenPos */
$startTokenPos = $assignedVariable->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::START_TOKEN_POSITION); $startTokenPos = $assignedVariable->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::START_TOKEN_POSITION);
if ($startTokenPos === null) {
continue;
}
// not in different scope, than previous one - e.g. if/while/else... // not in different scope, than previous one - e.g. if/while/else...
// get nesting level to $classMethodNode // get nesting level to $classMethodNode
/** @var Assign $assign */ /** @var Assign $assign */

View File

@ -16,11 +16,11 @@ final class VersionResolver
/** /**
* @var string * @var string
*/ */
public const PACKAGE_VERSION = '311a96fbf8a6f71faee4620db786669c76bbf015'; public const PACKAGE_VERSION = '32c0d7d1b7df03065d503d61d6424ebe019bc42b';
/** /**
* @var string * @var string
*/ */
public const RELEASE_DATE = '2021-07-08 01:58:23'; public const RELEASE_DATE = '2021-07-08 02:08:45';
public static function resolvePackageVersion() : string public static function resolvePackageVersion() : string
{ {
$process = new \RectorPrefix20210708\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); $process = new \RectorPrefix20210708\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3::getLoader(); return ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3 class ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75
{ {
private static $loader; private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php'; require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit8b4cd83fbe1cbaded6914d06ef308b75::getInitializer($loader));
} else { } else {
$classMap = require __DIR__ . '/autoload_classmap.php'; $classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) { if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3::$files; $includeFiles = Composer\Autoload\ComposerStaticInit8b4cd83fbe1cbaded6914d06ef308b75::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire32a9a856fc76aceff9b7aa7b492ef9c3($fileIdentifier, $file); composerRequire8b4cd83fbe1cbaded6914d06ef308b75($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequire32a9a856fc76aceff9b7aa7b492ef9c3($fileIdentifier, $file) function composerRequire8b4cd83fbe1cbaded6914d06ef308b75($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3 class ComposerStaticInit8b4cd83fbe1cbaded6914d06ef308b75
{ {
public static $files = array ( public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3868,9 +3868,9 @@ class ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit8b4cd83fbe1cbaded6914d06ef308b75::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit8b4cd83fbe1cbaded6914d06ef308b75::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit32a9a856fc76aceff9b7aa7b492ef9c3::$classMap; $loader->classMap = ComposerStaticInit8b4cd83fbe1cbaded6914d06ef308b75::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) { if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210708\AutoloadIncluder'); spl_autoload_call('RectorPrefix20210708\AutoloadIncluder');
} }
if (!class_exists('ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3', false) && !interface_exists('ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3', false) && !trait_exists('ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3', false)) { if (!class_exists('ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75', false) && !interface_exists('ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75', false) && !trait_exists('ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75', false)) {
spl_autoload_call('RectorPrefix20210708\ComposerAutoloaderInit32a9a856fc76aceff9b7aa7b492ef9c3'); spl_autoload_call('RectorPrefix20210708\ComposerAutoloaderInit8b4cd83fbe1cbaded6914d06ef308b75');
} }
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210708\Doctrine\Inflector\Inflector'); spl_autoload_call('RectorPrefix20210708\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210708\print_node(...func_get_args()); return \RectorPrefix20210708\print_node(...func_get_args());
} }
} }
if (!function_exists('composerRequire32a9a856fc76aceff9b7aa7b492ef9c3')) { if (!function_exists('composerRequire8b4cd83fbe1cbaded6914d06ef308b75')) {
function composerRequire32a9a856fc76aceff9b7aa7b492ef9c3() { function composerRequire8b4cd83fbe1cbaded6914d06ef308b75() {
return \RectorPrefix20210708\composerRequire32a9a856fc76aceff9b7aa7b492ef9c3(...func_get_args()); return \RectorPrefix20210708\composerRequire8b4cd83fbe1cbaded6914d06ef308b75(...func_get_args());
} }
} }
if (!function_exists('parseArgs')) { if (!function_exists('parseArgs')) {