Update Group operation.

loophp · Aug 27, 2020 · 6fce398 · 6fce398
1 parent 18a7885
commit 6fce398
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -978,14 +978,14 @@ public function it_can_group()
                 10 => ['h'],
             ]);
 
-        $callback = static function ($key, $value) {
-            return $value % 2;
+        $callback = static function (int $value, int $key) {
+            return 0 === ($value % 2) ? 'even' : 'odd';
         };
 
         $this::fromIterable(range(0, 20))
             ->group($callback)
             ->shouldIterateAs([
-                0 => [
+                'even' => [
                     0,
                     2,
                     4,
@@ -998,7 +998,7 @@ public function it_can_group()
                     18,
                     20,
                 ],
-                1 => [
+                'odd' => [
                     1,
                     3,
                     5,

diff --git a/src/Operation/Group.php b/src/Operation/Group.php
@@ -31,7 +31,7 @@ public function __construct(?callable $callable = null)
              * @return mixed
              * @psalm-return TKey
              */
-            static function ($key, $value) {
+            static function ($value, $key) {
                 return $key;
             };
     }
@@ -59,8 +59,10 @@ static function (Iterator $iterator, callable $callable): Generator {
                      * @psalm-return array<TKey, list<T>>
                      */
                     static function (array $collect, $value, $key) use ($callable): array {
-                        if (null !== $groupKey = $callable($key, $value)) {
+                        if (null !== $groupKey = $callable($value, $key)) {
                             $collect[$groupKey][] = $value;
+                        } else {
+                            $collect[$key] = $value;
                         }
 
                         return $collect;