From 6f92680bb862f8efe0c2a7f51a60eae807c6a826 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Tue, 3 Feb 2015 18:03:55 -0500 Subject: [PATCH 1/2] "Fix" minor BC break :-) --- README.md | 4 ++-- src/SecureStream.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index feec9c1..2bb80ef 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ succeeds or fails. ```php $connector = new React\SocketClient\Connector($loop, $dns); -$connector->create('www.google.com', 80)->then(function (React\Stream\Stream $stream) { +$connector->create('www.google.com', 80)->then(function (React\Stream\DuplexStreamInterface $stream) { $stream->write('...'); $stream->close(); }); @@ -57,7 +57,7 @@ a `Stream` instance that can be used just like any non-encrypted stream. ```php $secureConnector = new React\SocketClient\SecureConnector($connector, $loop); -$secureConnector->create('www.google.com', 443)->then(function (React\Stream\Stream $stream) { +$secureConnector->create('www.google.com', 443)->then(function (React\Stream\DuplexStreamInterface $stream) { $stream->write("GET / HTTP/1.0\r\nHost: www.google.com\r\n\r\n"); ... }); diff --git a/src/SecureStream.php b/src/SecureStream.php index c185331..ce6e1da 100644 --- a/src/SecureStream.php +++ b/src/SecureStream.php @@ -9,12 +9,12 @@ use React\Stream\Stream; use React\Stream\Util; -class SecureStream implements DuplexStreamInterface +class SecureStream extends Stream implements DuplexStreamInterface { - use EventEmitterTrait; - +// use EventEmitterTrait; + public $stream; - + public $decorating; protected $loop; @@ -35,12 +35,12 @@ public function __construct(Stream $stream, LoopInterface $loop) { $stream->on('drain', function() { $this->emit('drain', [$this]); }); - + $stream->pause(); - + $this->resume(); } - + public function handleData($stream) { $data = stream_get_contents($stream); @@ -51,7 +51,7 @@ public function handleData($stream) $this->end(); } } - + public function pause() { $this->loop->removeReadStream($this->decorating->stream); From 14116e4cbd0a13d0d1bb4963373da038649e67b5 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Wed, 11 Mar 2015 14:47:25 -0400 Subject: [PATCH 2/2] Undo API change in docs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2bb80ef..feec9c1 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ succeeds or fails. ```php $connector = new React\SocketClient\Connector($loop, $dns); -$connector->create('www.google.com', 80)->then(function (React\Stream\DuplexStreamInterface $stream) { +$connector->create('www.google.com', 80)->then(function (React\Stream\Stream $stream) { $stream->write('...'); $stream->close(); }); @@ -57,7 +57,7 @@ a `Stream` instance that can be used just like any non-encrypted stream. ```php $secureConnector = new React\SocketClient\SecureConnector($connector, $loop); -$secureConnector->create('www.google.com', 443)->then(function (React\Stream\DuplexStreamInterface $stream) { +$secureConnector->create('www.google.com', 443)->then(function (React\Stream\Stream $stream) { $stream->write("GET / HTTP/1.0\r\nHost: www.google.com\r\n\r\n"); ... });