Skip to content

Commit 8fae025

Browse files
clueclue
authored
Merge pull request #51 from clue-labs/deps
Update all ReactPHP dependencies to latest versions
2 parents f4a28bf + 5100d35 commit 8fae025

10 files changed

Lines changed: 48 additions & 51 deletions

‎composer.json‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@
1818
},
1919
"require": {
2020
"php": ">=5.3",
21-
"react/event-loop": "~0.3.0|~0.4.0",
22-
"clue/buzz-react": "^0.5",
23-
"react/promise": "~2.0|~1.1",
24-
"clue/json-stream": "~0.1.0",
25-
"rize/uri-template": "^0.3",
26-
"clue/promise-stream-react": "^0.1"
21+
"clue/buzz-react": "^2.0",
22+
"clue/json-stream": "^0.1",
23+
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
24+
"react/promise": "^2.0 || ^1.1",
25+
"react/promise-stream": "^1.0",
26+
"react/socket": "^1.0",
27+
"react/stream": "^1.0",
28+
"rize/uri-template": "^0.3"
2729
},
2830
"require-dev": {
29-
"clue/block-react": "~0.3.0",
30-
"clue/caret-notation": "~0.2.0",
31-
"clue/tar-react": "~0.1.0",
31+
"clue/block-react": "^1.0 || ^0.3",
32+
"clue/caret-notation": "^0.2",
33+
"clue/tar-react": "^0.2",
3234
"phpunit/phpunit": "^7.0 || ^6.0 || ^5.0 || ^4.8.35"
3335
}
3436
}

‎examples/exec-stream.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
// displays the streaming output as it happens.
55

66
use Clue\React\Docker\Client;
7-
use React\Stream\Stream;
7+
use React\Stream\WritableResourceStream;
88

99
require __DIR__ . '/../vendor/autoload.php';
1010

11+
if (DIRECTORY_SEPARATOR === '\\') {
12+
exit('File I/O not supported on Windows' . PHP_EOL);
13+
}
14+
1115
$container = 'asd';
1216
//$cmd = array('echo', 'hello world');
1317
//$cmd = array('sleep', '2');
@@ -22,11 +26,8 @@
2226
$loop = React\EventLoop\Factory::create();
2327
$client = new Client($loop);
2428

25-
$out = new Stream(STDOUT, $loop);
26-
$out->pause();
27-
28-
$stderr = new Stream(STDERR, $loop);
29-
$stderr->pause();
29+
$out = new WritableResourceStream(STDOUT, $loop);
30+
$stderr = new WritableResourceStream(STDERR, $loop);
3031

3132
// unkown exit code by default
3233
$exit = 1;

‎examples/export.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
// and how we it can be piped into a output tar file.
55

66
use Clue\React\Docker\Client;
7-
use React\Stream\Stream;
7+
use React\Stream\WritableResourceStream;
88

99
require __DIR__ . '/../vendor/autoload.php';
1010

11+
if (DIRECTORY_SEPARATOR === '\\') {
12+
exit('File I/O not supported on Windows' . PHP_EOL);
13+
}
14+
1115
$container = isset($argv[1]) ? $argv[1] : 'asd';
1216
$target = isset($argv[2]) ? $argv[2] : ($container . '.tar');
1317
echo 'Exporting whole container "' . $container . '" to "' . $target .'" (pass as arguments to this example)' . PHP_EOL;
@@ -22,8 +26,7 @@
2226
echo 'ERROR requesting stream' . PHP_EOL . $e;
2327
});
2428

25-
$out = new Stream(fopen($target, 'w'), $loop);
26-
$out->pause();
29+
$out = new WritableResourceStream(fopen($target, 'w'), $loop);
2730
$stream->pipe($out);
2831

2932
$loop->run();

‎src/Client.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ public function __construct(LoopInterface $loop, $url = null)
4242

