Bumped dependencies and php version 7.4. Also updated Changelog to reflect changes

Author: lordthorzonus

.scrutinizer.yml

@@ -1,7 +1,7 @@
 build:
     environment:
         php:
-            version: 5.5
+            version: 7.4
     dependencies:
         before:
             - composer install --dev --prefer-source --no-interaction

.travis.yml

@@ -1,11 +1,7 @@
 language: php
 
 php:
-  - "7.2"
-  - "7.1"
-  - "7.0"
-  - "5.6"
-  - "5.5"
+  - "7.4"
 
 sudo: false
 

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
 ## Updating from 1.0.0 to 2.0.0
- - Overall php version requirement was bumped from `5.5` to `7.3`
+ - Overall php version requirement was bumped from `5.5` to `7.4`
+ - Bumped version requirements for React dependencies and switched DataLoader to return ExtendedPromiseInterfaces instead of PromiseInterfaces.
  - Fluent interfaces in `Dataloader::prime()`,`DataLoader::clear` and `DataLoader::clearAll()` were removed. So change usages like:
     ```php
     $dataloader->clear('A')->prime('A', 'Y');

composer.json

@@ -5,11 +5,11 @@
     "keywords": ["batch loading", "dataloader", "graphql"],
     "require": {
         "react/promise": "^2.7.1",
-        "react/event-loop": "^1.1.0",
-        "php": "^7.3.0"
+        "react/event-loop": "^1.1.1",
+        "php": "^7.4.0"
     },
     "require-dev" : {
-        "phpunit/phpunit": "^8.0.2"
+        "phpunit/phpunit": "^9.1.4"
     },
     "license": "MIT",
     "authors": [

src/CacheMap.php

@@ -4,10 +4,7 @@
 
 final class CacheMap implements CacheMapInterface, \Countable
 {
-    /**
-     * @var array
-     */
-    private $cache = [];
+    private array $cache = [];
 
     /**
      * {@inheritdoc}

src/DataLoader.php

@@ -16,25 +16,13 @@ final class DataLoader implements DataLoaderInterface
      */
     private $batchLoadFunction;
 
-    /**
-     * @var array
-     */
-    private $promiseQueue = [];
+    private array $promiseQueue = [];
 
-    /**
-     * @var CacheMapInterface
-     */
-    private $promiseCache;
+    private CacheMapInterface $promiseCache;
 
-    /**
-     * @var LoopInterface
-     */
-    private $eventLoop;
+    private LoopInterface $eventLoop;
 
-    /**
-     * @var DataLoaderOptions
-     */
-    private $options;
+    private DataLoaderOptions $options;
 
     /**
      * Initiates a new DataLoader.
@@ -98,9 +86,7 @@ public function loadMany(array $keys): ExtendedPromiseInterface
     {
         return all(
             \array_map(
-                function ($key) {
-                    return $this->load($key);
-                },
+                fn($key) => $this->load($key),
                 $keys
             )
         );
@@ -146,9 +132,7 @@ private function scheduleDispatch(): void
     {
         if ($this->options->shouldBatch()) {
             $this->eventLoop->futureTick(
-                function () {
-                    $this->dispatchQueue();
-                }
+                fn() => $this->dispatchQueue()
             );
 
             return;
@@ -168,12 +152,13 @@ private function dispatchQueue(): void
         $this->promiseQueue = [];
 
         $maxBatchSize = $this->options->getMaxBatchSize();
+        $shouldBeDispatchedInMultipleBatches = $maxBatchSize !== null
+            && $maxBatchSize > 0
+            && $maxBatchSize < count($queue);
 
-        if ($maxBatchSize !== null && $maxBatchSize > 0 && $maxBatchSize < count($queue)) {
-            $this->dispatchQueueInMultipleBatches($queue, $maxBatchSize);
-        } else {
-            $this->dispatchQueueBatch($queue);
-        }
+        $shouldBeDispatchedInMultipleBatches
+            ? $this->dispatchQueueInMultipleBatches($queue, $maxBatchSize)
+            : $this->dispatchQueueBatch($queue);
     }
 
     /**
@@ -195,14 +180,14 @@ private function dispatchQueueBatch($batch)
             return $this->handleFailedDispatch($batch, $exception);
         }
 
-        $batchPromise->then(
-            function ($values) use ($batch, $keys) {
-                $this->validateBatchPromiseOutput($values, $keys);
-                $this->handleSuccessfulDispatch($batch, $values);
-            }
-        )->then(null, function ($error) use ($batch) {
-            $this->handleFailedDispatch($batch, $error);
-        });
+        $batchPromise
+            ->then(
+                function ($values) use ($batch, $keys) {
+                    $this->validateBatchPromiseOutput($values, $keys);
+                    $this->handleSuccessfulDispatch($batch, $values);
+                }
+            )
+            ->then(null, fn($error)  => $this->handleFailedDispatch($batch, $error));
     }
 
     /**
@@ -234,11 +219,9 @@ private function handleSuccessfulDispatch(array $batch, array $values): void
     {
         foreach ($batch as $index => $queueItem) {
             $value = $values[$index];
-            if ($value instanceof \Exception) {
-                $queueItem['reject']($value);
-            } else {
-                $queueItem['resolve']($value);
-            }
+            $value instanceof \Exception
+                ? $queueItem['reject']($value)
+                : $queueItem['resolve']($value);
         }
     }
 

src/DataLoaderOptions.php

@@ -4,20 +4,11 @@
 
 final class DataLoaderOptions
 {
-    /**
-     * @var bool
-     */
-    private  $shouldBatch;
-
-    /**
-     * @var null|int
-     */
-    private $maxBatchSize;
-
-    /**
-     * @var bool
-     */
-    private $shouldCache;
+    private bool $shouldBatch;
+
+    private ?int $maxBatchSize;
+
+    private bool $shouldCache;
 
     public function __construct(
         ?int $maxBatchSize = null,

tests/Unit/DataLoaderTest.php

@@ -37,9 +37,9 @@ public function setUp(): void
     public function it_builds_a_really_simple_data_loader()
     {
         $identityLoader = new DataLoader(
-            function ($keys) {
-                return resolve($keys);
-            }, $this->eventLoop, new CacheMap()
+            fn($keys) => resolve($keys),
+            $this->eventLoop,
+            new CacheMap()
         );
 
         /** @var Promise $promise1 */
@@ -888,14 +888,8 @@ function ($keys) {
                 $this->loadCalls[] = $keys;
 
                 return resolve(
-                    array_map(
-                        function ($key) {
-                            if ($key % 2 === 0) {
-                                return $key;
-                            }
-
-                            return new \Exception("Odd: {$key}");
-                        },
+                    \array_map(
+                        fn($key) => ($key % 2 === 0) ? $key : new \Exception("Odd: {$key}");
                         $keys
                     )
                 );
@@ -917,10 +911,8 @@ function ($keys) {
                 $this->loadCalls[] = $keys;
 
                 return resolve(
-                    array_map(
-                        function ($key) {
-                            return new \Exception("Error: {$key}");
-                        },
+                    \array_map(
+                        fn($key) => new \Exception("Error: {$key}"),
                         $keys
                     )
                 );