Fix tests

Author: mpdude

tests/Doctrine/Tests/ORM/Functional/ParserResultSerializationTest.php

@@ -35,20 +35,44 @@ protected function setUp(): void
      *
      * @dataProvider provideToSerializedAndBack
      */
-    public function testSerializeParserResult(Closure $toSerializedAndBack): void
+    public function testSerializeParserResultForQueryWithSqlWalker(Closure $toSerializedAndBack): void
     {
         $query = $this->_em
             ->createQuery('SELECT u FROM Doctrine\Tests\Models\Company\CompanyEmployee u WHERE u.name = :name');
 
+        // Use the (legacy) SqlWalker which directly puts an SqlExecutor instance into the parser result
+        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, Query\SqlWalker::class);
+
         $parserResult = self::parseQuery($query);
         $unserialized = $toSerializedAndBack($parserResult);
 
         $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());
     }
 
+    /**
+     * @param Closure(ParserResult): ParserResult $toSerializedAndBack
+     *
+     * @dataProvider provideToSerializedAndBack
+     */
+    public function testSerializeParserResultForQueryWithSqlOutputWalker(Closure $toSerializedAndBack): void
+    {
+        $query = $this->_em
+            ->createQuery('SELECT u FROM Doctrine\Tests\Models\Company\CompanyEmployee u WHERE u.name = :name');
+
+        $parserResult = self::parseQuery($query);
+        $unserialized = $toSerializedAndBack($parserResult);
+
+        $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());
+    }
+
     /** @return Generator<string, array{Closure(ParserResult): ParserResult}> */
     public function provideToSerializedAndBack(): Generator
     {

tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php

@@ -87,7 +87,8 @@ public function testExtraParametersAreStrippedWhenWalkerRemovingOriginalSelectEl
 
     public function testPaginatorNotCaringAboutExtraParametersWithoutOutputWalkers(): void
     {
-        $this->connection->expects(self::exactly(3))->method('executeQuery');
+        $result = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
+        $this->connection->expects(self::exactly(3))->method('executeQuery')->willReturn($result);
 
         $this->createPaginatorWithExtraParametersWithoutOutputWalkers([])->count();
         $this->createPaginatorWithExtraParametersWithoutOutputWalkers([[10]])->count();
@@ -96,7 +97,8 @@ public function testPaginatorNotCaringAboutExtraParametersWithoutOutputWalkers()
 
     public function testgetIteratorDoesCareAboutExtraParametersWithoutOutputWalkersWhenResultIsNotEmpty(): void
     {
-        $this->connection->expects(self::exactly(1))->method('executeQuery');
+        $result = $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
+        $this->connection->expects(self::exactly(1))->method('executeQuery')->willReturn($result);
         $this->expectException(Query\QueryException::class);
         $this->expectExceptionMessage('Too many parameters: the query defines 1 parameters and you bound 2');