bug #17177 [Process] Fix potential race condition leading to transient tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit ddf11f5b8a8e · 2015-12-30T11:25:59.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Process] Fix potential race condition leading to transient tests | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15617 | License | MIT | Doc PR | - Sibling of #17176 on 2.3 Commits ------- 99fc428 [Process] Fix potential race condition leading to transient tests
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1072,13 +1072,10 @@ private function readPipes($blocking, $close)
 
         $callback = $this->callback;
         foreach ($result as $type => $data) {
-            if (3 === $type) {
-                $this->fallbackStatus['running'] = false;
-                if (!isset($this->fallbackStatus['signaled'])) {
-                    $this->fallbackStatus['exitcode'] = (int) $data;
-                }
-            } else {
+            if (3 !== $type) {
                 $callback($type === self::STDOUT ? self::OUT : self::ERR, $data);
+            } elseif (!isset($this->fallbackStatus['signaled'])) {
+                $this->fallbackStatus['exitcode'] = (int) $data;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1072,13 +1072,10 @@ private function readPipes($blocking, $close)`
`1072`	`1072`
`1073`	`1073`	`$callback = $this->callback;`
`1074`	`1074`	`foreach ($result as $type => $data) {`
`1075`		`- if (3 === $type) {`
`1076`		`- $this->fallbackStatus['running'] = false;`
`1077`		`- if (!isset($this->fallbackStatus['signaled'])) {`
`1078`		`- $this->fallbackStatus['exitcode'] = (int) $data;`
`1079`		`- }`
`1080`		`- } else {`
	`1075`	`+ if (3 !== $type) {`
`1081`	`1076`	`$callback($type === self::STDOUT ? self::OUT : self::ERR, $data);`
	`1077`	`+ } elseif (!isset($this->fallbackStatus['signaled'])) {`
	`1078`	`+ $this->fallbackStatus['exitcode'] = (int) $data;`
`1082`	`1079`	`}`
`1083`	`1080`	`}`
`1084`	`1081`	`}`