Merge pull request #23 from

WyriHaximus-labs/support-react-stream-1.0-and-0.7

Support react/stream 1.0 and 0.7

Author: clue

composer.json

@@ -15,11 +15,11 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/stream": "^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3"
+        "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0 || ^4.8",
         "react/event-loop": "^0.4 || ^0.3",
-        "react/stream": "^0.6"
+        "react/stream": "^1.0 || ^0.7"
     }
 }

tests/ControlCodeParserTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use React\Stream\ReadableStream;
 use Clue\React\Term\ControlCodeParser;
+use React\Stream\ThroughStream;
 
 class ControlCodeParserTest extends TestCase
 {
@@ -10,7 +10,7 @@ class ControlCodeParserTest extends TestCase
 
     public function setUp()
     {
-        $this->input = new ReadableStream();
+        $this->input = new ThroughStream();
         $this->parser = new ControlCodeParser($this->input);
     }
 
@@ -264,7 +264,7 @@ public function testClosingParserWillCloseInput()
 
     public function testClosingParserWillRemoveAllDataListeners()
     {
-        $this->input = new ReadableStream();
+        $this->input = new ThroughStream();
         $this->parser = new ControlCodeParser($this->input);
 
         $this->parser->on('data', $this->expectCallableNever());
@@ -300,7 +300,7 @@ public function testPassingClosedInputToParserWillCloseParser()
 
     public function testPassingClosedInputToParserWillNotAddAnyDataListeners()
     {
-        $this->input = new ReadableStream();
+        $this->input = new ThroughStream();
         $this->input->close();
 
         $this->parser = new ControlCodeParser($this->input);

tests/FunctionalControlCodeParserTest.php

@@ -1,16 +1,16 @@
 <?php
 
-use React\EventLoop\Factory;
-use React\Stream\Stream;
 use Clue\React\Term\ControlCodeParser;
+use React\EventLoop\Factory;
+use React\Stream\ReadableResourceStream;
 
 class FunctionalControlCodeParserTest extends TestCase
 {
     public function testPipingReadme()
     {
         $loop = Factory::create();
 
-        $input = new Stream(fopen(__DIR__ . '/../README.md', 'r+'), $loop);
+        $input = new ReadableResourceStream(fopen(__DIR__ . '/../README.md', 'r+'), $loop);
         $parser = new ControlCodeParser($input);
 
         $buffer = '';