[12.x] Support enum values in Collection countBy method (#56830)

jnoordsij · web-flow · commit d03a367493e0 · 2025-08-29T15:15:02.000-05:00
* Support enum usage in Collection countBy

* Add tests for countBy using enum
diff --git a/src/Illuminate/Collections/LazyCollection.php b/src/Illuminate/Collections/LazyCollection.php
@@ -319,7 +319,7 @@ public function crossJoin(...$arrays)
     /**
      * Count the number of items in the collection by a field or using a callback.
      *
-     * @param  (callable(TValue, TKey): array-key)|string|null  $countBy
+     * @param  (callable(TValue, TKey): array-key|\UnitEnum)|string|null  $countBy
      * @return static<array-key, int>
      */
     public function countBy($countBy = null)
@@ -332,7 +332,7 @@ public function countBy($countBy = null)
             $counts = [];
 
             foreach ($this as $key => $value) {
-                $group = $countBy($value, $key);
+                $group = enum_value($countBy($value, $key));
 
                 if (empty($counts[$group])) {
                     $counts[$group] = 0;
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -805,6 +805,9 @@ public function testCountByStandalone($collection)
 
         $c = new $collection([1, 5, 1, 5, 5, 1]);
         $this->assertEquals([1 => 3, 5 => 3], $c->countBy()->all());
+
+        $c = new $collection([StaffEnum::James, StaffEnum::Joe, StaffEnum::Taylor]);
+        $this->assertEquals(['James' => 1, 'Joe' => 1, 'Taylor' => 1], $c->countBy()->all());
     }
 
     #[DataProvider('collectionClassProvider')]
@@ -815,6 +818,12 @@ public function testCountByWithKey($collection)
             ['key' => 'b'], ['key' => 'b'], ['key' => 'b'],
         ]);
         $this->assertEquals(['a' => 4, 'b' => 3], $c->countBy('key')->all());
+
+        $c = new $collection([
+            ['key' => TestBackedEnum::A],
+            ['key' => TestBackedEnum::B], ['key' => TestBackedEnum::B],
+        ]);
+        $this->assertEquals([1 => 1, 2 => 2], $c->countBy('key')->all());
     }
 
     #[DataProvider('collectionClassProvider')]
@@ -829,6 +838,9 @@ public function testCountableByWithCallback($collection)
         $this->assertEquals([true => 2, false => 3], $c->countBy(function ($i) {
             return $i % 2 === 0;
         })->all());
+
+        $c = new $collection(['A', 'A', 'B', 'A']);
+        $this->assertEquals(['A' => 3, 'B' => 1], $c->countBy(static fn ($i) => TestStringBackedEnum::from($i))->all());
     }
 
     public function testAdd()
