Made IExpressionBuilder varadic

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
index 154f2447c77..6e4a2061832 100644
--- a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
@@ -71,14 +71,13 @@ class ExpressionBuilder implements IExpressionBuilder {
 	 *     // (u.type = ?) AND (u.role = ?)
 	 *     $expr->andX('u.type = ?', 'u.role = ?'));
 	 *
-	 * @param mixed $x Optional clause. Defaults = null, but requires
+	 * @param mixed ...$x Optional clause. Defaults = null, but requires
 	 *                 at least one defined when converting to string.
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	public function andX($x = null) {
-		$arguments = func_get_args();
-		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $arguments);
+	public function andX(...$x) {
+		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $x);
 		return new CompositeExpression($compositeExpression);
 	}
 
@@ -91,14 +90,13 @@ class ExpressionBuilder implements IExpressionBuilder {
 	 *     // (u.type = ?) OR (u.role = ?)
 	 *     $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?'));
 	 *
-	 * @param mixed $x Optional clause. Defaults = null, but requires
+	 * @param mixed ...$x Optional clause. Defaults = null, but requires
 	 *                 at least one defined when converting to string.
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	public function orX($x = null) {
-		$arguments = func_get_args();
-		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $arguments);
+	public function orX(...$x) {
+		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $x);
 		return new CompositeExpression($compositeExpression);
 	}