mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-05 02:40:50 +00:00
Updated Rector to commit a7d45e469a134f8671749aaf4a9a5ea797394e3a
a7d45e469a
[Php80] Skip array append different keys in cases on ChangeSwitchToMatchRector (#3437)
This commit is contained in:
parent
5104869465
commit
0e8b799327
|
@ -14,6 +14,7 @@ use PhpParser\Node\Stmt\Return_;
|
|||
use PhpParser\Node\Stmt\Switch_;
|
||||
use PhpParser\Node\Stmt\Throw_;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\Php80\Enum\MatchKind;
|
||||
use Rector\Php80\ValueObject\CondAndExpr;
|
||||
|
@ -34,11 +35,17 @@ final class MatchSwitchAnalyzer
|
|||
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
|
||||
*/
|
||||
private $nodeComparator;
|
||||
public function __construct(\Rector\Php80\NodeAnalyzer\SwitchAnalyzer $switchAnalyzer, NodeNameResolver $nodeNameResolver, NodeComparator $nodeComparator)
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\Printer\BetterStandardPrinter
|
||||
*/
|
||||
private $betterStandardPrinter;
|
||||
public function __construct(\Rector\Php80\NodeAnalyzer\SwitchAnalyzer $switchAnalyzer, NodeNameResolver $nodeNameResolver, NodeComparator $nodeComparator, BetterStandardPrinter $betterStandardPrinter)
|
||||
{
|
||||
$this->switchAnalyzer = $switchAnalyzer;
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodeComparator = $nodeComparator;
|
||||
$this->betterStandardPrinter = $betterStandardPrinter;
|
||||
}
|
||||
/**
|
||||
* @param CondAndExpr[] $condAndExprs
|
||||
|
@ -94,8 +101,7 @@ final class MatchSwitchAnalyzer
|
|||
continue;
|
||||
}
|
||||
if ($expr->var instanceof ArrayDimFetch) {
|
||||
$arrayDimFecthName = $this->nodeNameResolver->getName($expr->var->var);
|
||||
$assignVariableNames[] = \get_class($expr->var) . $arrayDimFecthName . '[]';
|
||||
$assignVariableNames[] = $this->betterStandardPrinter->print($expr->var);
|
||||
} else {
|
||||
$assignVariableNames[] = \get_class($expr->var) . $this->nodeNameResolver->getName($expr->var);
|
||||
}
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '4e625d0b8e545bf8fc143f5c9a18e6295ecc3989';
|
||||
public const PACKAGE_VERSION = 'a7d45e469a134f8671749aaf4a9a5ea797394e3a';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-03-02 12:12:36';
|
||||
public const RELEASE_DATE = '2023-03-02 12:21:07';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit9b6a6fd2f7e8c640be4eea4e6f29dd94::getLoader();
|
||||
return ComposerAutoloaderInite4770c262ed48ac8d5798b18be9cb769::getLoader();
|
||||
|
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit9b6a6fd2f7e8c640be4eea4e6f29dd94
|
||||
class ComposerAutoloaderInite4770c262ed48ac8d5798b18be9cb769
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInit9b6a6fd2f7e8c640be4eea4e6f29dd94
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit9b6a6fd2f7e8c640be4eea4e6f29dd94', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInite4770c262ed48ac8d5798b18be9cb769', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit9b6a6fd2f7e8c640be4eea4e6f29dd94', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInite4770c262ed48ac8d5798b18be9cb769', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInite4770c262ed48ac8d5798b18be9cb769::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInite4770c262ed48ac8d5798b18be9cb769::$files;
|
||||
$requireFile = \Closure::bind(static function ($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 ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94
|
||||
class ComposerStaticInite4770c262ed48ac8d5798b18be9cb769
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3148,9 +3148,9 @@ class ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit9b6a6fd2f7e8c640be4eea4e6f29dd94::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInite4770c262ed48ac8d5798b18be9cb769::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInite4770c262ed48ac8d5798b18be9cb769::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInite4770c262ed48ac8d5798b18be9cb769::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user