Merge pull request #279 from alcaeus/variadic-logical-operators

alcaeus · web-flow · commit 1c22128aa007 · 2016-11-08T07:28:35.000+01:00
Allow passing multiple arguments to add* methods
diff --git a/lib/Doctrine/MongoDB/Aggregation/Expr.php b/lib/Doctrine/MongoDB/Aggregation/Expr.php
@@ -78,38 +78,38 @@ public function add($expression1, $expression2 /* , $expression3, ... */)
     }
 
     /**
-     * Add an $and clause to the current expression.
+     * Adds one or more $and clauses to the current expression.
      *
      * @see http://docs.mongodb.org/manual/reference/operator/aggregation/and/
      * @param array|self $expression
      * @return $this
      */
-    public function addAnd($expression)
+    public function addAnd($expression /*, $expression2, ... */)
     {
-        if ($this->currentField) {
-            $this->expr[$this->currentField]['$and'][] = $this->ensureArray($expression);
-        } else {
-            $this->expr['$and'][] = $this->ensureArray($expression);
+        if (! isset($this->expr['$and'])) {
+            $this->expr['$and'] = [];
         }
 
+        $this->expr['$and'] = array_merge($this->expr['$and'], array_map([$this, 'ensureArray'], func_get_args()));
+
         return $this;
     }
 
     /**
-     * Add an $or clause to the current expression.
+     * Adds one or more $or clause to the current expression.
      *
      * @see http://docs.mongodb.org/manual/reference/operator/aggregation/or/
      * @param array|self $expression
      * @return $this
      */
-    public function addOr($expression)
+    public function addOr($expression /*, $expression2, ... */)
     {
-        if ($this->currentField) {
-            $this->expr[$this->currentField]['$or'][] = $this->ensureArray($expression);
-        } else {
-            $this->expr['$or'][] = $this->ensureArray($expression);
+        if (! isset($this->expr['$or'])) {
+            $this->expr['$or'] = [];
         }
 
+        $this->expr['$or'] = array_merge($this->expr['$or'], array_map([$this, 'ensureArray'], func_get_args()));
+
         return $this;
     }
 
diff --git a/lib/Doctrine/MongoDB/Aggregation/Stage/Match.php b/lib/Doctrine/MongoDB/Aggregation/Stage/Match.php
@@ -58,7 +58,7 @@ public function getExpression()
     }
 
     /**
-     * Add an $and clause to the current query.
+     * Add one or more $and clauses to the current query.
      *
      * You can create a new expression using the {@link Builder::matchExpr()}
      * method.
@@ -68,15 +68,15 @@ public function getExpression()
      * @param array|Expr $expression
      * @return $this
      */
-    public function addAnd($expression)
+    public function addAnd($expression /* , $expression2, ... */)
     {
-        $this->query->addAnd($expression);
+        $this->query->addAnd(...func_get_args());
 
         return $this;
     }
 
     /**
-     * Add a $nor clause to the current query.
+     * Add one or more $nor clauses to the current query.
      *
      * You can create a new expression using the {@link Builder::matchExpr()}
      * method.
@@ -86,15 +86,15 @@ public function addAnd($expression)
      * @param array|Expr $expression
      * @return $this
      */
-    public function addNor($expression)
+    public function addNor($expression /*, $expression2, ... */)
     {
-        $this->query->addNor($expression);
+        $this->query->addNor(...func_get_args());
 
         return $this;
     }
 
     /**
-     * Add an $or clause to the current query.
+     * Add one or more $or clauses to the current query.
      *
      * You can create a new expression using the {@link Builder::matchExpr()}
      * method.
@@ -104,9 +104,9 @@ public function addNor($expression)
      * @param array|Expr $expression
      * @return $this
      */
-    public function addOr($expression)
+    public function addOr($expression /* , $expression2, ... */)
     {
-        $this->query->addOr($expression);
+        $this->query->addOr(...func_get_args());
 
         return $this;
     }
diff --git a/lib/Doctrine/MongoDB/Aggregation/Stage/Operator.php b/lib/Doctrine/MongoDB/Aggregation/Stage/Operator.php
@@ -88,31 +88,31 @@ public function add($expression1, $expression2 /* , $expression3, ... */)
     }
 
     /**
-     * Add an $and clause to the current expression.
+     * Add one or more $and clauses to the current expression.
      *
      * @see http://docs.mongodb.org/manual/reference/operator/aggregation/and/
      * @see Expr::addAnd
      * @param array|Expr $expression
      * @return $this
      */
