From 91de512bfa9a1a827721b988490960461e4d6374 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 9 May 2023 07:47:22 +0000 Subject: [PATCH] Updated Rector to commit 3f0753eca0da687f51d0c4ad1c09e689bd813e43 https://github.com/rectorphp/rector-src/commit/3f0753eca0da687f51d0c4ad1c09e689bd813e43 [Php70] Skip curly named variable on ThisCallOnStaticMethodToStaticCallRector (#3779) --- .../ThisCallOnStaticMethodToStaticCallRector.php | 4 ++++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php index 3274e09b376..21ec0e1df29 100644 --- a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php +++ b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php @@ -6,6 +6,7 @@ namespace Rector\Php70\Rector\MethodCall; use PhpParser\Node; use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Expr\Variable; +use PhpParser\Node\Identifier; use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassLike; use PHPStan\Reflection\Php\PhpMethodReflection; @@ -98,6 +99,9 @@ CODE_SAMPLE if (!$this->nodeNameResolver->isName($node->var, 'this')) { return null; } + if (!$node->name instanceof Identifier) { + return null; + } $methodName = $this->getName($node->name); if ($methodName === null) { return null; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index e49d50330da..56baf37e59a 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '6655c2c4e3d72d513c38162da5087bbc2df25b83'; + public const PACKAGE_VERSION = '3f0753eca0da687f51d0c4ad1c09e689bd813e43'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-05-09 14:38:07'; + public const RELEASE_DATE = '2023-05-09 14:43:22'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index ec723482351..0941b1c23f4 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit5e7fb43124e1dedec1564683666324a6::getLoader(); +return ComposerAutoloaderInitbc4b2d5befad476b0fe481a3b755391d::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 4219c68e3ad..93f936b82e1 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit5e7fb43124e1dedec1564683666324a6 +class ComposerAutoloaderInitbc4b2d5befad476b0fe481a3b755391d { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit5e7fb43124e1dedec1564683666324a6 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit5e7fb43124e1dedec1564683666324a6', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitbc4b2d5befad476b0fe481a3b755391d', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit5e7fb43124e1dedec1564683666324a6', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitbc4b2d5befad476b0fe481a3b755391d', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit5e7fb43124e1dedec1564683666324a6::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitbc4b2d5befad476b0fe481a3b755391d::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit5e7fb43124e1dedec1564683666324a6::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitbc4b2d5befad476b0fe481a3b755391d::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 72016243d72..88d6386a628 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit5e7fb43124e1dedec1564683666324a6 +class ComposerStaticInitbc4b2d5befad476b0fe481a3b755391d { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3113,9 +3113,9 @@ class ComposerStaticInit5e7fb43124e1dedec1564683666324a6 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit5e7fb43124e1dedec1564683666324a6::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit5e7fb43124e1dedec1564683666324a6::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit5e7fb43124e1dedec1564683666324a6::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitbc4b2d5befad476b0fe481a3b755391d::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitbc4b2d5befad476b0fe481a3b755391d::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitbc4b2d5befad476b0fe481a3b755391d::$classMap; }, null, ClassLoader::class); }