Merge branch '2.20.x' into 3.5.x

* 2.20.x:
  Remove calls to getMockForAbstractClass() (#12003)

Author: derrabus

tests/Tests/ORM/Functional/QueryCacheTest.php

@@ -4,6 +4,7 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
 use Doctrine\ORM\Query\ParserResult;
@@ -122,14 +123,15 @@ public function testQueryCacheHitDoesNotSaveParserResult(): void
 
         $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
 
-        $sqlExecMock = $this->createMock(AbstractSqlExecutor::class);
-
-        $sqlExecMock->expects(self::once())
-                    ->method('execute')
-                    ->willReturn(10);
+        $sqlExecutorStub = new class extends AbstractSqlExecutor {
+            public function execute(Connection $conn, array $params, array $types): int
+            {
+                return 10;
+            }
+        };
 
         $parserResultMock = new ParserResult();
-        $parserResultMock->setSqlExecutor($sqlExecMock);
+        $parserResultMock->setSqlExecutor($sqlExecutorStub);
 
         $cache = $this->createMock(CacheItemPoolInterface::class);
 

tests/Tests/ORM/Hydration/AbstractHydratorTest.php

@@ -10,11 +10,11 @@
 use Doctrine\DBAL\Result;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
-use Doctrine\ORM\Exception\ORMException;
 use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\Tests\Models\Hydration\SimpleEntity;
 use Doctrine\Tests\OrmFunctionalTestCase;
+use LogicException;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -27,7 +27,7 @@ class AbstractHydratorTest extends OrmFunctionalTestCase
     private EventManager&MockObject $mockEventManager;
     private Result&MockObject $mockResult;
     private ResultSetMapping&MockObject $mockResultMapping;
-    private AbstractHydrator&MockObject $hydrator;
+    private DummyHydrator $hydrator;
 
     protected function setUp(): void
     {
@@ -52,11 +52,7 @@ protected function setUp(): void
             ->method('fetchAssociative')
             ->willReturn(false);
 
-        $this->hydrator = $this
-            ->getMockBuilder(AbstractHydrator::class)
-            ->onlyMethods(['hydrateAllData'])
-            ->setConstructorArgs([$mockEntityManagerInterface])
-            ->getMock();
+        $this->hydrator = new DummyHydrator($mockEntityManagerInterface);
     }
 
     /**
@@ -142,13 +138,9 @@ public function testHydrateAllClearsAllAttachedListenersEvenOnError(): void
                 $this->assertTrue($eventListenerHasBeenRegistered);
             });
 
-        $this
-            ->hydrator
-            ->expects(self::once())
-            ->method('hydrateAllData')
-            ->willThrowException($this->createStub(ORMException::class));
+        $this->hydrator->throwException = true;
 
-        $this->expectException(ORMException::class);
+        $this->expectException(LogicException::class);
         $this->hydrator->hydrateAll($this->mockResult, $this->mockResultMapping);
     }
 
@@ -181,3 +173,18 @@ public function testToIterableIfYieldAndBreakBeforeFinishAlwaysCleansUp(): void
         self::assertCount(0, $evm->getListeners(Events::onClear));
     }
 }
+
+class DummyHydrator extends AbstractHydrator
+{
+    public bool $throwException = false;
+
+    /** @return array{} */
+    protected function hydrateAllData(): array
+    {
+        if ($this->throwException) {
+            throw new LogicException();
+        }
+
+        return [];
+    }
+}