Updated Rector to commit ca6cf9cc8e20dbb5350af21d2da872fe348775bb

rectorphp/rector-src@ca6cf9c [dx] warn early about deprecated skipped rules, as not neccessary to skip anymore (#7742)

Author: TomasVotruba

rules/Php81/Rector/Array_/ArrayToFirstClassCallableRector.php

@@ -29,7 +29,7 @@
  * @see RFC https://wiki.php.net/rfc/first_class_callable_syntax
  * @see \Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\ArrayToFirstClassCallableRectorTest
  */
-final class ArrayToFirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
+class ArrayToFirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
 {
     /**
      * @readonly

rules/Php81/Rector/Array_/FirstClassCallableRector.php

@@ -0,0 +1,23 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Php81\Rector\Array_;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
+/**
+ * @deprecated Renamed to \Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector
+ */
+final class FirstClassCallableRector extends \Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector implements DeprecatedInterface
+{
+    /**
+     * @return \PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\MethodCall|null
+     */
+    public function refactor(Node $node)
+    {
+        throw new ShouldNotHappenException(sprintf('%s is deprecated and renamed to "%s". Use it instead.', self::class, \Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector::class));
+    }
+}

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2.2.13';
+    public const PACKAGE_VERSION = 'ca6cf9cc8e20dbb5350af21d2da872fe348775bb';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-12-09 07:41:03';
+    public const RELEASE_DATE = '2025-12-09 11:53:46';
     /**
      * @var int
      */

src/Console/Command/ListRulesCommand.php

@@ -50,7 +50,7 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $rectorClasses = $this->resolveRectorClasses();
-        $skippedClasses = $this->getSkippedCheckers();
+        $skippedClasses = $this->getSkippedRectorClasses();
         $outputFormat = $input->getOption(Option::OUTPUT_FORMAT);
         if ($outputFormat === 'json') {
             $data = ['rectors' => $rectorClasses, 'skipped-rectors' => $skippedClasses];
@@ -78,18 +78,18 @@ private function resolveRectorClasses(): array
         return array_unique($rectorClasses);
     }
     /**
-     * @return string[]
+     * @return array<class-string>
      */
-    private function getSkippedCheckers(): array
+    private function getSkippedRectorClasses(): array
     {
-        $skippedCheckers = [];
-        foreach ($this->skippedClassResolver->resolve() as $checkerClass => $fileList) {
+        $skippedRectorClasses = [];
+        foreach ($this->skippedClassResolver->resolve() as $rectorClass => $fileList) {
             // ignore specific skips
             if ($fileList !== null) {
                 continue;
             }
-            $skippedCheckers[] = $checkerClass;
+            $skippedRectorClasses[] = $rectorClass;
         }
-        return $skippedCheckers;
+        return $skippedRectorClasses;
     }
 }

src/Console/Command/ProcessCommand.php

@@ -18,6 +18,7 @@
 use Rector\Exception\ShouldNotHappenException;
 use Rector\Reporting\DeprecatedRulesReporter;
 use Rector\Reporting\MissConfigurationReporter;
+use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver;
 use Rector\StaticReflection\DynamicSourceLocatorDecorator;
 use Rector\Util\MemoryLimiter;
 use Rector\ValueObject\Configuration;
@@ -78,7 +79,11 @@ final class ProcessCommand extends Command
      * @readonly
      */
     private ConfigurationRuleFilter $configurationRuleFilter;
-    public function __construct(AdditionalAutoloader $additionalAutoloader, ChangedFilesDetector $changedFilesDetector, ConfigInitializer $configInitializer, ApplicationFileProcessor $applicationFileProcessor, DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator, OutputFormatterCollector $outputFormatterCollector, SymfonyStyle $symfonyStyle, MemoryLimiter $memoryLimiter, ConfigurationFactory $configurationFactory, DeprecatedRulesReporter $deprecatedRulesReporter, MissConfigurationReporter $missConfigurationReporter, ConfigurationRuleFilter $configurationRuleFilter)
+    /**
+     * @readonly
+     */
+    private SkippedClassResolver $skippedClassResolver;
+    public function __construct(AdditionalAutoloader $additionalAutoloader, ChangedFilesDetector $changedFilesDetector, ConfigInitializer $configInitializer, ApplicationFileProcessor $applicationFileProcessor, DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator, OutputFormatterCollector $outputFormatterCollector, SymfonyStyle $symfonyStyle, MemoryLimiter $memoryLimiter, ConfigurationFactory $configurationFactory, DeprecatedRulesReporter $deprecatedRulesReporter, MissConfigurationReporter $missConfigurationReporter, ConfigurationRuleFilter $configurationRuleFilter, SkippedClassResolver $skippedClassResolver)
     {
         $this->additionalAutoloader = $additionalAutoloader;
         $this->changedFilesDetector = $changedFilesDetector;
@@ -92,6 +97,7 @@ public function __construct(AdditionalAutoloader $additionalAutoloader, ChangedF
         $this->deprecatedRulesReporter = $deprecatedRulesReporter;
         $this->missConfigurationReporter = $missConfigurationReporter;
         $this->configurationRuleFilter = $configurationRuleFilter;
+        $this->skippedClassResolver = $skippedClassResolver;
         parent::__construct();
     }
     protected function configure(): void
@@ -139,6 +145,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($configuration->getLevelOverflows() as $levelOverflow) {
             $this->reportLevelOverflow($levelOverflow);
         }
+        // 0. warn about skipped rules that are deprecated
+        if ($this->skippedClassResolver->resolveDeprecatedSkippedClasses() !== []) {
+            $this->symfonyStyle->warning(sprintf('These rules are skipped, but are deprecated. Most likely you do not need to skip them anymore as not part of any set and remove them: %s* %s', "\n\n", implode(' * ', $this->skippedClassResolver->resolveDeprecatedSkippedClasses()) . "\n"));
+        }
         // 1. warn about rules registered in both withRules() and sets to avoid bloated rector.php configs
         $setAndRulesDuplicatedRegistrations = $configuration->getBothSetAndRulesDuplicatedRegistrations();
         if ($setAndRulesDuplicatedRegistrations !== []) {

src/Skipper/SkipCriteriaResolver/SkippedClassResolver.php

@@ -3,30 +3,42 @@
 declare (strict_types=1);
 namespace Rector\Skipper\SkipCriteriaResolver;
 
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
+/**
+ * @see \Rector\Tests\Skipper\Skipper\SkippedClassResolverTest
+ */
 final class SkippedClassResolver
 {
     /**
-     * @var null|array<string, string[]|null>
+     * @var null|array<class-string, string[]|null>
      */
-    private $skippedClasses = null;
+    private $skippedClassesToFiles = null;
     /**
-     * @return array<string, string[]|null>
+     * @return array<class-string<DeprecatedInterface>>
+     */
+    public function resolveDeprecatedSkippedClasses(): array
+    {
+        $skippedClassNames = array_keys($this->resolve());
+        return array_filter($skippedClassNames, fn(string $class): bool => is_a($class, DeprecatedInterface::class, \true));
+    }
+    /**
+     * @return array<class-string, string[]|null>
      */
     public function resolve(): array
     {
         // disable cache in tests
         if (StaticPHPUnitEnvironment::isPHPUnitRun()) {
-            $this->skippedClasses = null;
+            $this->skippedClassesToFiles = null;
         }
         // already cached, even only empty array
-        if ($this->skippedClasses !== null) {
-            return $this->skippedClasses;
+        if ($this->skippedClassesToFiles !== null) {
+            return $this->skippedClassesToFiles;
         }
         $skip = SimpleParameterProvider::provideArrayParameter(Option::SKIP);
-        $this->skippedClasses = [];
+        $this->skippedClassesToFiles = [];
         foreach ($skip as $key => $value) {
             // e.g. [SomeClass::class] → shift values to [SomeClass::class => null]
             if (is_int($key)) {
@@ -40,8 +52,8 @@ public function resolve(): array
             if (!class_exists($key) && !interface_exists($key)) {
                 continue;
             }
-            $this->skippedClasses[$key] = $value;
+            $this->skippedClassesToFiles[$key] = $value;
         }
-        return $this->skippedClasses;
+        return $this->skippedClassesToFiles;
     }
 }

vendor/composer/autoload_classmap.php

@@ -2197,6 +2197,7 @@
     'Rector\\Php81\\NodeFactory\\EnumFactory' => $baseDir . '/rules/Php81/NodeFactory/EnumFactory.php',
     'Rector\\Php81\\NodeManipulator\\NullToStrictStringIntConverter' => $baseDir . '/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php',
     'Rector\\Php81\\Rector\\Array_\\ArrayToFirstClassCallableRector' => $baseDir . '/rules/Php81/Rector/Array_/ArrayToFirstClassCallableRector.php',
+    'Rector\\Php81\\Rector\\Array_\\FirstClassCallableRector' => $baseDir . '/rules/Php81/Rector/Array_/FirstClassCallableRector.php',
     'Rector\\Php81\\Rector\\ClassMethod\\NewInInitializerRector' => $baseDir . '/rules/Php81/Rector/ClassMethod/NewInInitializerRector.php',
     'Rector\\Php81\\Rector\\Class_\\MyCLabsClassToEnumRector' => $baseDir . '/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php',
     'Rector\\Php81\\Rector\\Class_\\SpatieEnumClassToEnumRector' => $baseDir . '/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php',

vendor/composer/autoload_static.php

@@ -2457,6 +2457,7 @@ class ComposerStaticInit74acfc93a8a335df0429191cbf621bda
         'Rector\\Php81\\NodeFactory\\EnumFactory' => __DIR__ . '/../..' . '/rules/Php81/NodeFactory/EnumFactory.php',
         'Rector\\Php81\\NodeManipulator\\NullToStrictStringIntConverter' => __DIR__ . '/../..' . '/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php',
         'Rector\\Php81\\Rector\\Array_\\ArrayToFirstClassCallableRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/Array_/ArrayToFirstClassCallableRector.php',
+        'Rector\\Php81\\Rector\\Array_\\FirstClassCallableRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/Array_/FirstClassCallableRector.php',
         'Rector\\Php81\\Rector\\ClassMethod\\NewInInitializerRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/ClassMethod/NewInInitializerRector.php',
         'Rector\\Php81\\Rector\\Class_\\MyCLabsClassToEnumRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php',
         'Rector\\Php81\\Rector\\Class_\\SpatieEnumClassToEnumRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php',