Merge pull request #8 from OwlyCode/wait-new-instances

Added fix to wait if new instances of dataloader were declared during the processing
overblog · Jan 20, 2017 · 55836c8 · 55836c8
2 parents 6cb2023 + 0fa6535
commit 55836c8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/DataLoader.php b/src/DataLoader.php
@@ -263,6 +263,11 @@ private static function awaitInstances()
                 $dataLoader->process();
             }
         }
+
+        // If new dataloaders were instanciated in the meantime, wait again !
+        if (count($dataLoaders) != count(self::$instances)) {
+            self::awaitInstances();
+        }
     }
 
     private function getCacheKeyFromKey($key)

diff --git a/tests/DataLoadTest.php b/tests/DataLoadTest.php
@@ -786,6 +786,29 @@ public function testCallingAwaitFunctionWhenNoInstanceOfDataLoaderShouldNotThrow
         DataLoader::await();
     }
 
+    public function testAwaitAlsoAwaitsNewlyCreatedDataloaders()
+    {
+        $firstComplete = false;
+        $secondComplete = false;
+
+        $first = new DataLoader(function ($values) use (&$firstComplete, &$secondComplete) {
+            $second = new DataLoader(function ($values) use (&$secondComplete) {
+                $secondComplete = true;
+                return self::$promiseFactory->createAll(['B']);
+            }, self::$promiseFactory);
+
+            $second->load('B');
+
+            $firstComplete = true;
+            return self::$promiseFactory->createAll(['A']);
+        }, self::$promiseFactory);
+
+        DataLoader::await($first->load('A'));
+
+        $this->assertTrue($firstComplete);
+        $this->assertTrue($secondComplete);
+    }
+
     public function cacheKey($key)
     {
         $cacheKey = [];