refactor: Use call_user_func_array() functions.

loophp · Mar 31, 2021 · 614a663 · 614a663 · jdreesen · Apr 4, 2021
1 parent 1e8de4a
commit 614a663
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 17 deletions.
diff --git a/src/Operation/AsyncMap.php b/src/Operation/AsyncMap.php
@@ -14,6 +14,7 @@
 use function Amp\ParallelFunctions\parallel;
 use function Amp\Promise\wait;
 use function Amp\Sync\ConcurrentIterator\map;
+use function call_user_func_array;
 use function function_exists;
 
 // phpcs:disable
@@ -65,7 +66,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                              *
                              * @psalm-return T
                              */
-                            static fn ($carry, callable $callback) => $callback($carry, $key);
+                            static fn ($carry, callable $callback) => call_user_func_array($callback, [$carry, $key]);
 
                     $callback =
                         /**

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/GroupBy.php b/src/Operation/GroupBy.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -62,7 +64,7 @@ static function (?callable $callable = null): Closure {
                          * @psalm-return non-empty-array<TKey, T|list<T>>
                          */
                         static function (array $collect, $value, $key) use ($callback): array {
-                            if (null !== $groupKey = $callback($value, $key)) {
+                            if (null !== $groupKey = call_user_func_array($callback, [$value, $key])) {
                                 $collect[$groupKey][] = $value;
                             } else {
                                 $collect[$key] = $value;

diff --git a/src/Operation/Has.php b/src/Operation/Has.php
@@ -9,6 +9,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 (Iterator $iterator) use ($callbacks): Generator {
                                  *
                                  * @psalm-param Iterator<TKey, T> $iterator
                                  */
-                                static fn ($value, $key, Iterator $iterator): bool => $callback($value, $key, $iterator) === $value,
+                                static fn ($value, $key, Iterator $iterator): bool => call_user_func_array($callback, [$value, $key, $iterator]) === $value,
                             $callbacks
                         );
 

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/MatchOne.php b/src/Operation/MatchOne.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -54,7 +56,7 @@ static function (callable ...$callbacks) use ($matcher): Closure {
                                  */
                                 static fn ($value, $key, Iterator $iterator): bool => array_reduce(
                                     $callbacks,
-                                    static fn (bool $carry, callable $callback): bool => $carry || $callback($value, $key, $iterator),
+                                    static fn (bool $carry, callable $callback): bool => $carry || call_user_func_array($callback, [$value, $key, $iterator]),
                                     false
                                 );
 
@@ -70,7 +72,7 @@ static function (callable ...$callbacks) use ($matcher): Closure {
                              *
                              * @psalm-param Iterator<TKey, T> $iterator
                              */
-                            static fn ($value, $key, Iterator $iterator): bool => $matcher($value, $key, $iterator) === $callback($value, $key, $iterator);
+                            static fn ($value, $key, Iterator $iterator): bool => call_user_func_array($matcher, [$value, $key, $iterator]) === call_user_func_array($callback, [$value, $key, $iterator]);
 
                         $dropWhileCallback =
                             /**

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/Reduction.php b/src/Operation/Reduction.php
@@ -8,6 +8,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -43,7 +45,7 @@ public function __invoke(): Closure
                      */
                     static function (Iterator $iterator) use ($callback, $initial): Generator {
                         foreach ($iterator as $key => $value) {
-                            yield $key => ($initial = $callback($initial, $value, $key, $iterator));
+                            yield $key => ($initial = call_user_func_array($callback, [$initial, $value, $key, $iterator]));
                         }
                     };
     }

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/Sort.php b/src/Operation/Sort.php
@@ -11,6 +11,8 @@
 use Iterator;
 use loophp\collection\Contract\Operation;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -76,7 +78,7 @@ static function (Iterator $iterator) use ($type, $callback): Iterator {
                                  * @psalm-param array{0:TKey|T, 1:T|TKey} $left
                                  * @psalm-param array{0:TKey|T, 1:T|TKey} $right
                                  */
-                                static fn (array $left, array $right): int => $callback($left[1], $right[1]);
+                                static fn (array $left, array $right): int => call_user_func_array($callback, [$left[1], $right[1]]);
 
                         /** @psalm-var callable(Iterator<TKey, T>): Generator<int, array{0:TKey, 1:T}> | callable(Iterator<TKey, T>): Generator<int, array{0:T, 1:TKey}> $before */
                         $before = Pipe::of()(...$operations['before']);

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/Times.php b/src/Operation/Times.php
@@ -9,6 +9,8 @@
 use Generator;
 use Iterator;
 
+use function call_user_func;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -45,7 +47,7 @@ static function (?Iterator $iterator = null) use ($number, $callback): Generator
                         $callback ??= static fn (int $value): int => $value;
 
                         for ($current = 1; $current <= $number; ++$current) {
-                            yield $callback($current);
+                            yield call_user_func($callback, $current);
                         }
                     };
     }

diff --git a/src/Operation/Unfold.php b/src/Operation/Unfold.php
@@ -7,6 +7,8 @@
 use Closure;
 use Generator;
 
+use function call_user_func_array;
+
 /**
  * @psalm-template TKey
  * @psalm-template TKey of array-key
@@ -41,7 +43,7 @@ public function __invoke(): Closure
                     static function () use ($parameters, $callback): Generator {
                         while (true) {
                             /** @psalm-var T $parameters */
-                            $parameters = $callback(...array_values((array) $parameters));
+                            $parameters = call_user_func_array($callback, array_values((array) $parameters));
 
                             yield $parameters;
                         }

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;