Merge pull request #6 from thklein/stream-update

Forward compatibility with Stream v0.7, v0.6, v0.5 and upcoming v1.0 (while keeping BC)

Author: clue

README.md

@@ -28,7 +28,7 @@ as parsed values instead of just chunks of strings:
 "hello w\u00f6rld"\r\n
 ```
 ```php
-$stdin = new Stream(STDIN, $loop);
+$stdin = new ReadableResourceStream(STDIN, $loop);
 
 $stream = new Decoder($stdin);
 
@@ -118,7 +118,7 @@ and accepts its data through the same interface, but handles any data as complet
 JSON elements instead of just chunks of strings:
 
 ```php
-$stdout = new Stream(STDOUT, $loop);
+$stdout = new WritableResourceStream(STDOUT, $loop);
 
 $stream = new Encoder($stdout);
 

composer.json

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

examples/validate.php

@@ -1,7 +1,8 @@
 <?php
 
 use React\EventLoop\Factory;
-use React\Stream\Stream;
+use React\Stream\ReadableResourceStream;
+use React\Stream\WritableResourceStream;
 use Clue\React\NDJson\Decoder;
 use Clue\React\NDJson\Encoder;
 
@@ -10,11 +11,9 @@
 $loop = Factory::create();
 
 $exit = 0;
-$in = new Stream(STDIN, $loop);
-$out = new Stream(STDOUT, $loop);
-$out->pause();
-$info = new Stream(STDERR, $loop);
-$info->pause();
+$in = new ReadableResourceStream(STDIN, $loop);
+$out = new WritableResourceStream(STDOUT, $loop);
+$info = new WritableResourceStream(STDERR, $loop);
 
 $decoder = new Decoder($in);
 $encoder = new Encoder($out);

tests/DecoderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use React\Stream\ReadableStream;
+use React\Stream\ReadableResourceStream;
 use Clue\React\NDJson\Decoder;
 
 class DecoderTest extends TestCase
@@ -10,7 +10,10 @@ class DecoderTest extends TestCase
 
     public function setUp()
     {
-        $this->input = new ReadableStream();
+        $stream = fopen('php://temp', 'r');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $this->input = new ReadableResourceStream($stream, $loop);
         $this->decoder = new Decoder($this->input);
     }
 

tests/EncoderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use React\Stream\WritableStream;
+use React\Stream\WritableResourceStream;
 use Clue\React\NDJson\Encoder;
 
 class EncoderTest extends TestCase
@@ -10,7 +10,10 @@ class EncoderTest extends TestCase
 
     public function setUp()
     {
-        $this->output = new WritableStream();
+        $stream = fopen('php://temp', 'r+');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $this->output = new WritableResourceStream($stream, $loop);
         $this->encoder = new Encoder($this->output);
     }