4343
if (substr($url, 0, 7) === 'unix://') {
4444
// send everything through a local unix domain socket
45-
$browser = $browser->withSender(
46-
Sender::createFromLoopUnix($loop, $url)
45+
$connector = new \React\Socket\FixedUriConnector(
46+
$url,
47+
new \React\Socket\UnixConnector($loop)
4748
);
4849

4950
// pretend all HTTP URLs to be on localhost
51+
$browser = new Browser($loop, $connector);
5052
$url = 'http://localhost/';
5153
}
5254

‎src/Io/StreamingParser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Clue\React\Docker\Io;
44

5-
use Clue\React\Promise\Stream;
65
use Psr\Http\Message\ResponseInterface;
7-
use React\Promise\PromiseInterface;
86
use React\Promise\Deferred;
7+
use React\Promise\PromiseInterface;
8+
use React\Promise\Stream;
99
use React\Stream\ReadableStreamInterface;
1010
use RuntimeException;
1111

‎tests/ClientTest.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Clue\Tests\React\Docker;
44

5-
use Clue\React\Buzz\Browser;
65
use Clue\React\Docker\Client;
76
use Psr\Http\Message\RequestInterface;
87
use Psr\Http\Message\ResponseInterface;
@@ -13,7 +12,6 @@
1312
class ClientTest extends TestCase
1413
{
1514
private $loop;
16-
private $sender;
1715
private $browser;
1816

1917
private $parser;
@@ -23,9 +21,7 @@ class ClientTest extends TestCase
2321
public function setUp()
2422
{
2523
$this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
26-
$this->sender = $this->getMockBuilder('Clue\React\Buzz\Io\Sender')->disableOriginalConstructor()->getMock();
27-
$this->browser = new Browser($this->loop, $this->sender);
28-
$this->browser = $this->browser->withBase('http://x/');
24+
$this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
2925

3026
$this->parser = $this->getMockBuilder('Clue\React\Docker\Io\ResponseParser')->getMock();
3127
$this->streamingParser = $this->getMockBuilder('Clue\React\Docker\Io\StreamingParser')->getMock();
@@ -562,13 +558,8 @@ private function expectRequestFlow($method, $url, ResponseInterface $response, $
562558

563559
private function expectRequest($method, $url, ResponseInterface $response)
564560
{
565-
$that = $this;
566-
$this->sender->expects($this->once())->method('send')->with($this->callback(function (RequestInterface $request) use ($that, $method, $url) {
567-
$that->assertEquals(strtoupper($method), $request->getMethod());
568-
$that->assertEquals('http://x' . $url, (string)$request->getUri());
569-
570-
return true;
571-
}))->will($this->returnPromise($response));
561+
$this->browser->expects($this->any())->method('withOptions')->willReturnSelf();
562+
$this->browser->expects($this->once())->method(strtolower($method))->with($url)->willReturn(\React\Promise\resolve($response));
572563
}
573564

574565
private function createResponse($body = '')

‎tests/FunctionalClientTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use Clue\React\Block;
66
use Clue\React\Docker\Client;
7-
use Clue\React\Promise\Stream;
87
use React\EventLoop\Factory as LoopFactory;
8+
use React\Promise\Stream;
99

1010
class FunctionalClientTest extends TestCase
1111
{

‎tests/Io/ReadableDemultiplexStreamTest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
use Clue\React\Docker\Io\ReadableDemultiplexStream;
66
use Clue\Tests\React\Docker\TestCase;
7-
use React\Stream\ReadableStream;
8-
use React\Stream\WritableStream;
7+
use React\Stream\ThroughStream;
98

109
class ReadableDemultiplexStreamTest extends TestCase
1110
{
@@ -14,7 +13,7 @@ class ReadableDemultiplexStreamTest extends TestCase
1413

1514
public function setUp()
1615
{
17-
$this->stream = new ReadableStream();
16+
$this->stream = new ThroughStream();
1817
$this->parser = new ReadableDemultiplexStream($this->stream);
1918
}
2019

@@ -106,7 +105,7 @@ public function testCloseTwiceWillEmitCloseOnceAndRemoveAllListeners()
106105

107106
public function testPipeWillBeForwardedToTargetStream()
108107
{
109-
$target = new WritableStream();
108+
$target = new ThroughStream();
110109
$target->on('pipe', $this->expectCallableOnceWith($this->parser));
111110

112111
$this->parser->pipe($target);

‎tests/Io/ReadableJsonStreamTest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
use Clue\React\Docker\Io\ReadableJsonStream;
66
use Clue\Tests\React\Docker\TestCase;
7-
use React\Stream\ReadableStream;
8-
use React\Stream\WritableStream;
7+
use React\Stream\ThroughStream;
98

109
class ReadableJsonStreamTest extends TestCase
1110
{
@@ -14,7 +13,7 @@ class ReadableJsonStreamTest extends TestCase
1413

1514
public function setUp()
1615
{
17-
$this->stream = new ReadableStream();
16+
$this->stream = new ThroughStream();
1817
$this->parser = new ReadableJsonStream($this->stream);
1918
}
2019

@@ -129,7 +128,7 @@ public function testCloseTwiceWillEmitCloseOnceAndRemoveAllListeners()
129128

130129
public function testPipeWillBeForwardedToTargetStream()
131130
{
132-
$target = new WritableStream();
131+
$target = new ThroughStream();
133132
$target->on('pipe', $this->expectCallableOnceWith($this->parser));
134133

135134
$this->parser->pipe($target);

‎tests/Io/StreamingParserTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use React\Promise;
88
use React\Promise\CancellablePromiseInterface;
99
use React\Promise\Deferred;
10-
use React\Stream\ReadableStream;
10+
use React\Stream\ThroughStream;
1111

1212
class StreamingParserTest extends TestCase
1313
{
@@ -20,7 +20,7 @@ public function setUp()
2020

2121
public function testJsonPassingRejectedPromiseResolvesWithClosedStream()
2222
{
23-
$stream = $this->parser->parseJsonStream(Promise\reject());
23+
$stream = $this->parser->parseJsonStream(Promise\reject(new \RuntimeException()));
2424

2525
$this->assertInstanceOf('React\Stream\ReadableStreamInterface', $stream);
2626
$this->assertFalse($stream->isReadable());
@@ -62,7 +62,7 @@ public function testJsonResolvingPromiseWithWrongValueWillEmitErrorAndCloseEvent
6262

6363
public function testPlainPassingRejectedPromiseResolvesWithClosedStream()
6464
{
65-
$stream = $this->parser->parsePlainStream(Promise\reject());
65+
$stream = $this->parser->parsePlainStream(Promise\reject(new \RuntimeException()));
6666

6767
$this->assertInstanceOf('React\Stream\ReadableStreamInterface', $stream);
6868
$this->assertFalse($stream->isReadable());
@@ -79,7 +79,7 @@ public function testDeferredClosedStreamWillReject()
7979

8080
public function testDeferredStreamEventsWillBeEmittedAndBuffered()
8181
{
82-
$stream = new ReadableStream();
82+
$stream = new ThroughStream();
8383

8484
$promise = $this->parser->deferredStream($stream);
8585

@@ -94,20 +94,20 @@ public function testDeferredStreamEventsWillBeEmittedAndBuffered()
9494

9595
public function testDeferredStreamErrorEventWillRejectPromise()
9696
{
97-
$stream = new ReadableStream();
97+
$stream = new ThroughStream();
9898

9999
$promise = $this->parser->deferredStream($stream);
100100

101101
$stream->emit('ignored', array('ignored'));
102102

103103
$stream->emit('data', array('a'));
104104

105-
$stream->emit('error', array('value', 'ignord'));
105+
$stream->emit('error', array(new \RuntimeException()));
106106

107107
$stream->close();
108108

109109
$this->expectPromiseReject($promise);
110-
$promise->then(null, $this->expectCallableOnceWith('value'));
110+
$promise->then(null, $this->expectCallableOnceWith($this->isInstanceOf('RuntimeException')));
111111
}
112112

113113
public function testDeferredCancelingPromiseWillCloseStream()
@@ -126,7 +126,7 @@ public function testDeferredCancelingPromiseWillCloseStream()
126126

127127
public function testDemultiplexStreamWillReturnReadable()
128128
{
129-
$stream = new ReadableStream();
129+
$stream = new ThroughStream();
130130

131131
$out = $this->parser->demultiplexStream($stream);
132132

0 commit comments

Comments
 (0)