Updated Rector to commit 8cd004440909a267f4530e2a1c8d0a6228a6b3d9

8cd0044409 Tiny static fixes (#4543)
This commit is contained in:
Tomas Votruba 2023-07-19 12:01:40 +00:00
parent 2e76492c3b
commit 20ccbb9b14
7 changed files with 18 additions and 20 deletions

View File

@ -3,8 +3,8 @@
declare (strict_types=1);
namespace Rector\CodeQuality\Rector\Class_;
use PhpParser\Node\Expr;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Stmt\Class_;

View File

@ -91,7 +91,7 @@ CODE_SAMPLE
if (!$this->isArrayType($node->expr)) {
return null;
}
$this->removeForeachValueAndUseArrayKeys($node);
$this->removeForeachValueAndUseArrayKeys($node, $node->keyVar);
return $node;
}
/**
@ -144,10 +144,10 @@ CODE_SAMPLE
return $this->exprUsedInNodeAnalyzer->isUsed($node, $variable);
});
}
private function removeForeachValueAndUseArrayKeys(Foreach_ $foreach) : void
private function removeForeachValueAndUseArrayKeys(Foreach_ $foreach, Expr $keyVarExpr) : void
{
// remove key value
$foreach->valueVar = $foreach->keyVar;
$foreach->valueVar = $keyVarExpr;
$foreach->keyVar = null;
$foreach->expr = $this->nodeFactory->createFuncCall('array_keys', [$foreach->expr]);
}

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'a0af8a1a1133943062fc438d11af7436bd74929d';
public const PACKAGE_VERSION = '8cd004440909a267f4530e2a1c8d0a6228a6b3d9';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-07-19 12:45:41';
public const RELEASE_DATE = '2023-07-19 11:57:47';
/**
* @var int
*/

View File

@ -334,12 +334,10 @@ final class NodeFactory
$arrayItem = new ArrayItem($itemValue);
} elseif (\is_array($item)) {
$arrayItem = new ArrayItem($this->createArray($item));
}
if ($item === null || $item instanceof ClassConstFetch) {
} elseif ($item === null || $item instanceof ClassConstFetch) {
$itemValue = BuilderHelpers::normalizeValue($item);
$arrayItem = new ArrayItem($itemValue);
}
if ($item instanceof Arg) {
} elseif ($item instanceof Arg) {
$arrayItem = new ArrayItem($item->value);
}
if ($arrayItem instanceof ArrayItem) {

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit6a1d6223de090fea598d138b99820e4f::getLoader();
return ComposerAutoloaderInit85944e20e2f4bbf6381158a172ebb5c9::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit6a1d6223de090fea598d138b99820e4f
class ComposerAutoloaderInit85944e20e2f4bbf6381158a172ebb5c9
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit6a1d6223de090fea598d138b99820e4f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit6a1d6223de090fea598d138b99820e4f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit85944e20e2f4bbf6381158a172ebb5c9', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit6a1d6223de090fea598d138b99820e4f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit85944e20e2f4bbf6381158a172ebb5c9', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit6a1d6223de090fea598d138b99820e4f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit85944e20e2f4bbf6381158a172ebb5c9::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit6a1d6223de090fea598d138b99820e4f::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit85944e20e2f4bbf6381158a172ebb5c9::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit6a1d6223de090fea598d138b99820e4f
class ComposerStaticInit85944e20e2f4bbf6381158a172ebb5c9
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3023,9 +3023,9 @@ class ComposerStaticInit6a1d6223de090fea598d138b99820e4f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit6a1d6223de090fea598d138b99820e4f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6a1d6223de090fea598d138b99820e4f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6a1d6223de090fea598d138b99820e4f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit85944e20e2f4bbf6381158a172ebb5c9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit85944e20e2f4bbf6381158a172ebb5c9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit85944e20e2f4bbf6381158a172ebb5c9::$classMap;
}, null, ClassLoader::class);
}