[Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least)

nicolas-grekas · nicolas-grekas · commit 7c29f08827d7 · 2016-08-02T12:54:05.000+02:00
diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
@@ -111,7 +111,7 @@ protected function write()
             if ($input) {
                 for (;;) {
                     $data = fread($input, self::CHUNK_SIZE);
-                    if (false === $data || '' === $data) {
+                    if (!isset($data[0])) {
                         break;
                     }
                     $written = fwrite($stdin, $data);
@@ -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]);
         }
     }
diff --git a/src/Symfony/Component/Process/Pipes/UnixPipes.php b/src/Symfony/Component/Process/Pipes/UnixPipes.php
@@ -120,7 +120,7 @@ public function readAndWrite($blocking, $close = false)
             do {
                 $data = fread($pipe, self::CHUNK_SIZE);
                 $read[$type] .= $data;
-            } while (false !== $data && '' !== $data);
+            } while (isset($data[0]));
 
             if (!isset($read[$type][0])) {
                 unset($read[$type]);
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -139,7 +139,7 @@ public function readAndWrite($blocking, $close = false)
         foreach ($this->fileHandles as $type => $fileHandle) {
             $data = stream_get_contents($fileHandle, -1, $this->readBytes[$type]);
 
-            if (false !== $data && '' !== $data) {
+            if (isset($data[0])) {
                 $this->readBytes[$type] += strlen($data);
                 $read[$type] = $data;
             }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ protected function write()`
`111`	`111`	`if ($input) {`
`112`	`112`	`for (;;) {`
`113`	`113`	`$data = fread($input, self::CHUNK_SIZE);`
`114`		`- if (false === $data \|\| '' === $data) {`
	`114`	`+ if (!isset($data[0])) {`
`115`	`115`	`break;`
`116`	`116`	`}`
`117`	`117`	`$written = fwrite($stdin, $data);`
`@@ -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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function readAndWrite($blocking, $close = false)`
`139`	`139`	`foreach ($this->fileHandles as $type => $fileHandle) {`
`140`	`140`	`$data = stream_get_contents($fileHandle, -1, $this->readBytes[$type]);`
`141`	`141`
`142`		`- if (false !== $data && '' !== $data) {`
	`142`	`+ if (isset($data[0])) {`
`143`	`143`	`$this->readBytes[$type] += strlen($data);`
`144`	`144`	`$read[$type] = $data;`
`145`	`145`	`}`