mirror of https://github.com/rectorphp/rector.git
Updated Rector to commit cec3a1183d0a82e38dfdb06ecfa9b9b5d97125de
cec3a1183d
[Php73] Skip prev() call on items after key called on ArrayKeyFirstLastRector (#3293)
This commit is contained in:
parent
78a094be89
commit
c67791b001
|
@ -95,6 +95,9 @@ CODE_SAMPLE
|
|||
if (!$keyFuncCall instanceof FuncCall) {
|
||||
return null;
|
||||
}
|
||||
if ($this->hasPrevCallNext($keyFuncCall)) {
|
||||
return null;
|
||||
}
|
||||
$newName = self::PREVIOUS_TO_NEW_FUNCTIONS[$this->getName($node)];
|
||||
$keyFuncCall->name = new Name($newName);
|
||||
$this->removeNode($node);
|
||||
|
@ -104,6 +107,21 @@ CODE_SAMPLE
|
|||
{
|
||||
return PhpVersionFeature::ARRAY_KEY_FIRST_LAST;
|
||||
}
|
||||
private function hasPrevCallNext(FuncCall $funcCall) : bool
|
||||
{
|
||||
return (bool) $this->betterNodeFinder->findFirstNext($funcCall, function (Node $subNode) use($funcCall) : bool {
|
||||
if (!$subNode instanceof FuncCall) {
|
||||
return \false;
|
||||
}
|
||||
if (!$this->isName($subNode, 'prev')) {
|
||||
return \false;
|
||||
}
|
||||
if ($subNode->isFirstClassCallable()) {
|
||||
return \true;
|
||||
}
|
||||
return $this->nodeComparator->areNodesEqual($subNode->args[0]->value, $funcCall->args[0]->value);
|
||||
});
|
||||
}
|
||||
private function shouldSkip(FuncCall $funcCall) : bool
|
||||
{
|
||||
if (!$this->isNames($funcCall, ['reset', 'end'])) {
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'fc77aa08f716935ceb22db7ec32f4a45fabf6cf1';
|
||||
public const PACKAGE_VERSION = 'cec3a1183d0a82e38dfdb06ecfa9b9b5d97125de';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-01-17 04:19:11';
|
||||
public const RELEASE_DATE = '2023-01-17 15:03:18';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit80cffdabf6aa441f3cff0b5ada8c9697::getLoader();
|
||||
return ComposerAutoloaderInit457c26c5e7dd8ff321817c1d2df5fb7f::getLoader();
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit80cffdabf6aa441f3cff0b5ada8c9697
|
||||
class ComposerAutoloaderInit457c26c5e7dd8ff321817c1d2df5fb7f
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInit80cffdabf6aa441f3cff0b5ada8c9697
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit80cffdabf6aa441f3cff0b5ada8c9697', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit457c26c5e7dd8ff321817c1d2df5fb7f', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit80cffdabf6aa441f3cff0b5ada8c9697', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit457c26c5e7dd8ff321817c1d2df5fb7f', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit457c26c5e7dd8ff321817c1d2df5fb7f::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit457c26c5e7dd8ff321817c1d2df5fb7f::$files;
|
||||
$requireFile = static function ($fileIdentifier, $file) {
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697
|
||||
class ComposerStaticInit457c26c5e7dd8ff321817c1d2df5fb7f
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3067,9 +3067,9 @@ class ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit80cffdabf6aa441f3cff0b5ada8c9697::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit457c26c5e7dd8ff321817c1d2df5fb7f::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit457c26c5e7dd8ff321817c1d2df5fb7f::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit457c26c5e7dd8ff321817c1d2df5fb7f::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
|
@ -797,17 +797,17 @@
|
|||
},
|
||||
{
|
||||
"name": "phpstan\/phpstan",
|
||||
"version": "1.9.11",
|
||||
"version_normalized": "1.9.11.0",
|
||||
"version": "1.9.12",
|
||||
"version_normalized": "1.9.12.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https:\/\/github.com\/phpstan\/phpstan.git",
|
||||
"reference": "60f3d68481eef216199eae7a2603cd5fe124d464"
|
||||
"reference": "44a338ff0d5572c13fd77dfd91addb96e48c29f8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/60f3d68481eef216199eae7a2603cd5fe124d464",
|
||||
"reference": "60f3d68481eef216199eae7a2603cd5fe124d464",
|
||||
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/44a338ff0d5572c13fd77dfd91addb96e48c29f8",
|
||||
"reference": "44a338ff0d5572c13fd77dfd91addb96e48c29f8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -816,7 +816,7 @@
|
|||
"conflict": {
|
||||
"phpstan\/phpstan-shim": "*"
|
||||
},
|
||||
"time": "2023-01-12T14:04:13+00:00",
|
||||
"time": "2023-01-17T10:44:04+00:00",
|
||||
"bin": [
|
||||
"phpstan",
|
||||
"phpstan.phar"
|
||||
|
@ -839,7 +839,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https:\/\/github.com\/phpstan\/phpstan\/issues",
|
||||
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/1.9.11"
|
||||
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/1.9.12"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -1,16 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmPAE0cACgkQzxoQjQ56
|
||||
5yDo2g//exbFGXxhaNJG5fR0OfelAEuLC36ZiVxdqwAV7mbxfxc945MkPssYVq4U
|
||||
x3jNZQj+u4SK94qehq6UsvitSsYpprhmrxST3zSe4GbRRAG3uvuvkKhTOpU7euS3
|
||||
KFE4kwt1L384fFogk+OTVtDBMMrjgIvfJPjJFhOuBlpf/twzCZ3UC004ExAgwKmT
|
||||
ObkHcvrxUlM/Kan8Hy7hyaeXUBQee+s/mVIhl8JT4jsZgGzspe2W9c37xtVhyFEa
|
||||
Y5E+Fjot+2nnc86TC8g2msfE3Ei5PJPFYF9DVQJ1aHmVEX2p6az2MvDJss45owLB
|
||||
Gd91sPHlZyOgHxbGdAMKzmud1CzsVpvqjJZcPaX8qbOWAlK6WhrZgfO0Q1pP8+u2
|
||||
blzRw2IdWX3VN3MbtmiRVlwXTOXUGnRjxhDTrpALY7fczg272AUR5Chszin8eoSx
|
||||
s0aVuHAOgMnj01wIKDsuBv+XPI6QFNTaa26LPP//o/eeWifo0vR0sTE/8mrR/JNH
|
||||
XsP7xhKzbZjDm/ui0jZ02kOZXtd/8xaUnmCDsYmBSK+aauq/ASAyI8Ufz9ytIT/D
|
||||
iZF2CHIpfTnL0uz93qWJtohVD6DDJLiiKJ8SlRiwjaxB1qa1YHPBNhPP5Cw3ezCD
|
||||
pzE1IC1DwSvosfXaiZnJ4xGnGoXVy75lJeRws+EmgvvB4G06L3o=
|
||||
=jiBI
|
||||
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmPGe94ACgkQzxoQjQ56
|
||||
5yAFWBAAiKQpo3laFPZfDuXuOF5AdbJsIe9NZrVkr/dybtZhCrJeej1IWKXysR+1
|
||||
xy6XkpmHfRtlmq0qMmPoHMAilbzvQ7jL6IBEeVspejTY9sH9NXjUPzbqU5Oi7a7t
|
||||
Ou+RBGnoKNPq9Agrz9h8SYnpHvZwt3JhXbfXPeLR2mI9gvbQcRrO31rs/m/G4i8f
|
||||
CAysFjb41fvlzHDpwCwF5Wgoyh82Z1CUsMNVeMZ2/h8ngmFCm9/vtWNa+SYWFQX/
|
||||
YJaDceeLEEp0zGC8/U0Zpycyny2GYsyLWyAT4D+c8MOn6GIefUiexRV1LsCg/9LE
|
||||
gLiuivV9op/59LZkFd+HpOttAFHQQLZKGIdnSD2nKelCMD/stCVcONXeIP7O0zE8
|
||||
VX2NY0w1KongV+SEMURwf+aCMlGvI2mgG0inYCrvkbIM/gb8kEY2fMhQe5vY3v5L
|
||||
PxkSkSe2XhoMpZ6EHs0z5tzn7dbphfjibATHThEF/nS6m9snyukEGnd05Xm/LuIh
|
||||
hHjKaJrvUc3OEuLbOoOLYz1CmJZFmI/LwS2BbONJtcsB7oK2zsV07+9z1NVwNiIe
|
||||
7qNBwWrk6UlozNJbl7AKB94qtZWxxnxEerfDzNeB3PDis53dOh2hR3Pg3ql0yReo
|
||||
iRhRTkVzAyQ1E6hKdxzieI+jzsqRt4DPAlz2cJ7sZ5QyRq2SngY=
|
||||
=z3p8
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
Loading…
Reference in New Issue