Update Psalm/typing annotations.

loophp · Aug 27, 2020 · d5207e3 · d5207e3
1 parent 6c3b94f
commit d5207e3
Show file tree

Hide file tree

Showing 63 changed files with 150 additions and 145 deletions.
diff --git a/src/Operation/Append.php b/src/Operation/Append.php
@@ -29,10 +29,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<T> $items
              *
-             * @psalm-return \Generator<TKey|int, T>
+             * @psalm-return Generator<TKey|int, T>
              */
             static function (Iterator $iterator, array $items): Generator {
                 foreach ($iterator as $key => $value) {

diff --git a/src/Operation/Apply.php b/src/Operation/Apply.php
@@ -26,13 +26,13 @@ public function __construct(callable ...$callbacks)
     }
 
     /**
-     * @psalm-return \Closure(\Iterator<TKey, T>, list<callable(T, TKey):(bool)>):(\Generator<TKey, T>)
+     * @psalm-return Closure(Iterator<TKey, T>, list<callable(T, TKey):(bool)>):(Generator<TKey, T>)
      */
     public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<callable(T, TKey):(bool)> $callbacks
              */
             static function (Iterator $iterator, array $callbacks): Generator {

diff --git a/src/Operation/Associate.php b/src/Operation/Associate.php
@@ -33,13 +33,13 @@ public function __construct(?callable $callbackForKeys = null, ?callable $callba
     }
 
     /**
-     * @psalm-return \Closure(\Iterator<TKey, T>, callable(TKey, T):(TKey), callable(TKey, T):(T)):(\Generator<TKey, T>)
+     * @psalm-return Closure(Iterator<TKey, T>, callable(TKey, T):(TKey), callable(TKey, T):(T)):(Generator<TKey, T>)
      */
     public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param callable(TKey, T):(TKey) $callbackForKeys
              * @psalm-param callable(TKey, T):(T) $callbackForValues
              */

diff --git a/src/Operation/Cache.php b/src/Operation/Cache.php
@@ -28,9 +28,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, CacheItemPoolInterface $cache): Generator {
                 return yield from new CacheIterator($iterator, $cache);

diff --git a/src/Operation/Chunk.php b/src/Operation/Chunk.php
@@ -34,10 +34,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param ArrayIterator<int, int> $sizes
              *
-             * @psalm-return \Generator<int, list<T>>
+             * @psalm-return Generator<int, list<T>>
              */
             static function (Iterator $iterator, ArrayIterator $sizes): Generator {
                 $sizesIterator = (new Run(new Loop()))($sizes);

diff --git a/src/Operation/Collapse.php b/src/Operation/Collapse.php
@@ -20,9 +20,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<array-key, T|iterable<TKey, T>> $iterator
+             * @psalm-param Iterator<array-key, T|iterable<TKey, T>> $iterator
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator): Generator {
                 foreach ($iterator as $value) {
@@ -31,8 +31,8 @@ static function (Iterator $iterator): Generator {
                     }
 
                     /**
-                     * @var TKey $subKey
-                     * @var T $subValue
+                     * @psalm-var TKey $subKey
+                     * @psalm-var T $subValue
                      */
                     foreach ($value as $subKey => $subValue) {
                         yield $subKey => $subValue;

diff --git a/src/Operation/Column.php b/src/Operation/Column.php
@@ -29,16 +29,16 @@ public function __construct($column)
     }
 
     /**
-     * @return \Closure(\Iterator<TKey, T>, array-key):(\Generator<int, iterable<TKey, T>>)
+     * @psalm-return Closure(Iterator<TKey, T>, array-key):(Generator<int, iterable<TKey, T>>)
      */
     public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param array-key $column
              *
-             * @psalm-return \Generator<int, iterable<TKey, T>>
+             * @psalm-return Generator<int, iterable<TKey, T>>
              *
              * @param mixed $column
              */

diff --git a/src/Operation/Combinate.php b/src/Operation/Combinate.php
@@ -33,10 +33,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param callable(array<int, T>, int): (array<int, T>) $getCombinations
              *
-             * @psalm-return \Generator<int, list<T>>
+             * @psalm-return Generator<int, list<T>>
              */
             static function (Iterator $iterator, ?int $length, callable $getCombinations): Generator {
                 $dataset = iterator_to_array($iterator);
@@ -62,7 +62,7 @@ static function (Iterator $iterator, ?int $length, callable $getCombinations): G
      * @psalm-param array<int, T> $dataset
      *
      * @return Generator<array<mixed>>
-     * @psalm-return \Generator<array<int, T>>
+     * @psalm-return Generator<array<int, T>>
      */
     private function getCombinations(array $dataset, int $length): Generator
     {

diff --git a/src/Operation/Combine.php b/src/Operation/Combine.php
@@ -34,10 +34,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param ArrayIterator<int, TKey> $keys
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, ArrayIterator $keys): Generator {
                 while ($iterator->valid() && $keys->valid()) {

diff --git a/src/Operation/Compact.php b/src/Operation/Compact.php
@@ -32,10 +32,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<T|null> $values
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, array $values): Generator {
                 return yield from

diff --git a/src/Operation/Cycle.php b/src/Operation/Cycle.php
@@ -27,9 +27,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, int $length): Generator {
                 if (0 === $length) {

diff --git a/src/Operation/Diff.php b/src/Operation/Diff.php
@@ -31,10 +31,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<T> $values
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, array $values): Generator {
                 foreach ($iterator as $key => $value) {

diff --git a/src/Operation/DiffKeys.php b/src/Operation/DiffKeys.php
@@ -31,14 +31,14 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<TKey> $values
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              *
              * @param mixed $values
              */
-            static function (Iterator $iterator, $values): Generator {
+            static function (Iterator $iterator, array $values): Generator {
                 foreach ($iterator as $key => $value) {
                     if (false === in_array($key, $values, true)) {
                         yield $key => $value;

diff --git a/src/Operation/Distinct.php b/src/Operation/Distinct.php
@@ -22,9 +22,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator): Generator {
                 $seen = [];

diff --git a/src/Operation/Explode.php b/src/Operation/Explode.php
@@ -30,10 +30,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<T> $explodes
              *
-             * @psalm-return \Generator<int, list<T>>
+             * @psalm-return Generator<int, list<T>>
              */
             static function (Iterator $iterator, array $explodes): Generator {
                 return yield from (new Run(

diff --git a/src/Operation/Filter.php b/src/Operation/Filter.php
@@ -40,10 +40,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
-             * @psalm-param list<callable(T, TKey, \Iterator<TKey, T>):(bool)> $callbacks
+             * @psalm-param Iterator<TKey, T> $iterator
+             * @psalm-param list<callable(T, TKey, Iterator<TKey, T>):(bool)> $callbacks
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, array $callbacks): Generator {
                 yield from array_reduce(

diff --git a/src/Operation/First.php b/src/Operation/First.php
@@ -54,9 +54,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, callable $callback, int $size): Generator {
                 $callback =

diff --git a/src/Operation/Flatten.php b/src/Operation/Flatten.php
@@ -29,9 +29,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<int, T>
+             * @psalm-return Generator<int, T>
              */
             static function (Iterator $iterator, int $depth): Generator {
                 foreach ($iterator as $value) {

diff --git a/src/Operation/Flip.php b/src/Operation/Flip.php
@@ -20,9 +20,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<int|string, TKey>
+             * @psalm-return Generator<int|string, TKey>
              */
             static function (Iterator $iterator): Generator {
                 foreach ($iterator as $key => $value) {

diff --git a/src/Operation/Forget.php b/src/Operation/Forget.php
@@ -31,10 +31,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<TKey> $keys
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, array $keys): Generator {
                 $keys = array_flip($keys);

diff --git a/src/Operation/Frequency.php b/src/Operation/Frequency.php
@@ -20,9 +20,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<int, T>
+             * @psalm-return Generator<int, T>
              */
             static function (Iterator $iterator): Generator {
                 $storage = [];

diff --git a/src/Operation/Group.php b/src/Operation/Group.php
@@ -40,10 +40,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param callable(TKey, T):(TKey) $callable
              *
-             * @psalm-return \Generator<int, list<T>>
+             * @psalm-return Generator<int, list<T>>
              */
             static function (Iterator $iterator, callable $callable): Generator {
                 $data = [];

diff --git a/src/Operation/Intersect.php b/src/Operation/Intersect.php
@@ -31,10 +31,10 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<T> $values
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator, array $values): Generator {
                 foreach ($iterator as $key => $value) {

diff --git a/src/Operation/IntersectKeys.php b/src/Operation/IntersectKeys.php
@@ -31,14 +31,14 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              * @psalm-param list<TKey> $values
              *
-             * @psalm-return \Generator<TKey, T>
+             * @psalm-return Generator<TKey, T>
              *
              * @param mixed $values
              */
-            static function (Iterator $iterator, $values): Generator {
+            static function (Iterator $iterator, array $values): Generator {
                 foreach ($iterator as $key => $value) {
                     if (false === in_array($key, $values, true)) {
                         continue;

diff --git a/src/Operation/Intersperse.php b/src/Operation/Intersperse.php
@@ -47,12 +47,12 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
              * @param mixed $element
              * @psalm-param T $element
              *
-             * @psalm-return \Generator<int|TKey, T>
+             * @psalm-return Generator<int|TKey, T>
              */
             static function (Iterator $iterator, $element, int $every, int $startAt): Generator {
                 foreach ($iterator as $key => $value) {

diff --git a/src/Operation/Keys.php b/src/Operation/Keys.php
@@ -20,9 +20,9 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<int, TKey>
+             * @psalm-return Generator<int, TKey>
              */
             static function (Iterator $iterator): Generator {
                 foreach ($iterator as $key => $value) {