Merge pull request #26 from PlumTreeSystems/master

Bump react/promise requirement to 3.0 for PHP 8.4 compatibility

Author: lordthorzonus

composer.json

@@ -4,7 +4,7 @@
     "description": "Port of Facebook's dataloader to PHP",
     "keywords": ["batch loading", "dataloader", "graphql"],
     "require": {
-        "react/promise": "^2.7.1",
+        "react/promise": "^3.0",
         "react/event-loop": "^1.1.1",
         "php": "^7.4.0|^8.0"
     },

src/DataLoader.php

@@ -5,9 +5,10 @@
 namespace leinonen\DataLoader;
 
 use React\EventLoop\LoopInterface;
-use function React\Promise\all;
-use React\Promise\ExtendedPromiseInterface;
 use React\Promise\Promise;
+use React\Promise\PromiseInterface;
+
+use function React\Promise\all;
 use function React\Promise\reject;
 use function React\Promise\resolve;
 
@@ -39,7 +40,7 @@ public function __construct(
         callable $batchLoadFunction,
         LoopInterface $loop,
         CacheMapInterface $cacheMap,
-        DataLoaderOptions $options = null
+        ?DataLoaderOptions $options = null
     ) {
         $this->batchLoadFunction = $batchLoadFunction;
         $this->eventLoop = $loop;
@@ -50,7 +51,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function load($key): ExtendedPromiseInterface
+    public function load($key): PromiseInterface
     {
         if ($key === null) {
             throw new \InvalidArgumentException(self::class . '::load must be called with a value, but got null');
@@ -84,7 +85,7 @@ function (callable $resolve, callable $reject) use ($key) {
     /**
      * {@inheritdoc}
      */
-    public function loadMany(array $keys): ExtendedPromiseInterface
+    public function loadMany(array $keys): PromiseInterface
     {
         return all(
             \array_map(
@@ -272,7 +273,7 @@ private function validateBatchPromiseOutput($values, $keys): void
     /**
      * Validates the batch promise returned from the batch load function.
      *
-     * @param $batchPromise
+     * @param  $batchPromise
      *
      * @throws DataLoaderException
      */

src/DataLoaderInterface.php

@@ -4,20 +4,19 @@
 
 namespace leinonen\DataLoader;
 
-use React\Promise\ExtendedPromiseInterface;
-use React\Promise\Promise;
+use React\Promise\PromiseInterface;
 
 interface DataLoaderInterface
 {
     /**
      * Returns a Promise for the value represented by the given key.
      *
      * @param  mixed  $key
-     * @return ExtendedPromiseInterface
+     * @return PromiseInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function load($key): ExtendedPromiseInterface;
+    public function load($key): PromiseInterface;
 
     /**
      * Loads multiple keys, promising an array of values.
@@ -30,11 +29,11 @@ public function load($key): ExtendedPromiseInterface;
      *  });
      *
      * @param  array  $keys
-     * @return ExtendedPromiseInterface
+     * @return PromiseInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function loadMany(array $keys): ExtendedPromiseInterface;
+    public function loadMany(array $keys): PromiseInterface;
 
     /**
      * Clears the value for the given key from the cache if it exists.

tests/Unit/DataLoaderAbuseTest.php

@@ -6,9 +6,10 @@
 use leinonen\DataLoader\DataLoader;
 use leinonen\DataLoader\DataLoaderException;
 use PHPUnit\Framework\TestCase;
-use React\EventLoop\Factory;
+use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 use React\Promise\Promise;
+
 use function React\Promise\resolve;
 
 class DataLoaderAbuseTest extends TestCase
@@ -20,7 +21,7 @@ class DataLoaderAbuseTest extends TestCase
 
     public function setUp(): void
     {
-        $this->eventLoop = Factory::create();
+        $this->eventLoop = Loop::get();
     }
 
     /**
@@ -162,7 +163,7 @@ function ($keys) {
     public function batch_function_must_return_a_promise_of_an_array_not_null()
     {
         $badLoader = $this->createDataLoader(function ($keys) {
-            return resolve();
+            return resolve(null);
         });
 
         $exception = null;
@@ -209,8 +210,8 @@ public function batch_function_must_promise_an_array_of_correct_length()
     /**
      * Creates a simple DataLoader.
      *
-     * @param $batchLoadFunction
-     * @param  array  $options
+     * @param  $batchLoadFunction
+     * @param  ?\leinonen\DataLoader\DataLoaderOptions  $options
      * @return DataLoader
      */
     private function createDataLoader($batchLoadFunction, $options = null)

tests/Unit/DataLoaderTest.php

@@ -8,8 +8,9 @@
 use PHPUnit\Framework\TestCase;
 use React\EventLoop\Factory;
 use React\EventLoop\LoopInterface;
-use function React\Promise\all;
 use React\Promise\Promise;
+
+use function React\Promise\all;
 use function React\Promise\resolve;
 
 class DataLoaderTest extends TestCase
@@ -777,12 +778,12 @@ public function it_batches_loads_occurring_within_promises()
 
         all([
             $identityLoader->load('A'),
-            resolve()->then(function () use ($identityLoader) {
-                resolve()->then(function () use ($identityLoader) {
+            resolve(null)->then(function () use ($identityLoader) {
+                resolve(null)->then(function () use ($identityLoader) {
                     $identityLoader->load('B');
-                    resolve()->then(function () use ($identityLoader) {
+                    resolve(null)->then(function () use ($identityLoader) {
                         $identityLoader->load('C');
-                        resolve()->then(function () use ($identityLoader) {
+                        resolve(null)->then(function () use ($identityLoader) {
                             $identityLoader->load('D');
                         });
                     });