Updated Rector to commit 55d788ad2c40ffd8835cead7aaf7f832e35d99b8

55d788ad2c [CodeQuality] Add StaticCall support on OptionalParametersAfterRequiredRector (#2817)
This commit is contained in:
Tomas Votruba 2022-08-22 10:08:19 +00:00
parent 204836d151
commit eb53b3cce9
5 changed files with 23 additions and 18 deletions

View File

@ -6,6 +6,7 @@ namespace Rector\CodeQuality\Rector\ClassMethod;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\MethodReflection;
@ -78,10 +79,10 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [ClassMethod::class, New_::class, MethodCall::class];
return [ClassMethod::class, New_::class, MethodCall::class, StaticCall::class];
}
/**
* @param ClassMethod|New_|MethodCall $node
* @param ClassMethod|New_|MethodCall|StaticCall $node
*/
public function refactor(Node $node) : ?Node
{
@ -125,7 +126,11 @@ CODE_SAMPLE
$new->args = $this->argumentSorter->sortArgsByExpectedParamOrder($new->getArgs(), $expectedArgOrParamOrder);
return $new;
}
private function refactorMethodCall(MethodCall $methodCall) : ?MethodCall
/**
* @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall $methodCall
* @return \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|null
*/
private function refactorMethodCall($methodCall)
{
$methodReflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($methodCall);
if (!$methodReflection instanceof MethodReflection) {
@ -144,7 +149,7 @@ CODE_SAMPLE
}
/**
* @return int[]|null
* @param \PhpParser\Node\Expr\New_|\PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Stmt\ClassMethod $node
* @param \PhpParser\Node\Expr\New_|\PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Expr\StaticCall $node
*/
private function resolveExpectedArgParamOrderIfDifferent(MethodReflection $methodReflection, $node) : ?array
{

View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'a4799d9625cffc65cdc838a59dfbe94e422e3a15';
public const PACKAGE_VERSION = '55d788ad2c40ffd8835cead7aaf7f832e35d99b8';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-21 17:09:15';
public const RELEASE_DATE = '2022-08-22 12:03:59';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit5f88ef681dea0ae7d791e69ba5b3e593
class ComposerAutoloaderInite64a2d241a212389ab20ae68e3c7e602
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit5f88ef681dea0ae7d791e69ba5b3e593
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit5f88ef681dea0ae7d791e69ba5b3e593', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInite64a2d241a212389ab20ae68e3c7e602', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit5f88ef681dea0ae7d791e69ba5b3e593', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInite64a2d241a212389ab20ae68e3c7e602', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInite64a2d241a212389ab20ae68e3c7e602::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInite64a2d241a212389ab20ae68e3c7e602::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire5f88ef681dea0ae7d791e69ba5b3e593($fileIdentifier, $file);
composerRequiree64a2d241a212389ab20ae68e3c7e602($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit5f88ef681dea0ae7d791e69ba5b3e593
* @param string $file
* @return void
*/
function composerRequire5f88ef681dea0ae7d791e69ba5b3e593($fileIdentifier, $file)
function composerRequiree64a2d241a212389ab20ae68e3c7e602($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 ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593
class ComposerStaticInite64a2d241a212389ab20ae68e3c7e602
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3256,9 +3256,9 @@ class ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5f88ef681dea0ae7d791e69ba5b3e593::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInite64a2d241a212389ab20ae68e3c7e602::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite64a2d241a212389ab20ae68e3c7e602::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite64a2d241a212389ab20ae68e3c7e602::$classMap;
}, null, ClassLoader::class);
}