Removed parallel processing from output, when using '--debug'.

Author: esthezia

.github/workflows/e2e-tests.yml

@@ -440,12 +440,12 @@ jobs:
               cd e2e/vvv-with-debug
               OUTPUT=$(../../bin/phpstan analyze -l 0 -vvv --debug test.php 2>&1)
               echo "$OUTPUT"
-              ../bashunit -a contains '# of spawned processes:    1' "$OUTPUT"
+              ../bashunit -a not_contains 'Parallel processing scheduler' "$OUTPUT"
           - script: |
               cd e2e/vvv-with-debug
               OUTPUT=$(../../bin/phpstan analyze -l 0 -vvv --debug --configuration parallel.neon test.php 2>&1)
               echo "$OUTPUT"
-              ../bashunit -a contains '# of spawned processes:    1' "$OUTPUT"
+              ../bashunit -a not_contains 'Parallel processing scheduler' "$OUTPUT"
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

src/Command/AnalyserRunner.php

@@ -71,30 +71,27 @@ public function runAnalyser(
 			);
 		}
 
-		$schedule = $this->scheduler->scheduleWork($this->cpuCoreCounter->getNumberOfCpuCores(), $files, $debug);
-		$mainScript = null;
-		if (isset($_SERVER['argv'][0]) && is_file($_SERVER['argv'][0])) {
-			$mainScript = $_SERVER['argv'][0];
-		}
+		if (!$debug && $allowParallel && function_exists('proc_open')) {
+			$schedule = $this->scheduler->scheduleWork($this->cpuCoreCounter->getNumberOfCpuCores(), $files);
+
+			$mainScript = null;
+			if (isset($_SERVER['argv'][0]) && is_file($_SERVER['argv'][0])) {
+				$mainScript = $_SERVER['argv'][0];
+			}
 
-		if (
-			!$debug
-			&& $allowParallel
-			&& function_exists('proc_open')
-			&& $mainScript !== null
-			&& $schedule->getNumberOfProcesses() > 0
-		) {
-			$loop = new StreamSelectLoop();
-			$result = null;
-			$promise = $this->parallelAnalyser->analyse($loop, $schedule, $mainScript, $postFileCallback, $projectConfigFile, $tmpFile, $insteadOfFile, $input, null);
-			$promise->then(static function (AnalyserResult $tmp) use (&$result): void {
-				$result = $tmp;
-			});
-			$loop->run();
-			if ($result === null) {
-				throw new ShouldNotHappenException();
+			if (($mainScript !== null) && ($schedule->getNumberOfProcesses() > 0)) {
+				$loop = new StreamSelectLoop();
+				$result = null;
+				$promise = $this->parallelAnalyser->analyse($loop, $schedule, $mainScript, $postFileCallback, $projectConfigFile, $tmpFile, $insteadOfFile, $input, null);
+				$promise->then(static function (AnalyserResult $tmp) use (&$result): void {
+					$result = $tmp;
+				});
+				$loop->run();
+				if ($result === null) {
+					throw new ShouldNotHappenException();
+				}
+				return $result;
 			}
-			return $result;
 		}
 
 		return $this->analyser->analyse(

src/Command/FixerWorkerCommand.php

@@ -413,7 +413,7 @@ private function runAnalyser(LoopInterface $loop, Container $container, array $f
 		/** @var CpuCoreCounter $cpuCoreCounter */
 		$cpuCoreCounter = $container->getByType(CpuCoreCounter::class);
 
-		$schedule = $scheduler->scheduleWork($cpuCoreCounter->getNumberOfCpuCores(), $files, false);
+		$schedule = $scheduler->scheduleWork($cpuCoreCounter->getNumberOfCpuCores(), $files);
 		$mainScript = null;
 		if (isset($_SERVER['argv'][0]) && is_file($_SERVER['argv'][0])) {
 			$mainScript = $_SERVER['argv'][0];

src/Parallel/Scheduler.php

@@ -42,11 +42,10 @@ public function __construct(
 	public function scheduleWork(
 		int $cpuCores,
 		array $files,
-		bool $debug = false,
 	): Schedule
 	{
 		$jobs = array_chunk($files, $this->jobSize);
-		$numberOfProcesses = $debug ? 1 : min(
+		$numberOfProcesses = min(
 			max((int) floor(count($jobs) / $this->minimumNumberOfJobsPerProcess), 1),
 			$cpuCores,
 		);

tests/PHPStan/Parallel/SchedulerTest.php

@@ -68,16 +68,6 @@ public static function dataSchedule(): array
 				1,
 				[1],
 			],
-			[
-				16,
-				16,
-				2,
-				20,
-				100,
-				1,
-				[20, 20, 20, 20, 20],
-				true,
-			],
 		];
 	}
 
@@ -97,12 +87,11 @@ public function testSchedule(
 		int $numberOfFiles,
 		int $expectedNumberOfProcesses,
 		array $expectedJobSizes,
-		bool $debug = false,
 	): void
 	{
 		$files = array_fill(0, $numberOfFiles, 'file.php');
 		$scheduler = new Scheduler($jobSize, $maximumNumberOfProcesses, $minimumNumberOfJobsPerProcess);
-		$schedule = $scheduler->scheduleWork($cpuCores, $files, $debug);
+		$schedule = $scheduler->scheduleWork($cpuCores, $files);
 
 		$this->assertSame($expectedNumberOfProcesses, $schedule->getNumberOfProcesses());
 		$jobSizes = array_map(static fn (array $job): int => count($job), $schedule->getJobs());