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

Updated Rector to commit 897e3da3b3

Browse Source 
897e3da3b3 [Defluent] Do not remove return from parameter and property on ReturnNewFluentChainMethodCallToNonFluentRector (#589)
This commit is contained in:
Tomas Votruba 2021-08-04 07:35:56 +00:00
parent fcfef6acab
commit 7a14ae82ec
6 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rules/Defluent/Rector/Return_/ReturnNewFluentChainMethodCallToNonFluentRector.php
View File

@ -78,9 +78,18 @@ CODE_SAMPLE
if (!$assignAndRootExprAndNodesToAdd instanceof \Rector\Defluent\ValueObject\AssignAndRootExprAndNodesToAdd) {
return null;
}
$nodesToAdd = $assignAndRootExprAndNodesToAdd->getNodesToAdd();
$lastNodeToAdd = \end($nodesToAdd);
if (!$lastNodeToAdd) {
return null;
}
if (!$lastNodeToAdd instanceof \PhpParser\Node\Stmt\Return_) {
\end($nodesToAdd);
$nodesToAdd[\key($nodesToAdd)] = new \PhpParser\Node\Stmt\Return_($lastNodeToAdd);
}
$this->fluentNodeRemover->removeCurrentNode($node);
$this->addNodesAfterNode($assignAndRootExprAndNodesToAdd->getNodesToAdd(), $node);
return null;
$this->addNodesAfterNode($nodesToAdd, $node);
return $node;
}
private function matchReturnMethodCall(\PhpParser\Node\Stmt\Return_ $return) : ?\PhpParser\Node\Expr
{

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '529eb40360f0a40a03bdaeb0e657fbaaec2a1c02';
public const PACKAGE_VERSION = '897e3da3b3540736a6f441125a048de6c27e4fe3';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-04 09:23:17';
public const RELEASE_DATE = '2021-08-04 09:25:40';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210804\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 ComposerAutoloaderInitab802636516c0b974278a389450e8313::getLoader();
return ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitab802636516c0b974278a389450e8313
class ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitab802636516c0b974278a389450e8313
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitab802636516c0b974278a389450e8313', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitab802636516c0b974278a389450e8313', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf', '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\ComposerStaticInitab802636516c0b974278a389450e8313::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit14d75ef04577cca4ad21d4c2c08bd4cf::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitab802636516c0b974278a389450e8313
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitab802636516c0b974278a389450e8313::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit14d75ef04577cca4ad21d4c2c08bd4cf::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireab802636516c0b974278a389450e8313($fileIdentifier, $file);
composerRequire14d75ef04577cca4ad21d4c2c08bd4cf($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequireab802636516c0b974278a389450e8313($fileIdentifier, $file)
function composerRequire14d75ef04577cca4ad21d4c2c08bd4cf($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 ComposerStaticInitab802636516c0b974278a389450e8313
class ComposerStaticInit14d75ef04577cca4ad21d4c2c08bd4cf
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3845,9 +3845,9 @@ class ComposerStaticInitab802636516c0b974278a389450e8313
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitab802636516c0b974278a389450e8313::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitab802636516c0b974278a389450e8313::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitab802636516c0b974278a389450e8313::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit14d75ef04577cca4ad21d4c2c08bd4cf::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit14d75ef04577cca4ad21d4c2c08bd4cf::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit14d75ef04577cca4ad21d4c2c08bd4cf::$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('RectorPrefix20210804\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitab802636516c0b974278a389450e8313', false) && !interface_exists('ComposerAutoloaderInitab802636516c0b974278a389450e8313', false) && !trait_exists('ComposerAutoloaderInitab802636516c0b974278a389450e8313', false)) {
spl_autoload_call('RectorPrefix20210804\ComposerAutoloaderInitab802636516c0b974278a389450e8313');
if (!class_exists('ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf', false) && !interface_exists('ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf', false) && !trait_exists('ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf', false)) {
spl_autoload_call('RectorPrefix20210804\ComposerAutoloaderInit14d75ef04577cca4ad21d4c2c08bd4cf');
}
if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) {
spl_autoload_call('RectorPrefix20210804\AjaxLogin');
@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210804\print_node(...func_get_args());
}
}
if (!function_exists('composerRequireab802636516c0b974278a389450e8313')) {
function composerRequireab802636516c0b974278a389450e8313() {
return \RectorPrefix20210804\composerRequireab802636516c0b974278a389450e8313(...func_get_args());
if (!function_exists('composerRequire14d75ef04577cca4ad21d4c2c08bd4cf')) {
function composerRequire14d75ef04577cca4ad21d4c2c08bd4cf() {
return \RectorPrefix20210804\composerRequire14d75ef04577cca4ad21d4c2c08bd4cf(...func_get_args());
}
}
if (!function_exists('parseArgs')) {