Bump ORM requirements, fix translation walker handling of paginated q…

…ueries

CHANGELOG.md

@@ -18,6 +18,11 @@ a release.
 ---
 
 ## [Unreleased]
+### Changed
+- Updated minimum versions for `doctrine/orm` to ^2.20 || ^3.3
+
+### Fixed
+- Regression with `doctrine/orm` ^2.20 || ^3.3 that caused the translation walker to produce queries with duplicated LIMIT clauses (issue #2917)
 
 ## [3.18.0] - 2025-02-01
 ### Added

composer.json

@@ -57,7 +57,7 @@
         "doctrine/dbal": "^3.7 || ^4.0",
         "doctrine/doctrine-bundle": "^2.3",
         "doctrine/mongodb-odm": "^2.3",
-        "doctrine/orm": "^2.14.0 || ^3.0",
+        "doctrine/orm": "^2.20 || ^3.3",
         "friendsofphp/php-cs-fixer": "^3.14.0",
         "nesbot/carbon": "^2.71 || ^3.0",
         "phpstan/phpstan": "^2.1.1",
@@ -76,7 +76,7 @@
         "doctrine/common": "<2.13 || >=4.0",
         "doctrine/dbal": "<3.7 || >=5.0",
         "doctrine/mongodb-odm": "<2.3 || >=3.0",
-        "doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1 || >=4.0"
+        "doctrine/orm": "<2.20 || >=3.0,<3.3 || >=4.0"
     },
     "suggest": {
         "doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",

phpstan-baseline.neon

@@ -540,12 +540,6 @@ parameters:
 			count: 1
 			path: src/Timestampable/Mapping/Driver/Yaml.php
 
-		-
-			message: '#^Call to an undefined static method Doctrine\\ORM\\Query\\SqlWalker\:\:getFinalizer\(\)\.$#'
-			identifier: staticMethod.notFound
-			count: 2
-			path: src/Tool/ORM/Walker/CompatSqlOutputWalker.php
-
 		-
 			message: '#^Access to an undefined property ProxyManager\\Proxy\\GhostObjectInterface&TObject of object\:\:\$identifier\.$#'
 			identifier: property.notFound

src/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php

@@ -21,11 +21,11 @@
 use Doctrine\ORM\Query\Exec\PreparedExecutorFinalizer;
 use Doctrine\ORM\Query\Exec\SingleTableDeleteUpdateExecutor;
 use Doctrine\ORM\Query\Exec\SqlFinalizer;
+use Doctrine\ORM\Query\SqlOutputWalker;
 use Gedmo\Exception\RuntimeException;
 use Gedmo\Exception\UnexpectedValueException;
 use Gedmo\SoftDeleteable\Query\TreeWalker\Exec\MultiTableDeleteExecutor;
 use Gedmo\SoftDeleteable\SoftDeleteableListener;
-use Gedmo\Tool\ORM\Walker\CompatSqlOutputWalker;
 use Gedmo\Tool\ORM\Walker\SqlWalkerCompat;
 
 /**
@@ -38,7 +38,7 @@
  *
  * @final since gedmo/doctrine-extensions 3.11
  */
-class SoftDeleteableWalker extends CompatSqlOutputWalker
+class SoftDeleteableWalker extends SqlOutputWalker
 {
     use SqlWalkerCompat;
 

src/Tool/ORM/Walker/SqlWalkerCompatForOrm2.php

@@ -9,8 +9,8 @@
 
 namespace Gedmo\Tool\ORM\Walker;
 
-use Doctrine\ORM\Query\AST;
 use Doctrine\ORM\Query\AST\DeleteClause;
+use Doctrine\ORM\Query\AST\DeleteStatement;
 use Doctrine\ORM\Query\AST\FromClause;
 use Doctrine\ORM\Query\AST\GroupByClause;
 use Doctrine\ORM\Query\AST\HavingClause;
@@ -19,8 +19,10 @@
 use Doctrine\ORM\Query\AST\SelectStatement;
 use Doctrine\ORM\Query\AST\SimpleSelectClause;
 use Doctrine\ORM\Query\AST\SubselectFromClause;
+use Doctrine\ORM\Query\AST\UpdateStatement;
 use Doctrine\ORM\Query\AST\WhereClause;
 use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
+use Doctrine\ORM\Query\Exec\SqlFinalizer;
 use Doctrine\ORM\Query\SqlWalker;
 
 /**
@@ -35,7 +37,7 @@ trait SqlWalkerCompatForOrm2
     /**
      * Gets an executor that can be used to execute the result of this walker.
      *
-     * @param SelectStatement|AST\UpdateStatement|AST\DeleteStatement $statement
+     * @param SelectStatement|UpdateStatement|DeleteStatement $statement
      *
      * @return AbstractSqlExecutor
      */
@@ -45,15 +47,11 @@ public function getExecutor($statement)
     }
 
     /**
-     * Walks down a SelectStatement AST node, thereby generating the appropriate SQL.
-     *
-     * @param SelectStatement $selectStatement
-     *
-     * @return string
+     * @param DeleteStatement|UpdateStatement|SelectStatement $AST
      */
-    public function walkSelectStatement($selectStatement)
+    public function getFinalizer($AST): SqlFinalizer
     {
-        return $this->doWalkSelectStatementWithCompat($selectStatement);
+        return $this->doGetFinalizerWithCompat($AST);
     }
 
     /**
@@ -169,16 +167,19 @@ public function walkWhereClause($whereClause)
     /**
      * Gets an executor that can be used to execute the result of this walker.
      *
-     * @param SelectStatement|AST\UpdateStatement|AST\DeleteStatement $statement
+     * @param SelectStatement|UpdateStatement|DeleteStatement $statement
      */
     protected function doGetExecutorWithCompat($statement): AbstractSqlExecutor
     {
         return parent::getExecutor($statement);
     }
 
-    protected function doWalkSelectStatementWithCompat(SelectStatement $selectStatement): string
+    /**
+     * @param DeleteStatement|UpdateStatement|SelectStatement $AST
+     */
+    protected function doGetFinalizerWithCompat($AST): SqlFinalizer
     {
-        return parent::walkSelectStatement($selectStatement);
+        return parent::getFinalizer($AST);
     }
 
     protected function doWalkSelectClauseWithCompat(SelectClause $selectClause): string

src/Tool/ORM/Walker/SqlWalkerCompatForOrm3.php

@@ -9,7 +9,6 @@
 
 namespace Gedmo\Tool\ORM\Walker;
 
-use Doctrine\ORM\Query\AST;
 use Doctrine\ORM\Query\AST\DeleteClause;
 use Doctrine\ORM\Query\AST\DeleteStatement;
 use Doctrine\ORM\Query\AST\FromClause;
@@ -23,6 +22,7 @@
 use Doctrine\ORM\Query\AST\UpdateStatement;
 use Doctrine\ORM\Query\AST\WhereClause;
 use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
+use Doctrine\ORM\Query\Exec\SqlFinalizer;
 use Doctrine\ORM\Query\SqlWalker;
 
 /**
@@ -42,12 +42,9 @@ public function getExecutor(SelectStatement|UpdateStatement|DeleteStatement $sta
         return $this->doGetExecutorWithCompat($statement);
     }
 
-    /**
-     * Walks down a SelectStatement AST node, thereby generating the appropriate SQL.
-     */
-    public function walkSelectStatement(SelectStatement $selectStatement): string
+    public function getFinalizer(DeleteStatement|UpdateStatement|SelectStatement $AST): SqlFinalizer
     {
-        return $this->doWalkSelectStatementWithCompat($selectStatement);
+        return $this->doGetFinalizerWithCompat($AST);
     }
 
     /**
@@ -134,9 +131,12 @@ protected function doGetExecutorWithCompat($statement): AbstractSqlExecutor
         return parent::getExecutor($statement);
     }
 
-    protected function doWalkSelectStatementWithCompat(SelectStatement $selectStatement): string
+    /**
+     * @param DeleteStatement|UpdateStatement|SelectStatement $AST
+     */
+    protected function doGetFinalizerWithCompat($AST): SqlFinalizer
     {
-        return parent::walkSelectStatement($selectStatement);
+        return parent::getFinalizer($AST);
     }
 
     protected function doWalkSelectClauseWithCompat(SelectClause $selectClause): string

src/Translatable/Query/TreeWalker/TranslationWalker.php

@@ -34,8 +34,8 @@
 use Doctrine\ORM\Query\Exec\SingleSelectExecutor;
 use Doctrine\ORM\Query\Exec\SingleSelectSqlFinalizer;
 use Doctrine\ORM\Query\Exec\SqlFinalizer;
+use Doctrine\ORM\Query\SqlOutputWalker;
 use Gedmo\Exception\RuntimeException;
-use Gedmo\Tool\ORM\Walker\CompatSqlOutputWalker;
 use Gedmo\Tool\ORM\Walker\SqlWalkerCompat;
 use Gedmo\Translatable\Hydrator\ORM\ObjectHydrator;
 use Gedmo\Translatable\Hydrator\ORM\SimpleObjectHydrator;
@@ -56,7 +56,7 @@
  *
  * @final since gedmo/doctrine-extensions 3.11
  */
-class TranslationWalker extends CompatSqlOutputWalker
+class TranslationWalker extends SqlOutputWalker
 {
     use SqlWalkerCompat;
 
@@ -155,12 +155,12 @@ protected function doGetFinalizerWithCompat($AST): SqlFinalizer
         }
         $this->prepareTranslatedComponents();
 
-        return new SingleSelectSqlFinalizer($this->walkSelectStatement($AST));
+        return new SingleSelectSqlFinalizer($this->createSqlForFinalizer($AST));
     }
 
-    protected function doWalkSelectStatementWithCompat(SelectStatement $selectStatement): string
+    protected function createSqlForFinalizer(SelectStatement $selectStatement): string
     {
-        $result = parent::walkSelectStatement($selectStatement);
+        $result = parent::createSqlForFinalizer($selectStatement);
         if ([] === $this->translatedComponents) {
             return $result;
         }

tests/Gedmo/Translatable/TranslationQueryWalkerTest.php

@@ -125,6 +125,21 @@ public function testJoinedWithStatements(): void
         static::assertSame('good', $comments[0]['subject']);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testPaginatedQuery(): void
+    {
+        $this->populateMore();
+
+        $dql = 'SELECT a FROM '.Article::class.' a';
+        $q = $this->em->createQuery($dql);
+        $q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, TranslationWalker::class);
+        $q->setFirstResult(0);
+        $q->setMaxResults(1);
+        $q->getResult(Query::HYDRATE_SIMPLEOBJECT);
+    }
+
     public function testShouldSelectWithTranslationFallbackOnSimpleObjectHydration(): void
     {
         $this->em->getConfiguration()->addCustomHydrationMode(