Skip to content

[5.4] else unnecessary in this snippet #19475

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

Closed
wants to merge 2 commits into from
Closed

[5.4] else unnecessary in this snippet #19475

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53ecc09
else unnecessary in this snippet
geekcom Jun 4, 2017
67f15e9
else unnecessary in this snippet yet
geekcom Jun 4, 2017
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
16 changes: 8 additions & 8 deletions src/Illuminate/Support/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,14 +1144,14 @@ public function shuffle($seed = null)

if (is_null($seed)) {
shuffle($items);
} else {
srand($seed);

usort($items, function () {
return rand(-1, 1);
});
}

srand($seed);

usort($items, function () {
return rand(-1, 1);
});

Copy link
Contributor

@lagbox lagbox Jun 4, 2017

Choose a reason for hiding this comment

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

again ... this is now always going to be executed

return new static($items);
}

Expand Down Expand Up @@ -1548,9 +1548,9 @@ public function offsetSet($key, $value)
{
if (is_null($key)) {
$this->items[] = $value;
} else {
$this->items[$key] = $value;
}

$this->items[$key] = $value;
Copy link
Contributor

@lagbox lagbox Jun 4, 2017

Choose a reason for hiding this comment

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

this is always going to be executed now

Copy link

@ghost ghost Jun 4, 2017 •
edited by ghost
Loading

Choose a reason for hiding this comment

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

@geekcom: you could've only done that shortening if you were breaking the path of execution (using guard clauses for instance). I wouldn't recommend that though, since it alters type signature in this case.

Copy link
Author

@geekcom geekcom Jun 4, 2017

Choose a reason for hiding this comment

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

ok, let's see what happens with this PR.

Copy link
Contributor

@lagbox lagbox Jun 4, 2017

Choose a reason for hiding this comment

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

you broke the functionality of at least 1 method for no reason at all ... what do you think is going to happen? :)

Copy link
Author

@geekcom geekcom Jun 4, 2017

Choose a reason for hiding this comment

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

humm, that's make sense, so sorry

}

/**
Expand Down