Skip to content

[10.x] Improves Support\Collection reduce method type definition #40813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 4, 2022
Merged

[10.x] Improves Support\Collection reduce method type definition #40813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd0bc8a
Update tests
fdalcin Feb 4, 2022
8838553
Trigger pipeline
fdalcin Feb 4, 2022
b24ce99
Fix generics type definition
fdalcin Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/Enumerable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Collections/Traits/EnumeratesValues.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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
*/
Expand Down
16 changes: 16 additions & 0 deletions types/Support/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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));

Expand Down