Fix doctrine ORM 3.0+ compatibility (#467)

geecu · Gunther Konig · web-flow · commit b51202a82e17 · 2025-01-31T08:02:54.000+01:00
Co-authored-by: Gunther Konig &lt;gunther.konig@webflow.ro&gt;
diff --git a/Entity/TransUnitRepository.php b/Entity/TransUnitRepository.php
@@ -113,7 +113,7 @@ public function getTransUnitList(array $locales = null, $rows = 20, $page = 1, a
      *
      * @return int
      */
-    public function count(array $locales = null,  array $filters = null)
+    public function count(array $locales = null,  array $filters = null): int
     {
         $this->loadCustomHydrator();
 
diff --git a/Util/Doctrine/SingleColumnArrayHydrator.php b/Util/Doctrine/SingleColumnArrayHydrator.php
@@ -18,7 +18,9 @@ protected function hydrateAllData()
     {
         $result = [];
 
-        while ($data = $this->_stmt->fetchNumeric()) {
+        $stmt = $this->_stmt ?? $this->stmt;
+
+        while ($data = $stmt->fetchNumeric()) {
             $value = $data[0];
 
             if (is_numeric($value)) {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function getTransUnitList(array $locales = null, $rows = 20, $page = 1, a`
`113`	`113`	`*`
`114`	`114`	`* @return int`
`115`	`115`	`*/`
`116`		`- public function count(array $locales = null, array $filters = null)`
	`116`	`+ public function count(array $locales = null, array $filters = null): int`
`117`	`117`	`{`
`118`	`118`	`$this->loadCustomHydrator();`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ protected function hydrateAllData()`
`18`	`18`	`{`
`19`	`19`	`$result = [];`
`20`	`20`
`21`		`- while ($data = $this->_stmt->fetchNumeric()) {`
	`21`	`+ $stmt = $this->_stmt ?? $this->stmt;`
	`22`	`+`
	`23`	`+ while ($data = $stmt->fetchNumeric()) {`
`22`	`24`	`$value = $data[0];`
`23`	`25`
`24`	`26`	`if (is_numeric($value)) {`