Remove broken assertion from DateAddFunction and DateSubFunction (#11243)

* Remove wrong asserts in DATE_ADD and DATE_SUB query AST function handlers

* Require DBAL 3.8.2

Author: ondrejmirtes

.github/workflows/static-analysis.yml

@@ -32,7 +32,7 @@ jobs:
         include:
         - dbal-version: default
           config: phpstan.neon
-        - dbal-version: 3.7
+        - dbal-version: 3.8.2
           config: phpstan-dbal3.neon
 
     steps:
@@ -65,7 +65,7 @@ jobs:
       matrix:
         dbal-version:
         - default
-        - 3.7
+        - 3.8.2
 
     steps:
       - name: "Checkout code"

composer.json

@@ -24,7 +24,7 @@
         "composer-runtime-api": "^2",
         "ext-ctype": "*",
         "doctrine/collections": "^2.1",
-        "doctrine/dbal": "^3.6 || ^4",
+        "doctrine/dbal": "^3.8.2 || ^4",
         "doctrine/deprecations": "^0.5.3 || ^1",
         "doctrine/event-manager": "^1.2 || ^2",
         "doctrine/inflector": "^1.4 || ^2.0",

src/Query/AST/Functions/DateAddFunction.php

@@ -11,8 +11,6 @@
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\TokenType;
 
-use function assert;
-use function is_numeric;
 use function strtolower;
 
 /**
@@ -63,17 +61,10 @@ public function getSql(SqlWalker $sqlWalker): string
         };
     }
 
-    /**
-     * @return numeric-string
-     *
-     * @throws ASTException
-     */
+    /** @throws ASTException */
     private function dispatchIntervalExpression(SqlWalker $sqlWalker): string
     {
-        $sql = $this->intervalExpression->dispatch($sqlWalker);
-        assert(is_numeric($sql));
-
-        return $sql;
+        return $this->intervalExpression->dispatch($sqlWalker);
     }
 
     public function parse(Parser $parser): void

src/Query/AST/Functions/DateSubFunction.php

@@ -8,8 +8,6 @@
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\Query\SqlWalker;
 
-use function assert;
-use function is_numeric;
 use function strtolower;
 
 /**
@@ -56,16 +54,9 @@ public function getSql(SqlWalker $sqlWalker): string
         };
     }
 
-    /**
-     * @return numeric-string
-     *
-     * @throws ASTException
-     */
+    /** @throws ASTException */
     private function dispatchIntervalExpression(SqlWalker $sqlWalker): string
     {
-        $sql = $this->intervalExpression->dispatch($sqlWalker);
-        assert(is_numeric($sql));
-
-        return $sql;
+        return $this->intervalExpression->dispatch($sqlWalker);
     }
 }

tests/Tests/ORM/Functional/QueryDqlFunctionTest.php

@@ -7,6 +7,7 @@
 use DateTimeImmutable;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\Tests\Models\Company\CompanyEmployee;
 use Doctrine\Tests\Models\Company\CompanyManager;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -487,4 +488,34 @@ protected function generateFixture(): void
         $this->_em->flush();
         $this->_em->clear();
     }
+
+    #[Group('GH-11240')]
+    public function testDateAddWithColumnInterval(): void
+    {
+        $query = sprintf(
+            'SELECT DATE_ADD(CURRENT_TIMESTAMP(), m.salary, \'day\') AS add FROM %s m',
+            CompanyEmployee::class,
+        );
+
+        $result = $this->_em->createQuery($query)
+            ->setMaxResults(1)
+            ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertArrayHasKey('add', $result);
+    }
+
+    #[Group('GH-11240')]
+    public function testDateSubWithColumnInterval(): void
+    {
+        $query = sprintf(
+            'SELECT DATE_SUB(CURRENT_TIMESTAMP(), m.salary, \'day\') AS add FROM %s m',
+            CompanyEmployee::class,
+        );
+
+        $result = $this->_em->createQuery($query)
+            ->setMaxResults(1)
+            ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertArrayHasKey('add', $result);
+    }
 }