bug #9367 [Process] Check if the pipe array is empty before calling stream_select() (jfposton)

fabpot · fabpot · commit 2375046a645e · 2013-11-15T17:36:12.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9367). Discussion ---------- [Process] Check if the pipe array is empty before calling stream_select() | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9280 | License | MIT | Doc PR | ProcessPipes generates a warning frequently which can cause issues for custom shutdown functions. Adding a check to see if the pipe array is empty should be functionally equivalent without having to generate the error. Fixes: #9280 Commits ------- 12f95e2 [Process] Check if the pipe array is empty before calling stream_select()
diff --git a/src/Symfony/Component/Process/ProcessPipes.php b/src/Symfony/Component/Process/ProcessPipes.php
@@ -247,6 +247,10 @@ private function readFileHandles($close = false)
      */
     private function readStreams($blocking, $close = false)
     {
+        if (empty($this->pipes)) {
+            return array();
+        }
+
         $read = array();
 
         $r = $this->pipes;
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -19,6 +19,16 @@
  */
 abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 {
+    public function testThatProcessDoesNotThrowWarningDuringRun()
+    {
+        @trigger_error('Test Error', E_USER_NOTICE);
+        $process = $this->getProcess("php -r 'sleep(3)'");
+        $process->run();
+        $actualError = error_get_last();
+        $this->assertEquals('Test Error', $actualError['message']);
+        $this->assertEquals(E_USER_NOTICE, $actualError['type']);
+    }
+
     /**
      * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
      */
