Skip to content
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

[8.x] Collection prevent null being added to resulting collection with pop and shift #38265

Closed
wants to merge 9 commits into from
Closed

[8.x] Collection prevent null being added to resulting collection with pop and shift #38265

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
946a4a4
pop olny return collection items
craig-sen Aug 7, 2021
faa5076
add test - pop only return collection items
craig-sen Aug 7, 2021
a60645f
shift only return collection items
craig-sen Aug 7, 2021
2c6b9fe
add test - shift only return collection items
craig-sen Aug 7, 2021
b9d9e23
if collection is empty or less than one return null
craig-sen Aug 7, 2021
f60ced8
add test return null when no items or less than zero
craig-sen Aug 7, 2021
40ccf2b
whitespace
craig-sen Aug 7, 2021
c907736
return an empty collection when less than 1 or no items
craig-sen Aug 9, 2021
29c6046
return collection when parameter supplied
craig-sen Aug 9, 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
Prev Previous commit
Next Next commit
shift only return collection items
  • Loading branch information
@craig-sen
craig-sen committed Aug 7, 2021
commit a60645f6521e7076fddfb000792d10959b0ade30
2 changes: 2 additions & 0 deletions src/Illuminate/Collections/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,8 @@ public function shift($count = 1)

$results = [];

$count = $count > $this->count() ? $this->count() : $count;

foreach (range(1, $count) as $item) {
array_push($results, array_shift($this->items));
}
Expand Down