mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-30 16:00:52 +00:00
Updated Rector to commit 4b6d1147546caf401b772b5bc7ab9002979c6cd5
4b6d114754
[CodingStyle] Handle multiple assigns on SplitDoubleAssignRector (#2873)
This commit is contained in:
parent
c6aab80b28
commit
9662cd48ba
|
@ -4,6 +4,7 @@ declare (strict_types=1);
|
|||
namespace Rector\CodingStyle\Rector\Assign;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\Assign;
|
||||
use PhpParser\Node\Expr\CallLike;
|
||||
use PhpParser\Node\Stmt\Expression;
|
||||
|
@ -58,15 +59,36 @@ CODE_SAMPLE
|
|||
if (!$firstAssign->expr instanceof Assign) {
|
||||
return null;
|
||||
}
|
||||
$nestedAssign = $firstAssign->expr;
|
||||
$newAssign = new Assign($firstAssign->var, $nestedAssign->expr);
|
||||
$newAssignExpression = new Expression($newAssign);
|
||||
// avoid calling the same method/funtion/new twice
|
||||
if (!$nestedAssign->expr instanceof CallLike) {
|
||||
$varAssign = new Assign($nestedAssign->var, $nestedAssign->expr);
|
||||
return [$newAssignExpression, new Expression($varAssign)];
|
||||
$lastAssignValue = $this->resolveLastAssignExpr($firstAssign);
|
||||
return $this->collectExpressions($firstAssign, $lastAssignValue);
|
||||
}
|
||||
/**
|
||||
* @return Expression[]
|
||||
*/
|
||||
private function collectExpressions(Assign $assign, Expr $expr) : array
|
||||
{
|
||||
/** @var Expression[] $expressions */
|
||||
$expressions = [];
|
||||
while ($assign instanceof Assign) {
|
||||
$expressions[] = new Expression(new Assign($assign->var, $expr));
|
||||
// CallLike check need to be after first fill Expression
|
||||
// so use existing variable defined to avoid repetitive call
|
||||
if ($expr instanceof CallLike) {
|
||||
$expr = $assign->var;
|
||||
}
|
||||
if (!$assign->expr instanceof Assign) {
|
||||
break;
|
||||
}
|
||||
/** @var Expr $assign */
|
||||
$assign = $assign->expr;
|
||||
}
|
||||
$varAssign = new Assign($nestedAssign->var, $firstAssign->var);
|
||||
return [$newAssignExpression, new Expression($varAssign)];
|
||||
return $expressions;
|
||||
}
|
||||
private function resolveLastAssignExpr(Assign $assign) : Expr
|
||||
{
|
||||
if (!$assign->expr instanceof Assign) {
|
||||
return $assign->expr;
|
||||
}
|
||||
return $this->resolveLastAssignExpr($assign->expr);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,12 +17,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '3addb8f8783cb5efbbbc80ef2a7c143487d19398';
|
||||
public const PACKAGE_VERSION = '4b6d1147546caf401b772b5bc7ab9002979c6cd5';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2022-08-31 12:08:55';
|
||||
public const RELEASE_DATE = '2022-08-31 17:31:56';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInitd35ca00b211d9318174eedda5c8ba661::getLoader();
|
||||
return ComposerAutoloaderInit339f989701ef593d70eb65986354df68::getLoader();
|
||||
|
|
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInitd35ca00b211d9318174eedda5c8ba661
|
||||
class ComposerAutoloaderInit339f989701ef593d70eb65986354df68
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,19 +22,19 @@ class ComposerAutoloaderInitd35ca00b211d9318174eedda5c8ba661
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInitd35ca00b211d9318174eedda5c8ba661', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit339f989701ef593d70eb65986354df68', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitd35ca00b211d9318174eedda5c8ba661', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit339f989701ef593d70eb65986354df68', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitd35ca00b211d9318174eedda5c8ba661::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit339f989701ef593d70eb65986354df68::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInitd35ca00b211d9318174eedda5c8ba661::$files;
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInit339f989701ef593d70eb65986354df68::$files;
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequired35ca00b211d9318174eedda5c8ba661($fileIdentifier, $file);
|
||||
composerRequire339f989701ef593d70eb65986354df68($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
|
@ -46,7 +46,7 @@ class ComposerAutoloaderInitd35ca00b211d9318174eedda5c8ba661
|
|||
* @param string $file
|
||||
* @return void
|
||||
*/
|
||||
function composerRequired35ca00b211d9318174eedda5c8ba661($fileIdentifier, $file)
|
||||
function composerRequire339f989701ef593d70eb65986354df68($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInitd35ca00b211d9318174eedda5c8ba661
|
||||
class ComposerStaticInit339f989701ef593d70eb65986354df68
|
||||
{
|
||||
public static $files = array (
|
||||
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
|
||||
|
@ -3146,9 +3146,9 @@ class ComposerStaticInitd35ca00b211d9318174eedda5c8ba661
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitd35ca00b211d9318174eedda5c8ba661::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitd35ca00b211d9318174eedda5c8ba661::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitd35ca00b211d9318174eedda5c8ba661::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit339f989701ef593d70eb65986354df68::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit339f989701ef593d70eb65986354df68::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit339f989701ef593d70eb65986354df68::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user