Allow use array and multi arguments

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - hhvm

composer.json

@@ -13,7 +13,7 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": "^5.5 || ^7.0"
+        "php": "^5.6 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0"

lib/Doctrine/Common/Collections/ExpressionBuilder.php

@@ -42,7 +42,7 @@ class ExpressionBuilder
      */
     public function andX($x = null)
     {
-        return new CompositeExpression(CompositeExpression::TYPE_AND, func_get_args());
+        return new CompositeExpression(CompositeExpression::TYPE_AND, is_array($x) ? $x : func_get_args());
     }
 
     /**
@@ -52,7 +52,7 @@ public function andX($x = null)
      */
     public function orX($x = null)
     {
-        return new CompositeExpression(CompositeExpression::TYPE_OR, func_get_args());
+        return new CompositeExpression(CompositeExpression::TYPE_OR, is_array($x) ? $x : func_get_args());
     }
 
     /**

tests/Doctrine/Tests/Common/Collections/ExpressionBuilderTest.php

@@ -37,6 +37,46 @@ public function testOrX()
         $this->assertEquals(CompositeExpression::TYPE_OR, $expr->getType());
     }
 
+    public function testAndXArguments()
+    {
+        $x = [
+            $this->builder->eq("a", "b"),
+            $this->builder->eq("c", "d"),
+        ];
+
+        $expr = $this->builder->andX(
+            $x[0],
+            $x[1]
+        );
+        $this->assertEquals($x, $expr->getExpressionList());
+
+        $expr = $this->builder->andX($x);
+        $this->assertEquals($x, $expr->getExpressionList());
+
+        $expr = $this->builder->andX(...$x);
+        $this->assertEquals($x, $expr->getExpressionList());
+    }
+
+    public function testOrXArguments()
+    {
+        $x = [
+            $this->builder->eq("a", "b"),
+            $this->builder->eq("c", "d"),
+        ];
+
+        $expr = $this->builder->orX(
+            $x[0],
+            $x[1]
+        );
+        $this->assertEquals($x, $expr->getExpressionList());
+
+        $expr = $this->builder->orX($x);
+        $this->assertEquals($x, $expr->getExpressionList());
+
+        $expr = $this->builder->orX(...$x);
+        $this->assertEquals($x, $expr->getExpressionList());
+    }
+
     public function testInvalidAndXArgument()
     {
         $this->setExpectedException("RuntimeException");