Improve backwards compatibility with Promise v1

reactphp · Feb 8, 2018 · ce9b58b · ce9b58b
1 parent 245c40f
commit ce9b58b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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()
     {