[5.4] Respect the signature of whereRaw, fix #18952#20234
Merged
taylorotwell merged 1 commit intolaravel:5.4from Jul 25, 2017
u1735067:patch-1
Merged
[5.4] Respect the signature of whereRaw, fix #18952#20234taylorotwell merged 1 commit intolaravel:5.4from u1735067:patch-1
taylorotwell merged 1 commit intolaravel:5.4from
u1735067:patch-1
Conversation
Would lead to ``` FatalThrowableError Type error: Argument 2 passed to Illuminate\Database\Query\Builder::orWhereRaw() must be of the type array, string given ``` otherwise.
Contributor
|
But doctype said it should be an |
Contributor
Author
|
What is the doctype ? (where ?) |
Contributor
|
sorry, docblock. /**
* Add a raw or where clause to the query.
*
* @param string $sql
* @param array $bindings
* @return \Illuminate\Database\Query\Builder|static
*/
public function orWhereRaw($sql, $bindings = [])
{
return $this->whereRaw($sql, $bindings, 'or');
} |
Contributor
Author
|
Updated in https://github.com/Alex131089/framework/commit/b95955d0303cbb327dd1eaed4328ad32911725de (same branch), does it need another pull request ? |
taylorotwell
pushed a commit
that referenced
this pull request
Jul 26, 2017
Thanks @a-komarev for pointing out.
This file contains hidden or 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
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.
Would lead to
otherwise, when used with a single value.
Fix #18952, closed for no (apparent) reason.