Remove deprecated methods from ParserResult

Author: mpdude

src/Query/ParserResult.php

@@ -22,12 +22,7 @@ class ParserResult
     /**
      * The SQL executor used for executing the SQL.
      */
-    private AbstractSqlExecutor|null $sqlExecutor = null;
-
-    /**
-     * The SQL executor used for executing the SQL.
-     */
-    private SqlFinalizer|null $sqlFinalizer = null;
+    private ?SqlFinalizer $sqlFinalizer = null;
 
     /**
      * The ResultSetMapping that describes how to map the SQL result set.
@@ -68,49 +63,18 @@ public function setResultSetMapping(ResultSetMapping $rsm): void
         $this->resultSetMapping = $rsm;
     }
 
-    /**
-     * Sets the SQL executor that should be used for this ParserResult.
-     *
-     * @deprecated
-     */
-    public function setSqlExecutor(AbstractSqlExecutor $executor): void
-    {
-        $this->sqlExecutor = $executor;
-    }
-
-    /**
-     * Gets the SQL executor used by this ParserResult.
-     *
-     * @deprecated
-     */
-    public function getSqlExecutor(): AbstractSqlExecutor
-    {
-        if ($this->sqlExecutor === null) {
-            throw new LogicException(sprintf(
-                'Executor not set yet. Call %s::setSqlExecutor() first.',
-                self::class,
-            ));
-        }
-
-        return $this->sqlExecutor;
-    }
-
     public function setSqlFinalizer(SqlFinalizer $finalizer): void
     {
         $this->sqlFinalizer = $finalizer;
     }
 
     public function prepareSqlExecutor(Query $query): AbstractSqlExecutor
     {
-        if ($this->sqlFinalizer !== null) {
-            return $this->sqlFinalizer->createExecutor($query);
-        }
-
-        if ($this->sqlExecutor !== null) {
-            return $this->sqlExecutor;
+        if ($this->sqlFinalizer === null) {
+            throw new LogicException('No SqlFinalizer has been set; this ParserResult is incomplete.');
         }
 
-        throw new LogicException('This ParserResult lacks both the SqlFinalizer as well as the (legacy) SqlExecutor');
+        return $this->sqlFinalizer->createExecutor($query);
     }
 
     /**

tests/Tests/ORM/Functional/ParserResultSerializationTest.php

@@ -77,8 +77,6 @@ public function testUnserializeSingleSelectResult(string $serialized): void
         $this->assertInstanceOf(ParserResult::class, $unserialized);
         $this->assertInstanceOf(ResultSetMapping::class, $unserialized->getResultSetMapping());
         $this->assertEquals(['name' => [0]], $unserialized->getParameterMappings());
-        $this->assertInstanceOf(SingleSelectExecutor::class, $unserialized->getSqlExecutor());
-        $this->assertIsString($unserialized->getSqlExecutor()->getSqlStatements());
     }
 
     /** @return Generator<string, array{string}> */

tests/Tests/ORM/Functional/QueryCacheTest.php

@@ -6,6 +6,7 @@
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
+use Doctrine\ORM\Query\Exec\SqlFinalizer;
 use Doctrine\ORM\Query\ParserResult;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use PHPUnit\Framework\Attributes\Depends;
@@ -122,15 +123,18 @@ public function testQueryCacheHitDoesNotSaveParserResult(): void
 
         $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
 
-        $sqlExecMock = $this->getMockBuilder(AbstractSqlExecutor::class)
+        $sqlExecutorMock = $this->getMockBuilder(AbstractSqlExecutor::class)
                             ->getMockForAbstractClass();
 
-        $sqlExecMock->expects(self::once())
+        $sqlExecutorMock->expects(self::once())
                     ->method('execute')
                     ->willReturn(10);
 
+        $sqlFinalizerMock = $this->createMock(SqlFinalizer::class);
+        $sqlFinalizerMock->method('createExecutor')->with($query)->willReturn($sqlExecutorMock);
+
         $parserResultMock = new ParserResult();
-        $parserResultMock->setSqlExecutor($sqlExecMock);
+        $parserResultMock->setSqlFinalizer($sqlFinalizerMock);
 
         $cache = $this->createMock(CacheItemPoolInterface::class);
 

tests/Tests/ORM/Query/ParserResultTest.php

@@ -25,23 +25,6 @@ public function testGetRsm(): void
         self::assertInstanceOf(ResultSetMapping::class, $this->parserResult->getResultSetMapping());
     }
 
-    public function testItThrowsWhenAttemptingToAccessTheExecutorBeforeItIsSet(): void
-    {
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage(
-            'Executor not set yet. Call Doctrine\ORM\Query\ParserResult::setSqlExecutor() first.',
-        );
-
-        $this->parserResult->getSqlExecutor();
-    }
-
-    public function testSetGetSqlExecutor(): void
-    {
-        $executor = $this->getMockForAbstractClass(AbstractSqlExecutor::class);
-        $this->parserResult->setSqlExecutor($executor);
-        self::assertSame($executor, $this->parserResult->getSqlExecutor());
-    }
-
     public function testGetSqlParameterPosition(): void
     {
         $this->parserResult->addParameterMapping(1, 1);