mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-11 11:02:38 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 5aefbba804af59f8622a5f65b456ff0bde070d78

Browse Source 
5aefbba804 [CodingStyle] Handle nested breaks in BinarySwitchToIfElseRector and SingularSwitchToIfRector ()
This commit is contained in:
Tomas Votruba 2021-06-12 12:03:11 +00:00
parent 843f414034
commit 065a643f3f
8 changed files with 37 additions and 27 deletions

12
rules/Renaming/NodeManipulator/SwitchManipulator.php

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\Renaming\NodeManipulator;
use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Break_;
final class SwitchManipulator
@ -14,8 +15,17 @@ final class SwitchManipulator
public function removeBreakNodes(array $stmts) : array
{
foreach ($stmts as $key => $node) {
if ($node instanceof \PhpParser\Node\Stmt\Break_) {
if (!$node instanceof \PhpParser\Node\Stmt\Break_) {
continue;
}
if (!$node->num instanceof \PhpParser\Node\Scalar\LNumber || $node->num->value === 1) {
unset($stmts[$key]);
continue;
}
if ($node->num->value === 2) {
$node->num = null;
} else {
$node->num = new \PhpParser\Node\Scalar\LNumber($node->num->value - 1);
}
}
return $stmts;

4
src/Application/VersionResolver.php

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '7bbbed11e7976ecdd3a66fb88002704119c9d516';
public const PACKAGE_VERSION = '5aefbba804af59f8622a5f65b456ff0bde070d78';
/**
* @var string
*/
public const RELEASE_DATE = '2021-06-12 08:29:20';
public const RELEASE_DATE = '2021-06-12 13:51:36';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210612\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 ComposerAutoloaderInitbbf430bf48b83238f9a8c345b42753f4::getLoader();
return ComposerAutoloaderInitdcb1d9d3b5763135dafbd5797c684612::getLoader();

14
vendor/composer/autoload_real.php vendored

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

8
vendor/composer/autoload_static.php vendored

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

12
vendor/composer/installed.json vendored

@ -4161,8 +4161,8 @@
},
{
"name": "symplify\/rule-doc-generator-contracts",
"version": "v9.3.23",
"version_normalized": "9.3.23.0",
"version": "v9.3.25",
"version_normalized": "9.3.25.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symplify\/rule-doc-generator-contracts.git",
@ -4198,7 +4198,7 @@
],
"description": "Contracts for production code of RuleDocGenerator",
"support": {
"source": "https:\/\/github.com\/symplify\/rule-doc-generator-contracts\/tree\/v9.3.23"
"source": "https:\/\/github.com\/symplify\/rule-doc-generator-contracts\/tree\/v9.3.25"
},
"funding": [
{
@ -4336,8 +4336,8 @@
},
{
"name": "symplify\/smart-file-system",
"version": "v9.3.23",
"version_normalized": "9.3.23.0",
"version": "v9.3.25",
"version_normalized": "9.3.25.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symplify\/smart-file-system.git",
@ -4378,7 +4378,7 @@
],
"description": "Sanitized FileInfo with safe getRealPath() and other handy methods",
"support": {
"source": "https:\/\/github.com\/symplify\/smart-file-system\/tree\/v9.3.23"
"source": "https:\/\/github.com\/symplify\/smart-file-system\/tree\/v9.3.25"
},
"funding": [
{

2
vendor/composer/installed.php vendored

File diff suppressed because one or more lines are too long

10
vendor/scoper-autoload.php vendored

@ -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('RectorPrefix20210612\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInitbbf430bf48b83238f9a8c345b42753f4', false) && !interface_exists('ComposerAutoloaderInitbbf430bf48b83238f9a8c345b42753f4', false) && !trait_exists('ComposerAutoloaderInitbbf430bf48b83238f9a8c345b42753f4', false)) {
spl_autoload_call('RectorPrefix20210612\ComposerAutoloaderInitbbf430bf48b83238f9a8c345b42753f4');
if (!class_exists('ComposerAutoloaderInitdcb1d9d3b5763135dafbd5797c684612', false) && !interface_exists('ComposerAutoloaderInitdcb1d9d3b5763135dafbd5797c684612', false) && !trait_exists('ComposerAutoloaderInitdcb1d9d3b5763135dafbd5797c684612', false)) {
spl_autoload_call('RectorPrefix20210612\ComposerAutoloaderInitdcb1d9d3b5763135dafbd5797c684612');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210612\Doctrine\Inflector\Inflector');
@ -3323,9 +3323,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210612\print_node(...func_get_args());
}
}
if (!function_exists('composerRequirebbf430bf48b83238f9a8c345b42753f4')) {
function composerRequirebbf430bf48b83238f9a8c345b42753f4() {
return \RectorPrefix20210612\composerRequirebbf430bf48b83238f9a8c345b42753f4(...func_get_args());
if (!function_exists('composerRequiredcb1d9d3b5763135dafbd5797c684612')) {
function composerRequiredcb1d9d3b5763135dafbd5797c684612() {
return \RectorPrefix20210612\composerRequiredcb1d9d3b5763135dafbd5797c684612(...func_get_args());
}
}
if (!function_exists('parseArgs')) {