Make PromiseInterface extend Interop\Async\Promise

src/FulfilledPromise.php

@@ -4,13 +4,13 @@
 
 use Interop\Async\Promise as AsyncInteropPromise;
 
-class FulfilledPromise implements ExtendedPromiseInterface, CancellablePromiseInterface, AsyncInteropPromise
+class FulfilledPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
 {
     private $value;
 
     public function __construct($value = null)
     {
-        if ($value instanceof PromiseInterface || $value instanceof AsyncInteropPromise) {
+        if ($value instanceof AsyncInteropPromise) {
             throw new \InvalidArgumentException('You cannot create React\Promise\FulfilledPromise with a promise. Use React\Promise\resolve($promiseOrValue) instead.');
         }
 

src/LazyPromise.php

@@ -2,9 +2,7 @@
 
 namespace React\Promise;
 
-use Interop\Async\Promise as AsyncInteropPromise;
-
-class LazyPromise implements ExtendedPromiseInterface, CancellablePromiseInterface, AsyncInteropPromise
+class LazyPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
 {
     private $factory;
     private $promise;

src/Promise.php

@@ -2,9 +2,7 @@
 
 namespace React\Promise;
 
-use Interop\Async\Promise as AsyncInteropPromise;
-
-class Promise implements ExtendedPromiseInterface, CancellablePromiseInterface, AsyncInteropPromise
+class Promise implements ExtendedPromiseInterface, CancellablePromiseInterface
 {
     private $canceller;
     private $result;
@@ -95,7 +93,7 @@ public function when(callable $onResolved)
             return $this->result()->when($onResolved);
         }
 
-        $this->handlers[] = function (AsyncInteropPromise $promise) use ($onResolved) {
+        $this->handlers[] = function (PromiseInterface $promise) use ($onResolved) {
             $promise->when($onResolved);
         };
     }

src/PromiseInterface.php

@@ -2,7 +2,9 @@
 
 namespace React\Promise;
 
-interface PromiseInterface
+use Interop\Async\Promise as AsyncInteropPromise;
+
+interface PromiseInterface extends AsyncInteropPromise
 {
     /**
      * @return PromiseInterface

src/RejectedPromise.php

@@ -4,13 +4,13 @@
 
 use Interop\Async\Promise as AsyncInteropPromise;
 
-class RejectedPromise implements ExtendedPromiseInterface, CancellablePromiseInterface, AsyncInteropPromise
+class RejectedPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
 {
     private $reason;
 
     public function __construct($reason = null)
     {
-        if ($reason instanceof PromiseInterface || $reason instanceof AsyncInteropPromise) {
+        if ($reason instanceof AsyncInteropPromise) {
             throw new \InvalidArgumentException('You cannot create React\Promise\RejectedPromise with a promise. Use React\Promise\reject($promiseOrValue) instead.');
         }
 

tests/FulfilledPromiseTest.php

@@ -50,6 +50,6 @@ public function shouldThrowExceptionIfConstructedWithAAsyncInteropPromise()
     {
         $this->setExpectedException('\InvalidArgumentException');
 
-        return new FulfilledPromise(new FulfilledPromise());
+        return new FulfilledPromise(new SimpleFulfilledAsyncInteropTestPromise());
     }
 }

tests/fixtures/SimpleFulfilledTestPromise.php

@@ -18,4 +18,9 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
             return new RejectedPromise($exception);
         }
     }
+
+    public function when(callable $onResolved)
+    {
+        $onResolved(null, 'foo');
+    }
 }

tests/fixtures/SimpleRejectedTestPromise.php

@@ -18,4 +18,9 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
             return new RejectedPromise($exception);
         }
     }
+
+    public function when(callable $onResolved)
+    {
+        $onResolved('foo');
+    }
 }