refactor: Use call_user_func_array.

loophp · Mar 30, 2021 · 82c5841 · 82c5841
1 parent 1e8de4a
commit 82c5841
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -60,7 +62,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                  * @psalm-param bool $carry
                                  * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                  */
-                                static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                 $result = true;
 

diff --git a/src/Operation/Every.php b/src/Operation/Every.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -52,7 +54,7 @@ static function (callable ...$callbacks): Closure {
                                  * @psalm-param bool $carry
                                  * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                  */
-                                static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                 return
                     /**

diff --git a/src/Operation/Map.php b/src/Operation/Map.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -48,7 +50,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                              *
                              * @psalm-return T
                              */
-                            static fn ($carry, callable $callback) => $callback($carry, $key, $iterator);
+                            static fn ($carry, callable $callback) => call_user_func_array($callback, [$carry, $key, $iterator]);
 
                     foreach ($iterator as $key => $value) {
                         yield $key => array_reduce($callbacks, $callbackFactory($key), $value);

diff --git a/src/Operation/Partition.php b/src/Operation/Partition.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -60,7 +62,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                      * @psalm-param bool $carry
                                      * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                      */
-                                    static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                    static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                     $true = $false = [];
 

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -60,7 +62,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                      * @psalm-param bool $carry
                                      * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                      */
-                                    static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                    static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                     $result = false;
 

diff --git a/src/Operation/Split.php b/src/Operation/Split.php
@@ -9,6 +9,8 @@
 use Iterator;
 use loophp\collection\Contract\Operation\Splitable;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -67,7 +69,7 @@ static function (Iterator $iterator) use ($type, $callbacks): Generator {
                                          * @psalm-param bool $carry
                                          * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                          */
-                                        static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                        static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                         foreach ($iterator as $key => $value) {
                             $callbackReturn = array_reduce(

diff --git a/src/Operation/TakeWhile.php b/src/Operation/TakeWhile.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -60,7 +62,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                  * @psalm-param bool $carry
                                  * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                  */
-                                static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                 foreach ($iterator as $key => $current) {
                     $result = array_reduce(

diff --git a/src/Operation/Until.php b/src/Operation/Until.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -60,7 +62,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                      * @psalm-param bool $carry
                                      * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                      */
-                                    static fn (bool $carry, callable $callable): bool => $carry || $callable($current, $key, $iterator);
+                                    static fn (bool $carry, callable $callable): bool => $carry || call_user_func_array($callable, [$current, $key, $iterator]);
 
                     foreach ($iterator as $key => $current) {
                         yield $key => $current;