Updated Rector to commit bc09bdc203c39fafb0616a9ea0c1d89d342c900a

bc09bdc203 [DowngradePhp80] Skip array on 2nd arg on DowngradeArrayFilterNullableCallbackRector (#1598)
This commit is contained in:
Tomas Votruba 2021-12-30 16:54:57 +00:00
parent 3110b1c6b7
commit c638bf24a8
6 changed files with 29 additions and 20 deletions

View File

@ -6,6 +6,7 @@ namespace Rector\DowngradePhp80\Rector\FuncCall;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\BinaryOp\Identical;
use PhpParser\Node\Expr\BooleanNot;
@ -19,6 +20,10 @@ use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Param;
use PhpParser\Node\Scalar\String_;
use PHPStan\Type\ArrayType;
use PHPStan\Type\ClosureType;
use PHPStan\Type\Constant\ConstantStringType;
use PHPStan\Type\StringType;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@ -98,7 +103,11 @@ CODE_SAMPLE
}
private function shouldSkipSecondArg(\PhpParser\Node\Expr $expr) : bool
{
return \in_array(\get_class($expr), [\PhpParser\Node\Scalar\String_::class, \PhpParser\Node\Expr\Closure::class, \PhpParser\Node\Expr\ArrowFunction::class], \true);
if (\in_array(\get_class($expr), [\PhpParser\Node\Scalar\String_::class, \PhpParser\Node\Expr\Closure::class, \PhpParser\Node\Expr\ArrowFunction::class, \PhpParser\Node\Expr\Array_::class], \true)) {
return \true;
}
$type = $this->nodeTypeResolver->getType($expr);
return \in_array(\get_class($type), [\PHPStan\Type\StringType::class, \PHPStan\Type\Constant\ConstantStringType::class, \PHPStan\Type\ArrayType::class, \PHPStan\Type\ClosureType::class], \true);
}
/**
* @param Arg[] $args

View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '18fbe1d0ded286436557c3ecc3e91cf553efb6c9';
public const PACKAGE_VERSION = 'bc09bdc203c39fafb0616a9ea0c1d89d342c900a';
/**
* @var string
*/
public const RELEASE_DATE = '2021-12-30 16:16:50';
public const RELEASE_DATE = '2021-12-30 16:46:24';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211230\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 ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e::getLoader();
return ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e
class ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9', '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\ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit64c7e56dd6947838bd86ef1c0b72dbc9::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit64c7e56dd6947838bd86ef1c0b72dbc9::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire8203956131c6cfe5b66f36bf3d4dc10e($fileIdentifier, $file);
composerRequire64c7e56dd6947838bd86ef1c0b72dbc9($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e
* @param string $file
* @return void
*/
function composerRequire8203956131c6cfe5b66f36bf3d4dc10e($fileIdentifier, $file)
function composerRequire64c7e56dd6947838bd86ef1c0b72dbc9($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 ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e
class ComposerStaticInit64c7e56dd6947838bd86ef1c0b72dbc9
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3844,9 +3844,9 @@ class ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8203956131c6cfe5b66f36bf3d4dc10e::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit64c7e56dd6947838bd86ef1c0b72dbc9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit64c7e56dd6947838bd86ef1c0b72dbc9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit64c7e56dd6947838bd86ef1c0b72dbc9::$classMap;
}, null, ClassLoader::class);
}

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('RectorPrefix20211230\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e', false) && !interface_exists('ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e', false) && !trait_exists('ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e', false)) {
spl_autoload_call('RectorPrefix20211230\ComposerAutoloaderInit8203956131c6cfe5b66f36bf3d4dc10e');
if (!class_exists('ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9', false) && !interface_exists('ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9', false) && !trait_exists('ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9', false)) {
spl_autoload_call('RectorPrefix20211230\ComposerAutoloaderInit64c7e56dd6947838bd86ef1c0b72dbc9');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211230\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -78,9 +78,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211230\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire8203956131c6cfe5b66f36bf3d4dc10e')) {
function composerRequire8203956131c6cfe5b66f36bf3d4dc10e() {
return \RectorPrefix20211230\composerRequire8203956131c6cfe5b66f36bf3d4dc10e(...func_get_args());
if (!function_exists('composerRequire64c7e56dd6947838bd86ef1c0b72dbc9')) {
function composerRequire64c7e56dd6947838bd86ef1c0b72dbc9() {
return \RectorPrefix20211230\composerRequire64c7e56dd6947838bd86ef1c0b72dbc9(...func_get_args());
}
}
if (!function_exists('scanPath')) {