Merge pull request #13 from mcg-web/optimize-await-method

Optimize `DataLoader::await` method

Author: mcg-web

src/DataLoader.php

@@ -239,21 +239,55 @@ protected function getPromiseAdapter()
      */
     public static function await($promise = null, $unwrap = true)
     {
+        self::awaitInstances();
+
+        if (null === $promise) {
+            return null;
+        }
+
+        if (is_callable([$promise, 'then'])) {
+            $isPromiseCompleted = false;
+            $resolvedValue = null;
+            $rejectedReason = null;
+
+            $promise->then(
+                function ($value) use (&$isPromiseCompleted, &$resolvedValue) {
+                    $isPromiseCompleted = true;
+                    $resolvedValue = $value;
+                },
+                function ($reason) use (&$isPromiseCompleted, &$rejectedReason) {
+                    $isPromiseCompleted = true;
+                    $rejectedReason = $reason;
+                }
+            );
+
+            //Promise is completed?
+            if ($isPromiseCompleted) {
+                // rejected ?
+                if ($rejectedReason instanceof \Exception) {
+                    if (!$unwrap) {
+                        return $rejectedReason;
+                    }
+                    throw $rejectedReason;
+                }
+
+                return $resolvedValue;
+            }
+        }
+
         if (empty(self::$instances)) {
             throw new \RuntimeException('Found no active DataLoader instance.');
         }
-        self::awaitInstances();
 
         return self::$instances[0]->getPromiseAdapter()->await($promise, $unwrap);
     }
 
     private static function awaitInstances()
     {
-        $dataLoaders = self::$instances;
+        do {
+            $wait = false;
+            $dataLoaders = self::$instances;
 
-        $wait = true;
-
-        while ($wait) {
             foreach ($dataLoaders as $dataLoader) {
                 if (!$dataLoader || !$dataLoader->needProcess()) {
                     $wait = false;
@@ -262,12 +296,7 @@ private static function awaitInstances()
                 $wait = true;
                 $dataLoader->process();
             }
-        }
-
-        // If new dataloaders were instanciated in the meantime, wait again !
-        if (count($dataLoaders) != count(self::$instances)) {
-            self::awaitInstances();
-        }
+        } while ($wait);
     }
 
     /**

tests/AbuseTest.php

@@ -111,7 +111,7 @@ public function testAwaitPromiseMustHaveAThenMethod()
      */
     public function testAwaitWithoutNoInstance()
     {
-        DataLoader::await();
+        DataLoader::await(self::$promiseAdapter->create());
     }
 
     /**

tests/DataLoadTest.php

@@ -809,6 +809,38 @@ public function testAwaitAlsoAwaitsNewlyCreatedDataloaders()
         $this->assertTrue($secondComplete);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testAwaitShouldReturnTheValueOfFulfilledPromiseWithoutNeedingActiveDataLoaderInstance()
+    {
+        $expectedValue = 'Ok!';
+        $value = DataLoader::await(self::$promiseAdapter->createFulfilled($expectedValue));
+
+        $this->assertEquals($expectedValue, $value);
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testAwaitShouldReturnTheRejectReasonOfRejectedPromiseWithoutNeedingActiveDataLoaderInstance()
+    {
+        $expectedException = new \Exception('Rejected!');
+        $exception = DataLoader::await(self::$promiseAdapter->createRejected($expectedException), false);
+
+        $this->assertEquals($expectedException, $exception);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Rejected!
+     * @runInSeparateProcess
+     */
+    public function testAwaitShouldThrowTheRejectReasonOfRejectedPromiseWithoutNeedingActiveDataLoaderInstance()
+    {
+        DataLoader::await(self::$promiseAdapter->createRejected(new \Exception('Rejected!')));
+    }
+
     public function cacheKey($key)
     {
         $cacheKey = [];