Skip to content

[8.x] Pass $key to closure in Collection and LazyCollection's reduce method as well #35878

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 11 commits into from
Jan 15, 2021
Merged

[8.x] Pass $key to closure in Collection and LazyCollection's reduce method as well #35878

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
31dbc46
add reduce with keys to collections
mokhosh Jan 10, 2021
4777a54
add reduce with keys to lazy collections
mokhosh Jan 10, 2021
1b788e7
add test for reduce with keys
mokhosh Jan 10, 2021
b84aaec
fix style
mokhosh Jan 10, 2021
cdbc409
merge reduceWithKeys into the existing reduce method
mokhosh Jan 14, 2021
8bb93ef
Merge branch '8.x' into 8.x
mokhosh Jan 14, 2021
fd7213f
remove reduce and reduceWithKeys from Collection
mokhosh Jan 15, 2021
4ff9136
remove reduce and reduceWithKeys from LazyCollection
mokhosh Jan 15, 2021
a94adeb
add reduce and reduceWithKeys to EnumeratesValues
mokhosh Jan 15, 2021
11bace2
add test for reduce with keys and reduceWithKeys
mokhosh Jan 15, 2021
88b8169
Merge branch '8.x' into 8.x
mokhosh Jan 15, 2021
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
8 changes: 7 additions & 1 deletion src/Illuminate/Collections/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,13 @@ public function random($number = null)
*/
public function reduce(callable $callback, $initial = null)
{
return array_reduce($this->items, $callback, $initial);
$result = $initial;

foreach ($this->items as $key => $value) {
$result = $callback($result, $value, $key);
}

return $result;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Collections/LazyCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,8 @@ public function reduce(callable $callback, $initial = null)
{
$result = $initial;

foreach ($this as $value) {
$result = $callback($result, $value);
foreach ($this as $key => $value) {
$result = $callback($result, $value, $key);
}

return $result;
Expand Down
2 changes: 1 addition & 1 deletion tests/Support/SupportCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3601,7 +3601,7 @@ public function testReduceWithKeys($collection)
'foo' => 'bar',
'baz' => 'qux',
]);
$this->assertEquals('foobarbazqux', $data->reduceWithKeys(function ($carry, $element, $key) {
$this->assertEquals('foobarbazqux', $data->reduce(function ($carry, $element, $key) {
return $carry .= $key.$element;
}));
Copy link
Contributor

@JosephSilber JosephSilber Jan 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Since we're still keeping reduceWithKeys around till 9.x (because it was already tagged), we shouldn't remove its test.
  2. You can just add the $key to the other test. No need for 2 separate tests.
  3. As discussed on that other PR, you can move the reduce method into the EnumeratesValues trait.

Copy link
Contributor Author

@mokhosh mokhosh Jan 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do, thanks for the comment

}
Expand Down