[Core] Make consistent only setAnalysedFiles() from PHPStan NodeScope…

…Resolver in both parallel and non-parallel for .php files (#3221)

Co-authored-by: GitHub Action <action@github.com>

packages/Parallel/WorkerRunner.php

@@ -7,7 +7,7 @@
 use Clue\React\NDJson\Decoder;
 use Clue\React\NDJson\Encoder;
 use Nette\Utils\FileSystem;
-use PHPStan\Analyser\NodeScopeResolver;
+use Rector\Core\Application\ApplicationFileProcessor;
 use Rector\Core\Application\FileSystem\RemovedAndAddedFilesProcessor;
 use Rector\Core\Console\Style\RectorConsoleOutputStyle;
 use Rector\Core\Contract\Processor\FileProcessorInterface;
@@ -37,10 +37,10 @@ final class WorkerRunner
     public function __construct(
         private readonly ArrayParametersMerger $arrayParametersMerger,
         private readonly CurrentFileProvider $currentFileProvider,
-        private readonly NodeScopeResolver $nodeScopeResolver,
         private readonly DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator,
         private readonly RectorConsoleOutputStyle $rectorConsoleOutputStyle,
         private readonly RemovedAndAddedFilesProcessor $removedAndAddedFilesProcessor,
+        private readonly ApplicationFileProcessor $applicationFileProcessor,
         private readonly array $fileProcessors = []
     ) {
     }
@@ -82,7 +82,7 @@ public function run(Encoder $encoder, Decoder $decoder, Configuration $configura
             $systemErrors = [];
 
             // 1. allow PHPStan to work with static reflection on provided files
-            $this->nodeScopeResolver->setAnalysedFiles($filePaths);
+            $this->applicationFileProcessor->configurePHPStanNodeScopeResolver($filePaths);
 
             foreach ($filePaths as $filePath) {
                 try {

src/Application/ApplicationFileProcessor.php

@@ -24,7 +24,6 @@
 use Symplify\EasyParallel\CpuCoreCountProvider;
 use Symplify\EasyParallel\Exception\ParallelShouldNotHappenException;
 use Symplify\EasyParallel\ScheduleFactory;
-use Webmozart\Assert\Assert;
 
 final class ApplicationFileProcessor
 {
@@ -81,7 +80,7 @@ public function run(Configuration $configuration, InputInterface $input): array
             $files = $this->fileFactory->createFromPaths($fileInfos);
 
             // 2. PHPStan has to know about all files too
-            $this->configurePHPStanNodeScopeResolver($files);
+            $this->configurePHPStanNodeScopeResolver($fileInfos);
 
             $systemErrorsAndFileDiffs = $this->processFiles($files, $configuration);
 
@@ -139,6 +138,18 @@ public function processFiles(array $files, Configuration $configuration): array
         return $systemErrorsAndFileDiffs;
     }
 
+    /**
+     * @param string[] $filePaths
+     */
+    public function configurePHPStanNodeScopeResolver(array $filePaths): void
+    {
+        $phpFilePaths = array_filter(
+            $filePaths,
+            static fn (string $filePath): bool => str_ends_with($filePath, '.php')
+        );
+        $this->nodeScopeResolver->setAnalysedFiles($phpFilePaths);
+    }
+
     /**
      * @param File[] $files
      */
@@ -260,34 +271,4 @@ private function resolveCalledRectorBinary(): ?string
 
         return $potentialEcsBinaryPath;
     }
-
-    /**
-     * @param File[] $files
-     */
-    private function configurePHPStanNodeScopeResolver(array $files): void
-    {
-        $filePaths = $this->resolvePhpFilePaths($files);
-        $this->nodeScopeResolver->setAnalysedFiles($filePaths);
-    }
-
-    /**
-     * @param File[] $files
-     * @return string[]
-     */
-    private function resolvePhpFilePaths(array $files): array
-    {
-        Assert::allIsAOf($files, File::class);
-
-        $phpFilePaths = [];
-
-        foreach ($files as $file) {
-            $filePath = $file->getFilePath();
-
-            if (\str_ends_with($filePath, '.php')) {
-                $phpFilePaths[] = $filePath;
-            }
-        }
-
-        return $phpFilePaths;
-    }
 }