[Performance] Remove CollectedData on ProcessResult (#5520)

rectorphp · Jan 30, 2024 · 58ef131 · 58ef131
1 parent 171fddb
commit 58ef131
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 131 deletions.
diff --git a/src/Application/ApplicationFileProcessor.php b/src/Application/ApplicationFileProcessor.php
@@ -5,7 +5,6 @@
 namespace Rector\Application;
 
 use Nette\Utils\FileSystem as UtilsFileSystem;
-use PHPStan\Collectors\CollectedData;
 use Rector\Caching\Detector\ChangedFilesDetector;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
@@ -58,7 +57,7 @@ public function run(Configuration $configuration, InputInterface $input): Proces
 
         // no files found
         if ($filePaths === []) {
-            return new ProcessResult([], [], []);
+            return new ProcessResult([], []);
         }
 
         $this->configureCustomErrorHandler();
@@ -118,9 +117,6 @@ public function processFiles(
         /** @var FileDiff[] $fileDiffs */
         $fileDiffs = [];
 
-        /** @var CollectedData[] $collectedData */
-        $collectedData = [];
-
         foreach ($filePaths as $filePath) {
             if ($preFileCallback !== null) {
                 $preFileCallback($filePath);
@@ -156,7 +152,7 @@ public function processFiles(
             }
         }
 
-        return new ProcessResult($systemErrors, $fileDiffs, $collectedData);
+        return new ProcessResult($systemErrors, $fileDiffs);
     }
 
     private function processFile(File $file, Configuration $configuration): FileProcessResult

diff --git a/src/Autoloading/BootstrapFilesIncluder.php b/src/Autoloading/BootstrapFilesIncluder.php
@@ -4,8 +4,8 @@
 
 namespace Rector\Autoloading;
 
-use Phar;
 use FilesystemIterator;
+use Phar;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Exception\ShouldNotHappenException;

diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php
@@ -325,11 +325,14 @@ public function withPhpSets(
                     return $this;
                 }
             }
+
             throw new InvalidConfigurationException(sprintf(
                 'We could not find local "composer.json" to determine your PHP version.%sPlease, fill the PHP version set in withPhpSets() manually.',
                 PHP_EOL
             ));
-        } elseif ($php53) {
+        }
+
+        if ($php53) {
             $this->sets[] = LevelSetList::UP_TO_PHP_53;
         } elseif ($php54) {
             $this->sets[] = LevelSetList::UP_TO_PHP_54;

diff --git a/src/Console/Command/WorkerCommand.php b/src/Console/Command/WorkerCommand.php
@@ -6,7 +6,6 @@
 
 use Clue\React\NDJson\Decoder;
 use Clue\React\NDJson\Encoder;
-use PHPStan\Collectors\CollectedData;
 use React\EventLoop\StreamSelectLoop;
 use React\Socket\ConnectionInterface;
 use React\Socket\TcpConnector;
@@ -132,22 +131,6 @@ private function runWorker(
                 return;
             }
 
-            $previouslyCollectedDataItems = $json[Bridge::PREVIOUSLY_COLLECTED_DATA] ?? [];
-            if ($previouslyCollectedDataItems !== []) {
-                // turn to value objects
-                $previouslyCollectedDatas = [];
-                foreach ($previouslyCollectedDataItems as $previouslyCollectedDataItem) {
-                    Assert::keyExists($previouslyCollectedDataItem, 'data');
-                    Assert::keyExists($previouslyCollectedDataItem, 'filePath');
-                    Assert::keyExists($previouslyCollectedDataItem, 'collectorType');
-
-                    $previouslyCollectedDatas[] = CollectedData::decode($previouslyCollectedDataItem);
-                }
-
-                $configuration->setCollectedData($previouslyCollectedDatas);
-                $configuration->enableSecondRun();
-            }
-
             /** @var string[] $filePaths */
             $filePaths = $json[Bridge::FILES] ?? [];
 
@@ -169,7 +152,6 @@ private function runWorker(
                     Bridge::FILES_COUNT => count($filePaths),
                     Bridge::SYSTEM_ERRORS => $processResult->getSystemErrors(),
                     Bridge::SYSTEM_ERRORS_COUNT => count($processResult->getSystemErrors()),
-                    Bridge::COLLECTED_DATA => $processResult->getCollectedData(),
                 ],
             ]);
         });

