make sue of rector runner

Author: TomasVotruba

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,13 +39,6 @@ public function forFile(File $file): array
     {
         $rectorsForPath = [];
         foreach ($this->rectors as $rector) {
-            var_dump($rector);
-            var_dump($file->getFilePath());
-
-            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,9 +71,9 @@ 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;
-        }
+        //        if ($this->skipper->shouldSkipRectorAndFile($postRector, $filePath)) {
+        //            return true;
+        //        }
 
         // skip renaming if rename class rector is skipped
         if ($postRector instanceof ClassRenamingPostRector && $this->skipper->shouldSkipRectorAndFile(

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
@@ -71,14 +65,14 @@ public function run(RectorInterface $rector, Node $node): int|Node|null|array
         // class/path skip is configured for this rule and file: run the rule on a deep clone to learn
         // whether it would actually have changed anything. Only a skip that prevents a real change
         // counts as used; the original node is left untouched, so the file stays skipped either way.
-        //        $skipMatch = $this->skipper->matchSkip($rector, $filePath);
-        //        if ($skipMatch instanceof SkipMatch) {
-        //            if ($rector->refactor($this->cloneNode($node)) !== null) {
-        //                $this->skipper->markSkipUsed($skipMatch);
-        //            }
-        //
-        //            return null;
-        //        }
+        $skipMatch = $this->skipper->matchSkip($rector, $filePath);
+        if ($skipMatch instanceof SkipMatch) {
+            if ($rector->refactor($this->cloneNode($node)) !== null) {
+                $this->skipper->markSkipUsed($skipMatch);
+            }
+
+            return null;
+        }
 
         // ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN
         $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $node;

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);