From b5d89bc18d1a2a56cdeea7b43c3f3de692a0eb0e Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 1 Jan 2022 11:27:52 +0000 Subject: [PATCH] Updated Rector to commit 34c61ba4498150972db843fca807416540ca71e8 https://github.com/rectorphp/rector-src/commit/34c61ba4498150972db843fca807416540ca71e8 Bump EndBug/add-and-commit from 7.4.0 to 7.5.0 (#1607) --- .../DowngradeThrowableTypeDeclarationRector.php | 6 +++--- 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(+), 22 deletions(-) diff --git a/rules/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector.php b/rules/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector.php index 18d68dde1f2..9ee6c25cda2 100644 --- a/rules/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector.php +++ b/rules/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector.php @@ -64,11 +64,11 @@ CODE_SAMPLE */ public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node { - $throwableType = new \PHPStan\Type\ObjectType('Throwable'); + $objectType = new \PHPStan\Type\ObjectType('Throwable'); foreach ($node->getParams() as $param) { - $this->phpDocFromTypeDeclarationDecorator->decorateParamWithSpecificType($param, $node, $throwableType); + $this->phpDocFromTypeDeclarationDecorator->decorateParamWithSpecificType($param, $node, $objectType); } - if (!$this->phpDocFromTypeDeclarationDecorator->decorateReturnWithSpecificType($node, $throwableType)) { + if (!$this->phpDocFromTypeDeclarationDecorator->decorateReturnWithSpecificType($node, $objectType)) { return null; } return $node; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 9f76b16aca9..c3bbca053e4 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '7d927c9a41a68ed456a9ba3a69b3bc11f704a717'; + public const PACKAGE_VERSION = '34c61ba4498150972db843fca807416540ca71e8'; /** * @var string */ - public const RELEASE_DATE = '2022-01-01 18:08:20'; + public const RELEASE_DATE = '2022-01-01 18:18:04'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20220101\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index abdafa1c8f6..c976f74e0e1 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4::getLoader(); +return ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 9a770fa7c7a..6c360de7d8d 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4 +class ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7', '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\ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit48c31c6acffc68fd072e20917a1836b7::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,12 +42,12 @@ class ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit48c31c6acffc68fd072e20917a1836b7::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire3c272c017a0d155da3ab6a0f5d9b31f4($fileIdentifier, $file); + composerRequire48c31c6acffc68fd072e20917a1836b7($fileIdentifier, $file); } return $loader; @@ -59,7 +59,7 @@ class ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4 * @param string $file * @return void */ -function composerRequire3c272c017a0d155da3ab6a0f5d9b31f4($fileIdentifier, $file) +function composerRequire48c31c6acffc68fd072e20917a1836b7($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 1a661bff699..27de879fec4 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4 +class ComposerStaticInit48c31c6acffc68fd072e20917a1836b7 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3846,9 +3846,9 @@ class ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit3c272c017a0d155da3ab6a0f5d9b31f4::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit48c31c6acffc68fd072e20917a1836b7::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit48c31c6acffc68fd072e20917a1836b7::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit48c31c6acffc68fd072e20917a1836b7::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 96c96075bc6..19bbb248d63 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -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('RectorPrefix20220101\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4', false) && !interface_exists('ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4', false) && !trait_exists('ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4', false)) { - spl_autoload_call('RectorPrefix20220101\ComposerAutoloaderInit3c272c017a0d155da3ab6a0f5d9b31f4'); +if (!class_exists('ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7', false) && !interface_exists('ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7', false) && !trait_exists('ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7', false)) { + spl_autoload_call('RectorPrefix20220101\ComposerAutoloaderInit48c31c6acffc68fd072e20917a1836b7'); } 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('RectorPrefix20220101\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -78,9 +78,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20220101\print_node(...func_get_args()); } } -if (!function_exists('composerRequire3c272c017a0d155da3ab6a0f5d9b31f4')) { - function composerRequire3c272c017a0d155da3ab6a0f5d9b31f4() { - return \RectorPrefix20220101\composerRequire3c272c017a0d155da3ab6a0f5d9b31f4(...func_get_args()); +if (!function_exists('composerRequire48c31c6acffc68fd072e20917a1836b7')) { + function composerRequire48c31c6acffc68fd072e20917a1836b7() { + return \RectorPrefix20220101\composerRequire48c31c6acffc68fd072e20917a1836b7(...func_get_args()); } } if (!function_exists('scanPath')) {