Merge pull request #14 from OwlyCode/fix-ignored-instances

Fixed ignored instances when added during await()
overblog · Feb 17, 2017 · 0fdf3ca · 0fdf3ca
2 parents 424ca96 + 1cd6049
commit 0fdf3ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/DataLoader.php b/src/DataLoader.php
@@ -290,7 +290,7 @@ private static function awaitInstances()
 
             foreach ($dataLoaders as $dataLoader) {
                 if (!$dataLoader || !$dataLoader->needProcess()) {
-                    $wait = false;
+                    $wait |= false;
                     continue;
                 }
                 $wait = true;

diff --git a/tests/DataLoadTest.php b/tests/DataLoadTest.php
@@ -803,6 +803,11 @@ public function testAwaitAlsoAwaitsNewlyCreatedDataloaders()
             return self::$promiseAdapter->createAll(['A']);
         }, self::$promiseAdapter);
 
+        // This tests that an idling dataloader do not cause the others to be skipped.
+        $third = new DataLoader(function () {
+            // noop
+        }, self::$promiseAdapter);
+
         DataLoader::await($first->load('A'));
 
         $this->assertTrue($firstComplete);