Updated type hints and deps

Author: davidwdan

composer.json

@@ -30,13 +30,6 @@
   },
   "require": {
     "react/promise": "~2.2",
-    "wyrihaximus/react-async-interop-loop": "^0.2.2",
     "reactivex/rxphp": "2.x-dev"
-  },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/davidwdan/RxPHP.git"
-    }
-  ]
+  }
 }

src/Promise.php

@@ -3,21 +3,22 @@
 namespace Rx\React;
 
 use React\Promise\CancellablePromiseInterface;
+use React\Promise\Promise as ReactPromise;
+use React\Promise\PromiseInterface;
 use Rx\Disposable\CallbackDisposable;
 use Rx\ObservableInterface;
 use Rx\Observable;
 use Rx\Observable\AnonymousObservable;
-use Rx\Observer\CallbackObserver;
 use Rx\Subject\AsyncSubject;
 use React\Promise\Deferred;
 
 final class Promise
 {
     /**
      * @param mixed $value
-     * @return \React\Promise\Promise A promise resolved to $value
+     * @return ReactPromise A promise resolved to $value
      */
-    public static function resolved($value)
+    public static function resolved($value): ReactPromise
     {
         $d = new Deferred();
         $d->resolve($value);
@@ -26,9 +27,9 @@ public static function resolved($value)
 
     /**
      * @param mixed $exception
-     * @return \React\Promise\Promise A promise rejected with $exception
+     * @return ReactPromise A promise rejected with $exception
      */
-    public static function rejected($exception)
+    public static function rejected($exception): ReactPromise
     {
         $d = new Deferred();
         $d->reject($exception);
@@ -40,14 +41,15 @@ public static function rejected($exception)
      *
      * @param ObservableInterface $observable
      * @param Deferred $deferred
-     * @return \React\Promise\Promise
+     * @return ReactPromise
+     * @throws \InvalidArgumentException
      */
-    public static function fromObservable(ObservableInterface $observable, Deferred $deferred = null): \React\Promise\Promise
+    public static function fromObservable(ObservableInterface $observable, Deferred $deferred = null): ReactPromise
     {
         $d     = $deferred ?: new Deferred();
         $value = null;
 
-        $observable->subscribe(new CallbackObserver(
+        $observable->subscribe(
             function ($v) use (&$value) {
                 $value = $v;
             },
@@ -57,18 +59,19 @@ function ($error) use ($d) {
             function () use ($d, &$value) {
                 $d->resolve($value);
             }
-        ));
+        );
 
         return $d->promise();
     }
 
     /**
      * Converts a Promise to an Observable sequence
      *
-     * @param CancellablePromiseInterface $promise
-     * @return Observable\AnonymousObservable
+     * @param PromiseInterface $promise
+     * @return Observable
+     * @throws \InvalidArgumentException
      */
-    public static function toObservable(CancellablePromiseInterface $promise): AnonymousObservable
+    public static function toObservable(PromiseInterface $promise): Observable
     {
         $subject = new AsyncSubject();
 
@@ -87,7 +90,9 @@ function ($error) use ($subject) {
             $disp = $subject->subscribe($observer);
             return new CallbackDisposable(function () use ($p, $disp) {
                 $disp->dispose();
-                $p->cancel();
+                if ($p instanceof CancellablePromiseInterface) {
+                    $p->cancel();
+                }
             });
         });
     }

src/PromiseFactory.php

@@ -10,9 +10,10 @@ final class PromiseFactory
      * Returns an observable sequence that invokes the specified factory function whenever a new observer subscribes.
      *
      * @param callable $factory
-     * @return \Rx\Observable\AnonymousObservable
+     * @return Observable
+     * @throws \InvalidArgumentException
      */
-    public static function toObservable(callable $factory)
+    public static function toObservable(callable $factory): Observable
     {
         $observableFactory = function () use ($factory) {
             return Promise::toObservable($factory());