From ce9b58b60201991695d0c216ac534f5c077a03fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Fri, 26 Jan 2018 12:18:52 +0100 Subject: [PATCH] Improve backwards compatibility with Promise v1 --- composer.json | 2 +- src/Request.php | 2 +- tests/RequestTest.php | 19 ------------------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 8619309..c98729d 100644 --- a/composer.json +++ b/composer.json @@ -7,9 +7,9 @@ "php": ">=5.4.0", "evenement/evenement": "^3.0 || ^2.0", "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3", + "react/promise": "^2.1 || ^1.2.1", "react/socket": "^1.0 || ^0.8.4", "react/stream": "^1.0 || ^0.7.1", - "react/promise": "~2.2", "ringcentral/psr7": "^1.2" }, "require-dev": { diff --git a/src/Request.php b/src/Request.php index c1aa1bf..ac42b5f 100644 --- a/src/Request.php +++ b/src/Request.php @@ -56,7 +56,7 @@ private function writeHead() $pendingWrites = &$this->pendingWrites; $promise = $this->connect(); - $promise->done( + $promise->then( function (ConnectionInterface $stream) use ($requestData, &$streamRef, &$stateRef, &$pendingWrites) { $streamRef = $stream; diff --git a/tests/RequestTest.php b/tests/RequestTest.php index 1d45c9b..c55c53b 100644 --- a/tests/RequestTest.php +++ b/tests/RequestTest.php @@ -272,25 +272,6 @@ public function requestShouldEmitErrorIfUrlHasNoScheme() $request->end(); } - /** - * @test - * @expectedException Exception - * @expectedExceptionMessage something failed - */ - public function requestDoesNotHideErrors() - { - $requestData = new RequestData('GET', 'http://www.example.com'); - $request = new Request($this->connector, $requestData); - - $this->rejectedConnectionMock(); - - $request->on('error', function () { - throw new \Exception('something failed'); - }); - - $request->end(); - } - /** @test */ public function postRequestShouldSendAPostRequest() {