Updated Rector to commit 2328ea6338d2496c409aaf2d8a001052e323feda

rectorphp/rector-src@2328ea6 [skip] track used skips as class => [paths] map (#8074)

Author: TomasVotruba

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '19dcdb7816f10cb502a1b2ef5a6628185f74e49d';
+    public const PACKAGE_VERSION = '2328ea6338d2496c409aaf2d8a001052e323feda';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-21 13:42:16';
+    public const RELEASE_DATE = '2026-06-21 14:38:56';
     /**
      * @var int
      */

src/Parallel/Application/ParallelFileProcessor.php

@@ -71,7 +71,7 @@ public function process(Schedule $schedule, string $mainScript, callable $postFi
         $fileDiffs = [];
         /** @var SystemError[] $systemErrors */
         $systemErrors = [];
-        /** @var array<string, true> $usedSkips */
+        /** @var array<string, array<string, true>> $usedSkips */
         $usedSkips = [];
         $tcpServer = new TcpServer('127.0.0.1:0', $streamSelectLoop);
         $this->processPool = new ProcessPool($tcpServer);
@@ -127,11 +127,14 @@ function (array $json) use ($parallelProcess, &$systemErrors, &$fileDiffs, &$use
                      *      file_diffs: array<string, mixed>,
                      *      files_count: int,
                      *      system_errors_count: int,
-                     *      used_skips: string[]
+                     *      used_skips: array<string, string[]>
                      * } $json */
                     $totalChanged += $json[Bridge::TOTAL_CHANGED];
-                    foreach ($json[Bridge::USED_SKIPS] as $usedSkip) {
-                        $usedSkips[$usedSkip] = \true;
+                    foreach ($json[Bridge::USED_SKIPS] as $skip => $paths) {
+                        $usedSkips[$skip] ??= [];
+                        foreach ($paths as $path) {
+                            $usedSkips[$skip][$path] = \true;
+                        }
                     }
                     // decode arrays to objects
                     foreach ($json[Bridge::SYSTEM_ERRORS] as $jsonError) {
@@ -191,6 +194,10 @@ function ($exitCode, string $stdErr) use (&$systemErrors, $processIdentifier): v
         if ($reachedSystemErrorsCountLimit) {
             $systemErrors[] = new SystemError(sprintf('Reached system errors count limit of %d, exiting...', self::SYSTEM_ERROR_LIMIT));
         }
-        return new ProcessResult($systemErrors, $fileDiffs, $totalChanged, array_keys($usedSkips));
+        $mergedUsedSkips = [];
+        foreach ($usedSkips as $skip => $paths) {
+            $mergedUsedSkips[$skip] = array_keys($paths);
+        }
+        return new ProcessResult($systemErrors, $fileDiffs, $totalChanged, $mergedUsedSkips);
     }
 }

src/Reporting/UnusedSkipResolver.php

@@ -100,7 +100,7 @@ private function resolveGlobalRelativePaths(): array
         return $globalRelativePaths;
     }
     /**
-     * @param string[] $usedSkips
+     * @param array<string, string[]> $usedSkips
      * @return string[]
      */
     private function resolveUnusedRuleScopedSkips(array $usedSkips): array
@@ -110,9 +110,9 @@ private function resolveUnusedRuleScopedSkips(array $usedSkips): array
         foreach ($this->resolveRelativePathsByClass() as $rectorClass => $relativePaths) {
             $unusedRelativePaths = [];
             foreach ($relativePaths as $path => $relativePath) {
-                // used skips are tracked scoped to their rule as "class|path", so the same path
+                // used skips are tracked scoped to their rule (class => [path]), so the same path
                 // skipped under another rule does not mark this one used (see SkipSkipper)
-                if (!in_array($rectorClass . '|' . $path, $usedSkips, \true)) {
+                if (!in_array($path, $usedSkips[$rectorClass] ?? [], \true)) {
                     $unusedRelativePaths[] = $relativePath;
                 }
             }
@@ -125,14 +125,15 @@ private function resolveUnusedRuleScopedSkips(array $usedSkips): array
         return $unusedSkips;
     }
     /**
-     * @param string[] $usedSkips
+     * @param array<string, string[]> $usedSkips
      * @return string[]
      */
     private function resolveUnusedGlobalSkips(array $usedSkips): array
     {
         $unusedSkips = [];
         foreach ($this->resolveGlobalRelativePaths() as $path => $relativePath) {
-            if (!in_array($path, $usedSkips, \true)) {
+            // global path skips are tracked by their own path key, with no nested paths
+            if (!array_key_exists($path, $usedSkips)) {
                 $unusedSkips[] = $relativePath;
             }
         }

src/Skipper/Skipper/SkipSkipper.php

@@ -34,11 +34,11 @@ public function doesMatchSkip($checker, string $filePath, array $skippedClasses)
                 $this->usedSkipCollector->markUsed($skippedClass);
                 return \true;
             }
-            // mark the specific matched path used, scoped to its rule via "class|path" - the same
-            // path can be skipped under multiple rules, so a path-only key would mark them all used
+            // 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
             $matchedPath = $this->fileInfoMatcher->matchPattern($filePath, $skippedFiles);
             if ($matchedPath !== null) {
-                $this->usedSkipCollector->markUsed($skippedClass . '|' . $matchedPath);
+                $this->usedSkipCollector->markUsed($skippedClass, $matchedPath);
                 return \true;
             }
         }

src/Skipper/Skipper/UsedSkipCollector.php

@@ -12,18 +12,29 @@
 final class UsedSkipCollector
 {
     /**
-     * @var array<string, true>
+     * Map of skip element (rule class or global path) to the set of paths matched under it.
+     * Rule-scoped skips collect their matched paths; skip-everywhere rules and global path skips
+     * keep an empty path set, the same shape as the "->withSkip()" config.
+     *
+     * @var array<string, array<string, true>>
      */
     private array $usedSkips = [];
-    public function markUsed(string $skip): void
+    public function markUsed(string $skip, ?string $path = null): void
     {
-        $this->usedSkips[$skip] = \true;
+        $this->usedSkips[$skip] ??= [];
+        if ($path !== null) {
+            $this->usedSkips[$skip][$path] = \true;
+        }
     }
     /**
-     * @return string[]
+     * @return array<string, string[]>
      */
     public function provide(): array
     {
-        return array_keys($this->usedSkips);
+        $usedSkips = [];
+        foreach ($this->usedSkips as $skip => $paths) {
+            $usedSkips[$skip] = array_keys($paths);
+        }
+        return $usedSkips;
     }
 }

src/ValueObject/ProcessResult.php

@@ -23,13 +23,13 @@ final class ProcessResult
      */
     private int $totalChanged;
     /**
-     * @var string[]
+     * @var array<string, string[]>
      */
     private array $usedSkips = [];
     /**
      * @param SystemError[] $systemErrors
      * @param FileDiff[] $fileDiffs
-     * @param string[] $usedSkips
+     * @param array<string, string[]> $usedSkips
      */
     public function __construct(array $systemErrors, array $fileDiffs, int $totalChanged, array $usedSkips = [])
     {
@@ -39,7 +39,10 @@ public function __construct(array $systemErrors, array $fileDiffs, int $totalCha
         $this->usedSkips = $usedSkips;
         Assert::allIsInstanceOf($systemErrors, SystemError::class);
         Assert::allIsInstanceOf($fileDiffs, FileDiff::class);
-        Assert::allString($usedSkips);
+        Assert::allString(array_keys($usedSkips));
+        foreach ($usedSkips as $usedSkip) {
+            Assert::allString($usedSkip);
+        }
     }
     /**
      * @return SystemError[]
@@ -71,19 +74,22 @@ public function addSystemErrors(array $systemErrors): void
      * their result from worker processes only. Merge those main-process marks back in, or they would
      * be wrongly reported as unused.
      *
-     * @param string[] $usedSkips
+     * @param array<string, string[]> $usedSkips
      */
     public function addUsedSkips(array $usedSkips): void
     {
-        Assert::allString($usedSkips);
-        $this->usedSkips = array_values(array_unique(array_merge($this->usedSkips, $usedSkips)));
+        foreach ($usedSkips as $skip => $paths) {
+            Assert::allString($paths);
+            $existingPaths = $this->usedSkips[$skip] ?? [];
+            $this->usedSkips[$skip] = array_values(array_unique(array_merge($existingPaths, $paths)));
+        }
     }
     public function getTotalChanged(): int
     {
         return $this->totalChanged;
     }
     /**
-     * @return string[]
+     * @return array<string, string[]>
      */
     public function getUsedSkips(): array
     {