Merge pull request #272 from boesing/1.3.x-merge-up-into-2.0.x_dFYQU2LB

Merge release 1.3.0 into 2.0.x
boesing · Oct 22, 2024 · a434de4 · a434de4
2 parents 1e3e8b7 + a295bff
commit a434de4
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 69 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>boesing/.github:renovate-config"
+  ]
+}
diff --git a/src/Map.php b/src/Map.php
@@ -20,6 +20,7 @@
 use function array_values;
 use function asort;
 use function implode;
+use function is_array;
 use function sprintf;
 use function strcmp;
 use function uasort;
@@ -375,16 +376,10 @@ public function partition(callable $callback): array
         return [$instance1, $instance2];
     }
 
-    /**
-     * @template TGroup of non-empty-string
-     * @psalm-param callable(TValue):TGroup $callback
-     *
-     * @psalm-return MapInterface<TGroup,MapInterface<TKey,TValue>>
-     */
     public function group(callable $callback): MapInterface
     {
         /**
-         * @psalm-var MapInterface<TGroup,MapInterface<TKey,TValue>> $groups
+         * @psalm-var MapInterface<non-empty-string,MapInterface<TKey,TValue>> $groups
          */
         $groups = new GenericMap([]);
 
@@ -393,15 +388,21 @@ public function group(callable $callback): MapInterface
              * @psalm-suppress ImpureFunctionCall Upstream projects have to ensure that they do not manipulate the
              *                                    value here.
              */
-            $groupIdentifier = $callback($value);
-            try {
-                $group = $groups->get($groupIdentifier);
-            } catch (OutOfBoundsException) {
-                $group       = clone $this;
-                $group->data = [];
+            $groupIdentifiers = $callback($value);
+            if (! is_array($groupIdentifiers)) {
+                $groupIdentifiers = [$groupIdentifiers];
             }
 
-            $groups = $groups->put($groupIdentifier, $group->put($key, $value));
+            foreach ($groupIdentifiers as $groupIdentifier) {
+                try {
+                    $group = $groups->get($groupIdentifier);
+                } catch (OutOfBoundsException) {
+                    $group       = clone $this;
+                    $group->data = [];
+                }
+
+                $groups = $groups->put($groupIdentifier, $group->put($key, $value));
+            }
         }
 
         return $groups;

diff --git a/src/MapInterface.php b/src/MapInterface.php
@@ -215,10 +215,10 @@ public function partition(callable $callback): array;
     /**
      * Groups the items of this object by using the callback.
      *
-     * @template TGroup of non-empty-string
+     * @template TGroup of non-empty-string|non-empty-list<non-empty-string>
      * @psalm-param callable(TValue):TGroup $callback
      *
-     * @psalm-return MapInterface<TGroup,MapInterface<TKey,TValue>>
+     * @psalm-return MapInterface<non-empty-string,MapInterface<TKey,TValue>>
      */
     public function group(callable $callback): MapInterface;
 

diff --git a/src/OrderedList.php b/src/OrderedList.php
@@ -23,6 +23,7 @@
 use function count;
 use function hash;
 use function implode;
+use function is_array;
 use function is_callable;
 use function serialize;
 use function shuffle;
@@ -369,30 +370,30 @@ public function partition(callable $callback): array
         return [$instance1, $instance2];
     }
 
-    /**
-     * @template TGroup of non-empty-string
-     * @psalm-param callable(TValue):TGroup $callback
-     *
-     * @psalm-return MapInterface<TGroup,OrderedListInterface<TValue>>
-     */
     public function group(callable $callback): MapInterface
     {
-        /** @var MapInterface<TGroup,OrderedListInterface<TValue>> $groups */
+        /** @var MapInterface<non-empty-string,OrderedListInterface<TValue>> $groups */
         $groups = new GenericMap([]);
         foreach ($this as $value) {
             /**
              * @psalm-suppress ImpureFunctionCall Upstream projects have to ensure that they do not manipulate the
              *                                    value here.
              */
-            $groupName = $callback($value);
-            if (! $groups->has($groupName)) {
-                $groups = $groups->put($groupName, new GenericOrderedList([$value]));
-                continue;
+            $groupNames = $callback($value);
+            if (! is_array($groupNames)) {
+                $groupNames = [$groupNames];
             }
 
-            $existingGroup = $groups->get($groupName);
-            $existingGroup = $existingGroup->add($value);
-            $groups        = $groups->put($groupName, $existingGroup);
+            foreach ($groupNames as $groupName) {
+                if (! $groups->has($groupName)) {
+                    $groups = $groups->put($groupName, new GenericOrderedList([$value]));
+                    continue;
+                }
+
+                $existingGroup = $groups->get($groupName);
+                $existingGroup = $existingGroup->add($value);
+                $groups        = $groups->put($groupName, $existingGroup);
+            }
         }
 
         return $groups;

diff --git a/src/OrderedListInterface.php b/src/OrderedListInterface.php
@@ -182,10 +182,10 @@ public function partition(callable $callback): array;
     /**
      * Groups the items by using the callback.
      *
-     * @template TGroup of non-empty-string
+     * @template TGroup of non-empty-string|non-empty-list<non-empty-string>
      * @psalm-param callable(TValue):TGroup $callback
      *
-     * @psalm-return MapInterface<TGroup,OrderedListInterface<TValue>>
+     * @psalm-return MapInterface<non-empty-string,OrderedListInterface<TValue>>
      */
     public function group(callable $callback): MapInterface;
 

diff --git a/tests/GenericMapTest.php b/tests/GenericMapTest.php
@@ -736,6 +736,19 @@ public function testWillGroupValuesToNewInstancesOfInitialInstance(): void
         self::assertEquals($object2, $b->get('bar'));
     }
 
+    public function testWillGroupValueIntoMultipleGroups(): void
+    {
+        $map = new GenericMap([
+            'foo' => $object1 = new GenericObject(1),
+        ]);
+
+        $grouped = $map->group(fn () => ['a', 'b']);
+        self::assertTrue($grouped->has('a'));
+        self::assertTrue($grouped->has('b'));
+        self::assertTrue($grouped->get('a')->contains($object1));
+        self::assertTrue($grouped->get('b')->contains($object1));
+    }
+
     /**
      * @template     T
      * @psalm-param array<string,T> $elements

diff --git a/tests/GenericOrderedListTest.php b/tests/GenericOrderedListTest.php
@@ -1049,6 +1049,19 @@ public function testWillGroupValuesToNewInstancesOfInitialInstance(): void
         self::assertEquals($object2, $b->at(0));
     }
 
+    public function testWillGroupValueIntoMultipleGroups(): void
+    {
+        $list = new GenericOrderedList([
+            $object1 = new GenericObject(1),
+        ]);
+
+        $grouped = $list->group(fn () => ['a', 'b']);
+        self::assertTrue($grouped->has('a'));
+        self::assertTrue($grouped->has('b'));
+        self::assertTrue($grouped->get('a')->contains($object1));
+        self::assertTrue($grouped->get('b')->contains($object1));
+    }
+
     /**
      * @template     T
      * @psalm-param  list<T> $data