Updated Rector to commit 44c95d4157d8b3d2db32e9c352c0202064ad0a40

44c95d4157 Add skipped Rectors to list-rules (#3162)
This commit is contained in:
Tomas Votruba 2022-12-06 13:36:55 +00:00
parent 7bd500a158
commit 639da95550
5 changed files with 43 additions and 16 deletions

View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = 'd3abaa1d05318488f8c1f401fc46a9e48b056d4f'; public const PACKAGE_VERSION = '44c95d4157d8b3d2db32e9c352c0202064ad0a40';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2022-12-06 14:07:43'; public const RELEASE_DATE = '2022-12-06 13:31:32';
/** /**
* @var int * @var int
*/ */

View File

@ -10,6 +10,7 @@ use Rector\Core\Console\Output\RectorOutputStyle;
use Rector\Core\Contract\Rector\RectorInterface; use Rector\Core\Contract\Rector\RectorInterface;
use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface; use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface;
use Rector\PostRector\Contract\Rector\PostRectorInterface; use Rector\PostRector\Contract\Rector\PostRectorInterface;
use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver;
use RectorPrefix202212\Symfony\Component\Console\Command\Command; use RectorPrefix202212\Symfony\Component\Console\Command\Command;
use RectorPrefix202212\Symfony\Component\Console\Input\InputInterface; use RectorPrefix202212\Symfony\Component\Console\Input\InputInterface;
use RectorPrefix202212\Symfony\Component\Console\Input\InputOption; use RectorPrefix202212\Symfony\Component\Console\Input\InputOption;
@ -21,6 +22,11 @@ final class ListRulesCommand extends Command
* @var \Rector\Core\Console\Output\RectorOutputStyle * @var \Rector\Core\Console\Output\RectorOutputStyle
*/ */
private $rectorOutputStyle; private $rectorOutputStyle;
/**
* @readonly
* @var \Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver
*/
private $skippedClassResolver;
/** /**
* @var RectorInterface[] * @var RectorInterface[]
* @readonly * @readonly
@ -29,9 +35,10 @@ final class ListRulesCommand extends Command
/** /**
* @param RectorInterface[] $rectors * @param RectorInterface[] $rectors
*/ */
public function __construct(RectorOutputStyle $rectorOutputStyle, array $rectors) public function __construct(RectorOutputStyle $rectorOutputStyle, SkippedClassResolver $skippedClassResolver, array $rectors)
{ {
$this->rectorOutputStyle = $rectorOutputStyle; $this->rectorOutputStyle = $rectorOutputStyle;
$this->skippedClassResolver = $skippedClassResolver;
$this->rectors = $rectors; $this->rectors = $rectors;
parent::__construct(); parent::__construct();
} }
@ -44,14 +51,19 @@ final class ListRulesCommand extends Command
protected function execute(InputInterface $input, OutputInterface $output) : int protected function execute(InputInterface $input, OutputInterface $output) : int
{ {
$rectorClasses = $this->resolveRectorClasses(); $rectorClasses = $this->resolveRectorClasses();
$skippedClasses = $this->getSkippedCheckers();
$outputFormat = $input->getOption(Option::OUTPUT_FORMAT); $outputFormat = $input->getOption(Option::OUTPUT_FORMAT);
if ($outputFormat === 'json') { if ($outputFormat === 'json') {
$data = ['rectors' => $rectorClasses]; $data = ['rectors' => $rectorClasses, 'skipped-rectors' => $skippedClasses];
echo Json::encode($data, Json::PRETTY) . \PHP_EOL; echo Json::encode($data, Json::PRETTY) . \PHP_EOL;
return Command::SUCCESS; return Command::SUCCESS;
} }
$this->rectorOutputStyle->title('Loaded Rector rules'); $this->rectorOutputStyle->title('Loaded Rector rules');
$this->rectorOutputStyle->listing($rectorClasses); $this->rectorOutputStyle->listing($rectorClasses);
if ($skippedClasses !== []) {
$this->rectorOutputStyle->title('Skipped Rector rules');
$this->rectorOutputStyle->listing($skippedClasses);
}
return Command::SUCCESS; return Command::SUCCESS;
} }
/** /**
@ -71,4 +83,19 @@ final class ListRulesCommand extends Command
\sort($rectorClasses); \sort($rectorClasses);
return $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;
}
} }

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75::getLoader(); return ComposerAutoloaderInitfcc9c77a3d63982f159c077d4b5b6706::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75 class ComposerAutoloaderInitfcc9c77a3d63982f159c077d4b5b6706
{ {
private static $loader; private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75
return self::$loader; 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__)); 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'; 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->setClassMapAuthoritative(true);
$loader->register(true); $loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$files; $includeFiles = \Composer\Autoload\ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$files;
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirefeaa61d1178cf36daa1000bff0cefb75($fileIdentifier, $file); composerRequirefcc9c77a3d63982f159c077d4b5b6706($fileIdentifier, $file);
} }
return $loader; return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitfeaa61d1178cf36daa1000bff0cefb75
* @param string $file * @param string $file
* @return void * @return void
*/ */
function composerRequirefeaa61d1178cf36daa1000bff0cefb75($fileIdentifier, $file) function composerRequirefcc9c77a3d63982f159c077d4b5b6706($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75 class ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706
{ {
public static $files = array ( public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3020,9 +3020,9 @@ class ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitfeaa61d1178cf36daa1000bff0cefb75::$classMap; $loader->classMap = ComposerStaticInitfcc9c77a3d63982f159c077d4b5b6706::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }