bug #19508 [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 05c9f6c5db20 · 2016-08-03T08:42:43.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | composer/composer#5381, composer/composer#5566 | License | MIT | Doc PR | - Even if I tried with my local hhvm, I can't reproduce the reported issues, yet it looks like some versions of HHVM trigger a notice here. Commits ------- 2bb2b9b [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least)
diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
@@ -134,9 +134,7 @@ protected function write()
         if (null === $this->input && !isset($this->inputBuffer[0])) {
             fclose($this->pipes[0]);
             unset($this->pipes[0]);
-        }
-
-        if (!$w) {
+        } elseif (!$w) {
             return array($this->pipes[0]);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,7 @@ protected function write()`
`134`	`134`	`if (null === $this->input && !isset($this->inputBuffer[0])) {`
`135`	`135`	`fclose($this->pipes[0]);`
`136`	`136`	`unset($this->pipes[0]);`
`137`		`- }`
`138`		`-`
`139`		`- if (!$w) {`
	`137`	`+ } elseif (!$w) {`
`140`	`138`	`return array($this->pipes[0]);`
`141`	`139`	`}`
`142`	`140`	`}`