-    public function addAnd($expression)
+    public function addAnd($expression /* , $expression2, ... */)
     {
-        $this->expr->addAnd($expression);
+        $this->expr->addAnd(...func_get_args());
 
         return $this;
     }
 
     /**
-     * Add an $or clause to the current expression.
+     * Add one or more $or clauses to the current expression.
      *
      * @see http://docs.mongodb.org/manual/reference/operator/aggregation/or/
      * @see Expr::addOr
      * @param array|Expr $expression
      * @return $this
      */
-    public function addOr($expression)
+    public function addOr($expression /* , $expression2, ... */)
     {
-        $this->expr->addOr($expression);
+        $this->expr->addOr(...func_get_args());
 
         return $this;
     }
diff --git a/lib/Doctrine/MongoDB/Query/Builder.php b/lib/Doctrine/MongoDB/Query/Builder.php
@@ -68,7 +68,7 @@ public function __construct(Collection $collection)
     }
 
     /**
-     * Add an $and clause to the current query.
+     * Add one or more $and clauses to the current query.
      *
      * You can create a new expression using the {@link Builder::expr()} method.
      *
@@ -77,9 +77,9 @@ public function __construct(Collection $collection)
      * @param array|Expr $expression
      * @return $this
      */
-    public function addAnd($expression)
+    public function addAnd($expression /* , $expression2, ... */)
     {
-        $this->expr->addAnd($expression);
+        $this->expr->addAnd(...func_get_args());
         return $this;
     }
 
@@ -105,7 +105,7 @@ public function addManyToSet(array $values)
     }
 
     /**
-     * Add a $nor clause to the current query.
+     * Add one or more $nor clauses to the current query.
      *
      * You can create a new expression using the {@link Builder::expr()} method.
      *
@@ -114,14 +114,14 @@ public function addManyToSet(array $values)
      * @param array|Expr $expression
      * @return $this
      */
-    public function addNor($expression)
+    public function addNor($expression /* , $expression2, ... */)
     {
-        $this->expr->addNor($expression);
+        $this->expr->addNor(...func_get_args());
         return $this;
     }
 
     /**
-     * Add an $or clause to the current query.
+     * Add one or more $or clauses to the current query.
      *
      * You can create a new expression using the {@link Builder::expr()} method.
      *
@@ -130,9 +130,9 @@ public function addNor($expression)
      * @param array|Expr $expression
      * @return $this
      */
-    public function addOr($expression)
+    public function addOr($expression /* , $expression2, ... */)
     {
-        $this->expr->addOr($expression);
+        $this->expr->addOr(...func_get_args());
         return $this;
     }
 
diff --git a/lib/Doctrine/MongoDB/Query/Expr.php b/lib/Doctrine/MongoDB/Query/Expr.php
@@ -57,16 +57,29 @@ class Expr
     protected $currentField;
 
     /**
-     * Add an $and clause to the current query.
+     * Add one or more $and clauses to the current query.
      *
      * @see Builder::addAnd()
      * @see http://docs.mongodb.org/manual/reference/operator/and/
      * @param array|Expr $expression
      * @return $this
      */
-    public function addAnd($expression)
+    public function addAnd($expression /*, $expression2, ... */)
     {
-        $this->query['$and'][] = $expression instanceof Expr ? $expression->getQuery() : $expression;
+        if (! isset($this->query['$and'])) {
+            $this->query['$and'] = [];
+        }
+
+        $this->query['$and'] = array_merge(
+            $this->query['$and'],
+            array_map(
+                function ($expression) {
+                    return $expression instanceof Expr ? $expression->getQuery() : $expression;
+                },
+                func_get_args()
+            )
+        );
+
         return $this;
     }
 
@@ -93,30 +106,46 @@ public function addManyToSet(array $values)
     }
 
     /**
-     * Add a $nor clause to the current query.
+     * Add one or more $nor clauses to the current query.
      *
      * @see Builder::addNor()
      * @see http://docs.mongodb.org/manual/reference/operator/nor/
      * @param array|Expr $expression
      * @return $this
      */
-    public function addNor($expression)
+    public function addNor($expression /* , $expression2, ... */)
     {
-        $this->query['$nor'][] = $expression instanceof Expr ? $expression->getQuery() : $expression;
+        if (! isset($this->query['$nor'])) {
+            $this->query['$nor'] = [];
+        }
+
+        $this->query['$nor'] = array_merge(
+            $this->query['$nor'],
+            array_map(function ($expression) { return $expression instanceof Expr ? $expression->getQuery() : $expression; }, func_get_args())
+        );
+
         return $this;
     }
 
     /**
-     * Add an $or clause to the current query.
+     * Add one or more $or clauses to the current query.
      *
      * @see Builder::addOr()
      * @see http://docs.mongodb.org/manual/reference/operator/or/
      * @param array|Expr $expression
      * @return $this
      */