diff --git a/src/Parallel/Application/ParallelFileProcessor.php b/src/Parallel/Application/ParallelFileProcessor.php
@@ -7,7 +7,6 @@
 use Clue\React\NDJson\Decoder;
 use Clue\React\NDJson\Encoder;
 use Nette\Utils\Random;
-use PHPStan\Collectors\CollectedData;
 use React\EventLoop\StreamSelectLoop;
 use React\Socket\ConnectionInterface;
 use React\Socket\TcpServer;
@@ -80,28 +79,17 @@ public function process(
         /** @var FileDiff[] $fileDiffs */
         $fileDiffs = [];
 
-        /** @var CollectedData[] $collectedData */
-        $collectedData = [];
-
         /** @var SystemError[] $systemErrors */
         $systemErrors = [];
 
         $tcpServer = new TcpServer('127.0.0.1:0', $streamSelectLoop);
         $this->processPool = new ProcessPool($tcpServer);
 
-        $tcpServer->on(ReactEvent::CONNECTION, function (ConnectionInterface $connection) use (
-            &$jobs,
-            $configuration
-        ): void {
+        $tcpServer->on(ReactEvent::CONNECTION, function (ConnectionInterface $connection) use (&$jobs): void {
             $inDecoder = new Decoder($connection, true, 512, 0, 4 * 1024 * 1024);
             $outEncoder = new Encoder($connection);
 
-            $inDecoder->on(ReactEvent::DATA, function (array $data) use (
-                &$jobs,
-                $inDecoder,
-                $outEncoder,
-                $configuration
-            ): void {
+            $inDecoder->on(ReactEvent::DATA, function (array $data) use (&$jobs, $inDecoder, $outEncoder): void {
                 $action = $data[ReactCommand::ACTION];
                 if ($action !== Action::HELLO) {
                     return;
@@ -121,7 +109,6 @@ public function process(
                 $parallelProcess->request([
                     ReactCommand::ACTION => Action::MAIN,
                     Content::FILES => $jobsChunk,
-                    Bridge::PREVIOUSLY_COLLECTED_DATA => $configuration->getCollectedData(),
                 ]);
             });
         });
@@ -162,7 +149,6 @@ public function process(
         $processSpawner = function () use (
             &$systemErrors,
             &$fileDiffs,
-            &$collectedData,
             &$jobs,
             $postFileCallback,
             &$systemErrorsCount,
@@ -198,7 +184,6 @@ function (array $json) use (
                     &$jobs,
                     $postFileCallback,
                     &$systemErrorsCount,
-                    &$collectedData,
                     &$reachedInternalErrorsCountLimit,
                     $processIdentifier,
                     &$fileChunksBudgetPerProcess,
@@ -218,10 +203,6 @@ function (array $json) use (
                         $fileDiffs[] = FileDiff::decode($jsonFileDiff);
                     }
 
-                    foreach ($json[Bridge::COLLECTED_DATA] as $collectedDataItem) {
-                        $collectedData[] = CollectedData::decode($collectedDataItem);
-                    }
-
                     $postFileCallback($json[Bridge::FILES_COUNT]);
 
                     $systemErrorsCount += $json[Bridge::SYSTEM_ERRORS_COUNT];
@@ -290,6 +271,6 @@ function ($exitCode, string $stdErr) use (&$systemErrors, $processIdentifier): v
             ));
         }
 
-        return new ProcessResult($systemErrors, $fileDiffs, $collectedData);
+        return new ProcessResult($systemErrors, $fileDiffs);
     }
 }
diff --git a/src/Parallel/ValueObject/Bridge.php b/src/Parallel/ValueObject/Bridge.php
@@ -33,14 +33,4 @@ final class Bridge
      * @var string
      */
     public const FILES_COUNT = 'files_count';
-
-    /**
-     * @var string
-     */
-    public const COLLECTED_DATA = 'collected_data';
-
-    /**
-     * @var string
-     */
-    public const PREVIOUSLY_COLLECTED_DATA = 'previously_collected_data';
 }
diff --git a/src/ValueObject/Configuration.php b/src/ValueObject/Configuration.php
@@ -4,36 +4,28 @@
 
 namespace Rector\ValueObject;
 
-use PHPStan\Collectors\CollectedData;
 use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
 use Webmozart\Assert\Assert;
 
-final class Configuration
+final readonly class Configuration
 {
-    private bool $isSecondRun = false;
-
-    /**
-     * @var CollectedData[]
-     */
-    private array $collectedData = [];
-
     /**
      * @param string[] $fileExtensions
      * @param string[] $paths
      */
     public function __construct(
-        private readonly bool $isDryRun = false,
-        private readonly bool $showProgressBar = true,
-        private readonly bool $shouldClearCache = false,
-        private readonly string $outputFormat = ConsoleOutputFormatter::NAME,
-        private readonly array $fileExtensions = ['php'],
-        private readonly array $paths = [],
-        private readonly bool $showDiffs = true,
-        private readonly string | null $parallelPort = null,
-        private readonly string | null $parallelIdentifier = null,
-        private readonly bool $isParallel = false,
-        private readonly string|null $memoryLimit = null,
-        private readonly bool $isDebug = false,
+        private bool $isDryRun = false,
+        private bool $showProgressBar = true,
+        private bool $shouldClearCache = false,
+        private string $outputFormat = ConsoleOutputFormatter::NAME,
+        private array $fileExtensions = ['php'],
+        private array $paths = [],
+        private bool $showDiffs = true,
+        private string | null $parallelPort = null,
+        private string | null $parallelIdentifier = null,
+        private bool $isParallel = false,
+        private string|null $memoryLimit = null,
+        private bool $isDebug = false,
     ) {
     }
 
@@ -103,44 +95,4 @@ public function isDebug(): bool
     {
         return $this->isDebug;
     }
-
-    /**
-     * @param CollectedData[] $collectedData
-     */
-    public function setCollectedData(array $collectedData): void
-    {
-        $this->collectedData = $collectedData;
-    }
-
-    /**
-     * @return CollectedData[]
-     */
-    public function getCollectedData(): array
-    {
-        return $this->collectedData;
-    }
-
-    /**
-     * @api
-     */
-    public function enableSecondRun(): void
-    {
-        $this->isSecondRun = true;
-    }
-
-    /**
-     * @api
-     */
-    public function isSecondRun(): bool
-    {
-        return $this->isSecondRun;
-    }
-
-    /**
-     * @api used in tests
-     */
-    public function reset(): void
-    {
-        $this->isSecondRun = false;
-    }
 }
diff --git a/src/ValueObject/ProcessResult.php b/src/ValueObject/ProcessResult.php
@@ -4,7 +4,6 @@
 
 namespace Rector\ValueObject;
 
-use PHPStan\Collectors\CollectedData;
 use Rector\ValueObject\Error\SystemError;
 use Rector\ValueObject\Reporting\FileDiff;
 use Webmozart\Assert\Assert;
@@ -14,16 +13,13 @@ final class ProcessResult
     /**
      * @param SystemError[] $systemErrors
      * @param FileDiff[] $fileDiffs
-     * @param CollectedData[] $collectedData
      */
     public function __construct(
         private array $systemErrors,
         private readonly array $fileDiffs,
-        private readonly array $collectedData
     ) {
         Assert::allIsInstanceOf($systemErrors, SystemError::class);
         Assert::allIsInstanceOf($fileDiffs, FileDiff::class);
-        Assert::allIsInstanceOf($collectedData, CollectedData::class);
     }
 
     /**
@@ -42,14 +38,6 @@ public function getFileDiffs(): array
         return $this->fileDiffs;
     }
 
-    /**
-     * @return CollectedData[]
-     */
-    public function getCollectedData(): array
-    {
-        return $this->collectedData;
-    }
-
     /**
      * @param SystemError[] $systemErrors
      */