From e974c922b9b0f19c882e45fd86651728a81ff1cd Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 11 Nov 2022 11:47:05 +0000 Subject: [PATCH] Updated Rector to commit b31bb42c902e6de649cb1228579be72023c171ec https://github.com/rectorphp/rector-src/commit/b31bb42c902e6de649cb1228579be72023c171ec [Php81] Register uniqid function on NullToStrictStringFuncCallArgRector (#3045) --- src/Application/VersionResolver.php | 4 ++-- src/Rector/AbstractRector.php | 8 +++----- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index a816df04371..7a5db1eee7c 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -17,12 +17,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'ac8fc4c418132ab78ca3c0d61d8533bf530fe58f'; + public const PACKAGE_VERSION = 'b31bb42c902e6de649cb1228579be72023c171ec'; /** * @api * @var string */ - public const RELEASE_DATE = '2022-11-11 12:41:30'; + public const RELEASE_DATE = '2022-11-11 12:41:06'; /** * @var int */ diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php index 22cef02c86e..054a09ccecb 100644 --- a/src/Rector/AbstractRector.php +++ b/src/Rector/AbstractRector.php @@ -216,10 +216,7 @@ CODE_SAMPLE; // for PHP doc info factory and change notifier $this->currentNodeProvider->setNode($node); $this->printDebugCurrentFileAndRule(); - $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE); - if ($originalNode instanceof Node) { - $this->changedNodeScopeRefresher->reIndexNodeAttributes($node); - } + $this->changedNodeScopeRefresher->reIndexNodeAttributes($node); $refactoredNode = $this->refactor($node); // nothing to change → continue if ($refactoredNode === null) { @@ -229,7 +226,8 @@ CODE_SAMPLE; $errorMessage = \sprintf(self::EMPTY_NODE_ARRAY_MESSAGE, static::class); throw new ShouldNotHappenException($errorMessage); } - $originalNode = $originalNode ?? $node; + /** @var Node $originalNode */ + $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $node; /** @var Node[]|Node $refactoredNode */ $this->createdByRuleDecorator->decorate($refactoredNode, $originalNode, static::class); $rectorWithLineChange = new RectorWithLineChange(\get_class($this), $originalNode->getLine()); diff --git a/vendor/autoload.php b/vendor/autoload.php index e22f3baac64..134bb55aa5e 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 ComposerAutoloaderInite44fc4973d8f5353532ddfa60bef9e3b::getLoader(); +return ComposerAutoloaderInitdf03c9bec31b7f661a682f9f88cae2ad::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 9fbd229b9a1..6cbb6653368 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInite44fc4973d8f5353532ddfa60bef9e3b +class ComposerAutoloaderInitdf03c9bec31b7f661a682f9f88cae2ad { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInite44fc4973d8f5353532ddfa60bef9e3b return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInite44fc4973d8f5353532ddfa60bef9e3b', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitdf03c9bec31b7f661a682f9f88cae2ad', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInite44fc4973d8f5353532ddfa60bef9e3b', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitdf03c9bec31b7f661a682f9f88cae2ad', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitdf03c9bec31b7f661a682f9f88cae2ad::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInitdf03c9bec31b7f661a682f9f88cae2ad::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiree44fc4973d8f5353532ddfa60bef9e3b($fileIdentifier, $file); + composerRequiredf03c9bec31b7f661a682f9f88cae2ad($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInite44fc4973d8f5353532ddfa60bef9e3b * @param string $file * @return void */ -function composerRequiree44fc4973d8f5353532ddfa60bef9e3b($fileIdentifier, $file) +function composerRequiredf03c9bec31b7f661a682f9f88cae2ad($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 18ea86bd3dc..68d8e16237e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b +class ComposerStaticInitdf03c9bec31b7f661a682f9f88cae2ad { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3053,9 +3053,9 @@ class ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInite44fc4973d8f5353532ddfa60bef9e3b::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitdf03c9bec31b7f661a682f9f88cae2ad::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitdf03c9bec31b7f661a682f9f88cae2ad::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitdf03c9bec31b7f661a682f9f88cae2ad::$classMap; }, null, ClassLoader::class); }