mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made orWhere varadic 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-03-13 09:28:27 +01:00
parent 07cb6aaeff
commit d6b93e6620
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/DB/QueryBuilder/QueryBuilder.php
View File

@ -781,16 +781,16 @@ class QueryBuilder implements IQueryBuilder {
* ->orWhere('u.id = 2'); * ->orWhere('u.id = 2');
* </code> * </code>
* *
* @param mixed $where The WHERE statement. * @param mixed ...$where The WHERE statement.
* *
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance. * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
* *
* @see where() * @see where()
*/ */
public function orWhere($where) { public function orWhere(...$where) {
call_user_func_array( call_user_func_array(
[$this->queryBuilder, 'orWhere'], [$this->queryBuilder, 'orWhere'],
func_get_args() $where
); );
return $this; return $this;

6
lib/public/DB/QueryBuilder/IQueryBuilder.php
View File

@ -568,7 +568,7 @@ interface IQueryBuilder {
* ->andWhere('u.is_active = 1'); * ->andWhere('u.is_active = 1');
* </code> * </code>
* *
* @param mixed $where The query restrictions. * @param mixed ...$where The query restrictions.
* *
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance. * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
* *
@ -589,14 +589,14 @@ interface IQueryBuilder {
* ->orWhere('u.id = 2'); * ->orWhere('u.id = 2');
* </code> * </code>
* *
* @param mixed $where The WHERE statement. * @param mixed ...$where The WHERE statement.
* *
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance. * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
* *
* @see where() * @see where()
* @since 8.2.0 * @since 8.2.0
*/ */
public function orWhere($where); public function orWhere(...$where);
/** /**
* Specifies a grouping over the results of the query. * Specifies a grouping over the results of the query.