From d6b93e662024c35d02e8762d04c726c84c6c454a Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 13 Mar 2018 09:28:27 +0100 Subject: [PATCH] Made orWhere varadic Signed-off-by: Roeland Jago Douma --- lib/private/DB/QueryBuilder/QueryBuilder.php | 6 +++--- lib/public/DB/QueryBuilder/IQueryBuilder.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index 25f21f3c56..0d0e6594b5 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -781,16 +781,16 @@ class QueryBuilder implements IQueryBuilder { * ->orWhere('u.id = 2'); * * - * @param mixed $where The WHERE statement. + * @param mixed ...$where The WHERE statement. * * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance. * * @see where() */ - public function orWhere($where) { + public function orWhere(...$where) { call_user_func_array( [$this->queryBuilder, 'orWhere'], - func_get_args() + $where ); return $this; diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 5d6aadc13e..876e77378e 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -568,7 +568,7 @@ interface IQueryBuilder { * ->andWhere('u.is_active = 1'); * * - * @param mixed $where The query restrictions. + * @param mixed ...$where The query restrictions. * * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance. * @@ -589,14 +589,14 @@ interface IQueryBuilder { * ->orWhere('u.id = 2'); * * - * @param mixed $where The WHERE statement. + * @param mixed ...$where The WHERE statement. * * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance. * * @see where() * @since 8.2.0 */ - public function orWhere($where); + public function orWhere(...$where); /** * Specifies a grouping over the results of the query.