From 341eb6df4466af30469427df31344618a986bfad Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 7 Aug 2023 18:15:37 +0000 Subject: [PATCH] Updated Rector to commit fe9d91c0c0f9553e27dfae17a391236f27498e5c https://github.com/rectorphp/rector-src/commit/fe9d91c0c0f9553e27dfae17a391236f27498e5c [DX] Make use of Laravel container - step #14 (#4709) --- .../SkipCriteriaResolver/SkippedClassResolver.php | 3 ++- .../SkipCriteriaResolver/SkippedPathsResolver.php | 3 ++- src/Application/VersionResolver.php | 4 ++-- src/Console/Command/ListRulesCommand.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/Skipper/SkipCriteriaResolver/SkippedClassResolver.php b/packages/Skipper/SkipCriteriaResolver/SkippedClassResolver.php index e11c1ae1d1f..219715eaeb8 100644 --- a/packages/Skipper/SkipCriteriaResolver/SkippedClassResolver.php +++ b/packages/Skipper/SkipCriteriaResolver/SkippedClassResolver.php @@ -26,7 +26,8 @@ final class SkippedClassResolver */ public function resolve() : array { - if ($this->skippedClasses !== []) { + // skip cache in tests + if ($this->skippedClasses !== [] && !\defined('PHPUNIT_COMPOSER_INSTALL')) { return $this->skippedClasses; } $skip = SimpleParameterProvider::provideArrayParameter(Option::SKIP); diff --git a/packages/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php b/packages/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php index 268e794d0f7..5c9dd673790 100644 --- a/packages/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php +++ b/packages/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php @@ -29,7 +29,8 @@ final class SkippedPathsResolver */ public function resolve() : array { - if ($this->skippedPaths !== []) { + // disable cache in tests + if ($this->skippedPaths !== [] && !\defined('PHPUNIT_COMPOSER_INSTALL')) { return $this->skippedPaths; } $skip = SimpleParameterProvider::provideArrayParameter(Option::SKIP); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 0b538d0987b..8b51492d0c7 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 = '58f3e0cb15ccf65e9a364da08b272d9313554623'; + public const PACKAGE_VERSION = 'fe9d91c0c0f9553e27dfae17a391236f27498e5c'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-07 18:53:52'; + public const RELEASE_DATE = '2023-08-07 18:11:22'; /** * @var int */ diff --git a/src/Console/Command/ListRulesCommand.php b/src/Console/Command/ListRulesCommand.php index 0495c263372..c6f29aaa155 100644 --- a/src/Console/Command/ListRulesCommand.php +++ b/src/Console/Command/ListRulesCommand.php @@ -41,9 +41,9 @@ final class ListRulesCommand extends Command $this->skippedClassResolver = $skippedClassResolver; parent::__construct(); if ($rectors instanceof RewindableGenerator) { - $rectors = $rectors->getIterator(); + $rectors = \iterator_to_array($rectors->getIterator()); } - $this->rectors = \iterator_to_array($rectors); + $this->rectors = $rectors; } protected function configure() : void { diff --git a/vendor/autoload.php b/vendor/autoload.php index d795ec9036f..0d52c08fa20 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 ComposerAutoloaderInit5a439b0f4203c96f0be25162f5e23b75::getLoader(); +return ComposerAutoloaderInit559d7c64beb2543afb27088e8c091ad9::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b03e05e9bd6..5c4ced71ab7 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit5a439b0f4203c96f0be25162f5e23b75 +class ComposerAutoloaderInit559d7c64beb2543afb27088e8c091ad9 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit5a439b0f4203c96f0be25162f5e23b75 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit5a439b0f4203c96f0be25162f5e23b75', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit559d7c64beb2543afb27088e8c091ad9', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit5a439b0f4203c96f0be25162f5e23b75', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit559d7c64beb2543afb27088e8c091ad9', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit559d7c64beb2543afb27088e8c091ad9::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit559d7c64beb2543afb27088e8c091ad9::$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 b0dbd223f2e..12bf0420580 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75 +class ComposerStaticInit559d7c64beb2543afb27088e8c091ad9 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3012,9 +3012,9 @@ class ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit5a439b0f4203c96f0be25162f5e23b75::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit559d7c64beb2543afb27088e8c091ad9::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit559d7c64beb2543afb27088e8c091ad9::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit559d7c64beb2543afb27088e8c091ad9::$classMap; }, null, ClassLoader::class); }