Updated Rector to commit dd21759b1194fe28cd266337124fd3035c62ead9

rectorphp/rector-src@dd21759 [skip] mark class/path skip used only when rule would change the file (#8076)

Author: TomasVotruba

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2328ea6338d2496c409aaf2d8a001052e323feda';
+    public const PACKAGE_VERSION = 'dd21759b1194fe28cd266337124fd3035c62ead9';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-21 14:38:56';
+    public const RELEASE_DATE = '2026-06-22 11:04:17';
     /**
      * @var int
      */

src/Rector/AbstractRector.php

@@ -13,7 +13,9 @@
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\Trait_;
+use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor;
+use PhpParser\NodeVisitor\CloningVisitor;
 use PhpParser\NodeVisitorAbstract;
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Type\ObjectType;
@@ -33,6 +35,7 @@
 use Rector\PhpParser\Comparing\NodeComparator;
 use Rector\PhpParser\Node\NodeFactory;
 use Rector\Skipper\Skipper\Skipper;
+use Rector\Skipper\ValueObject\SkipMatch;
 use Rector\ValueObject\Application\File;
 abstract class AbstractRector extends NodeVisitorAbstract implements RectorInterface
 {
@@ -106,7 +109,18 @@ final public function enterNode(Node $node)
             return null;
         }
         $filePath = $this->file->getFilePath();
-        if ($this->skipper->shouldSkipCurrentNode($this, $filePath, static::class, $node)) {
+        // node already changed by this rule in a previous pass → hard skip
+        if ($this->skipper->shouldSkipCurrentNode(static::class, $node)) {
+            return null;
+        }
+        // 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($this, $filePath);
+        if ($skipMatch instanceof SkipMatch) {
+            if ($this->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
@@ -210,6 +224,14 @@ protected function mirrorComments(Node $newNode, Node $oldNode): void
     {
         $this->commentsMerger->mirrorComments($newNode, $oldNode);
     }
+    /**
+     * Deep clone, so a skipped rule can be probed on the clone without mutating the real node.
+     */
+    private function cloneNode(Node $node): Node
+    {
+        $nodeTraverser = new NodeTraverser(new CloningVisitor());
+        return $nodeTraverser->traverse([$node])[0];
+    }
     /**
      * @param Node|Node[] $refactoredNode
      * @return Node|Node[]

src/Skipper/SkipVoter/ClassSkipVoter.php

@@ -6,6 +6,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver;
 use Rector\Skipper\Skipper\SkipSkipper;
+use Rector\Skipper\ValueObject\SkipMatch;
 final class ClassSkipVoter
 {
     /**
@@ -39,9 +40,9 @@ public function match($element): bool
     /**
      * @param string|object $element
      */
-    public function shouldSkip($element, string $filePath): bool
+    public function matchSkip($element, string $filePath): ?SkipMatch
     {
         $skippedClasses = $this->skippedClassResolver->resolve();
-        return $this->skipSkipper->doesMatchSkip($element, $filePath, $skippedClasses);
+        return $this->skipSkipper->match($element, $filePath, $skippedClasses);
     }
 }

src/Skipper/Skipper/SkipSkipper.php

@@ -4,44 +4,38 @@
 namespace Rector\Skipper\Skipper;
 
 use Rector\Skipper\Matcher\FileInfoMatcher;
+use Rector\Skipper\ValueObject\SkipMatch;
 final class SkipSkipper
 {
     /**
      * @readonly
      */
     private FileInfoMatcher $fileInfoMatcher;
-    /**
-     * @readonly
-     */
-    private \Rector\Skipper\Skipper\UsedSkipCollector $usedSkipCollector;
-    public function __construct(FileInfoMatcher $fileInfoMatcher, \Rector\Skipper\Skipper\UsedSkipCollector $usedSkipCollector)
+    public function __construct(FileInfoMatcher $fileInfoMatcher)
     {
         $this->fileInfoMatcher = $fileInfoMatcher;
-        $this->usedSkipCollector = $usedSkipCollector;
     }
     /**
      * @param array<string, string[]|null> $skippedClasses
      * @param object|string $checker
      */
-    public function doesMatchSkip($checker, string $filePath, array $skippedClasses): bool
+    public function match($checker, string $filePath, array $skippedClasses): ?SkipMatch
     {
         foreach ($skippedClasses as $skippedClass => $skippedFiles) {
             if (!is_a($checker, $skippedClass, \true)) {
                 continue;
             }
             // skip everywhere
             if (!is_array($skippedFiles)) {
-                $this->usedSkipCollector->markUsed($skippedClass);
-                return \true;
+                return new SkipMatch($skippedClass, null);
             }
-            // mark the specific matched path used, scoped to its rule - the same path can be skipped
-            // under multiple rules, so the path is nested under its rule, not tracked on its own
+            // the same path can be skipped under multiple rules, so the matched path is reported
+            // scoped to its rule, not tracked on its own
             $matchedPath = $this->fileInfoMatcher->matchPattern($filePath, $skippedFiles);
             if ($matchedPath !== null) {
-                $this->usedSkipCollector->markUsed($skippedClass, $matchedPath);
-                return \true;
+                return new SkipMatch($skippedClass, $matchedPath);
             }
         }
-        return \false;
+        return null;
     }
 }

src/Skipper/Skipper/Skipper.php

@@ -7,6 +7,7 @@
 use Rector\Contract\Rector\RectorInterface;
 use Rector\ProcessAnalyzer\RectifiedAnalyzer;
 use Rector\Skipper\SkipVoter\ClassSkipVoter;
+use Rector\Skipper\ValueObject\SkipMatch;
 /**
  * @api
  * @see \Rector\Tests\Skipper\Skipper\SkipperTest
@@ -25,11 +26,16 @@ final class Skipper
      * @readonly
      */
     private ClassSkipVoter $classSkipVoter;
-    public function __construct(RectifiedAnalyzer $rectifiedAnalyzer, \Rector\Skipper\Skipper\PathSkipper $pathSkipper, ClassSkipVoter $classSkipVoter)
+    /**
+     * @readonly
+     */
+    private \Rector\Skipper\Skipper\UsedSkipCollector $usedSkipCollector;
+    public function __construct(RectifiedAnalyzer $rectifiedAnalyzer, \Rector\Skipper\Skipper\PathSkipper $pathSkipper, ClassSkipVoter $classSkipVoter, \Rector\Skipper\Skipper\UsedSkipCollector $usedSkipCollector)
     {
         $this->rectifiedAnalyzer = $rectifiedAnalyzer;
         $this->pathSkipper = $pathSkipper;
         $this->classSkipVoter = $classSkipVoter;
+        $this->usedSkipCollector = $usedSkipCollector;
     }
     /**
      * @param string|object $element
@@ -47,20 +53,34 @@ public function shouldSkipFilePath(string $filePath): bool
      */
     public function shouldSkipElementAndFilePath($element, string $filePath): bool
     {
-        if (!$this->classSkipVoter->match($element)) {
+        $skipMatch = $this->matchSkip($element, $filePath);
+        if (!$skipMatch instanceof SkipMatch) {
             return \false;
         }
-        return $this->classSkipVoter->shouldSkip($element, $filePath);
+        $this->markSkipUsed($skipMatch);
+        return \true;
     }
     /**
-     * @param class-string<RectorInterface> $rectorClass
+     * Match a class/path skip without marking it used. Callers that can only tell whether the skip
+     * actually prevented a change later on must mark it used themselves via markSkipUsed().
      * @param string|object $element
      */
-    public function shouldSkipCurrentNode($element, string $filePath, string $rectorClass, Node $node): bool
+    public function matchSkip($element, string $filePath): ?SkipMatch
     {
-        if ($this->shouldSkipElementAndFilePath($element, $filePath)) {
-            return \true;
+        if (!$this->classSkipVoter->match($element)) {
+            return null;
         }
+        return $this->classSkipVoter->matchSkip($element, $filePath);
+    }
+    public function markSkipUsed(SkipMatch $skipMatch): void
+    {
+        $this->usedSkipCollector->markUsed($skipMatch->getSkippedClass(), $skipMatch->getMatchedPath());
+    }
+    /**
+     * @param class-string<RectorInterface> $rectorClass
+     */
+    public function shouldSkipCurrentNode(string $rectorClass, Node $node): bool
+    {
         return $this->rectifiedAnalyzer->hasRectified($rectorClass, $node);
     }
 }

src/Skipper/ValueObject/SkipMatch.php

@@ -0,0 +1,33 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Skipper\ValueObject;
+
+/**
+ * Result of a matched class/path skip: the skipped class and the concrete path pattern
+ * that matched, if the skip is scoped to specific paths.
+ */
+final class SkipMatch
+{
+    /**
+     * @readonly
+     */
+    private string $skippedClass;
+    /**
+     * @readonly
+     */
+    private ?string $matchedPath;
+    public function __construct(string $skippedClass, ?string $matchedPath)
+    {
+        $this->skippedClass = $skippedClass;
+        $this->matchedPath = $matchedPath;
+    }
+    public function getSkippedClass(): string
+    {
+        return $this->skippedClass;
+    }
+    public function getMatchedPath(): ?string
+    {
+        return $this->matchedPath;
+    }
+}

vendor/composer/autoload_classmap.php

@@ -2495,6 +2495,7 @@
     'Rector\\Skipper\\Skipper\\SkipSkipper' => $baseDir . '/src/Skipper/Skipper/SkipSkipper.php',
     'Rector\\Skipper\\Skipper\\Skipper' => $baseDir . '/src/Skipper/Skipper/Skipper.php',
     'Rector\\Skipper\\Skipper\\UsedSkipCollector' => $baseDir . '/src/Skipper/Skipper/UsedSkipCollector.php',
+    'Rector\\Skipper\\ValueObject\\SkipMatch' => $baseDir . '/src/Skipper/ValueObject/SkipMatch.php',
     'Rector\\StaticReflection\\DynamicSourceLocatorDecorator' => $baseDir . '/src/StaticReflection/DynamicSourceLocatorDecorator.php',
     'Rector\\StaticTypeMapper\\Contract\\PhpDocParser\\PhpDocTypeMapperInterface' => $baseDir . '/src/StaticTypeMapper/Contract/PhpDocParser/PhpDocTypeMapperInterface.php',
     'Rector\\StaticTypeMapper\\Contract\\PhpParser\\PhpParserNodeMapperInterface' => $baseDir . '/src/StaticTypeMapper/Contract/PhpParser/PhpParserNodeMapperInterface.php',

vendor/composer/autoload_static.php

@@ -2760,6 +2760,7 @@ class ComposerStaticInit311c1aff9403b33c90f3edae71d2b69d
         'Rector\\Skipper\\Skipper\\SkipSkipper' => __DIR__ . '/../..' . '/src/Skipper/Skipper/SkipSkipper.php',
         'Rector\\Skipper\\Skipper\\Skipper' => __DIR__ . '/../..' . '/src/Skipper/Skipper/Skipper.php',
         'Rector\\Skipper\\Skipper\\UsedSkipCollector' => __DIR__ . '/../..' . '/src/Skipper/Skipper/UsedSkipCollector.php',
+        'Rector\\Skipper\\ValueObject\\SkipMatch' => __DIR__ . '/../..' . '/src/Skipper/ValueObject/SkipMatch.php',
         'Rector\\StaticReflection\\DynamicSourceLocatorDecorator' => __DIR__ . '/../..' . '/src/StaticReflection/DynamicSourceLocatorDecorator.php',
         'Rector\\StaticTypeMapper\\Contract\\PhpDocParser\\PhpDocTypeMapperInterface' => __DIR__ . '/../..' . '/src/StaticTypeMapper/Contract/PhpDocParser/PhpDocTypeMapperInterface.php',
         'Rector\\StaticTypeMapper\\Contract\\PhpParser\\PhpParserNodeMapperInterface' => __DIR__ . '/../..' . '/src/StaticTypeMapper/Contract/PhpParser/PhpParserNodeMapperInterface.php',