Merge pull request #28 from weirdan/allow-expr-comparison-in-where

Allow Expr\Comparison in where(), orWhere() and andWhere()
psalm · Oct 14, 2019 · 354d8a5 · 354d8a5
2 parents af57802 + 04a9c94
commit 354d8a5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/stubs/QueryBuilder.php b/stubs/QueryBuilder.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Query\Expr;
 
 /**
- * @psalm-type _WhereExpr=Expr\Base|string
+ * @psalm-type _WhereExpr=Expr\Base|Expr\Comparison|string
  * @psalm-type _SelectExpr=Expr\Func|string
  */
 class QueryBuilder

diff --git a/tests/acceptance/QueryBuilder.feature b/tests/acceptance/QueryBuilder.feature
@@ -106,7 +106,7 @@ Feature: QueryBuilder
       | Type                 | Message                                                                                                                                                                                                                    |
       | ImplicitToStringCast | Argument 1 of Doctrine\ORM\QueryBuilder::select expects array<array-key, string\|Doctrine\ORM\Query\Expr\Func>\|null\|string\|Doctrine\ORM\Query\Expr\Func, Doctrine\ORM\Query\Expr\Andx provided with a __toString method |
 
-  @QueryBuilder @x
+  @QueryBuilder
   Scenario: QueryBuilder::select() rejects wrong non-stringable arguments
     Given I have the following code
       """
@@ -116,3 +116,25 @@ Feature: QueryBuilder
     Then I see these errors
       | Type                  | Message                                                                                                                                                                         |
       | InvalidScalarArgument | Argument 1 of Doctrine\ORM\QueryBuilder::select expects array<array-key, string\|Doctrine\ORM\Query\Expr\Func>\|null\|string\|Doctrine\ORM\Query\Expr\Func, float(2.2) provided |
+
+  @QueryBuilder
+  Scenario: QueryBuilder ::where(), ::orWhere() and ::andWhere accept Expr\Comparison
+    Given I have Psalm newer than "3.3.2" (because of "missing functionality")
+    And I have the following code
+      """
+      $expr = new Expr\Comparison('id', Expr\Comparison::EQ, 1);
+      builder()->where($expr)->andWhere($expr)->orWhere($expr)->distinct();
+      """
+    When I run Psalm
+    Then I see no errors
+
+  @QueryBuilder
+  Scenario: QueryBuilder ::where(), ::orWhere() and ::andWhere accept array with Expr\Comparison
+    Given I have Psalm newer than "3.3.2" (because of "missing functionality")
+    And I have the following code
+      """
+      $expr = new Expr\Comparison('id', Expr\Comparison::EQ, 1);
+      builder()->where([$expr])->andWhere([$expr])->orWhere([$expr])->distinct();
+      """
+    When I run Psalm
+    Then I see no errors