Use chained then, force our implementation so it's called even if then not called

Author: joelwurtz

src/Guzzle6Promise.php

@@ -28,44 +28,39 @@ class Guzzle6Promise implements Promise
     /**
      * @var Exception
      */
-    private $error;
+    private $exception;
 
     public function __construct(PromiseInterface $promise)
     {
-        $this->promise = $promise;
-        $this->state   = self::PENDING;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function then(callable $onFulfilled = null, callable $onRejected = null)
-    {
-        $onFulfilledInternal = function ($response) use($onFulfilled) {
+        $this->promise = $promise->then(function ($response) {
             $this->response = $response;
             $this->state = self::FULFILLED;
 
-            return $onFulfilled($this->response);
-        };
-
-        $onRejectedInternal = function ($reason) use($onRejected) {
+            return $response;
+        }, function ($reason) {
             if (!($reason instanceof RequestException)) {
-                 throw new \RuntimeException("Invalid reason");
+                throw new \RuntimeException("Invalid reason");
             }
 
-            $this->state = self::REJECTED;
-            $this->error = new Exception\NetworkException($reason->getMessage(), $reason->getRequest(), $reason);
+            $this->state    = self::REJECTED;
+            $this->exception = new Exception\NetworkException($reason->getMessage(), $reason->getRequest(), $reason);
 
             if ($reason->hasResponse()) {
-                $this->error = new Exception\HttpException($reason->getMessage(), $reason->getRequest(), $reason->getResponse(), $reason);
+                $this->exception = new Exception\HttpException($reason->getMessage(), $reason->getRequest(), $reason->getResponse(), $reason);
             }
 
-            return $onRejected($this->error);
-        };
+            throw $this->exception;
+        });
 
-        $this->promise = $this->promise->then($onFulfilledInternal, $onRejectedInternal);
+        $this->state   = self::PENDING;
+    }
 
-        return new static($this->promise);
+    /**
+     * {@inheritdoc}
+     */
+    public function then(callable $onFulfilled = null, callable $onRejected = null)
+    {
+        return new static($this->promise->then($onFulfilled, $onRejected));
     }
 
     /**
@@ -92,13 +87,13 @@ public function getResponse()
     /**
      * {@inheritdoc}
      */
-    public function getError()
+    public function getException()
     {
         if (self::REJECTED !== $this->state) {
             throw new \LogicException("Error not available for the current state");
         }
 
-        return $this->error;
+        return $this->exception;
     }
 
     /**