Fix compatibility issues with Doctrine.

lexik · Aug 25, 2024 · a547f06 · a547f06
1 parent 6bd4e3d
commit a547f06
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Entity/TransUnitRepository.php b/Entity/TransUnitRepository.php
@@ -111,15 +111,19 @@ public function getTransUnitList(array $locales = null, $rows = 20, $page = 1, a
     /**
      * Count the number of trans unit.
      *
+     * @param array<string, mixed>        $criteria
      * @return int
      */
-    public function count(array $locales = null,  array $filters = null)
+    public function count(array $criteria = []): int
     {
         $this->loadCustomHydrator();
 
         $builder = $this->createQueryBuilder('tu')
             ->select('COUNT(DISTINCT tu.id) AS number');
 
+        $locales = $criteria['locales'] ?? null;
+        $filters = $criteria['filters'] ?? null;
+
         $this->addTransUnitFilters($builder, $filters);
         $this->addTranslationFilter($builder, $locales, $filters);
 

diff --git a/Util/Doctrine/SingleColumnArrayHydrator.php b/Util/Doctrine/SingleColumnArrayHydrator.php
@@ -2,6 +2,8 @@
 
 namespace Lexik\Bundle\TranslationBundle\Util\Doctrine;
 
+use Doctrine\DBAL\Result;
+use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
 
 /**
@@ -14,7 +16,7 @@ class SingleColumnArrayHydrator extends AbstractHydrator
     /**
      * {@inheritdoc}
      */
-    protected function hydrateAllData()
+    protected function hydrateAllData(): mixed
     {
         $result = [];
 
@@ -34,4 +36,13 @@ protected function hydrateAllData()
 
         return $result;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hydrateAll(Result $stmt, ResultSetMapping $resultSetMapping, array $hints = []): mixed
+    {
+        $this->_stmt = $stmt;
+        return parent::hydrateAll($stmt, $resultSetMapping, $hints);
+    }
 }