bug #11381 [2.3] [Process] Use correct test for empty string in UnixPipes (whs, romainneutron)

fabpot · fabpot · commit 91e32f810bc9 · 2014-07-16T15:02:06.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [2.3] [Process] Use correct test for empty string in UnixPipes | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This PR supersedes #11264 : 2.3 compatibility + Windows compatibility + CS fix Commits ------- cec0a45 [Process] Adjust PR #11264, make it Windows compatible and fix CS 9e1ea4a [Process] Use correct test for empty string in UnixPipes
diff --git a/src/Symfony/Component/Process/ProcessPipes.php b/src/Symfony/Component/Process/ProcessPipes.php
@@ -313,11 +313,11 @@ private function readStreams($blocking, $close = false)
             $type = array_search($pipe, $this->pipes);
 
             $data = '';
-            while ($dataread = fread($pipe, self::CHUNK_SIZE)) {
+            while ('' !== $dataread = (string) fread($pipe, self::CHUNK_SIZE)) {
                 $data .= $dataread;
             }
 
-            if ($data) {
+            if ('' !== $data) {
                 $read[$type] = $data;
             }
 
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -287,6 +287,19 @@ public function testGetIncrementalOutput()
         }
     }
 
+    public function testZeroAsOutput()
+    {
+        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+            // see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
+            $p = $this->getProcess('echo | set /p dummyName=0');
+        } else {
+            $p = $this->getProcess('printf 0');
+        }
+
+        $p->run();
+        $this->assertSame('0', $p->getOutput());
+    }
+
     public function testExitCodeCommandFailed()
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {

Original file line number	Diff line number	Diff line change
`@@ -313,11 +313,11 @@ private function readStreams($blocking, $close = false)`
`313`	`313`	`$type = array_search($pipe, $this->pipes);`
`314`	`314`
`315`	`315`	`$data = '';`
`316`		`- while ($dataread = fread($pipe, self::CHUNK_SIZE)) {`
	`316`	`+ while ('' !== $dataread = (string) fread($pipe, self::CHUNK_SIZE)) {`
`317`	`317`	`$data .= $dataread;`
`318`	`318`	`}`
`319`	`319`
`320`		`- if ($data) {`
	`320`	`+ if ('' !== $data) {`
`321`	`321`	`$read[$type] = $data;`
`322`	`322`	`}`
`323`	`323`
Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,19 @@ public function testGetIncrementalOutput()`
`287`	`287`	`}`
`288`	`288`	`}`
`289`	`289`
	`290`	`+ public function testZeroAsOutput()`
	`291`	`+ {`
	`292`	`+ if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
	`293`	`+ // see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line`
	`294`	`+ $p = $this->getProcess('echo \| set /p dummyName=0');`
	`295`	`+ } else {`
	`296`	`+ $p = $this->getProcess('printf 0');`
	`297`	`+ }`
	`298`	`+`
	`299`	`+ $p->run();`
	`300`	`+ $this->assertSame('0', $p->getOutput());`
	`301`	`+ }`
	`302`	`+`
`290`	`303`	`public function testExitCodeCommandFailed()`
`291`	`304`	`{`
`292`	`305`	`if (defined('PHP_WINDOWS_VERSION_BUILD')) {`