Merge pull request #40813 from fdalcin/generic-reduce-key

[9.x] Improves `Support\Collection` reduce method type definition

Author: nunomaduro

src/Illuminate/Collections/Enumerable.php

@@ -805,7 +805,7 @@ public function random($number = null);
      * @template TReduceInitial
      * @template TReduceReturnType
      *
-     * @param  callable(TReduceInitial|TReduceReturnType, TValue): TReduceReturnType  $callback
+     * @param  callable(TReduceInitial|TReduceReturnType, TValue, TKey): TReduceReturnType  $callback
      * @param  TReduceInitial  $initial
      * @return TReduceReturnType
      */

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -744,7 +744,7 @@ function ($carry, $pipe) {
      * @template TReduceInitial
      * @template TReduceReturnType
      *
-     * @param  callable(TReduceInitial|TReduceReturnType, TValue): TReduceReturnType  $callback
+     * @param  callable(TReduceInitial|TReduceReturnType, TValue, TKey): TReduceReturnType  $callback
      * @param  TReduceInitial  $initial
      * @return TReduceReturnType
      */
@@ -808,7 +808,7 @@ class_basename(static::class), gettype($result)
      * @template TReduceWithKeysInitial
      * @template TReduceWithKeysReturnType
      *
-     * @param  callable(TReduceWithKeysInitial|TReduceWithKeysReturnType, TValue): TReduceWithKeysReturnType  $callback
+     * @param  callable(TReduceWithKeysInitial|TReduceWithKeysReturnType, TValue, TKey): TReduceWithKeysReturnType  $callback
      * @param  TReduceWithKeysInitial  $initial
      * @return TReduceWithKeysReturnType
      */

types/Support/Collection.php

@@ -544,6 +544,14 @@
         assertType('User', $user);
         assertType('int', $int);
 
+        return 1;
+    }, 0));
+assertType('int', $collection
+    ->reduce(function ($int, $user, $key) {
+        assertType('User', $user);
+        assertType('int', $int);
+        assertType('int', $key);
+
         return 1;
     }, 0));
 
@@ -559,6 +567,14 @@
         assertType('User', $user);
         assertType('int', $int);
 
+        return 1;
+    }, 0));
+assertType('int', $collection
+    ->reduceWithKeys(function ($int, $user, $key) {
+        assertType('User', $user);
+        assertType('int', $int);
+        assertType('int', $key);
+
         return 1;
     }, 0));