[Gen] support non-arraykey keys for generators/iterables

azjezz · Aug 22, 2020 · 3573bda · 3573bda
1 parent d9543be
commit 3573bda
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 21 deletions.
diff --git a/src/Psl/Gen/drop.php b/src/Psl/Gen/drop.php
@@ -15,7 +15,7 @@
  *      Gen\drop([1, 2, 3, 4, 5], 3)
  *      => Gen(4, 5)
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv>    $iterable   Iterable to drop the elements from

diff --git a/src/Psl/Gen/drop_while.php b/src/Psl/Gen/drop_while.php
@@ -17,7 +17,7 @@
  *      Gen\drop_while([3, 1, 4, -1, 5], fn($i) => $i > 0)
  *      => Gen(-1, 5)
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv>    $iterable Iterable to drop values from

diff --git a/src/Psl/Gen/enumerate.php b/src/Psl/Gen/enumerate.php
@@ -9,7 +9,7 @@
 /**
  * Converts an iterable of key and value pairs, into a generator of entries.
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv>    $iterable

diff --git a/src/Psl/Gen/filter.php b/src/Psl/Gen/filter.php
@@ -19,7 +19,7 @@
  *      Gen\filter(['foo', 'bar', 'baz', 'qux'], fn($value) => Str\contains($value, 'a'));
  *      => Gen('bar', 'baz')
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv>            $iterable

diff --git a/src/Psl/Gen/filter_keys.php b/src/Psl/Gen/filter_keys.php
@@ -19,7 +19,7 @@
  *      Gen\filter_keys([0 => 'a', 1 => 'b', 2 => 'c'], fn($key) => $key <= 1);
  *      => Gen(0 => 'a', 1 => 'b')
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv>            $iterable

diff --git a/src/Psl/Gen/filter_with_key.php b/src/Psl/Gen/filter_with_key.php
@@ -19,7 +19,7 @@
  *      Gen\filter(['foo', 'bar', 'baz', 'qux'], fn($key, $value) => $key > 1 && Str\contains($value, 'a'));
  *      => Gen('baz')
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv>            $iterable

diff --git a/src/Psl/Gen/from_keys.php b/src/Psl/Gen/from_keys.php
@@ -10,7 +10,7 @@
  * Returns a generator where each value is the result of calling the given
  * function on the corresponding key.
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk>        $keys

diff --git a/src/Psl/Gen/keys.php b/src/Psl/Gen/keys.php
@@ -14,7 +14,7 @@
  *      Gen\keys(['a' => 0, 'b' => 1, 'c' => 2])
  *      => Gen('a', 'b', 'c')
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv> $iterable Iterable to get keys from

diff --git a/src/Psl/Gen/map.php b/src/Psl/Gen/map.php
@@ -18,7 +18,7 @@
  *     Gen\map([1, 2, 3, 4, 5], fn($i) => $i * 2);
  *     => Gen(2, 4, 6, 8, 10)
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  * @psalm-template T
  *

diff --git a/src/Psl/Gen/map_keys.php b/src/Psl/Gen/map_keys.php
@@ -18,8 +18,8 @@
  *     Gen\map_keys([0 => 1, 1 => 2, 2 => 3, 3 => 4, 4 => 5], fn($i) => $i * 2);
  *     => Gen(0 => 1, 2 => 2, 4 => 3, 6 => 4, 8 => 5)
  *
- * @psalm-template Tk1 of array-key
- * @psalm-template Tk2 of array-key
+ * @psalm-template Tk1
+ * @psalm-template Tk2
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk1, Tv>    $iterable Iterable to be mapped over

diff --git a/src/Psl/Gen/map_with_key.php b/src/Psl/Gen/map_with_key.php
@@ -17,7 +17,7 @@
  *     Gen\map_with_key([1, 2, 3, 4, 5], fn($k, $v) => $k + $v);
  *     => Gen(1, 3, 5, 7, 9)
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  * @psalm-template T
  *

diff --git a/src/Psl/Gen/pull.php b/src/Psl/Gen/pull.php
@@ -24,11 +24,8 @@
  *      )
  *
  *
- * k of array-key
- * v
- *
  * @psalm-template T
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<T> $iterable

diff --git a/src/Psl/Gen/reductions.php b/src/Psl/Gen/reductions.php
@@ -15,7 +15,7 @@
  *
  * Reductions yield each accumulator along the way.
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  * @psalm-template Ts
  *

diff --git a/src/Psl/Gen/take.php b/src/Psl/Gen/take.php
@@ -10,7 +10,7 @@
 /**
  * Take the first n elements from an iterable.
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv> $iterable

diff --git a/src/Psl/Gen/take_while.php b/src/Psl/Gen/take_while.php
@@ -17,7 +17,7 @@
  *      Gen\take_while([3, 1, 4, -1, 5], fn($i) => $i > 0)
  *      => Gen(3, 1, 4)
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param    iterable<Tk, Tv>     $iterable Iterable to take values from

diff --git a/src/Psl/Gen/values.php b/src/Psl/Gen/values.php
@@ -17,7 +17,7 @@
  *      Gen\values([17 => 1, 42 => 2, -2 => 100])
  *      => Gen(1, 42, 100)
  *
- * @psalm-template Tk of array-key
+ * @psalm-template Tk
  * @psalm-template Tv
  *
  * @psalm-param iterable<Tk, Tv> $iterable Iterable to get values from

diff --git a/src/Psl/Gen/zip.php b/src/Psl/Gen/zip.php
@@ -26,7 +26,7 @@
  * @psalm-template Tk
  * @psalm-template Tv
  *
- * @psalm-param iterable<iterable<Tk, Tv>>  $iterables
+ * @psalm-param iterable<Tk, Tv> ...$iterables
  *
  * @psalm-return Generator<list<Tk>, list<Tv>, mixed, void>
  */