Merge pull request #40 from boundwize/refactor-move-is-parallel

samsonasik · web-flow · commit b142bf33f7ca · 2026-05-15T20:40:19.000+07:00
refactor: move parallel logic different to isParallel()
diff --git a/src/Analyser/AnalyserOptions.php b/src/Analyser/AnalyserOptions.php
@@ -6,6 +6,7 @@
 
 use Fidry\CpuCoreCounter\CpuCoreCounter;
 
+use function function_exists;
 use function max;
 
 final readonly class AnalyserOptions
@@ -31,6 +32,10 @@ public static function parallel(?int $workerCount = null): self
 
     public function isParallel(): bool
     {
-        return $this->workerCount > 1;
+        if ($this->workerCount <= 1) {
+            return false;
+        }
+
+        return function_exists('proc_open');
     }
 }
diff --git a/src/Analyser/Parallel/ParallelClassNodeExtractor.php b/src/Analyser/Parallel/ParallelClassNodeExtractor.php
@@ -4,10 +4,7 @@
 
 namespace Boundwize\StructArmed\Analyser\Parallel;
 
-use Boundwize\StructArmed\Analyser\AnalyserOptions;
 use Boundwize\StructArmed\Analyser\ClassNode;
-use Boundwize\StructArmed\Analyser\ClassNodeExtractor;
-use Boundwize\StructArmed\LayerResolver\ChainLayerResolver;
 use Boundwize\StructArmed\Progress\ProgressHandlerInterface;
 use RuntimeException;
 
@@ -23,7 +20,6 @@
 use function feof;
 use function file_put_contents;
 use function fread;
-use function function_exists;
 use function is_array;
 use function is_dir;
 use function is_resource;
@@ -45,8 +41,6 @@
 
 final readonly class ParallelClassNodeExtractor
 {
-    private AnalyserOptions $analyserOptions;
-
     /**
      * @param array<string, string|list<string>> $layers
      * @param array<string, array{pattern: string, excludePattern: string|null}> $layerPatterns
@@ -58,7 +52,6 @@ public function __construct(
         private int $workerCount,
         private ?string $cacheDirectory = null,
     ) {
-        $this->analyserOptions = AnalyserOptions::parallel($this->workerCount);
     }
 
     /**
@@ -67,8 +60,8 @@ public function __construct(
      */
     public function extract(array $files, ?ProgressHandlerInterface $progressHandler = null): array
     {
-        if ($files === [] || ! $this->analyserOptions->isParallel() || ! function_exists('proc_open')) {
-            return (new ClassNodeExtractor($this->layerResolver()))->extract($files, $progressHandler);
+        if ($files === []) {
+            return [];
         }
 
         $workerCount = min($this->workerCount, count($files));
@@ -257,11 +250,6 @@ private function temporaryFile(): string
         return $file;
     }
 
-    private function layerResolver(): ChainLayerResolver
-    {
-        return ChainLayerResolver::fromLayerConfig($this->layers, $this->basePath, $this->layerPatterns);
-    }
-
     /**
      * @param list<string> $files
      */

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`use Fidry\CpuCoreCounter\CpuCoreCounter;`
`8`	`8`
	`9`	`+use function function_exists;`
`9`	`10`	`use function max;`
`10`	`11`
`11`	`12`	`final readonly class AnalyserOptions`
`@@ -31,6 +32,10 @@ public static function parallel(?int $workerCount = null): self`
`31`	`32`
`32`	`33`	`public function isParallel(): bool`
`33`	`34`	`{`
`34`		`- return $this->workerCount > 1;`
	`35`	`+ if ($this->workerCount <= 1) {`
	`36`	`+ return false;`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ return function_exists('proc_open');`
`35`	`40`	`}`
`36`	`41`	`}`