Update all ReactPHP dependencies to latest versions

Author: clue

composer.json

@@ -18,17 +18,19 @@
     },
     "require": {
         "php": ">=5.3",
-        "clue/buzz-react": "^1.0",
+        "clue/buzz-react": "^2.0",
         "clue/json-stream": "^0.1",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
         "react/promise": "^2.0 || ^1.1",
         "react/promise-stream": "^1.0",
+        "react/socket": "^1.0",
+        "react/stream": "^1.0",
         "rize/uri-template": "^0.3"
     },
     "require-dev": {
         "clue/block-react": "^1.0 || ^0.3",
         "clue/caret-notation": "^0.2",
-        "clue/tar-react": "^0.2 || ^0.1",
+        "clue/tar-react": "^0.2",
         "phpunit/phpunit": "^7.0 || ^6.0 || ^5.0 || ^4.8.35"
     }
 }

examples/exec-stream.php

@@ -4,10 +4,14 @@
 // displays the streaming output as it happens.
 
 use Clue\React\Docker\Client;
-use React\Stream\Stream;
+use React\Stream\WritableResourceStream;
 
 require __DIR__ . '/../vendor/autoload.php';
 
+if (DIRECTORY_SEPARATOR === '\\') {
+    exit('File I/O not supported on Windows' . PHP_EOL);
+}
+
 $container = 'asd';
 //$cmd = array('echo', 'hello world');
 //$cmd = array('sleep', '2');
@@ -22,11 +26,8 @@
 $loop = React\EventLoop\Factory::create();
 $client = new Client($loop);
 
-$out = new Stream(STDOUT, $loop);
-$out->pause();
-
-$stderr = new Stream(STDERR, $loop);
-$stderr->pause();
+$out = new WritableResourceStream(STDOUT, $loop);
+$stderr = new WritableResourceStream(STDERR, $loop);
 
 // unkown exit code by default
 $exit = 1;

examples/export.php

@@ -4,10 +4,14 @@
 // and how we it can be piped into a output tar file.
 
 use Clue\React\Docker\Client;
-use React\Stream\Stream;
+use React\Stream\WritableResourceStream;
 
 require __DIR__ . '/../vendor/autoload.php';
 
+if (DIRECTORY_SEPARATOR === '\\') {
+    exit('File I/O not supported on Windows' . PHP_EOL);
+}
+
 $container = isset($argv[1]) ? $argv[1] : 'asd';
 $target = isset($argv[2]) ? $argv[2] : ($container . '.tar');
 echo 'Exporting whole container "' . $container . '" to "' . $target .'" (pass as arguments to this example)' . PHP_EOL;
@@ -22,8 +26,7 @@
     echo 'ERROR requesting stream' . PHP_EOL . $e;
 });
 
-$out = new Stream(fopen($target, 'w'), $loop);
-$out->pause();
+$out = new WritableResourceStream(fopen($target, 'w'), $loop);
 $stream->pipe($out);
 
 $loop->run();

src/Client.php

