Parallel analysis for everyone!

ondrejmirtes · ondrejmirtes · commit c249adec8c24 · 2020-02-25T19:39:05.000+01:00
diff --git a/conf/bleedingEdge.neon b/conf/bleedingEdge.neon
@@ -2,5 +2,4 @@ parameters:
 	featureToggles:
 		closureUsesThis: true
 		randomIntParameters: true
-		parallel: true
 		resultCache: true
diff --git a/conf/config.neon b/conf/config.neon
@@ -10,7 +10,6 @@ parameters:
 		staticReflectionForPhpParser: true
 		disableRuntimeReflectionProvider: false
 		enableScanningPaths: false
-		parallel: false
 		resultCache: false
 	fileExtensions:
 		- php
@@ -337,7 +336,6 @@ services:
 		class: PHPStan\Command\AnalyseApplication
 		arguments:
 			memoryLimitFile: %memoryLimitFile%
-			runParallel: %featureToggles.parallel%
 
 	-
 		class: PHPStan\Command\IgnoredRegexValidator
diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php
@@ -33,17 +33,13 @@ class AnalyseApplication
 	/** @var string */
 	private $memoryLimitFile;
 
-	/** @var bool */
-	private $runParallel;
-
 	public function __construct(
 		Analyser $analyser,
 		StubValidator $stubValidator,
 		ParallelAnalyser $parallelAnalyser,
 		Scheduler $scheduler,
 		ResultCacheManager $resultCacheManager,
-		string $memoryLimitFile,
-		bool $runParallel
+		string $memoryLimitFile
 	)
 	{
 		$this->analyser = $analyser;
@@ -52,7 +48,6 @@ public function __construct(
 		$this->scheduler = $scheduler;
 		$this->resultCacheManager = $resultCacheManager;
 		$this->memoryLimitFile = $memoryLimitFile;
-		$this->runParallel = $runParallel;
 	}
 
 	/**
@@ -206,8 +201,7 @@ private function runAnalyser(
 		}
 
 		if (
-			$this->runParallel
-			&& !$debug
+			!$debug
 			&& $mainScript !== null
 			&& $schedule->getNumberOfProcesses() > 1
 		) {
diff --git a/tests/PHPStan/Parallel/parallel-analyser.neon b/tests/PHPStan/Parallel/parallel-analyser.neon
@@ -1,5 +1,3 @@
 parameters:
-	featureToggles:
-		parallel: true
 	parallel:
 		jobSize: 1
