1
0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-20 07:19:47 +01:00

Updated Rector to commit 9bd39bd18c746d46e9c02acd632529f2a2ef85a1

9bd39bd18c [NodeNestingScope] Remove Switch_ from LOOP_NODES constant value in ContextAnalyzer ()
This commit is contained in:
Tomas Votruba 2021-06-29 18:01:07 +00:00
parent 3cd8f75855
commit c9d6b2a0e5
7 changed files with 27 additions and 20 deletions

@ -29,7 +29,7 @@ final class ContextAnalyzer
/**
* @var array<class-string<Stmt>>
*/
private const LOOP_NODES = [\PhpParser\Node\Stmt\For_::class, \PhpParser\Node\Stmt\Foreach_::class, \PhpParser\Node\Stmt\While_::class, \PhpParser\Node\Stmt\Do_::class, \PhpParser\Node\Stmt\Switch_::class];
private const LOOP_NODES = [\PhpParser\Node\Stmt\For_::class, \PhpParser\Node\Stmt\Foreach_::class, \PhpParser\Node\Stmt\While_::class, \PhpParser\Node\Stmt\Do_::class];
/**
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
@ -57,6 +57,10 @@ final class ContextAnalyzer
}
return \false;
}
public function isInSwitch(\PhpParser\Node $node) : bool
{
return (bool) $this->betterNodeFinder->findParentType($node, \PhpParser\Node\Stmt\Switch_::class);
}
public function isInIf(\PhpParser\Node $node) : bool
{
$breakNodes = \array_merge([\PhpParser\Node\Stmt\If_::class], self::BREAK_NODES);

@ -71,6 +71,9 @@ CODE_SAMPLE
if ($this->contextAnalyzer->isInLoop($node)) {
return null;
}
if ($this->contextAnalyzer->isInSwitch($node)) {
return null;
}
if ($this->contextAnalyzer->isInIf($node)) {
return new \PhpParser\Node\Stmt\Return_();
}

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '1d84e60878a581be5a9cf0520f7d63946c1a8d15';
public const PACKAGE_VERSION = '9bd39bd18c746d46e9c02acd632529f2a2ef85a1';
/**
* @var string
*/
public const RELEASE_DATE = '2021-06-29 18:57:07';
public const RELEASE_DATE = '2021-06-29 19:48:20';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210629\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored

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

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258
class ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14', '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\ComposerStaticInitdf2b71c33432b304ee98ada7f850f258::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit2381a674387ed07cec21360af1b79d14::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitdf2b71c33432b304ee98ada7f850f258::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit2381a674387ed07cec21360af1b79d14::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiredf2b71c33432b304ee98ada7f850f258($fileIdentifier, $file);
composerRequire2381a674387ed07cec21360af1b79d14($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequiredf2b71c33432b304ee98ada7f850f258($fileIdentifier, $file)
function composerRequire2381a674387ed07cec21360af1b79d14($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

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

@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
spl_autoload_call('RectorPrefix20210629\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258', false) && !interface_exists('ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258', false) && !trait_exists('ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258', false)) {
spl_autoload_call('RectorPrefix20210629\ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258');
if (!class_exists('ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14', false) && !interface_exists('ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14', false) && !trait_exists('ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14', false)) {
spl_autoload_call('RectorPrefix20210629\ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210629\Doctrine\Inflector\Inflector');
@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210629\print_node(...func_get_args());
}
}
if (!function_exists('composerRequiredf2b71c33432b304ee98ada7f850f258')) {
function composerRequiredf2b71c33432b304ee98ada7f850f258() {
return \RectorPrefix20210629\composerRequiredf2b71c33432b304ee98ada7f850f258(...func_get_args());
if (!function_exists('composerRequire2381a674387ed07cec21360af1b79d14')) {
function composerRequire2381a674387ed07cec21360af1b79d14() {
return \RectorPrefix20210629\composerRequire2381a674387ed07cec21360af1b79d14(...func_get_args());
}
}
if (!function_exists('parseArgs')) {