Forward compatibility with stable ReactPHP components

Author: clue

composer.json

@@ -15,10 +15,10 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/promise": "~1.0|~2.0",
-        "react/child-process": "~0.3.0|~0.4.0",
-        "react/stream": "~0.3.0|~0.4.0",
-        "react/event-loop": "~0.3.0|~0.4.0"
+        "react/child-process": "^0.5 || ^0.4 || ^0.3",
+        "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
+        "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.6",
+        "react/promise": "^2.0 || ^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0 || ^6.0 || ^5.0 || ^4.8.35"

src/DeferredShell.php

@@ -3,7 +3,7 @@
 namespace Clue\React\Shell;
 
 use React\Promise\Deferred;
-use React\Stream\CompositeStream;
+use React\Stream\DuplexStreamInterface;
 use RuntimeException;
 
 class DeferredShell
@@ -21,7 +21,7 @@ class DeferredShell
     private $buffer = '';
     private $started = false;
 
-    public function __construct(CompositeStream $stream)
+    public function __construct(DuplexStreamInterface $stream)
     {
         $this->stream = $stream;
 

tests/DeferredShellTest.php

@@ -8,7 +8,7 @@ class DeferredShellTest extends TestCase
 
     public function setUp()
     {
-        $this->stream = $this->getMockBuilder('React\Stream\CompositeStream')->disableOriginalConstructor()->getMock();
+        $this->stream = $this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock();
     }
 
     public function testExecuteWritesToStream()

tests/ProcessLauncherTest.php

@@ -1,7 +1,6 @@
 <?php
 
 use Clue\React\Shell\ProcessLauncher;
-use React\Stream\ReadableStream;
 
 class ProcessLauncherTest extends TestCase
 {
@@ -30,9 +29,12 @@ public function testProcessWillBeStarted()
     public function testClosingStreamTerminatesRunningProcess()
     {
         $process = $this->getMockBuilder('React\ChildProcess\Process')->disableOriginalConstructor()->getMock();
-        $process->stdout = new ReadableStream();
+        $process->stdout = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $process->stdin = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
+        $process->stdout->expects($this->any())->method('isReadable')->willReturn(true);
+        $process->stdin->expects($this->any())->method('isWritable')->willReturn(true);
+
         $process->expects($this->once())->method('isRunning')->will($this->returnValue(true));
         $process->expects($this->once())->method('terminate')->with($this->equalTo(SIGKILL));
 
@@ -44,9 +46,12 @@ public function testClosingStreamTerminatesRunningProcess()
     public function testClosingStreamOfNonRunningProcessWillNotTerminate()
     {
         $process = $this->getMockBuilder('React\ChildProcess\Process')->disableOriginalConstructor()->getMock();
-        $process->stdout = new ReadableStream();
+        $process->stdout = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $process->stdin = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
+        $process->stdout->expects($this->any())->method('isReadable')->willReturn(true);
+        $process->stdin->expects($this->any())->method('isWritable')->willReturn(true);
+
         $process->expects($this->once())->method('isRunning')->will($this->returnValue(false));
         $process->expects($this->never())->method('terminate');