Fix double SQL finalization

Author: janedbal

phpcs.xml.dist

@@ -269,7 +269,6 @@
     <rule ref="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces"/>
     <rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration" />
     <rule ref="SlevomatCodingStandard.Classes.TraitUseSpacing" />
-    <rule ref="SlevomatCodingStandard.Classes.DisallowConstructorPropertyPromotion" />
     <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
         <properties>
             <property name="linesCountBeforeFirstContent" value="0"/>
@@ -305,7 +304,6 @@
     <rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
     <rule ref="SlevomatCodingStandard.Functions.UselessParameterDefaultValue"/>
     <rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/>
-    <rule ref="SlevomatCodingStandard.Functions.DisallowArrowFunction"/>
     <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace"/>
     <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
         <properties>

src/HintDrivenSqlWalker.php

@@ -54,7 +54,6 @@
 use Doctrine\ORM\Query\AST\UpdateStatement;
 use Doctrine\ORM\Query\AST\WhereClause;
 use Doctrine\ORM\Query\Exec\PreparedExecutorFinalizer;
-use Doctrine\ORM\Query\Exec\SingleSelectSqlFinalizer;
 use Doctrine\ORM\Query\Exec\SqlFinalizer;
 use Doctrine\ORM\Query\OutputWalker;
 use Doctrine\ORM\Query\Parser;
@@ -99,7 +98,7 @@ public function getFinalizer(DeleteStatement|UpdateStatement|SelectStatement $AS
     {
         switch (true) {
             case $AST instanceof SelectStatement:
-                return new SingleSelectSqlFinalizer($this->walkSelectStatement($AST));
+                return new NoopSqlFinalizer($this->walkSelectStatement($AST));
 
             case $AST instanceof UpdateStatement:
                 return new PreparedExecutorFinalizer($this->createUpdateStatementExecutor($AST));

src/NoopSqlFinalizer.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types = 1);
+
+namespace ShipMonk\Doctrine\Walker;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
+use Doctrine\ORM\Query\Exec\FinalizedSelectExecutor;
+use Doctrine\ORM\Query\Exec\SqlFinalizer;
+
+class NoopSqlFinalizer implements SqlFinalizer
+{
+
+    public function __construct(readonly private string $sql)
+    {
+    }
+
+    public function createExecutor(Query $query): AbstractSqlExecutor
+    {
+        return new FinalizedSelectExecutor($this->sql);
+    }
+
+}

tests/HintDrivenSqlWalkerTest.php

@@ -20,20 +20,19 @@ class HintDrivenSqlWalkerTest extends TestCase
 {
 
     /**
+     * @param callable(EntityManager):Query $queryCallback
      * @dataProvider walksProvider
      */
     public function testWalker(
-        string $dql,
+        callable $queryCallback,
         string $handlerClass,
         mixed $hintValue,
         string $expectedSql,
     ): void
     {
         $entityManagerMock = $this->createEntityManagerMock();
 
-        $query = new Query($entityManagerMock);
-        $query->setDQL($dql);
-
+        $query = $queryCallback($entityManagerMock);
         $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, HintDrivenSqlWalker::class);
         $query->setHint($handlerClass, $hintValue);
         $producedSql = $query->getSQL();
@@ -42,39 +41,52 @@ public function testWalker(
     }
 
     /**
-     * @return Generator<string, array{string, class-string<HintHandler>, mixed, string}>
+     * @return Generator<string, array{callable(EntityManager):Query, class-string<HintHandler>, mixed, string}>
      */
     public static function walksProvider(): iterable
     {
         $selectDql = sprintf('SELECT w FROM %s w', DummyEntity::class);
 
         yield 'Lowercase select' => [
-            $selectDql,
+            static fn(EntityManager $entityManager): Query => $entityManager->createQuery($selectDql),
             LowercaseSelectHintHandler::class,
             null,
             'select d0_.id AS id_0 FROM dummy_entity d0_',
         ];
 
         yield 'Comment whole sql - select' => [
-            $selectDql,
+            static fn(EntityManager $entityManager): Query => $entityManager->createQuery($selectDql),
             CommentWholeSqlHintHandler::class,
             'custom comment',
             'SELECT d0_.id AS id_0 FROM dummy_entity d0_ -- custom comment',
         ];
 
         yield 'Comment whole sql - update' => [
-            sprintf('UPDATE %s w SET w.id = 1', DummyEntity::class),
+            static fn(EntityManager $entityManager): Query => $entityManager->createQuery(sprintf('UPDATE %s w SET w.id = 1', DummyEntity::class)),
             CommentWholeSqlHintHandler::class,
             'custom comment',
             'UPDATE dummy_entity SET id = 1 -- custom comment',
         ];
 
         yield 'Comment whole sql - delete' => [
-            sprintf('DELETE FROM %s w', DummyEntity::class),
+            static fn(EntityManager $entityManager): Query => $entityManager->createQuery(sprintf('DELETE FROM %s w', DummyEntity::class)),
             CommentWholeSqlHintHandler::class,
             'custom comment',
             'DELETE FROM dummy_entity -- custom comment',
         ];
+
+        yield 'Comment whole sql with LIMIT' => [
+            static function (EntityManager $entityManager): Query {
+                return $entityManager->createQueryBuilder()
+                    ->select('w')
+                    ->from(DummyEntity::class, 'w')
+                    ->setMaxResults(1)
+                    ->getQuery();
+            },
+            CommentWholeSqlHintHandler::class,
+            'custom comment',
+            'SELECT d0_.id AS id_0 FROM dummy_entity d0_ LIMIT 1 -- custom comment',
+        ];
     }
 
     private function createEntityManagerMock(): EntityManager