Skip to content

Commit

Permalink
minor #28965 [Process] pass all output to the wait-until callback (ni…
Browse files Browse the repository at this point in the history
…colas-grekas)

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
  • Loading branch information
nicolas-grekas committed Oct 24, 2018
2 parents 2edadf0 + a320133 commit 8c24c35
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Symfony/Component/Process/Process.php
Expand Up @@ -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;
}
Expand Down

0 comments on commit 8c24c35

Please sign in to comment.