Skip to content

get and has method else removed #24029

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 1 commit into from
Closed

get and has method else removed #24029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Arr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,11 @@ public static function get($array, $key, $default = null)
}

foreach (explode('.', $key) as $segment) {
if (static::accessible($array) && static::exists($array, $segment)) {
$array = $array[$segment];
} else {
return value($default);
if (!static::accessible($array) && !static::exists($array, $segment)) {
Copy link
Member

@nunomaduro nunomaduro Apr 26, 2018

Choose a reason for hiding this comment

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

I believe you made a mistake here. The code you are looking for is:

if (! static::accessible($array) ||  ! static::exists($array, $segment)) {

Copy link
Contributor Author

@khanrn khanrn Apr 27, 2018

Choose a reason for hiding this comment

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

Uh... I missed to turn the and to an or!

return value($default);
}

$array = $array[$segment];
}

return $array;
Expand Down Expand Up @@ -335,11 +335,11 @@ public static function has($array, $keys)
}

foreach (explode('.', $key) as $segment) {
if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) {
$subKeyArray = $subKeyArray[$segment];
} else {
return false;
if (!static::accessible($subKeyArray) && !static::exists($subKeyArray, $segment)) {
Copy link
Member

@nunomaduro nunomaduro Apr 26, 2018

Choose a reason for hiding this comment

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

I believe you made a mistake here. The code you are looking for is:

if (! static::accessible($subKeyArray) || ! static::exists($subKeyArray, $segment)) {

Copy link
Contributor Author

@khanrn khanrn Apr 27, 2018

Choose a reason for hiding this comment

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

Uh... I missed to turn the and to an or!

return false;
}

$subKeyArray = $subKeyArray[$segment];
}
}

Expand Down