Fix #26: Combining CurlClient with StopwatchPlugin causes Promise onRejected handler to never be invoked.

Author: mekras

src/PromiseCore.php

@@ -185,7 +185,12 @@ public function fulfill()
         $this->state = Promise::FULFILLED;
         $response = $this->responseBuilder->getResponse();
         $response->getBody()->seek(0);
-        $response = $this->call($this->onFulfilled, $response);
+
+        while (count($this->onFulfilled) > 0) {
+            $callback = array_shift($this->onFulfilled);
+            $response = call_user_func($callback, $response);
+        }
+
         if ($response instanceof ResponseInterface) {
             $this->responseBuilder->setResponse($response);
         }
@@ -201,10 +206,14 @@ public function reject(Exception $exception)
         $this->exception = $exception;
         $this->state = Promise::REJECTED;
 
-        try {
-            $this->call($this->onRejected, $this->exception);
-        } catch (Exception $exception) {
-            $this->exception = $exception;
+        while (count($this->onRejected) > 0) {
+            $callback = array_shift($this->onRejected);
+            try {
+                $exception = call_user_func($callback, $this->exception);
+                $this->exception = $exception;
+            } catch (Exception $exception) {
+                $this->exception = $exception;
+            }
         }
     }
 

tests/PromiseCoreTest.php

@@ -83,6 +83,39 @@ function (RequestException $exception) {
         static::assertEquals('Bar', $core->getException()->getMessage());
     }
 
+    /**
+     * «onReject» callback can throw exception.
+     *
+     * @see https://github.com/php-http/curl-client/issues/26
+     */
+    public function testIssue26()
+    {
+        $request = $this->createRequest('GET', '/');
+        $this->handle = curl_init();
+
+        $core = new PromiseCore(
+            $request,
+            $this->handle,
+            new ResponseBuilder($this->createResponse())
+        );
+        $core->addOnRejected(
+            function (RequestException $exception) {
+                throw new RequestException('Foo', $exception->getRequest(), $exception);
+            }
+        );
+        $core->addOnRejected(
+            function (RequestException $exception) {
+                return new RequestException('Bar', $exception->getRequest(), $exception);
+            }
+        );
+
+        $exception = new RequestException('Error', $request);
+        $core->reject($exception);
+        static::assertEquals(Promise::REJECTED, $core->getState());
+        static::assertInstanceOf(Exception::class, $core->getException());
+        static::assertEquals('Bar', $core->getException()->getMessage());
+    }
+
     /**
      * @expectedException \LogicException
      */