From c9d6b2a0e54b4ceb56191329f56b20bcb9e9b144 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 29 Jun 2021 18:01:07 +0000 Subject: [PATCH] Updated Rector to commit 9bd39bd18c746d46e9c02acd632529f2a2ef85a1 https://github.com/rectorphp/rector-src/commit/9bd39bd18c746d46e9c02acd632529f2a2ef85a1 [NodeNestingScope] Remove Switch_ from LOOP_NODES constant value in ContextAnalyzer (#333) --- packages/NodeNestingScope/ContextAnalyzer.php | 6 +++++- .../BreakNotInLoopOrSwitchToReturnRector.php | 3 +++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 7 files changed, 27 insertions(+), 20 deletions(-) diff --git a/packages/NodeNestingScope/ContextAnalyzer.php b/packages/NodeNestingScope/ContextAnalyzer.php index d0cd565d423..4e0f11571c4 100644 --- a/packages/NodeNestingScope/ContextAnalyzer.php +++ b/packages/NodeNestingScope/ContextAnalyzer.php @@ -29,7 +29,7 @@ final class ContextAnalyzer /** * @var array> */ - 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); diff --git a/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php b/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php index 33830eb6b3f..0d332accaa7 100644 --- a/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php +++ b/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php @@ -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_(); } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 7426953742e..bf3d3213ff6 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -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__); diff --git a/vendor/autoload.php b/vendor/autoload.php index b243d467dae..0ef3659ff0d 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitdf2b71c33432b304ee98ada7f850f258::getLoader(); +return ComposerAutoloaderInit2381a674387ed07cec21360af1b79d14::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a1a10902f89..28e2d965086 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -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; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 9e11bfaac4c..f4c6ab425d2 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -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); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 9c9b9198208..4d9762250b8 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -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')) {