Rebase branch

Author: yann-eugone

src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php

@@ -153,43 +153,11 @@ public function query(Query $query): iterable
             ->from($this->table);
 
         /**
-         * @phpstan-var array<string, array<int, int|string>> $queryParameters
-         * @phpstan-var array<string, int> $queryTypes
+         * @phpstan-var array<string, mixed> $queryParameters
+         * @phpstan-var array<string, string|int> $queryTypes
          */
         [$queryParameters, $queryTypes] = $this->addWheres($query, $qb);
 
-        if ($query->startTime()) {
-            $qb->andWhere($qb->expr()->isNotNull('start_time'));
-        }
-        $startDateFrom = $query->startTime()?->getFrom();
-        if ($startDateFrom) {
-            $qb->andWhere($qb->expr()->gte('start_time', ':startDateFrom'));
-            $queryParameters['startDateFrom'] = $startDateFrom;
-            $queryTypes['startDateFrom'] = Types::DATETIME_IMMUTABLE;
-        }
-        $startDateTo = $query->startTime()?->getTo();
-        if ($startDateTo) {
-            $qb->andWhere($qb->expr()->lte('start_time', ':startDateTo'));
-            $queryParameters['startDateTo'] = $startDateTo;
-            $queryTypes['startDateTo'] = Types::DATETIME_IMMUTABLE;
-        }
-
-        if ($query->endTime()) {
-            $qb->andWhere($qb->expr()->isNotNull('start_time'));
-        }
-        $endDateFrom = $query->endTime()?->getFrom();
-        if ($endDateFrom) {
-            $qb->andWhere($qb->expr()->gte('end_time', ':endDateFrom'));
-            $queryParameters['endDateFrom'] = $endDateFrom;
-            $queryTypes['endDateFrom'] = Types::DATETIME_IMMUTABLE;
-        }
-        $endDateTo = $query->endTime()?->getTo();
-        if ($endDateTo) {
-            $qb->andWhere($qb->expr()->lte('end_time', ':endDateTo'));
-            $queryParameters['endDateTo'] = $endDateTo;
-            $queryTypes['endDateTo'] = Types::DATETIME_IMMUTABLE;
-        }
-
         switch ($query->sort()) {
             case Query::SORT_BY_START_ASC:
                 $qb->orderBy('start_time', 'asc');
@@ -217,8 +185,14 @@ public function count(Query $query): int
         $qb->select('count(*)')
             ->from($this->table);
 
+        /**
+         * @phpstan-var array<string, mixed> $queryParameters
+         * @phpstan-var array<string, string|int> $queryTypes
+         */
+        [$queryParameters, $queryTypes] = $this->addWheres($query, $qb);
+
         /** @var int $result */
-        $result = $this->connection->executeQuery($qb->getSQL(), ...$this->addWheres($query, $qb))->fetchOne();
+        $result = $this->connection->executeQuery($qb->getSQL(), $queryParameters, $queryTypes)->fetchOne();
 
         return $result;
     }
@@ -354,7 +328,7 @@ private function getNormalizer(): JobExecutionRowNormalizer
     }
 
     /**
-     * @return array<int, array<string, array<int|string>|int>>
+     * @return array{array<string, mixed>, array<string, string|int>}
      */
     private function addWheres(Query $query, QueryBuilder $qb): array
     {
@@ -382,6 +356,38 @@ private function addWheres(Query $query, QueryBuilder $qb): array
             $queryTypes['statuses'] = Connection::PARAM_INT_ARRAY;
         }
 
+        if ($query->startTime()) {
+            $qb->andWhere($qb->expr()->isNotNull('start_time'));
+        }
+        $startDateFrom = $query->startTime()?->getFrom();
+        if ($startDateFrom) {
+            $qb->andWhere($qb->expr()->gte('start_time', ':startDateFrom'));
+            $queryParameters['startDateFrom'] = $startDateFrom;
+            $queryTypes['startDateFrom'] = Types::DATETIME_IMMUTABLE;
+        }
+        $startDateTo = $query->startTime()?->getTo();
+        if ($startDateTo) {
+            $qb->andWhere($qb->expr()->lte('start_time', ':startDateTo'));
+            $queryParameters['startDateTo'] = $startDateTo;
+            $queryTypes['startDateTo'] = Types::DATETIME_IMMUTABLE;
+        }
+
+        if ($query->endTime()) {
+            $qb->andWhere($qb->expr()->isNotNull('start_time'));
+        }
+        $endDateFrom = $query->endTime()?->getFrom();
+        if ($endDateFrom) {
+            $qb->andWhere($qb->expr()->gte('end_time', ':endDateFrom'));
+            $queryParameters['endDateFrom'] = $endDateFrom;
+            $queryTypes['endDateFrom'] = Types::DATETIME_IMMUTABLE;
+        }
+        $endDateTo = $query->endTime()?->getTo();
+        if ($endDateTo) {
+            $qb->andWhere($qb->expr()->lte('end_time', ':endDateTo'));
+            $queryParameters['endDateTo'] = $endDateTo;
+            $queryTypes['endDateTo'] = Types::DATETIME_IMMUTABLE;
+        }
+
         return [$queryParameters, $queryTypes];
     }
 }

src/batch/tests/Storage/FilesystemJobExecutionStorageTest.php

@@ -142,16 +142,15 @@ public function list(): \Generator
     /**
      * @dataProvider query
      */
-    public function testQueryWithProvider(QueryBuilder $query, array $expectedCouples, ?int $expectedCount = null): void
+    public function testQueryWithProvider(QueryBuilder $query, array $expectedCouples): void
     {
         $storage = $this->createStorage(
             __DIR__ . '/fixtures/filesystem-job-execution',
             new JsonJobExecutionSerializer()
         );
 
         self::assertExecutions($expectedCouples, $storage->query($query->getQuery()));
-        $expectedCount ??= count($expectedCouples);
-        self::assertEquals($expectedCount, $storage->count($query->getQuery()));
+        self::assertEquals(\count($expectedCouples), $storage->count($query->getQuery()));
     }
 
     public function query(): \Generator