-    public function addOr($expression)
+    public function addOr($expression /* , $expression2, ... */)
     {
-        $this->query['$or'][] = $expression instanceof Expr ? $expression->getQuery() : $expression;
+        if (! isset($this->query['$or'])) {
+            $this->query['$or'] = [];
+        }
+
+        $this->query['$or'] = array_merge(
+            $this->query['$or'],
+            array_map(function ($expression) { return $expression instanceof Expr ? $expression->getQuery() : $expression; }, func_get_args())
+        );
+
         return $this;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,38 +78,38 @@ public function add($expression1, $expression2 /* , $expression3, ... */)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
`81`		`- * Add an $and clause to the current expression.`
	`81`	`+ * Adds one or more $and clauses to the current expression.`
`82`	`82`	`*`
`83`	`83`	`* @see http://docs.mongodb.org/manual/reference/operator/aggregation/and/`
`84`	`84`	`* @param array\|self $expression`
`85`	`85`	`* @return $this`
`86`	`86`	`*/`
`87`		`- public function addAnd($expression)`
	`87`	`+ public function addAnd($expression /, $expression2, ... /)`
`88`	`88`	`{`
`89`		`- if ($this->currentField) {`
`90`		`- $this->expr[$this->currentField]['$and'][] = $this->ensureArray($expression);`
`91`		`- } else {`
`92`		`- $this->expr['$and'][] = $this->ensureArray($expression);`
	`89`	`+ if (! isset($this->expr['$and'])) {`
	`90`	`+ $this->expr['$and'] = [];`
`93`	`91`	`}`
`94`	`92`
	`93`	`+ $this->expr['$and'] = array_merge($this->expr['$and'], array_map([$this, 'ensureArray'], func_get_args()));`
	`94`	`+`
`95`	`95`	`return $this;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`99`		`- * Add an $or clause to the current expression.`
	`99`	`+ * Adds one or more $or clause to the current expression.`
`100`	`100`	`*`
`101`	`101`	`* @see http://docs.mongodb.org/manual/reference/operator/aggregation/or/`
`102`	`102`	`* @param array\|self $expression`
`103`	`103`	`* @return $this`
`104`	`104`	`*/`
`105`		`- public function addOr($expression)`
	`105`	`+ public function addOr($expression /, $expression2, ... /)`
`106`	`106`	`{`
`107`		`- if ($this->currentField) {`
`108`		`- $this->expr[$this->currentField]['$or'][] = $this->ensureArray($expression);`
`109`		`- } else {`
`110`		`- $this->expr['$or'][] = $this->ensureArray($expression);`
	`107`	`+ if (! isset($this->expr['$or'])) {`
	`108`	`+ $this->expr['$or'] = [];`
`111`	`109`	`}`
`112`	`110`
	`111`	`+ $this->expr['$or'] = array_merge($this->expr['$or'], array_map([$this, 'ensureArray'], func_get_args()));`
	`112`	`+`
`113`	`113`	`return $this;`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function getExpression()`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
`61`		`- * Add an $and clause to the current query.`
	`61`	`+ * Add one or more $and clauses to the current query.`
`62`	`62`	`*`
`63`	`63`	`* You can create a new expression using the {@link Builder::matchExpr()}`
`64`	`64`	`* method.`
`@@ -68,15 +68,15 @@ public function getExpression()`
`68`	`68`	`* @param array\|Expr $expression`
`69`	`69`	`* @return $this`
`70`	`70`	`*/`
`71`		`- public function addAnd($expression)`
	`71`	`+ public function addAnd($expression /* , $expression2, ... */)`
`72`	`72`	`{`
`73`		`- $this->query->addAnd($expression);`
	`73`	`+ $this->query->addAnd(...func_get_args());`
`74`	`74`
`75`	`75`	`return $this;`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
`79`		`- * Add a $nor clause to the current query.`
	`79`	`+ * Add one or more $nor clauses to the current query.`
`80`	`80`	`*`
`81`	`81`	`* You can create a new expression using the {@link Builder::matchExpr()}`
`82`	`82`	`* method.`
`@@ -86,15 +86,15 @@ public function addAnd($expression)`
`86`	`86`	`* @param array\|Expr $expression`
`87`	`87`	`* @return $this`
`88`	`88`	`*/`
`89`		`- public function addNor($expression)`
	`89`	`+ public function addNor($expression /, $expression2, ... /)`
`90`	`90`	`{`
`91`		`- $this->query->addNor($expression);`
	`91`	`+ $this->query->addNor(...func_get_args());`
`92`	`92`
`93`	`93`	`return $this;`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/**`
`97`		`- * Add an $or clause to the current query.`
	`97`	`+ * Add one or more $or clauses to the current query.`
`98`	`98`	`*`
`99`	`99`	`* You can create a new expression using the {@link Builder::matchExpr()}`
`100`	`100`	`* method.`
`@@ -104,9 +104,9 @@ public function addNor($expression)`
`104`	`104`	`* @param array\|Expr $expression`
`105`	`105`	`* @return $this`
`106`	`106`	`*/`
`107`		`- public function addOr($expression)`
	`107`	`+ public function addOr($expression /* , $expression2, ... */)`
`108`	`108`	`{`
`109`		`- $this->query->addOr($expression);`
	`109`	`+ $this->query->addOr(...func_get_args());`
`110`	`110`
`111`	`111`	`return $this;`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,31 +88,31 @@ public function add($expression1, $expression2 /* , $expression3, ... */)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`
`91`		`- * Add an $and clause to the current expression.`
	`91`	`+ * Add one or more $and clauses to the current expression.`
`92`	`92`	`*`
`93`	`93`	`* @see http://docs.mongodb.org/manual/reference/operator/aggregation/and/`
`94`	`94`	`* @see Expr::addAnd`
`95`	`95`	`* @param array\|Expr $expression`
`96`	`96`	`* @return $this`
`97`	`97`	`*/`
`98`		`- public function addAnd($expression)`
	`98`	`+ public function addAnd($expression /* , $expression2, ... */)`
`99`	`99`	`{`
`100`		`- $this->expr->addAnd($expression);`
	`100`	`+ $this->expr->addAnd(...func_get_args());`
`101`	`101`
`102`	`102`	`return $this;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
`106`		`- * Add an $or clause to the current expression.`
	`106`	`+ * Add one or more $or clauses to the current expression.`
`107`	`107`	`*`
`108`	`108`	`* @see http://docs.mongodb.org/manual/reference/operator/aggregation/or/`
`109`	`109`	`* @see Expr::addOr`
`110`	`110`	`* @param array\|Expr $expression`
`111`	`111`	`* @return $this`
`112`	`112`	`*/`
`113`		`- public function addOr($expression)`
	`113`	`+ public function addOr($expression /* , $expression2, ... */)`
`114`	`114`	`{`
`115`		`- $this->expr->addOr($expression);`
	`115`	`+ $this->expr->addOr(...func_get_args());`
`116`	`116`
`117`	`117`	`return $this;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function __construct(Collection $collection)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`
`71`		`- * Add an $and clause to the current query.`
	`71`	`+ * Add one or more $and clauses to the current query.`
`72`	`72`	`*`
`73`	`73`	`* You can create a new expression using the {@link Builder::expr()} method.`
`74`	`74`	`*`
`@@ -77,9 +77,9 @@ public function __construct(Collection $collection)`
`77`	`77`	`* @param array\|Expr $expression`
`78`	`78`	`* @return $this`
`79`	`79`	`*/`
`80`		`- public function addAnd($expression)`
	`80`	`+ public function addAnd($expression /* , $expression2, ... */)`
`81`	`81`	`{`
`82`		`- $this->expr->addAnd($expression);`
	`82`	`+ $this->expr->addAnd(...func_get_args());`
`83`	`83`	`return $this;`
`84`	`84`	`}`
`85`	`85`
`@@ -105,7 +105,7 @@ public function addManyToSet(array $values)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/**`
`108`		`- * Add a $nor clause to the current query.`
	`108`	`+ * Add one or more $nor clauses to the current query.`
`109`	`109`	`*`
`110`	`110`	`* You can create a new expression using the {@link Builder::expr()} method.`
`111`	`111`	`*`
`@@ -114,14 +114,14 @@ public function addManyToSet(array $values)`
`114`	`114`	`* @param array\|Expr $expression`
`115`	`115`	`* @return $this`
`116`	`116`	`*/`
`117`		`- public function addNor($expression)`
	`117`	`+ public function addNor($expression /* , $expression2, ... */)`
`118`	`118`	`{`
`119`		`- $this->expr->addNor($expression);`
	`119`	`+ $this->expr->addNor(...func_get_args());`
`120`	`120`	`return $this;`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/**`
`124`		`- * Add an $or clause to the current query.`
	`124`	`+ * Add one or more $or clauses to the current query.`
`125`	`125`	`*`
`126`	`126`	`* You can create a new expression using the {@link Builder::expr()} method.`
`127`	`127`	`*`
`@@ -130,9 +130,9 @@ public function addNor($expression)`
`130`	`130`	`* @param array\|Expr $expression`
`131`	`131`	`* @return $this`
`132`	`132`	`*/`
`133`		`- public function addOr($expression)`
	`133`	`+ public function addOr($expression /* , $expression2, ... */)`
`134`	`134`	`{`
`135`		`- $this->expr->addOr($expression);`
	`135`	`+ $this->expr->addOr(...func_get_args());`
`136`	`136`	`return $this;`
`137`	`137`	`}`
`138`	`138`