Updated Rector to commit 5a3a59c50c7810296274eb4408737c8f2f8921e7

rectorphp/rector-src@5a3a59c Remove collectors, as performance very costly and not practically useful (rectorphp#5470)
aschempp · Jan 15, 2024 · ec3d78e · ec3d78e
1 parent e24202f
commit ec3d78e
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 484 deletions.
diff --git a/config/config.php b/config/config.php
@@ -13,7 +13,6 @@
     $rectorConfig->autoloadPaths([]);
     $rectorConfig->bootstrapFiles([]);
     $rectorConfig->parallel();
-    $rectorConfig->disableCollectors();
     // to avoid autoimporting out of the box
     $rectorConfig->importNames(\false, \false);
     $rectorConfig->removeUnusedImports(\false);

diff --git a/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenCollectorRector.php b/rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenCollectorRector.php
diff --git a/src/Application/ApplicationFileProcessor.php b/src/Application/ApplicationFileProcessor.php
@@ -156,7 +156,6 @@ public function processFiles(array $filePaths, Configuration $configuration, ?ca
                 if ($currentFileDiff instanceof FileDiff) {
                     $fileDiffs[] = $currentFileDiff;
                 }
-                $collectedData = \array_merge($collectedData, $fileProcessResult->getCollectedData());
                 // progress bar on parallel handled on runParallel()
                 if (\is_callable($postFileCallback)) {
                     $postFileCallback(1);

diff --git a/src/Application/Collector/CollectorNodeVisitor.php b/src/Application/Collector/CollectorNodeVisitor.php
diff --git a/src/Application/Collector/CollectorProcessor.php b/src/Application/Collector/CollectorProcessor.php
diff --git a/src/Application/FileProcessor.php b/src/Application/FileProcessor.php
@@ -4,7 +4,6 @@
 namespace Rector\Application;
 
 use PHPStan\AnalysedCodeException;
-use Rector\Application\Collector\CollectorProcessor;
 use Rector\Caching\Detector\ChangedFilesDetector;
 use Rector\ChangesReporting\ValueObjectFactory\ErrorFactory;
 use Rector\ChangesReporting\ValueObjectFactory\FileDiffFactory;
@@ -61,11 +60,6 @@ final class FileProcessor
      * @var \Rector\FileSystem\FilePathHelper
      */
     private $filePathHelper;
-    /**
-     * @readonly
-     * @var \Rector\Application\Collector\CollectorProcessor
-     */
-    private $collectorProcessor;
     /**
      * @readonly
      * @var \Rector\PostRector\Application\PostFileProcessor
@@ -81,7 +75,7 @@ final class FileProcessor
      * @var \Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator
      */
     private $nodeScopeAndMetadataDecorator;
-    public function __construct(FormatPerservingPrinter $formatPerservingPrinter, RectorNodeTraverser $rectorNodeTraverser, SymfonyStyle $symfonyStyle, FileDiffFactory $fileDiffFactory, ChangedFilesDetector $changedFilesDetector, ErrorFactory $errorFactory, FilePathHelper $filePathHelper, CollectorProcessor $collectorProcessor, PostFileProcessor $postFileProcessor, RectorParser $rectorParser, NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator)
+    public function __construct(FormatPerservingPrinter $formatPerservingPrinter, RectorNodeTraverser $rectorNodeTraverser, SymfonyStyle $symfonyStyle, FileDiffFactory $fileDiffFactory, ChangedFilesDetector $changedFilesDetector, ErrorFactory $errorFactory, FilePathHelper $filePathHelper, PostFileProcessor $postFileProcessor, RectorParser $rectorParser, NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator)
     {
         $this->formatPerservingPrinter = $formatPerservingPrinter;
         $this->rectorNodeTraverser = $rectorNodeTraverser;
@@ -90,22 +84,17 @@ public function __construct(FormatPerservingPrinter $formatPerservingPrinter, Re
         $this->changedFilesDetector = $changedFilesDetector;
         $this->errorFactory = $errorFactory;
         $this->filePathHelper = $filePathHelper;
-        $this->collectorProcessor = $collectorProcessor;
         $this->postFileProcessor = $postFileProcessor;
         $this->rectorParser = $rectorParser;
         $this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator;
     }
     public function processFile(File $file, Configuration $configuration) : FileProcessResult
     {
-        if ($configuration->isSecondRun() && $configuration->isCollectors()) {
-            // 2nd run
-            $this->rectorNodeTraverser->prepareCollectorRectorsRun($configuration);
-        }
         // 1. parse files to nodes
         $parsingSystemError = $this->parseFileAndDecorateNodes($file);
         if ($parsingSystemError instanceof SystemError) {
             // we cannot process this file as the parsing and type resolving itself went wrong
-            return new FileProcessResult([$parsingSystemError], null, []);
+            return new FileProcessResult([$parsingSystemError], null);
         }
         $fileHasChanged = \false;
         $filePath = $file->getFilePath();
@@ -114,8 +103,6 @@ public function processFile(File $file, Configuration $configuration) : FileProc
         do {
             $file->changeHasChanged(\false);
             $newStmts = $this->rectorNodeTraverser->traverse($file->getNewStmts());
-            // collect data
-            $fileCollectedData = $configuration->isCollectors() ? $this->collectorProcessor->process($newStmts) : [];
             // apply post rectors
             $postNewStmts = $this->postFileProcessor->traverse($newStmts, $filePath);
             // this is needed for new tokens added in "afterTraverse()"
@@ -138,7 +125,7 @@ public function processFile(File $file, Configuration $configuration) : FileProc
             $currentFileDiff = $this->fileDiffFactory->createFileDiffWithLineChanges($file, $file->getOriginalFileContent(), $file->getFileContent(), $rectorWithLineChanges);
             $file->setFileDiff($currentFileDiff);
         }
-        return new FileProcessResult([], $file->getFileDiff(), $fileCollectedData);
+        return new FileProcessResult([], $file->getFileDiff());
     }
     private function parseFileAndDecorateNodes(File $file) : ?SystemError
     {

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '34ab8dc0f9a7e8b7cfa1a88cdf36ced9020964f8';
+    public const PACKAGE_VERSION = '5a3a59c50c7810296274eb4408737c8f2f8921e7';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-01-16 03:17:08';
+    public const RELEASE_DATE = '2024-01-15 23:08:35';
     /**
      * @var int
      */

diff --git a/src/Collector/MockedClassCollector.php b/src/Collector/MockedClassCollector.php