octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-27 13:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 5b17710c25

Browse Source 
5b17710c25 [EarlyReturn] Returns array of If_ on ChangeOrIfReturnToEarlyReturnRector (#853)
This commit is contained in:
Tomas Votruba 2021-09-08 17:20:44 +00:00
parent 19cabc37e2
commit d5b6ae034e
6 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php
View File

@ -69,8 +69,9 @@ CODE_SAMPLE
}
/**
* @param If_ $node
* @return null|If_[]
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
public function refactor(\PhpParser\Node $node) : ?array
{
if (!$this->ifManipulator->isIfWithOnly($node, \PhpParser\Node\Stmt\Return_::class)) {
return null;
@ -84,14 +85,12 @@ CODE_SAMPLE
/** @var Return_ $return */
$return = $node->stmts[0];
$ifs = $this->createMultipleIfs($node->cond, $return, []);
foreach ($ifs as $key => $if) {
if ($key === 0) {
$this->mirrorComments($if, $node);
}
$this->nodesToAddCollector->addNodeBeforeNode($if, $node);
// ensure ifs not removed by other rules
if ($ifs === []) {
return null;
}
$this->removeNode($node);
return $node;
$this->mirrorComments($ifs[0], $node);
return $ifs;
}
/**
* @param If_[] $ifs

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'f8a31303f5b57fde34fb077b9463d6599537b5c5';
public const PACKAGE_VERSION = '5b17710c25ddb7cd75a31dfbf7bc2ed05072b6e8';
/**
* @var string
*/
public const RELEASE_DATE = '2021-09-08 16:41:56';
public const RELEASE_DATE = '2021-09-08 19:07:19';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210908\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';
return ComposerAutoloaderInit6ca28deea5e0c06e928baa01c9b9ec20::getLoader();
return ComposerAutoloaderInitff6d460a6e24c36917861baacec99784::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

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

10
vendor/scoper-autoload.php vendored
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)) {
spl_autoload_call('RectorPrefix20210908\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit6ca28deea5e0c06e928baa01c9b9ec20', false) && !interface_exists('ComposerAutoloaderInit6ca28deea5e0c06e928baa01c9b9ec20', false) && !trait_exists('ComposerAutoloaderInit6ca28deea5e0c06e928baa01c9b9ec20', false)) {
spl_autoload_call('RectorPrefix20210908\ComposerAutoloaderInit6ca28deea5e0c06e928baa01c9b9ec20');
if (!class_exists('ComposerAutoloaderInitff6d460a6e24c36917861baacec99784', false) && !interface_exists('ComposerAutoloaderInitff6d460a6e24c36917861baacec99784', false) && !trait_exists('ComposerAutoloaderInitff6d460a6e24c36917861baacec99784', false)) {
spl_autoload_call('RectorPrefix20210908\ComposerAutoloaderInitff6d460a6e24c36917861baacec99784');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20210908\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3311,9 +3311,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210908\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire6ca28deea5e0c06e928baa01c9b9ec20')) {
function composerRequire6ca28deea5e0c06e928baa01c9b9ec20() {
return \RectorPrefix20210908\composerRequire6ca28deea5e0c06e928baa01c9b9ec20(...func_get_args());
if (!function_exists('composerRequireff6d460a6e24c36917861baacec99784')) {
function composerRequireff6d460a6e24c36917861baacec99784() {
return \RectorPrefix20210908\composerRequireff6d460a6e24c36917861baacec99784(...func_get_args());
}
}
if (!function_exists('parseArgs')) {