Merge pull request #22 from php-http/fix_wrong_rejection_detection

Set state to rejected when the rejection callback is called

Author: sagikazarmark

src/Guzzle6Promise.php

@@ -55,16 +55,16 @@ public function __construct(PromiseInterface $promise, RequestInterface $request
 
             return $response;
         }, function ($reason) use ($request) {
+            $this->state = self::REJECTED;
+
             if ($reason instanceof HttplugException) {
-                $this->state = self::REJECTED;
                 $this->exception = $reason;
             } elseif ($reason instanceof GuzzleExceptions\GuzzleException) {
-                $this->state = self::REJECTED;
                 $this->exception = $this->handleException($reason, $request);
             } elseif ($reason instanceof \Exception) {
-                throw new \RuntimeException('Invalid exception returned from Guzzle6', 0, $reason);
+                $this->exception = new \RuntimeException('Invalid exception returned from Guzzle6', 0, $reason);
             } else {
-                throw new \UnexpectedValueException('Reason returned from Guzzle6 must be an Exception', 0, $reason);
+                $this->exception = new \UnexpectedValueException('Reason returned from Guzzle6 must be an Exception', 0, $reason);
             }
 
             throw $this->exception;

tests/Guzzle6PromiseTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Http\Adapter\Tests;
+
+use GuzzleHttp\Exception as GuzzleExceptions;
+use GuzzleHttp\Promise\RejectedPromise;
+use Http\Adapter\Guzzle6Promise;
+
+/**
+ * @author Márk Sági-Kazár <[email protected]>
+ */
+class Guzzle6PromiseTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException \Exception
+     */
+    public function testNonDomainExceptionIsHandled()
+    {
+        $request = $this->prophesize('Psr\Http\Message\RequestInterface');
+        $promise = new RejectedPromise(new \Exception());
+
+        $guzzlePromise = new Guzzle6Promise($promise, $request->reveal());
+
+        $guzzlePromise->wait();
+    }
+}