misc

rules-tests/Renaming/Rector/Name/RenameClassRector/config/skip_after_defined_configured_rule.php

@@ -10,10 +10,9 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->removeUnusedImports();
 
-    $rectorConfig
-        ->ruleWithConfiguration(RenameClassRector::class, [
-            OldClass::class => NewClass::class,
-        ]);
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        OldClass::class => NewClass::class,
+    ]);
 
     // skip the path after defined
     $rectorConfig->skip([

src/Application/FileProcessor.php

@@ -44,6 +44,7 @@ public function __construct(
         private RectorParser $rectorParser,
         private NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator,
         private UsedImportsResolver $usedImportsResolver,
+        private RectorRegistry $rectorRegistry,
     ) {
     }
 
@@ -59,6 +60,9 @@ public function processFile(File $file, Configuration $configuration): FileProce
         $fileHasChanged = false;
         $filePath = $file->getFilePath();
 
+        $currentRectors = $this->rectorRegistry->forFile($file);
+        $this->rectorNodeTraverser->refreshPhpRectors($currentRectors);
+
         do {
             $file->changeHasChanged(false);
 

src/Application/RectorRegistry.php

@@ -6,7 +6,6 @@
 
 use Rector\Contract\Rector\HTMLAverseRectorInterface;
 use Rector\Contract\Rector\RectorInterface;
-use Rector\Skipper\Skipper\Skipper;
 use Rector\ValueObject\Application\File;
 
 /**
@@ -19,7 +18,6 @@ final class RectorRegistry
      */
     public function __construct(
         private array $rectors,
-        private readonly Skipper $skipper
     ) {
     }
 
@@ -41,10 +39,6 @@ public function forFile(File $file): array
     {
         $rectorsForPath = [];
         foreach ($this->rectors as $rector) {
-            if ($this->skipper->shouldSkipRectorAndFile($rector, $file->getFilePath())) {
-                continue;
-            }
-
             if ($rector instanceof HTMLAverseRectorInterface && $file->containsHTML()) {
                 continue;
             }

src/PhpParser/NodeTraverser/RectorNodeTraverser.php

@@ -62,7 +62,6 @@ public function traverse(array $nodes): array
 
     /**
      * @param RectorInterface[] $rectors
-     * @api used in tests to update the active rules
      *
      * @internal Used only in Rector core, not supported outside. Might change any time.
      */

src/PostRector/Application/PostFileProcessor.php

@@ -71,10 +71,6 @@ public function traverse(array $stmts, File $file): array
      */
     private function shouldSkipPostRector(PostRectorInterface $postRector, string $filePath, array $stmts): bool
     {
-        if ($this->skipper->shouldSkipRectorAndFile($postRector, $filePath)) {
-            return true;
-        }
-
         // skip renaming if rename class rector is skipped
         if ($postRector instanceof ClassRenamingPostRector && $this->skipper->shouldSkipRectorAndFile(
             $this->renameClassRector,

src/Rector/RectorRunner.php

@@ -13,7 +13,6 @@
 use Rector\Application\ChangedNodeScopeRefresher;
 use Rector\Application\Provider\CurrentFileProvider;
 use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
-use Rector\Contract\Rector\HTMLAverseRectorInterface;
 use Rector\Contract\Rector\RectorInterface;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\NodeDecorator\CreatedByRuleDecorator;
@@ -56,11 +55,6 @@ public function __construct(
     public function run(RectorInterface $rector, Node $node): int|Node|null|array
     {
         $file = $this->getFile();
-
-        if ($rector instanceof HTMLAverseRectorInterface && $file->containsHTML()) {
-            return null;
-        }
-
         $filePath = $file->getFilePath();
 
         // node already changed by this rule in a previous pass → hard skip

src/Reporting/UnusedSkipResolver.php

@@ -7,8 +7,8 @@
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\FileSystem\FilePathHelper;
-use Rector\Skipper\Skipper\Skipper;
 use Rector\Skipper\SkipCriteriaResolver\SkippedPathsResolver;
+use Rector\Skipper\Skipper\Skipper;
 use Rector\ValueObject\ProcessResult;
 
 /**

tests/Application/RectorRegistryTest.php

@@ -34,11 +34,6 @@ protected function tearDown(): void
 
     public function testForFile(): void
     {
-        $file = new File(__DIR__ . '/skipped_directory/some_file.php', '');
-        $rectorsForPath = $this->rectorRegistry->forFile($file);
-
-        $this->assertSame([], $rectorsForPath);
-
         $file = new File(__DIR__ . '/some_file.php', '');
         $rectorsForPath = $this->rectorRegistry->forFile($file);