Fix StartCondition::isCanceled()

Author: steevanb

changelog.md

@@ -1,5 +1,7 @@
 ### master
 
+- Fix `StartCondition::isCanceled()` when a previous process has been canceled
+
 ### [0.7.2](../../compare/0.7.1...0.7.2) - 2022-03-08
 
 - Fix start ready processes when maximum paralell processes is not configured or value is `null`

composer.json

@@ -19,7 +19,7 @@
     "require-dev": {
         "ext-simplexml": "*",
         "phpunit/phpunit": "9.5.*",
-        "symfony/var-dumper": "5.3.*"
+        "symfony/var-dumper": "5.4.*"
     },
     "autoload": {
         "psr-4": {

src/Console/Application/ParallelProcessesApplication.php

@@ -177,29 +177,31 @@ protected function startProcesses(): self
     protected function waitProcessesTermination(OutputInterface $output): self
     {
         $terminated = 0;
-        while ($terminated !== count($this->getProcesses())) {
+        while ($terminated < $this->getProcesses()->count()) {
             if ($this->isCanceled()) {
                 break;
             }
 
             $terminated = 0;
 
+            $this
+                ->startReadyProcesses()
+                ->defineCanceledProcesses();
+
             foreach ($this->getProcesses()->toArray() as $process) {
                 if ($process->isCanceled() || $process->isTerminated()) {
                     $terminated++;
                 }
             }
 
-            $this
-                ->startReadyProcesses()
-                ->defineCanceledProcesses();
-
             $this
                 ->getTheme()
                 ->resetOutput($output, $this->getProcesses())
                 ->outputProcessesState($output, $this->getProcesses());
 
-            usleep($this->getRefreshInterval());
+            if ($terminated < $this->getProcesses()->count()) {
+                usleep($this->getRefreshInterval());
+            }
         }
 
         return $this;

src/Process/StartCondition.php

@@ -106,15 +106,21 @@ public function isCanceled(): bool
         $return = false;
 
         foreach ($this->getProcessesSuccessful()->toArray() as $successfulProcess) {
-            if ($successfulProcess->isTerminated() && $successfulProcess->isSuccessful() === false) {
+            if (
+                ($successfulProcess->isTerminated() && $successfulProcess->isSuccessful() === false)
+                || $successfulProcess->isCanceled()
+            ) {
                 $return = true;
                 break;
             }
         }
 
         if ($return === false) {
             foreach ($this->getProcessesFailed()->toArray() as $failedProcess) {
-                if ($failedProcess->isTerminated() && $failedProcess->isSuccessful()) {
+                if (
+                    ($failedProcess->isTerminated() && $failedProcess->isSuccessful())
+                    || $failedProcess->isCanceled()
+                ) {
                     $return = true;
                     break;
                 }