From d33e363a754405fff68d753158262054119a2d00 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 14 Dec 2021 08:15:01 +0000 Subject: [PATCH] Updated Rector to commit be53990e5ded97da0ed922b538aa0dd7c28dd100 https://github.com/rectorphp/rector-src/commit/be53990e5ded97da0ed922b538aa0dd7c28dd100 [Php80] Handle abstract method on StringableForToStringRector (#1483) --- .../Rector/Class_/StringableForToStringRector.php | 3 +++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/rules/Php80/Rector/Class_/StringableForToStringRector.php b/rules/Php80/Rector/Class_/StringableForToStringRector.php index 1698d89359a..86866856439 100644 --- a/rules/Php80/Rector/Class_/StringableForToStringRector.php +++ b/rules/Php80/Rector/Class_/StringableForToStringRector.php @@ -109,6 +109,9 @@ CODE_SAMPLE } private function processNotStringType(\PhpParser\Node\Stmt\ClassMethod $toStringClassMethod) : void { + if ($toStringClassMethod->isAbstract()) { + return; + } $hasReturn = $this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($toStringClassMethod, \PhpParser\Node\Stmt\Return_::class); if (!$hasReturn) { $stmts = (array) $toStringClassMethod->stmts; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 3407a076d5a..2893cfca057 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'a7fe982fcbe5901a7e072ec3911cdd201536eb01'; + public const PACKAGE_VERSION = 'be53990e5ded97da0ed922b538aa0dd7c28dd100'; /** * @var string */ - public const RELEASE_DATE = '2021-12-14 09:00:20'; + public const RELEASE_DATE = '2021-12-14 09:00:45'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20211214\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index f2c0ef54462..1d65122a9f2 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3::getLoader(); +return ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 2a8f01d99ea..4afada45ffc 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3 +class ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594', '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\ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4ce333fe066a8c4caab802e425b53594::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit4ce333fe066a8c4caab802e425b53594::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirecfd8902248b1aa23e73871ae46edafb3($fileIdentifier, $file); + composerRequire4ce333fe066a8c4caab802e425b53594($fileIdentifier, $file); } return $loader; } } -function composerRequirecfd8902248b1aa23e73871ae46edafb3($fileIdentifier, $file) +function composerRequire4ce333fe066a8c4caab802e425b53594($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index c69b2a88adc..4b081326eea 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3 +class ComposerStaticInit4ce333fe066a8c4caab802e425b53594 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3822,9 +3822,9 @@ class ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitcfd8902248b1aa23e73871ae46edafb3::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4ce333fe066a8c4caab802e425b53594::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4ce333fe066a8c4caab802e425b53594::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit4ce333fe066a8c4caab802e425b53594::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 1fceeb9d5d8..c056239912f 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) { spl_autoload_call('RectorPrefix20211214\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3', false) && !interface_exists('ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3', false) && !trait_exists('ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3', false)) { - spl_autoload_call('RectorPrefix20211214\ComposerAutoloaderInitcfd8902248b1aa23e73871ae46edafb3'); +if (!class_exists('ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594', false) && !interface_exists('ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594', false) && !trait_exists('ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594', false)) { + spl_autoload_call('RectorPrefix20211214\ComposerAutoloaderInit4ce333fe066a8c4caab802e425b53594'); } 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('RectorPrefix20211214\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -81,9 +81,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20211214\print_node(...func_get_args()); } } -if (!function_exists('composerRequirecfd8902248b1aa23e73871ae46edafb3')) { - function composerRequirecfd8902248b1aa23e73871ae46edafb3() { - return \RectorPrefix20211214\composerRequirecfd8902248b1aa23e73871ae46edafb3(...func_get_args()); +if (!function_exists('composerRequire4ce333fe066a8c4caab802e425b53594')) { + function composerRequire4ce333fe066a8c4caab802e425b53594() { + return \RectorPrefix20211214\composerRequire4ce333fe066a8c4caab802e425b53594(...func_get_args()); } } if (!function_exists('scanPath')) {