refactor: Minor style and type changes.

loophp · Jan 11, 2021 · 34d626c · 34d626c
1 parent 6c14308
commit 34d626c
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 40 deletions.
diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -61,7 +61,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 || $callable($current, $key, $iterator);
 
                 $result = true;
 

diff --git a/src/Operation/Every.php b/src/Operation/Every.php
@@ -52,7 +52,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 || $callable($current, $key, $iterator);
 
                 return
                     /**

diff --git a/src/Operation/Forget.php b/src/Operation/Forget.php
@@ -36,10 +36,8 @@ static function (...$keys): Closure {
                      *
                      * @param mixed $key
                      * @psalm-param TKey $key
-                     *
-                     * @psalm-param Iterator<TKey, T> $iterator
                      */
-                    static fn ($value, $key, Iterator $iterator): bool => false === in_array($key, $keys, true);
+                    static fn ($value, $key): bool => false === in_array($key, $keys, true);
 
                 /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
                 $filter = Filter::of()($filterCallbackFactory($keys));

diff --git a/src/Operation/Has.php b/src/Operation/Has.php
@@ -37,7 +37,8 @@ static function (callable ...$callbacks): Closure {
                      * @psalm-return Generator<int|TKey, bool>
                      */
                     static function (Iterator $iterator) use ($callbacks): Generator {
-                        $callback =
+                        /** @psalm-var list<Closure(T, TKey, Iterator<TKey, T>): bool> $callbacks */
+                        $callbacks = array_map(
                             /**
                              * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callback
                              */
@@ -51,9 +52,9 @@ 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;
-
-                        $callbacks = array_map($callback, $callbacks);
+                                static fn ($value, $key, Iterator $iterator): bool => $callback($value, $key, $iterator) === $value,
+                            $callbacks
+                        );
 
                         foreach ($iterator as $key => $current) {
                             /** @psalm-var Iterator<int, bool> $result */

diff --git a/src/Operation/Intersect.php b/src/Operation/Intersect.php
@@ -33,13 +33,8 @@ static function (...$values): Closure {
                     /**
                      * @param mixed $value
                      * @psalm-param T $value
-                     *
-                     * @param mixed $key
-                     * @psalm-param TKey $key
-                     *
-                     * @psalm-param Iterator<TKey, T> $iterator
                      */
-                    static fn ($value, $key, Iterator $iterator): bool => in_array($value, $values, true);
+                    static fn ($value): bool => in_array($value, $values, true);
 
                 /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
                 $filter = Filter::of()($filterCallbackFactory($values));

diff --git a/src/Operation/MatchOne.php b/src/Operation/MatchOne.php
@@ -42,27 +42,21 @@ static function (callable ...$callbacks) use ($matcher): Closure {
                              *
                              * @psalm-return Closure(T, TKey, Iterator<TKey, T>): bool
                              */
-                            static function (array $callbacks): Closure {
-                                return
-                                    /**
-                                     * @psalm-param T $value
-                                     *
-                                     * @param mixed $value
-                                     *
-                                     * @psalm-param TKey $key
-                                     *
-                                     * @param mixed $key
-                                     *
-                                     * @psalm-param Iterator<TKey, T> $iterator
-                                     */
-                                    static function ($value, $key, Iterator $iterator) use ($callbacks): bool {
-                                        return array_reduce(
-                                            $callbacks,
-                                            static fn (bool $carry, callable $callback): bool => ($carry || $callback($value, $key, $iterator)),
-                                            false
-                                        );
-                                    };
-                            };
+                            static fn (array $callbacks): Closure =>
+                                /**
+                                 * @param mixed $value
+                                 * @psalm-param T $value
+                                 *
+                                 * @param mixed $key
+                                 * @psalm-param TKey $key
+                                 *
+                                 * @psalm-param Iterator<TKey, T> $iterator
+                                 */
+                                static fn ($value, $key, Iterator $iterator): bool => array_reduce(
+                                    $callbacks,
+                                    static fn (bool $carry, callable $callback): bool => $carry || $callback($value, $key, $iterator),
+                                    false
+                                );
 
                         $callback = $callbackReducer($callbacks);
 

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -61,7 +61,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 || $callable($current, $key, $iterator);
 
                     $result = false;
 

diff --git a/src/Operation/Split.php b/src/Operation/Split.php
@@ -68,7 +68,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 || $callable($current, $key, $iterator);
 
                         foreach ($iterator as $key => $value) {
                             $callbackReturn = array_reduce(

diff --git a/src/Operation/TakeWhile.php b/src/Operation/TakeWhile.php
@@ -61,7 +61,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 || $callable($current, $key, $iterator);
 
                 foreach ($iterator as $key => $current) {
                     $result = array_reduce(

diff --git a/src/Operation/Until.php b/src/Operation/Until.php
@@ -61,7 +61,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 || $callable($current, $key, $iterator);
 
                     foreach ($iterator as $key => $current) {
                         yield $key => $current;