Fix bug with Partition operation.

loophp · Jul 16, 2021 · e44d50b · e44d50b
1 parent 94476e2
commit e44d50b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/Collection.php b/src/Collection.php
@@ -670,7 +670,7 @@ public function partition(callable ...$callbacks): CollectionInterface
         return new self(
             Pipe::of()(
                 Partition::of()(...$callbacks),
-                Map::of()(static fn (Iterator $iterator): CollectionInterface => self::fromIterable($iterator))
+                Map::of()(static fn (array $callUserFuncParameters): CollectionInterface => self::fromCallable(...$callUserFuncParameters)),
             ),
             $this->getIterator()
         );

diff --git a/src/Operation/Partition.php b/src/Operation/Partition.php
@@ -42,13 +42,9 @@ public function __invoke(): Closure
                  *
                  * @return Generator<int, Iterator<TKey, T>>
                  */
-                static function (Iterator $iterator) use ($callbacks): Iterator {
-                    /** @var Iterator<TKey, T> $filter */
-                    $filter = Filter::of()(...$callbacks)($iterator);
-                    /** @var Iterator<TKey, T> $reject */
-                    $reject = Reject::of()(...$callbacks)($iterator);
-
-                    return yield from [$filter, $reject];
-                };
+                static fn (Iterator $iterator): Generator => yield from [
+                        [Filter::of()(...$callbacks), $iterator],
+                        [Reject::of()(...$callbacks), $iterator],
+                    ];
     }
 }