docs: Update typing information.

loophp · Jan 9, 2021 · 861cb9f · 861cb9f
1 parent 7502dc0
commit 861cb9f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/src/Collection.php b/src/Collection.php
@@ -179,15 +179,9 @@ public function associate(
              * @param mixed $carry
              * @psalm-param T|TKey $carry
              *
-             * @param mixed $key
-             * @psalm-param TKey $key
-             *
-             * @param mixed $value
-             * @psalm-param T $value
-             *
-             * @psalm-return TKey|T
+             * @psalm-return T|TKey
              */
-            static fn ($carry, $key, $value) => $carry;
+            static fn ($carry) => $carry;
 
         $callbackForKeys ??= $defaultCallback;
         $callbackForValues ??= $defaultCallback;
@@ -455,11 +449,10 @@ public function ifThenElse(callable $condition, callable $then, ?callable $else
         $else ??=
             /**
              * @psalm-param T $value
-             * @psalm-param TKey $key
              *
              * @psalm-return T
              */
-            static fn ($value, $key) => $value;
+            static fn ($value) => $value;
 
         return new self(IfThenElse::of()($condition)($then)($else), $this->getIterator());
     }
@@ -585,10 +578,7 @@ public function permutate(): CollectionInterface
 
     public function pipe(callable ...$callables): self
     {
-        return new self(
-            Pipe::of()(...$callables),
-            $this->getIterator()
-        );
+        return new self(Pipe::of()(...$callables), $this->getIterator());
     }
 
     public function pluck($pluck, $default = null): CollectionInterface

diff --git a/src/Contract/Operation/Hasable.php b/src/Contract/Operation/Hasable.php
@@ -15,7 +15,7 @@
 interface Hasable
 {
     /**
-     * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callback
+     * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool ...$callbacks
      *
      * @psalm-return \loophp\collection\Collection<int, bool>
      */

diff --git a/src/Iterator/ProxyIterator.php b/src/Iterator/ProxyIterator.php
@@ -12,8 +12,6 @@
  *
  * @psalm-template TKey
  * @psalm-template T
- *
- * @implements OuterIterator<TKey, T>
  */
 abstract class ProxyIterator implements OuterIterator
 {

diff --git a/src/Operation/Flip.php b/src/Operation/Flip.php
@@ -40,7 +40,7 @@ public function __invoke(): Closure
              */
             static fn ($carry, $key, $value) => $key;
 
-        /** @psalm-var Closure(Iterator<TKey, T>): Generator<T, TKey> $associate */
+        /** @psalm-var Closure(Iterator<TKey, T>): Closure(Iterator<TKey, T>): Generator<T, TKey> $associate */
         $associate = Associate::of()($callbackForKeys)($callbackForValues);
 
         // Point free style.

diff --git a/src/Operation/Transpose.php b/src/Operation/Transpose.php
@@ -28,7 +28,7 @@ public function __invoke(): Closure
              *
              * @psalm-return Generator<TKey, list<T>>
              */
-            static function (Iterator $iterator): Iterator {
+            static function (Iterator $iterator): Generator {
                 $mit = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);
 
                 foreach ($iterator as $iterableIterator) {
@@ -54,7 +54,10 @@ static function (Iterator $iterator): Iterator {
                      */
                     static fn (array $carry, array $key, array $value): array => $value;
 
-                return Associate::of()($callbackForKeys)($callbackForValues)($mit);
+                $associate = Associate::of()($callbackForKeys)($callbackForValues)($mit);
+
+                /** @psalm-var Generator<TKey, list<T>> $associate */
+                return $associate;
             };
     }
 }