sa: Update typing information.

loophp · Dec 31, 2021 · 351676b · 351676b
1 parent 58a3919
commit 351676b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/src/Operation/Associate.php b/src/Operation/Associate.php
@@ -29,7 +29,7 @@ final class Associate extends AbstractOperation
      * @template NewTKey
      * @template NewT
      *
-     * @return Closure(callable(TKey=, T=, Iterator<TKey, T>=): NewTKey): Closure(callable(T=, TKey=, Iterator<TKey, T>=): NewT): Closure(Iterator<TKey, T>): Generator<NewTKey, NewT>
+     * @return Closure(callable(mixed=, mixed=, Iterator<mixed, mixed>=): mixed): Closure(callable(mixed=, mixed=, Iterator<mixed, mixed>=): mixed): Closure(Iterator<mixed, mixed>): Generator<mixed, mixed>
      */
     public function __invoke(): Closure
     {

diff --git a/src/Operation/FlatMap.php b/src/Operation/FlatMap.php
@@ -29,13 +29,13 @@ final class FlatMap extends AbstractOperation
      * @template IKey
      * @template IValue
      *
-     * @return Closure(callable(T=, TKey=, Iterator<TKey, T>=): iterable<IKey, IValue>): Closure(Iterator<TKey, T>): Generator<IKey, IValue>
+     * @return Closure(callable(T=, TKey=, Iterator<TKey, T>=): iterable<mixed, mixed>): Closure(Iterator<TKey, T>): Generator<mixed, mixed>
      */
     public function __invoke(): Closure
     {
         return
             /**
-             * @param callable(T=, TKey=, Iterator<TKey, T>=): iterable<IKey, IValue> $callback
+             * @param callable(T=, TKey=, Iterator<TKey, T>=): iterable<mixed, mixed> $callback
              */
             static function (callable $callback): Closure {
                 /** @var Closure(Iterator<TKey, T>): Generator<IKey, IValue> $flatMap */

diff --git a/src/Operation/Product.php b/src/Operation/Product.php
@@ -67,11 +67,11 @@ static function (iterable ...$iterables): Closure {
                             /**
                              * @param Iterator<int, list<T>> $as
                              */
-                            static fn (Iterator $as): Generator => FlatMap::of()(
+                            static fn (Iterator $as): Generator => (new FlatMap())()(
                                 /**
                                  * @param list<T> $a
                                  */
-                                static fn (array $a): Generator => FlatMap::of()(
+                                static fn (array $a): Generator => (new FlatMap())()(
                                     /**
                                      * @param T|U $x
                                      *

diff --git a/src/Operation/Reduce.php b/src/Operation/Reduce.php
@@ -29,7 +29,7 @@ final class Reduce extends AbstractOperation
      * @template V
      * @template W
      *
-     * @return Closure(callable((V|W)=, T=, TKey=, Iterator<TKey, T>=): W): Closure(V): Closure(Iterator<TKey, T>): Generator<TKey, W>
+     * @return Closure(callable(mixed=, mixed=, mixed=, Iterator<mixed, mixed>=): mixed): Closure(mixed): Closure(Iterator<TKey, T>): Generator<TKey, mixed>
      */
     public function __invoke(): Closure
     {
@@ -48,7 +48,7 @@ public function __invoke(): Closure
                 static function ($initial) use ($callback): Closure {
                     /** @var Closure(Iterator<TKey, T>): Generator<TKey, W> $pipe */
                     $pipe = Pipe::of()(
-                        Reduction::of()($callback)($initial),
+                        (new Reduction())()($callback)($initial),
                         Last::of(),
                     );
 

diff --git a/src/Operation/Reduction.php b/src/Operation/Reduction.php
@@ -29,7 +29,7 @@ final class Reduction extends AbstractOperation
      * @template V
      * @template W
      *
-     * @return Closure(callable((V|W)=, T=, TKey=, Iterator<TKey, T>=): W): Closure(V): Closure(Iterator<TKey, T>): Generator<TKey, W>
+     * @return Closure(callable(mixed=, mixed=, mixed=, Iterator<mixed, mixed>=): mixed): Closure(mixed): Closure(Iterator<TKey, T>): Generator<TKey, mixed>
      */
     public function __invoke(): Closure
     {

diff --git a/src/Operation/Zip.php b/src/Operation/Zip.php
@@ -66,11 +66,12 @@ static function (iterable ...$iterables): Closure {
                         ),
                     ]);
 
+                /** @var MultipleIterator<array-key, (Iterator<TKey, T>|Iterator<UKey, U>)> $buildMultipleIterator */
                 $buildMultipleIterator =
-                    /**
-                     * @return Closure(ArrayIterator<int, (Iterator<TKey, T>|IterableIterator<UKey, U>)>): MultipleIterator
-                     */
-                    Reduce::of()(
+                     /**
+                      * @return Closure(ArrayIterator<int, (Iterator<TKey, T>|IterableIterator<UKey, U>)>): MultipleIterator
+                      */
+                     (new Reduce())()(
                         /**
                          * @param Iterator<TKey, T> $iterator
                          */
@@ -79,7 +80,7 @@ static function (MultipleIterator $acc, Iterator $iterator): MultipleIterator {
 
                             return $acc;
                         }
-                    )(new MultipleIterator(MultipleIterator::MIT_NEED_ANY));
+                     )(new MultipleIterator(MultipleIterator::MIT_NEED_ANY));
 
                 /** @var Closure(Iterator<TKey, T>): Generator<list<TKey|UKey>, list<T|U>> $pipe */
                 $pipe = Pipe::of()(