@@ -42,11 +42,13 @@ public function __construct(LoopInterface $loop, $url = null)
 
         if (substr($url, 0, 7) === 'unix://') {
             // send everything through a local unix domain socket
-            $browser = $browser->withSender(
-                Sender::createFromLoopUnix($loop, $url)
+            $connector = new \React\Socket\FixedUriConnector(
+                $url,
+                new \React\Socket\UnixConnector($loop)
             );
 
             // pretend all HTTP URLs to be on localhost
+            $browser = new Browser($loop, $connector);
             $url = 'http://localhost/';
         }
 

tests/ClientTest.php

@@ -2,7 +2,6 @@
 
 namespace Clue\Tests\React\Docker;
 
-use Clue\React\Buzz\Browser;
 use Clue\React\Docker\Client;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -13,7 +12,6 @@
 class ClientTest extends TestCase
 {
     private $loop;
-    private $sender;
     private $browser;
 
     private $parser;
@@ -23,9 +21,7 @@ class ClientTest extends TestCase
     public function setUp()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
-        $this->sender = $this->getMockBuilder('Clue\React\Buzz\Io\Sender')->disableOriginalConstructor()->getMock();
-        $this->browser = new Browser($this->loop, $this->sender);
-        $this->browser = $this->browser->withBase('http://x/');
+        $this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
 
         $this->parser = $this->getMockBuilder('Clue\React\Docker\Io\ResponseParser')->getMock();
         $this->streamingParser = $this->getMockBuilder('Clue\React\Docker\Io\StreamingParser')->getMock();
@@ -562,13 +558,8 @@ private function expectRequestFlow($method, $url, ResponseInterface $response, $
 
     private function expectRequest($method, $url, ResponseInterface $response)
     {
-        $that = $this;
-        $this->sender->expects($this->once())->method('send')->with($this->callback(function (RequestInterface $request) use ($that, $method, $url) {
-            $that->assertEquals(strtoupper($method), $request->getMethod());
-            $that->assertEquals('http://x' . $url, (string)$request->getUri());
-
-            return true;
-        }))->will($this->returnPromise($response));
+        $this->browser->expects($this->any())->method('withOptions')->willReturnSelf();
+        $this->browser->expects($this->once())->method(strtolower($method))->with($url)->willReturn(\React\Promise\resolve($response));
     }
 
     private function createResponse($body = '')

tests/Io/ReadableDemultiplexStreamTest.php

@@ -4,8 +4,7 @@
 
 use Clue\React\Docker\Io\ReadableDemultiplexStream;
 use Clue\Tests\React\Docker\TestCase;
-use React\Stream\ReadableStream;
-use React\Stream\WritableStream;
+use React\Stream\ThroughStream;
 
 class ReadableDemultiplexStreamTest extends TestCase
 {
@@ -14,7 +13,7 @@ class ReadableDemultiplexStreamTest extends TestCase
 
     public function setUp()
     {
-        $this->stream = new ReadableStream();
+        $this->stream = new ThroughStream();
         $this->parser = new ReadableDemultiplexStream($this->stream);
     }
 
@@ -106,7 +105,7 @@ public function testCloseTwiceWillEmitCloseOnceAndRemoveAllListeners()
 
     public function testPipeWillBeForwardedToTargetStream()
     {
-        $target = new WritableStream();
+        $target = new ThroughStream();
         $target->on('pipe', $this->expectCallableOnceWith($this->parser));
 
         $this->parser->pipe($target);

tests/Io/ReadableJsonStreamTest.php

@@ -4,8 +4,7 @@
 
 use Clue\React\Docker\Io\ReadableJsonStream;
 use Clue\Tests\React\Docker\TestCase;
-use React\Stream\ReadableStream;
-use React\Stream\WritableStream;
+use React\Stream\ThroughStream;
 
 class ReadableJsonStreamTest extends TestCase
 {
@@ -14,7 +13,7 @@ class ReadableJsonStreamTest extends TestCase
 
     public function setUp()
     {
-        $this->stream = new ReadableStream();
+        $this->stream = new ThroughStream();
         $this->parser = new ReadableJsonStream($this->stream);
     }
 
@@ -129,7 +128,7 @@ public function testCloseTwiceWillEmitCloseOnceAndRemoveAllListeners()
 
     public function testPipeWillBeForwardedToTargetStream()
     {
-        $target = new WritableStream();
+        $target = new ThroughStream();
         $target->on('pipe', $this->expectCallableOnceWith($this->parser));
 
         $this->parser->pipe($target);

tests/Io/StreamingParserTest.php

@@ -7,7 +7,7 @@
 use React\Promise;
 use React\Promise\CancellablePromiseInterface;
 use React\Promise\Deferred;
-use React\Stream\ReadableStream;
+use React\Stream\ThroughStream;
 
 class StreamingParserTest extends TestCase
 {
@@ -79,7 +79,7 @@ public function testDeferredClosedStreamWillReject()
 
     public function testDeferredStreamEventsWillBeEmittedAndBuffered()
     {
-        $stream = new ReadableStream();
+        $stream = new ThroughStream();
 
         $promise = $this->parser->deferredStream($stream);
 
@@ -94,7 +94,7 @@ public function testDeferredStreamEventsWillBeEmittedAndBuffered()
 
     public function testDeferredStreamErrorEventWillRejectPromise()
     {
-        $stream = new ReadableStream();
+        $stream = new ThroughStream();
 
         $promise = $this->parser->deferredStream($stream);
 
@@ -126,7 +126,7 @@ public function testDeferredCancelingPromiseWillCloseStream()
 
     public function testDemultiplexStreamWillReturnReadable()
     {
-        $stream = new ReadableStream();
+        $stream = new ThroughStream();
 
         $out = $this->parser->demultiplexStream($stream);