From 0009358c17b4c84d94efc94ed91d097d11e4321a Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 13 Mar 2018 09:32:31 +0100
Subject: [PATCH] Made orHaving varadic
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/DB/QueryBuilder/QueryBuilder.php | 6 +++---
lib/public/DB/QueryBuilder/IQueryBuilder.php | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 3c29728386e..3cb7ba133db 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -948,14 +948,14 @@ class QueryBuilder implements IQueryBuilder {
* Adds a restriction over the groups of the query, forming a logical
* disjunction with any existing having restrictions.
*
- * @param mixed $having The restriction to add.
+ * @param mixed ...$having The restriction to add.
*
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
*/
- public function orHaving($having) {
+ public function orHaving(...$having) {
call_user_func_array(
[$this->queryBuilder, 'orHaving'],
- func_get_args()
+ $having
);
return $this;
diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
index c27a0cb9643..7fea31f4688 100644
--- a/lib/public/DB/QueryBuilder/IQueryBuilder.php
+++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -704,12 +704,12 @@ interface IQueryBuilder {
* Adds a restriction over the groups of the query, forming a logical
* disjunction with any existing having restrictions.
*
- * @param mixed $having The restriction to add.
+ * @param mixed ...$having The restriction to add.
*
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
* @since 8.2.0
*/
- public function orHaving($having);
+ public function orHaving(...$having);
/**
* Specifies an ordering for the query results.
--
GitLab