From 79315b7df208e62a263c0d56ff0e9daee652c9e6 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 1 May 2022 18:14:46 +0000 Subject: [PATCH] Updated Rector to commit 1c828eea13161f5db8936cd21484dced04325449 https://github.com/rectorphp/rector-src/commit/1c828eea13161f5db8936cd21484dced04325449 work around bug with autoload collistion with custom PHPStan rule test --- bootstrap.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, 24 insertions(+), 20 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index 9b2b440a270..3da92efab97 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -17,7 +17,11 @@ spl_autoload_register(function (string $class): void { // prefixed version autoload $composerAutoloader = require __DIR__ . '/vendor/autoload.php'; } - $composerAutoloader->loadClass($class); + + // some weird collision with PHPStan custom rule tests + if (! is_int($composerAutoloader)) { + $composerAutoloader->loadClass($class); + } } // aliased by php-scoper, that's why its missing diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index cd194f66164..a96abdb0eb8 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '0.12.23'; + public const PACKAGE_VERSION = '1c828eea13161f5db8936cd21484dced04325449'; /** * @var string */ - public const RELEASE_DATE = '2022-05-01 14:53:41'; + public const RELEASE_DATE = '2022-05-01 20:08:53'; /** * @var string */ diff --git a/vendor/autoload.php b/vendor/autoload.php index b0a9958e3a6..9749dad09ba 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38::getLoader(); +return ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index c04d0a5f731..f8ecc97679f 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38 +class ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit01e12e5ab7c25d7c701e521d3794c1ab::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInit01e12e5ab7c25d7c701e521d3794c1ab::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiref1f352c5a4d5427f97395636cbdeeb38($fileIdentifier, $file); + composerRequire01e12e5ab7c25d7c701e521d3794c1ab($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38 * @param string $file * @return void */ -function composerRequiref1f352c5a4d5427f97395636cbdeeb38($fileIdentifier, $file) +function composerRequire01e12e5ab7c25d7c701e521d3794c1ab($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 45733303f5a..b95bf08882d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38 +class ComposerStaticInit01e12e5ab7c25d7c701e521d3794c1ab { public static $files = array ( '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', @@ -3880,9 +3880,9 @@ class ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitf1f352c5a4d5427f97395636cbdeeb38::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit01e12e5ab7c25d7c701e521d3794c1ab::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit01e12e5ab7c25d7c701e521d3794c1ab::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit01e12e5ab7c25d7c701e521d3794c1ab::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 6ad877ed76c..791dda0ad97 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('RectorPrefix20220501\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38', false) && !interface_exists('ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38', false) && !trait_exists('ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38', false)) { - spl_autoload_call('RectorPrefix20220501\ComposerAutoloaderInitf1f352c5a4d5427f97395636cbdeeb38'); +if (!class_exists('ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab', false) && !interface_exists('ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab', false) && !trait_exists('ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab', false)) { + spl_autoload_call('RectorPrefix20220501\ComposerAutoloaderInit01e12e5ab7c25d7c701e521d3794c1ab'); } 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('RectorPrefix20220501\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -59,9 +59,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20220501\print_node(...func_get_args()); } } -if (!function_exists('composerRequiref1f352c5a4d5427f97395636cbdeeb38')) { - function composerRequiref1f352c5a4d5427f97395636cbdeeb38() { - return \RectorPrefix20220501\composerRequiref1f352c5a4d5427f97395636cbdeeb38(...func_get_args()); +if (!function_exists('composerRequire01e12e5ab7c25d7c701e521d3794c1ab')) { + function composerRequire01e12e5ab7c25d7c701e521d3794c1ab() { + return \RectorPrefix20220501\composerRequire01e12e5ab7c25d7c701e521d3794c1ab(...func_get_args()); } } if (!function_exists('scanPath')) {