Merge pull request #41272 from fdalcin/9.x

[9.x] Improves `Support\Collection` reduce method type definition
laravel · Feb 28, 2022 · 1a1c140 · 1a1c140
2 parents d1c3d4f + 1abcca2
commit 1a1c140
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/Illuminate/Collections/Enumerable.php b/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
      */

diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php
@@ -745,7 +745,7 @@ function ($carry, $callback) {
      * @template TReduceInitial
      * @template TReduceReturnType
      *
-     * @param  callable(TReduceInitial|TReduceReturnType, TValue): TReduceReturnType  $callback
+     * @param  callable(TReduceInitial|TReduceReturnType, TValue, TKey): TReduceReturnType  $callback
      * @param  TReduceInitial  $initial
      * @return TReduceReturnType
      */

diff --git a/types/Support/Collection.php b/types/Support/Collection.php
@@ -634,6 +634,14 @@ function ($collection, $count) {
         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));