Merge pull request #210 from WyriHaximus-secret-labs/ObservableFactoryWrapper-should-convert-promise-to-observable

ObservableFactoryWrapper should convert promise to observable

Author: asm89

src/ObservableFactoryWrapper.php

@@ -4,6 +4,9 @@
 
 namespace Rx;
 
+use React\Promise\PromiseInterface;
+use Rx\React\Promise;
+
 final class ObservableFactoryWrapper
 {
     private $selector;
@@ -17,6 +20,10 @@ public function __invoke(): Observable
     {
         $result = call_user_func_array($this->selector, func_get_args());
 
+        if ($result instanceof PromiseInterface) {
+            $result = Promise::toObservable($result);
+        }
+
         if (!$result instanceof ObservableInterface) {
             $reflectCallable = new \ReflectionFunction($this->selector);
             throw new \Exception("You must return an Observable or Promise in {$reflectCallable->getFileName()} on line {$reflectCallable->getStartLine()}\n");

test/Rx/ObservableFactoryWrapperTest.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Rx;
+
+use React\Promise\PromiseInterface;
+use function React\Promise\resolve;
+
+class ObservableFactoryWrapperTest extends TestCase
+{
+    public function testPromiseIsConvertedToObservable()
+    {
+        $afw = new ObservableFactoryWrapper(static function (): PromiseInterface {
+            return resolve(true);
+        });
+        $true = null;
+        $afw()->subscribe(function ($v) use (&$true) {
+            $true = $v;
+        });
+
+        self::assertTrue($true);
+    }
+
+    public function testObservable()
+    {
+        $afw = new ObservableFactoryWrapper(static function (): Observable {
+            return Observable::fromArray([true], Scheduler::getImmediate());
+        });
+        $true = null;
+        $afw()->subscribe(function ($v) use (&$true) {
+            $true = $v;
+        });
+
+        self::assertTrue($true);
+    }
+
+    public function testNotAnObservableOrPromise()
+    {
+        self::expectException(\Exception::class);
+        self::expectExceptionMessageMatches('/You must return an Observable or Promise in/');
+
+        $afw = new ObservableFactoryWrapper(static function (): bool {
+            return true;
+        });
+        $afw();
+    }
+}