Move SqlExecutor creation to ParserResult, to minimize public methods…

… available on it

src/Query.php

@@ -292,11 +292,7 @@ private function parse(): ParserResult
 
     private function initializeSqlExecutor(): void
     {
-        if ($this->parserResult->hasSqlFinalizer()) {
-            $this->sqlExecutor = $this->parserResult->getSqlFinalizer()->createExecutor($this);
-        } else {
-            $this->sqlExecutor = $this->parserResult->getSqlExecutor();
-        }
+        $this->sqlExecutor = $this->parserResult->prepareSqlExecutor($this);
     }
 
     /**
@@ -842,7 +838,7 @@ protected function getQueryCacheId(): string
                 Deprecation::trigger(
                     'doctrine/orm',
                     'https://github.com/doctrine/orm/pull/11188/',
-                    'Your output walker class %s should implement %s and provide a %s. This also means the output walker should not use the query firstResult/maxResult values, which should be added in the finalization phase only.',
+                    'Your output walker class %s should implement %s in order to provide a %s. This also means the output walker should not use the query firstResult/maxResult values, which should be read from the query by the SqlFinalizer only.',
                     $outputWalkerClass,
                     OutputWalker::class,
                     SqlFinalizer::class

src/Query/Parser.php

@@ -10,6 +10,7 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\AST\Functions;
+use Doctrine\ORM\Query\Exec\SqlFinalizer;
 use LogicException;
 use ReflectionClass;
 
@@ -398,6 +399,14 @@ public function parse()
             $finalizer = $outputWalker->getFinalizer($AST);
             $this->parserResult->setSqlFinalizer($finalizer);
         } else {
+            Deprecation::trigger(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/11188/',
+                'Your output walker class %s should implement %s in order to provide a %s. This also means the output walker should not use the query firstResult/maxResult values, which should be read from the query by the SqlFinalizer only.',
+                $outputWalkerClass,
+                OutputWalker::class,
+                SqlFinalizer::class
+            );
             $executor = $outputWalker->getExecutor($AST);
             $this->parserResult->setSqlExecutor($executor);
         }

src/Query/ParserResult.php

@@ -4,6 +4,7 @@
 
 namespace Doctrine\ORM\Query;
 
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
 use Doctrine\ORM\Query\Exec\SqlFinalizer;
 use LogicException;
@@ -88,6 +89,7 @@ public function setResultSetMapping(ResultSetMapping $rsm)
      * @param AbstractSqlExecutor $executor
      *
      * @return void
+     * @deprecated
      */
     public function setSqlExecutor($executor)
     {
@@ -97,6 +99,7 @@ public function setSqlExecutor($executor)
     /**
      * Gets the SQL executor used by this ParserResult.
      *
+     * @deprecated
      * @return ?AbstractSqlExecutor
      */
     public function getSqlExecutor()
@@ -109,24 +112,17 @@ public function setSqlFinalizer(SqlFinalizer $finalizer): void
         $this->sqlFinalizer = $finalizer;
     }
 
-    public function getSqlFinalizer(): SqlFinalizer
+    public function prepareSqlExecutor(Query $query): AbstractSqlExecutor
     {
-        if ($this->sqlFinalizer === null) {
-            throw new LogicException('This ParserResult was not created with an SqlFinalizer');
+        if (null !== $this->sqlFinalizer) {
+            return $this->sqlFinalizer->createExecutor($query);
         }
 
-        return $this->sqlFinalizer;
-    }
+        if (null !== $this->sqlExecutor) {
+            return $this->sqlExecutor;
+        }
 
-    /**
-     * @internal
-     *
-     * @psalm-internal Doctrine\ORM\Query
-     * @psalm-assert-if-true !null $this->sqlFinalizer
-     */
-    public function hasSqlFinalizer(): bool
-    {
-        return $this->sqlFinalizer !== null;
+        throw new LogicException('This ParserResult lacks both the SqlFinalizer as well as the (legacy) SqlExecutor');
     }
 
     /**

tests/Tests/ORM/Functional/ParserResultSerializationTest.php

@@ -49,8 +49,7 @@ public function testSerializeParserResultForQueryWithSqlWalker(Closure $toSerial
         $this->assertInstanceOf(ParserResult::class, $unserialized);
         $this->assertInstanceOf(ResultSetMapping::class, $unserialized->getResultSetMapping());
         $this->assertEquals(['name' => [0]], $unserialized->getParameterMappings());
-        $this->assertFalse($unserialized->hasSqlFinalizer());
-        $this->assertInstanceOf(SingleSelectExecutor::class, $unserialized->getSqlExecutor());
+        $this->assertNotNull($unserialized->prepareSqlExecutor($query));
     }
 
     /**
@@ -69,8 +68,7 @@ public function testSerializeParserResultForQueryWithSqlOutputWalker(Closure $to
         $this->assertInstanceOf(ParserResult::class, $unserialized);
         $this->assertInstanceOf(ResultSetMapping::class, $unserialized->getResultSetMapping());
         $this->assertEquals(['name' => [0]], $unserialized->getParameterMappings());
-        $this->assertTrue($unserialized->hasSqlFinalizer());
-        $this->assertNotNull($unserialized->getSqlFinalizer());
+        $this->assertNotNull($unserialized->prepareSqlExecutor($query));
     }
 
     /** @return Generator<string, array{Closure(ParserResult): ParserResult}> */

tests/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php

@@ -22,7 +22,7 @@ public function testDqlQueryTransformation(string $dql, string $expectedSql): vo
         $query->setHint(WhereInWalker::HINT_PAGINATOR_HAS_IDS, true);
 
         $result   = (new Parser($query))->parse();
-        $executor = $result->getSqlFinalizer()->createExecutor($query);
+        $executor = $result->prepareSqlExecutor($query);
 
         self::assertEquals($expectedSql, $executor->getSqlStatements());
         self::assertEquals([0], $result->getSqlParameterPositions(WhereInWalker::PAGINATOR_ID_ALIAS));