From 21bcc712c13ef8dbb241a58ad5b27ccc72a51db9 Mon Sep 17 00:00:00 2001 From: Bohdan Yurov Date: Wed, 7 Jun 2017 12:43:56 +0300 Subject: [PATCH] Upgrade to new ReactPHP components --- composer.json | 11 ++++++----- src/Io/Sender.php | 9 +++------ src/Io/Transaction.php | 9 +++------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 154131a..855bf1f 100644 --- a/composer.json +++ b/composer.json @@ -16,11 +16,12 @@ "require": { "php": ">=5.3", "react/event-loop": "^0.4 || ^0.3", - "react/http-client": "^0.4 || ^0.3", - "react/socket-client": "^0.5 || ^0.4.5", - "react/dns": "^0.4.1 || ^0.3", - "react/promise": "^2 || ^1.1", - "react/stream": "^0.4 || ^0.3.1", + "react/http-client": "^1.0 || ^0.5", + "react/socket": "^1.0 || ^0.8", + "react/dns": "^0.4", + "react/promise": "^2", + "react/stream": "^1.0 || ^0.7", + "react/promise-stream": "^1.0 || ^0.1", "psr/http-message": "^1.0", "ringcentral/psr7": "^1.2" }, diff --git a/src/Io/Sender.php b/src/Io/Sender.php index 5a7c976..db39332 100644 --- a/src/Io/Sender.php +++ b/src/Io/Sender.php @@ -4,16 +4,13 @@ use React\HttpClient\Client as HttpClient; use Psr\Http\Message\RequestInterface; -use Psr\Http\Message\ResponseInterface; -use React\HttpClient\Request as RequestStream; use React\HttpClient\Response as ResponseStream; use React\Promise\Deferred; use React\EventLoop\LoopInterface; use React\Dns\Resolver\Factory as ResolverFactory; -use React\SocketClient\Connector; -use React\SocketClient\SecureConnector; -use RuntimeException; -use React\SocketClient\ConnectorInterface; +use React\Socket\Connector; +use React\Socket\SecureConnector; +use React\Socket\ConnectorInterface; use React\Dns\Resolver\Resolver; use React\Promise; use Clue\React\Buzz\Message\MessageFactory; diff --git a/src/Io/Transaction.php b/src/Io/Transaction.php index 1759579..2a80407 100644 --- a/src/Io/Transaction.php +++ b/src/Io/Transaction.php @@ -5,15 +5,12 @@ use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Exception; -use Clue\React\Buzz\Browser; -use React\HttpClient\Client as HttpClient; -use Clue\React\Buzz\Io\Sender; use Clue\React\Buzz\Message\ResponseException; use Clue\React\Buzz\Message\MessageFactory; -use Clue\React\Buzz\Message\BufferedResponse; -use React\Stream\BufferedSink; +use React\Promise\PromiseInterface; use React\Stream\ReadableStreamInterface; use React\Promise; +use React\Promise\Stream as PromiseStream; /** * @internal @@ -94,7 +91,7 @@ public function bufferResponse(ResponseInterface $response) // buffer stream and resolve with buffered body $messageFactory = $this->messageFactory; - return BufferedSink::createPromise($stream)->then(function ($body) use ($response, $messageFactory) { + return PromiseStream\buffer($stream)->then(function ($body) use ($response, $messageFactory) { return $response->withBody($messageFactory->body($body)); }); }