minor #28965 [Process] pass all output to the wait-until callback (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 8c24c35fe86e · 2018-10-24T12:37:43.000+02:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [Process] pass all output to the wait-until callback | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Introduced yesterday, my bad. Should make appveyor green hopefully. Commits ------- a320133 [Process] pass all output to the wait-until callback
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -458,7 +458,7 @@ public function waitUntil(callable $callback): bool
 
             foreach ($output as $type => $data) {
                 if (3 !== $type) {
-                    $ready = $ready || $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data);
+                    $ready = $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data) || $ready;
                 } elseif (!isset($this->fallbackStatus['signaled'])) {
                     $this->fallbackStatus['exitcode'] = (int) $data;
                 }

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ public function waitUntil(callable $callback): bool`
`458`	`458`
`459`	`459`	`foreach ($output as $type => $data) {`
`460`	`460`	`if (3 !== $type) {`
`461`		`- $ready = $ready \|\| $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data);`
	`461`	`+ $ready = $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data) \|\| $ready;`
`462`	`462`	`} elseif (!isset($this->fallbackStatus['signaled'])) {`
`463`	`463`	`$this->fallbackStatus['exitcode'] = (int) $data;`
`464`	`464`	`}`