From 639da955509647567740da315c12f2c5126a879c Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 6 Dec 2022 13:36:55 +0000 Subject: [PATCH] Updated Rector to commit 44c95d4157d8b3d2db32e9c352c0202064ad0a40 https://github.com/rectorphp/rector-src/commit/44c95d4157d8b3d2db32e9c352c0202064ad0a40 Add skipped Rectors to list-rules (#3162) --- src/Application/VersionResolver.php | 4 +-- src/Console/Command/ListRulesCommand.php | 31 ++++++++++++++++++++++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++------ vendor/composer/autoload_static.php | 8 +++--- 5 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index e3ff1cc376a..c3ff7b35427 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 = 'd3abaa1d05318488f8c1f401fc46a9e48b056d4f'; + public const PACKAGE_VERSION = '44c95d4157d8b3d2db32e9c352c0202064ad0a40'; /** * @api * @var string */ - public const RELEASE_DATE = '2022-12-06 14:07:43'; + public const RELEASE_DATE = '2022-12-06 13:31:32'; /** * @var int */ diff --git a/src/Console/Command/ListRulesCommand.php b/src/Console/Command/ListRulesCommand.php index 741e665db73..5f353c61b86 100644 --- a/src/Console/Command/ListRulesCommand.php +++ b/src/Console/Command/ListRulesCommand.php @@ -10,6 +10,7 @@ use Rector\Core\Console\Output\RectorOutputStyle; use Rector\Core\Contract\Rector\RectorInterface; use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface; use Rector\PostRector\Contract\Rector\PostRectorInterface; +use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver; use RectorPrefix202212\Symfony\Component\Console\Command\Command; use RectorPrefix202212\Symfony\Component\Console\Input\InputInterface; use RectorPrefix202212\Symfony\Component\Console\Input\InputOption; @@ -21,6 +22,11 @@ final class ListRulesCommand extends Command * @var \Rector\Core\Console\Output\RectorOutputStyle */ private $rectorOutputStyle; + /** + * @readonly + * @var \Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver + */ + private $skippedClassResolver; /** * @var RectorInterface[] * @readonly @@ -29,9 +35,10 @@ final class ListRulesCommand extends Command /** * @param RectorInterface[] $rectors */ - public function __construct(RectorOutputStyle $rectorOutputStyle, array $rectors) + public function __construct(RectorOutputStyle $rectorOutputStyle, SkippedClassResolver $skippedClassResolver, array $rectors) { $this->rectorOutputStyle = $rectorOutputStyle; + $this->skippedClassResolver = $skippedClassResolver; $this->rectors = $rectors; parent::__construct(); } @@ -44,14 +51,19 @@ final class ListRulesCommand extends Command protected function execute(InputInterface $input, OutputInterface $output) : int { $rectorClasses = $this->resolveRectorClasses(); + $skippedClasses = $this->getSkippedCheckers(); $outputFormat = $input->getOption(Option::OUTPUT_FORMAT); if ($outputFormat === 'json') { - $data = ['rectors' => $rectorClasses]; + $data = ['rectors' => $rectorClasses, 'skipped-rectors' => $skippedClasses]; echo Json::encode($data, Json::PRETTY) . \PHP_EOL; return Command::SUCCESS; } $this->rectorOutputStyle->title('Loaded Rector rules'); $this->rectorOutputStyle->listing($rectorClasses); + if ($skippedClasses !== []) { + $this->rectorOutputStyle->title('Skipped Rector rules'); + $this->rectorOutputStyle->listing($skippedClasses); + } return Command::SUCCESS; } /** @@ -71,4 +83,19 @@ final class ListRulesCommand extends Command \sort($rectorClasses); return $rectorClasses; } + /** + * @return string[] + */ + private function getSkippedCheckers() : array + { + $skippedCheckers = []; + foreach ($this->skippedClassResolver->resolve() as $checkerClass => $fileList) { + // ignore specific skips + if ($fileList !== null) { + continue; + } + $skippedCheckers[] = $checkerClass; + } + return $skippedCheckers; + } } diff --git a/vendor/autoload.php b/vendor/autoload.php index f935a918e50..b8f38d9495a 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 ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75::getLoader(); +return ComposerAutoloaderInitfcc9c77a3d63982f159c077d4b5b6706::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b682b2700d9..d03fe5eaa10 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75 +class ComposerAutoloaderInitfcc9c77a3d63982f159c077d4b5b6706 { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitfcc9c77a3d63982f159c077d4b5b6706', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitfcc9c77a3d63982f159c077d4b5b6706', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirefeaa61d1178cf36daa1000bff0cefb75($fileIdentifier, $file); + composerRequirefcc9c77a3d63982f159c077d4b5b6706($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75 * @param string $file * @return void */ -function composerRequirefeaa61d1178cf36daa1000bff0cefb75($fileIdentifier, $file) +function composerRequirefcc9c77a3d63982f159c077d4b5b6706($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 71c2e3ce016..21537d82d55 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75 +class ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3020,9 +3020,9 @@ class ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$classMap; }, null, ClassLoader::class); }