[5.5] Fix Collection::contains() when the found value is null #21442
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -217,7 +217,7 @@ public function contains($key, $operator = null, $value = null) | |||
| { | |||
| if (func_num_args() == 1) { | |||
| if ($this->useAsCallable($key)) { | |||
| return ! is_null($this->first($key)); | |||
| return $this->first($key, '__placeholder') != '__placeholder'; | |||
There was a problem hiding this comment.
Is that safe though? What guarantee is there that the actual value isn't __placeholder?
In other places we've used an instance of stdClass for these.
There was a problem hiding this comment.
BTW, we should augment the with helper to allow passing it a callback. Then this would be:
return with(new stdClass, function ($placeholder) use ($key) {
return $this->first($key, $placeholder) != $placeholder;
});There was a problem hiding this comment.
Can we pleeeease get arrow functions already???
return with(new stdClass, $placeholder => $this->first($key, $placeholder) != $placeholder);Why can't we have nice things in PHP? 😢
There was a problem hiding this comment.
switched to using stdClass.
Because php ¯_(ツ)_/¯
|
I submitted a PR for the |
edmandiesamonte
added a commit
to edmandiesamonte/framework
that referenced
this pull request
Oct 2, 2017
* upstream/5.5: (84 commits) Correct docBlock depenency on syncWithoutDetaching (laravel#21478) update v5.5 changelog allow to specify the queue while scheduling of queued jobs (laravel#21473) [5.5] Clear CountQuery "select" bindings since we're overriding the columns anyway (laravel#21468) add interface access pivot on resource update v5.5 changelog extract trait Fix docblock in Route (laravel#21454) fix test formatting Fix Relation::morphMap() merge (issue laravel#21457). (laravel#21458) extract AnonymousResourceCollection into class to allow serialization revert relationship limits Fix spelling of 'optionally' [5.5] Fix Collection::contains() when the found value is null (laravel#21442) Allow passing a callback to "with" (laravel#21445) [5.5] Add relation and model attributes in RelationNotFoundException (laravel#21426) [5.5] Make sure sql for virtual columns is added after the unsigned modifier (laravel#21441) vendor:publish options alphabetized (laravel#21412) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As reported in #21406
Currently
Collection::contains()usesCollection::first(), iffirst()returned nullcontainswill return false even if null is the desired value.