SA: Update operations.

src/Collection.php

@@ -702,15 +702,19 @@ public function pair(): CollectionInterface
     public function partition(callable ...$callbacks): CollectionInterface
     {
         // TODO: Move this docblock above closure when https://github.com/phpstan/phpstan/issues/3770 lands.
-        $mapCallback = static function (array $partitionResult): CollectionInterface {
+        $mapCallback =
             /**
-             * @var Closure(Iterator<TKey, T>): Generator<TKey, T> $callback
-             * @var array{0: Iterator<TKey, T>} $parameters
+             * @param array{0: (Closure(Iterator<TKey, T>): Generator<TKey, T>), 1: (array{0: Iterator<TKey, T>})} $partitionResult
              */
-            [$callback, $parameters] = $partitionResult;
+            static function (array $partitionResult): CollectionInterface {
+                /**
+                 * @var Closure(Iterator<TKey, T>): Generator<TKey, T> $callback
+                 * @var array{0: Iterator<TKey, T>} $parameters
+                 */
+                [$callback, $parameters] = $partitionResult;
 
-            return self::fromCallable($callback, $parameters);
-        };
+                return self::fromCallable($callback, $parameters);
+            };
 
         return new self(Pipe::of()(Partition::of()(...$callbacks), Map::of()($mapCallback)), [$this->getIterator()]);
     }
@@ -847,15 +851,19 @@ public function sort(int $type = Operation\Sortable::BY_VALUES, ?callable $callb
     public function span(callable ...$callbacks): CollectionInterface
     {
         // TODO: Move this docblock above closure when https://github.com/phpstan/phpstan/issues/3770 lands.
-        $mapCallback = static function (array $spanResult): CollectionInterface {
+        $mapCallback =
             /**
-             * @var Closure(Iterator<TKey, T>): Generator<TKey, T> $callback
-             * @var array{0: Iterator<TKey, T>} $parameters
+             * @param array{0: (Closure(Iterator<TKey, T>): Generator<TKey, T>), 1: (array{0: Iterator<TKey, T>})} $spanResult
              */
-            [$callback, $parameters] = $spanResult;
+            static function (array $spanResult): CollectionInterface {
+                /**
+                 * @var Closure(Iterator<TKey, T>): Generator<TKey, T> $callback
+                 * @var array{0: Iterator<TKey, T>} $parameters
+                 */
+                [$callback, $parameters] = $spanResult;
 
-            return self::fromCallable($callback, $parameters);
-        };
+                return self::fromCallable($callback, $parameters);
+            };
 
         return new self(Pipe::of()(Span::of()(...$callbacks), Map::of()($mapCallback)), [$this->getIterator()]);
     }

src/Operation/Partition.php

@@ -49,7 +49,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                     /** @var array{0: Closure(Iterator<TKey, T>): Generator<TKey, T>, 1: array{0: Iterator<TKey, T>}} $reject */
                     $reject = [Reject::of()(...$callbacks), [$iterator]];
 
-                    yield from [$filter, $reject];
+                    return yield from [$filter, $reject];
                 };
     }
 }

src/Operation/Span.php

@@ -49,7 +49,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                     /** @var array{0: Closure(Iterator<TKey, T>): Generator<TKey, T>, 1: array{0: Iterator<TKey, T>}} $dropWhile */
                     $dropWhile = [DropWhile::of()(...$callbacks), [$iterator]];
 
-                    yield from [$takeWhile, $dropWhile];
+                    return yield from [$takeWhile, $dropWhile];
                 };
     }
 }

src/Operation/Transpose.php

@@ -46,7 +46,7 @@ static function (Iterator $iterator): Generator {
                 $callbackForKeys =
                     /**
                      * @param array $carry
-                     * @param array<int, TKey> $key
+                     * @param non-empty-array<int, TKey> $key
                      *
                      * @return TKey
                      */

src/Operation/Unpair.php

@@ -24,15 +24,15 @@ final class Unpair extends AbstractOperation
     /**
      * @pure
      *
-     * @return Closure(Iterator<TKey, T>): Generator<int, array{TKey, T}>
+     * @return Closure(Iterator<TKey, T>): Generator<int, array<TKey, T>>
      */
     public function __invoke(): Closure
     {
         return
             /**
              * @param Iterator<TKey, T> $iterator
              *
-             * @return Generator<int, array{TKey, T}>
+             * @return Generator<int, array<TKey, T>>
              */
             static function (Iterator $iterator): Generator {
                 foreach ($iterator as $key => $value) {

tests/static-analysis/scanLeft.php

@@ -13,7 +13,8 @@
 use loophp\collection\Contract\Collection as CollectionInterface;
 
 $sum = static fn (int $carry, int $value): int => $carry + $value;
-$concat = static fn (?string $carry, string $string): string => sprintf('%s%s', (string) $carry, $string);
+$concat = static fn (string $carry, string $string): string => sprintf('%s%s', $carry, $string);
+$concatWithNull = static fn (?string $carry, string $string): string => sprintf('%s%s', (string) $carry, $string);
 $toString =
     /**
      * @param bool|string $carry
@@ -50,5 +51,5 @@ function scanLeft_checkListOfSize1String(CollectionInterface $collection): void
 
 scanLeft_checkListInt(Collection::fromIterable([1, 2, 3])->scanLeft($sum, 5));
 scanLeft_checkListString(Collection::fromIterable(range('a', 'c'))->scanLeft($concat, ''));
-scanLeft_checkListStringWithNull(Collection::fromIterable(range('a', 'c'))->scanLeft($concat));
+scanLeft_checkListStringWithNull(Collection::fromIterable(range('a', 'c'))->scanLeft($concatWithNull));
 scanLeft_checkListOfSize1String(Collection::fromIterable([10])->scanLeft($toString, true));

tests/static-analysis/scanRight.php

@@ -13,7 +13,8 @@
 use loophp\collection\Contract\Collection as CollectionInterface;
 
 $sum = static fn (int $carry, int $value): int => $carry + $value;
-$concat = static fn (?string $carry, string $string): string => sprintf('%s%s', (string) $carry, $string);
+$concat = static fn (string $carry, string $string): string => sprintf('%s%s', $carry, $string);
+$concatWithNull = static fn (?string $carry, string $string): string => sprintf('%s%s', (string) $carry, $string);
 $toString =
     /**
      * @param bool|string $carry
@@ -50,5 +51,5 @@ function scanRight_checkListOfSize1String(CollectionInterface $collection): void
 
 scanRight_checkListInt(Collection::fromIterable([1, 2, 3])->scanRight($sum, 5));
 scanRight_checkListString(Collection::fromIterable(range('a', 'c'))->scanRight($concat, ''));
-scanRight_checkListStringWithNull(Collection::fromIterable(range('a', 'c'))->scanRight($concat));
+scanRight_checkListStringWithNull(Collection::fromIterable(range('a', 'c'))->scanRight($concatWithNull));
 scanRight_checkListOfSize1String(Collection::fromIterable([10])->scanRight($toString, true));