Forward compatibility with latest Stream releases

Author: clue

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": ">=5.3",
         "react/event-loop": "0.3.*|0.4.*",
-        "react/stream": "^0.5 || ^0.4.2",
+        "react/stream": "^0.7 || ^0.6",
         "clue/utf8-react": "^1.0 || ^0.1",
         "clue/term-react": "^1.0 || ^0.1.1"
     },

src/Stdio.php

@@ -7,10 +7,11 @@
 use Evenement\EventEmitter;
 use React\EventLoop\LoopInterface;
 use React\Stream\DuplexStreamInterface;
+use React\Stream\ReadableResourceStream;
 use React\Stream\ReadableStreamInterface;
 use React\Stream\Util;
+use React\Stream\WritableResourceStream;
 use React\Stream\WritableStreamInterface;
-use React\Stream\Stream;
 
 class Stdio extends EventEmitter implements DuplexStreamInterface
 {
@@ -268,21 +269,16 @@ private function restoreTtyMode()
     private function createStdin(LoopInterface $loop)
     {
         // STDIN not defined ("php -a") or already closed (`fclose(STDIN)`)
-        if (!defined('STDIN') || !is_resource(STDIN)) {
-            $stream = new Stream(fopen('php://memory', 'r'), $loop);
-            $stream->close();
-            return $stream;
-        }
-
-        $stream = new Stream(STDIN, $loop);
-
-        // support starting program with closed STDIN ("example.php 0<&-")
+        // also support starting program with closed STDIN ("example.php 0<&-")
         // the stream is a valid resource and is not EOF, but fstat fails
-        if (fstat(STDIN) === false) {
+        if (!defined('STDIN') || !is_resource(STDIN) || fstat(STDIN) === false) {
+            $stream = new ReadableResourceStream(fopen('php://memory', 'r'), $loop);
             $stream->close();
             return $stream;
         }
 
+        $stream = new ReadableResourceStream(STDIN, $loop);
+
         if (function_exists('readline_callback_handler_install')) {
             // Prefer `ext-readline` to install dummy handler to turn on raw input mode.
             // We will nevery actually feed the readline handler and instead
@@ -313,12 +309,13 @@ private function createStdin(LoopInterface $loop)
     private function createStdout(LoopInterface $loop)
     {
         // STDOUT not defined ("php -a") or already closed (`fclose(STDOUT)`)
-        if (!defined('STDOUT') || !is_resource(STDOUT)) {
-            $output = new Stream(fopen('php://memory', 'r+'), $loop);
+        // also support starting program with closed STDOUT ("example.php >&-")
+        // the stream is a valid resource and is not EOF, but fstat fails
+        if (!defined('STDOUT') || !is_resource(STDOUT) || fstat(STDOUT) === false) {
+            $output = new WritableResourceStream(fopen('php://memory', 'r+'), $loop);
             $output->close();
         } else {
-            $output = new Stream(STDOUT, $loop);
-            $output->pause();
+            $output = new WritableResourceStream(STDOUT, $loop);
         }
 
         return $output;

tests/FunctionalExampleTest.php

@@ -41,6 +41,17 @@ public function testPeriodicExampleWithClosedInputQuitsImmediately()
         $this->assertNotContains('you just said:', $output);
     }
 
+    public function testPeriodicExampleWithClosedInputAndOutputQuitsImmediatelyWithoutOutput()
+    {
+        $output = $this->execExample('php 01-periodic.php <&- >&- 2>&1');
+
+        if (strpos($output, 'said') !== false) {
+            $this->markTestIncomplete('Your platform exhibits a closed STDIN bug, this may need some further debugging');
+        }
+
+        $this->assertEquals('', $output);
+    }
+
     public function testStubShowStdinIsReadableByDefault()
     {
         $output = $this->execExample('php ../tests/stub/01-check-stdin.php');

tests/ReadlineTest.php

@@ -1,7 +1,7 @@
 <?php
 
 use Clue\React\Stdio\Readline;
-use React\Stream\ReadableStream;
+use React\Stream\ThroughStream;
 
 class ReadlineTest extends TestCase
 {
@@ -11,7 +11,7 @@ class ReadlineTest extends TestCase
 
     public function setUp()
     {
-        $this->input = new ReadableStream();
+        $this->input = new ThroughStream();
         $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
         $this->readline = new Readline($this->input, $this->output);

tests/StdioTest.php

@@ -1,10 +1,9 @@
 <?php
 
-use React\EventLoop\Factory;
 use Clue\React\Stdio\Stdio;
 use Clue\React\Stdio\Readline;
-use React\Stream\ReadableStream;
-use React\Stream\WritableStream;
+use React\EventLoop\Factory;
+use React\Stream\ThroughStream;
 
 class StdioTest extends TestCase
 {
@@ -408,7 +407,7 @@ public function testDataEventWithoutNewlineWillBeForwardedAsIs()
 
     public function testEndEventWillBeForwarded()
     {
-        $input = new ReadableStream();
+        $input = new ThroughStream();
         $output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
         //$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
@@ -423,7 +422,7 @@ public function testEndEventWillBeForwarded()
 
     public function testErrorEventFromInputWillBeForwarded()
     {
-        $input = new ReadableStream();
+        $input = new ThroughStream();
         $output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
         //$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
@@ -439,7 +438,7 @@ public function testErrorEventFromInputWillBeForwarded()
     public function testErrorEventFromOutputWillBeForwarded()
     {
         $input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
-        $output = new WritableStream();
+        $output = new ThroughStream();
 
         //$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
         $readline = new Readline($input, $output);