bug #18349 [Process] Fix stream_select priority when writing to stdin (nicolas-grekas)

This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Fix stream_select priority when writing to stdin

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

f31e783 [Process] Fix stream_select priority when writing to stdin

Author: fabpot

src/Symfony/Component/Process/Pipes/AbstractPipes.php

@@ -22,10 +22,9 @@ abstract class AbstractPipes implements PipesInterface
     public $pipes = array();
 
     /** @var string */
-    protected $inputBuffer = '';
+    private $inputBuffer = '';
     /** @var resource|null */
-    protected $input;
-
+    private $input;
     /** @var bool */
     private $blocked = true;
 
@@ -91,9 +90,8 @@ protected function write()
         if (!isset($this->pipes[0])) {
             return;
         }
-
-        $e = array();
-        $r = null !== $this->input ? array($this->input) : $e;
+        $input = $this->input;
+        $r = $e = array();
         $w = array($this->pipes[0]);
 
         // let's have a look if something changed in streams
@@ -110,7 +108,7 @@ protected function write()
                 }
             }
 
-            foreach ($r as $input) {
+            if ($input) {
                 for (;;) {
                     $data = fread($input, self::CHUNK_SIZE);
                     if (!isset($data[0])) {
@@ -124,7 +122,7 @@ protected function write()
                         return array($this->pipes[0]);
                     }
                 }
-                if (!isset($data[0]) && feof($input)) {
+                if (feof($input)) {
                     // no more data to read on input resource
                     // use an empty buffer in the next reads
                     $this->input = null;

src/Symfony/Component/Process/Process.php

@@ -158,7 +158,7 @@ public function __construct($commandline, $cwd = null, array $env = null, $input
             $this->setEnv($env);
         }
 
-        $this->input = $input;
+        $this->setInput($input);
         $this->setTimeout($timeout);
         $this->useFileHandles = '\\' === DIRECTORY_SEPARATOR;
         $this->pty = false;

src/Symfony/Component/Process/ProcessUtils.php

@@ -80,7 +80,7 @@ public static function escapeArgument($argument)
      * @param string $caller The name of method call that validates the input
      * @param mixed  $input  The input to validate
      *
-     * @return string The validated input
+     * @return mixed The validated input
      *
      * @throws InvalidArgumentException In case the input is not valid
      *
@@ -92,6 +92,9 @@ public static function validateInput($caller, $input)
             if (is_resource($input)) {
                 return $input;
             }
+            if (is_string($input)) {
+                return $input;
+            }
             if (is_scalar($input)) {
                 return (string) $input;
             }

src/Symfony/Component/Process/Tests/ProcessTest.php

@@ -209,6 +209,24 @@ public function testSetStreamAsInput($code, $size)
         $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
     }
 
+    public function testLiveStreamAsInput()
+    {
+        $stream = fopen('php://memory', 'r+');
+        fwrite($stream, 'hello');
+        rewind($stream);
+
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('stream_copy_to_stream(STDIN, STDOUT);')));
+        $p->setInput($stream);
+        $p->start(function ($type, $data) use ($stream) {
+            if ('hello' === $data) {
+                fclose($stream);
+            }
+        });
+        $p->wait();
+
+        $this->assertSame('hello', $p->getOutput());
+    }
+
     /**
      * @expectedException \Symfony\Component\Process\Exception\LogicException
      * @expectedExceptionMessage Input can not be set while the process is running.