Merge pull request #3865 from BenMorel/remove-andx

Remove ExpressionBuilder::andX()/orX()

UPGRADE.md

 # Upgrade to 4.0
 
+## BC BREAK: Removed `ExpressionBuilder` methods
+
+The `andX()` and `orX()` methods of the `ExpressionBuilder` class have been removed. Use `and()` and `or()` instead.
+
 ## BC BREAK: Removed `CompositeExpression` methods
 
 The `add()` and `addMultiple()` methods of the `CompositeExpression` class have been removed. Use `with()` instead, which returns a new instance.

lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php

@@ -60,26 +60,6 @@ class ExpressionBuilder
         return new CompositeExpression(CompositeExpression::TYPE_OR, array_merge([$expression], $expressions));
     }
 
-    /**
-     * @deprecated Use `and()` instead.
-     *
-     * @param string|CompositeExpression ...$expressions Requires at least one defined when converting to string.
-     */
-    public function andX(...$expressions) : CompositeExpression
-    {
-        return new CompositeExpression(CompositeExpression::TYPE_AND, $expressions);
-    }
-
-    /**
-     * @deprecated Use `or()` instead.
-     *
-     * @param string|CompositeExpression ...$expressions Requires at least one defined when converting to string.
-     */
-    public function orX(...$expressions) : CompositeExpression
-    {
-        return new CompositeExpression(CompositeExpression::TYPE_OR, $expressions);
-    }
-
     /**
      * Creates a comparison expression.
      *

tests/Doctrine/Tests/DBAL/Query/Expression/ExpressionBuilderTest.php

@@ -40,22 +40,6 @@ class ExpressionBuilderTest extends DbalTestCase
         self::assertEquals($expected, (string) $composite);
     }
 
-    /**
-     * @param string[]|CompositeExpression[] $parts
-     *
-     * @dataProvider provideDataForAnd
-     */
-    public function testAndX(array $parts, string $expected) : void
-    {
-        $composite = $this->expr->andX();
-
-        foreach ($parts as $part) {
-            $composite = $composite->with($part);
-        }
-
-        self::assertEquals($expected, (string) $composite);
-    }
-
     /**
      * @return mixed[][]
      */
@@ -113,22 +97,6 @@ class ExpressionBuilderTest extends DbalTestCase
         self::assertEquals($expected, (string) $composite);
     }
 
-    /**
-     * @param string[]|CompositeExpression[] $parts
-     *
-     * @dataProvider provideDataForOr
-     */
-    public function testOrX(array $parts, string $expected) : void
-    {
-        $composite = $this->expr->orX();
-
-        foreach ($parts as $part) {
-            $composite = $composite->with($part);
-        }
-
-        self::assertEquals($expected, (string) $composite);
-    }
-
     /**
      * @return mixed[][]
      */