Removed all eventLoop references

Author: Jeremiah VALERIE

.travis.yml

@@ -29,5 +29,4 @@ install: composer update --prefer-dist --no-interaction
 script: if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then phpunit -d xdebug.max_nesting_level=1000 --debug --coverage-clover build/logs/clover.xml; else phpunit --debug; fi
 
 after_success:
-    - composer require "satooshi/php-coveralls:^1.0"
-    - travis_retry php vendor/bin/coveralls -v
+    - if [[ "$TRAVIS_PHP_VERSION" != "5.6"]]; then composer require "satooshi/php-coveralls:^1.0" && travis_retry php vendor/bin/coveralls -v; fi

README.md

@@ -11,8 +11,7 @@ data sources such as databases or web services via batching and caching.
 
 ## Requirements
 
-* This library require [React/Promise](https://github.com/reactphp/promise) and PHP >= 5.5 to works.
-* The [React/EventLoop](https://github.com/reactphp/event-loop) component are **totally optional** (see `await` method for more details).
+This library require [React/Promise](https://github.com/reactphp/promise) and PHP >= 5.5 to works.
 
 ## Getting Started
 
@@ -40,8 +39,8 @@ A batch loading callable / callback accepts an Array of keys, and returns a Prom
 resolves to an Array of values.
 
 Then load individual values from the loader. DataLoaderPHP will coalesce all
-individual loads which occur within a single frame of execution (a single tick
-of the event loop if install or using `await` method) and then call your batch function with all requested keys.
+individual loads which occur within a single frame of execution (using `await` method) 
+and then call your batch function with all requested keys.
 
 ```php
 $userLoader->load(1)

src/DataLoader.php

@@ -35,26 +35,15 @@ class DataLoader
      */
     private $queue = [];
 
-    /**
-     * @var null|\React\EventLoop\LoopInterface
-     */
-    private $eventLoop;
-
-    /**
-     * @var Promise
-     */
-    private $resolvedPromise;
-
     /**
      * @var self[]
      */
     private static $instances = [];
 
-    public function __construct(BatchLoadFn $batchLoadFn, Option $options = null)
+    public function __construct(callable $batchLoadFn, Option $options = null)
     {
         $this->batchLoadFn = $batchLoadFn;
         $this->options = $options ?: new Option();
-        $this->eventLoop = class_exists('React\\EventLoop\\Factory') ? \React\EventLoop\Factory::create() : null;
         $this->promiseCache = $this->options->getCacheMap();
         self::$instances[] = $this;
     }
@@ -97,12 +86,7 @@ function ($resolve, $reject) use (&$promise, $key, $shouldBatch) {
                 // A single dispatch should be scheduled per queue at the time when the
                 // queue changes from "empty" to "full".
                 if (count($this->queue) === 1) {
-                    if ($shouldBatch) {
-                        // If batching, schedule a task to dispatch the queue.
-                        $this->enqueuePostPromiseJob(function () {
-                            $this->dispatchQueue();
-                        });
-                    } else {
+                    if (!$shouldBatch) {
                         // Otherwise dispatch the (queue of one) immediately.
                         $this->dispatchQueue();
                     }
@@ -124,11 +108,11 @@ function (callable $resolve, callable $reject) {
     /**
      * Loads multiple keys, promising an array of values:
      *
-     *     [$a, $b] = $myLoader->loadMany(['a', 'b']);
+     *     list($a, $b) = $myLoader->loadMany(['a', 'b']);
      *
      * This is equivalent to the more verbose:
      *
-     *     [$a, $b] = \React\Promise\all([
+     *     list($a, $b) = \React\Promise\all([
      *       $myLoader->load('a'),
      *       $myLoader->load('b')
      *     ]);
@@ -207,7 +191,9 @@ public function __destruct()
         if ($this->needProcess()) {
             foreach ($this->queue as $data) {
                 try {
-                    $data['promise']->cancel();
+                    /** @var Promise $promise */
+                    $promise = $data['promise'];
+                    $promise->cancel();
                 } catch (\Exception $e) {
                     // no need to do nothing if cancel failed
                 }
@@ -310,22 +296,6 @@ private function checkKey($key, $method)
         }
     }
 
-    /**
-     * @param $fn
-     */
-    private function enqueuePostPromiseJob($fn)
-    {
-        if (!$this->resolvedPromise) {
-            $this->resolvedPromise = \React\Promise\resolve();
-        }
-
-        if ($this->eventLoop) {
-            $this->resolvedPromise->then(function () use ($fn) {
-                $this->eventLoop->nextTick($fn);
-            });
-        }
-    }
-
     /**
      * Given the current state of a Loader instance, perform a batch load
      * from its current queue.