Merge 4.5.x into 5.0.x

tests/Connection/CachedQueryTest.php

@@ -88,7 +88,7 @@ private function createConnection(int $expectedQueryCount, array $columnNames, a
             ->method('query')
             ->willReturnCallback(static fn (): ArrayResult => new ArrayResult($columnNames, $rows));
 
-        $driver = $this->createMock(Driver::class);
+        $driver = self::createStub(Driver::class);
         $driver->method('connect')
             ->willReturn($connection);
 

tests/ConnectionTest.php

@@ -185,12 +185,12 @@ public function testTransactionIsNotActiveAfterTransactionalInAutoCommitMode():
 
     public function testTransactionIsActiveAfterTransactionalInNoAutoCommitMode(): void
     {
-        $platformMock = $this->createMock(AbstractPlatform::class);
+        $platformMock = self::createStub(AbstractPlatform::class);
         $platformMock
             ->method('supportsSavepoints')
             ->willReturn(true);
 
-        $driverMock = $this->createMock(Driver::class);
+        $driverMock = self::createStub(Driver::class);
         $driverMock
             ->method('connect')
             ->willReturn(
@@ -472,7 +472,7 @@ public function testFetch(string $method, callable $invoke, mixed $expected): vo
             ->willReturn($expected);
 
         $driver = $this->createConfiguredMock(Driver::class, [
-            'connect' => $this->createMock(DriverConnection::class),
+            'connect' => self::createStub(DriverConnection::class),
         ]);
 
         $conn = $this->getMockBuilder(Connection::class)
@@ -567,7 +567,7 @@ public function testPlatformDetectionTriggersConnectionIfRequiredByTheDriver():
             ->method('getServerVersion')
             ->willReturn('6.6.6');
 
-        $platform = $this->createMock(AbstractPlatform::class);
+        $platform = self::createStub(AbstractPlatform::class);
 
         $driver = $this->createMock(Driver::class);
         $driver->expects(self::once())
@@ -592,7 +592,7 @@ public function testPlatformDetectionDoesNotTriggerConnectionIfNotRequiredByTheD
         $driverConnection->expects(self::never())
             ->method('getServerVersion');
 
-        $platform = $this->createMock(AbstractPlatform::class);
+        $platform = self::createStub(AbstractPlatform::class);
 
         $driver = $this->createMock(Driver::class);
         $driver->expects(self::never())
@@ -610,9 +610,9 @@ public function testPlatformDetectionFetchedFromParameters(): void
     {
         $driverMock = $this->createMock(Driver::class);
 
-        $driverConnectionMock = $this->createMock(Driver\Connection::class);
+        $driverConnectionMock = self::createStub(Driver\Connection::class);
 
-        $platformMock = $this->createMock(AbstractPlatform::class);
+        $platformMock = self::createStub(AbstractPlatform::class);
 
         $connection = new Connection(['serverVersion' => '8.0'], $driverMock);
 
@@ -632,9 +632,9 @@ public function testPlatformDetectionFetchedFromPrimaryReplicaParameters(): void
     {
         $driverMock = $this->createMock(Driver::class);
 
-        $driverConnectionMock = $this->createMock(Driver\Connection::class);
+        $driverConnectionMock = self::createStub(Driver\Connection::class);
 
-        $platformMock = $this->createMock(AbstractPlatform::class);
+        $platformMock = self::createStub(AbstractPlatform::class);
 
         $connection = new Connection(['primary' => ['serverVersion' => '8.0']], $driverMock);
 
@@ -652,7 +652,7 @@ public function testPlatformDetectionFetchedFromPrimaryReplicaParameters(): void
 
     public function testConnectionParamsArePassedToTheQueryCacheProfileInExecuteCacheQuery(): void
     {
-        $cacheItemMock = $this->createMock(CacheItemInterface::class);
+        $cacheItemMock = self::createStub(CacheItemInterface::class);
         $cacheItemMock->method('isHit')->willReturn(true);
         $cacheItemMock->method('get')->willReturn(['realKey' => [[], []]]);
 
@@ -684,7 +684,7 @@ public function testConnectionParamsArePassedToTheQueryCacheProfileInExecuteCach
             ->with($query, $params, $types, $expectedConnectionParams)
             ->willReturn(['cacheKey', 'realKey']);
 
-        $driver = $this->createMock(Driver::class);
+        $driver = self::createStub(Driver::class);
 
         (new Connection(self::CONNECTION_PARAMS, $driver))
             ->executeCacheQuery($query, $params, $types, $queryCacheProfileMock);

tests/Driver/Middleware/AbstractConnectionMiddlewareTest.php

@@ -14,7 +14,7 @@ final class AbstractConnectionMiddlewareTest extends TestCase
 {
     public function testPrepare(): void
     {
-        $statement  = $this->createMock(Statement::class);
+        $statement  = self::createStub(Statement::class);
         $connection = $this->createMock(Connection::class);
         $connection->expects(self::once())
             ->method('prepare')
@@ -26,7 +26,7 @@ public function testPrepare(): void
 
     public function testQuery(): void
     {
-        $result     = $this->createMock(Result::class);
+        $result     = self::createStub(Result::class);
         $connection = $this->createMock(Connection::class);
         $connection->expects(self::once())
             ->method('query')

tests/Driver/Middleware/AbstractDriverMiddlewareTest.php

@@ -13,7 +13,7 @@ final class AbstractDriverMiddlewareTest extends TestCase
 {
     public function testConnect(): void
     {
-        $connection = $this->createMock(Connection::class);
+        $connection = self::createStub(Connection::class);
         $driver     = $this->createMock(Driver::class);
         $driver->expects(self::once())
             ->method('connect')

tests/Driver/Middleware/AbstractStatementMiddlewareTest.php

@@ -13,7 +13,7 @@ final class AbstractStatementMiddlewareTest extends TestCase
 {
     public function testExecute(): void
     {
-        $result    = $this->createMock(Result::class);
+        $result    = self::createStub(Result::class);
         $statement = $this->createMock(Statement::class);
         $statement->expects(self::once())
             ->method('execute')

tests/DriverManagerTest.php

@@ -38,7 +38,7 @@ public function testInvalidDriver(): void
     #[RequiresPhpExtension('sqlite3')]
     public function testCustomWrapper(): void
     {
-        $wrapper      = $this->createMock(Connection::class);
+        $wrapper      = self::createStub(Connection::class);
         $wrapperClass = $wrapper::class;
 
         $options = [

tests/Logging/MiddlewareTest.php

@@ -20,9 +20,9 @@ class MiddlewareTest extends TestCase
     #[Override]
     public function setUp(): void
     {
-        $connection = $this->createMock(Connection::class);
+        $connection = self::createStub(Connection::class);
 
-        $driver = $this->createMock(Driver::class);
+        $driver = self::createStub(Driver::class);
         $driver->method('connect')
             ->willReturn($connection);
 

tests/Portability/ConnectionTest.php

@@ -28,7 +28,7 @@ public function testGetNativeConnection(): void
         $nativeConnection = new class () {
         };
 
-        $driverConnection = $this->createMock(ConnectionInterface::class);
+        $driverConnection = self::createStub(ConnectionInterface::class);
         $driverConnection->method('getNativeConnection')
             ->willReturn($nativeConnection);
 

tests/Query/QueryBuilderTest.php

@@ -40,7 +40,7 @@ protected function setUp(): void
         $this->conn->method('createExpressionBuilder')
            ->willReturnCallback(fn () => new ExpressionBuilder($this->conn));
 
-        $platform = $this->createMock(AbstractPlatform::class);
+        $platform = self::createStub(AbstractPlatform::class);
         $platform->method('getUnionSelectPartSQL')
             ->willReturnArgument(0);
         $platform->method('getUnionAllSQL')

tests/Schema/ColumnTest.php

@@ -67,7 +67,7 @@ public function testSettingUnknownOptionIsStillSupported(): void
         $this->expectException(UnknownColumnOption::class);
         $this->expectExceptionMessage('The "unknown_option" column option is not supported.');
 
-        new Column('foo', $this->createMock(Type::class), ['unknown_option' => 'bar']);
+        new Column('foo', self::createStub(Type::class), ['unknown_option' => 'bar']);
     }
 
     public function testOptionsShouldNotBeIgnored(): void

tests/Schema/MySQLInheritCharsetTest.php

@@ -81,7 +81,7 @@ public function testTableOptions(): void
      */
     private function getTableOptionsForOverride(array $params = []): array
     {
-        $driverMock = $this->createMock(Driver::class);
+        $driverMock = self::createStub(Driver::class);
 
         $platform = new MySQLPlatform();
         $conn     = new Connection($params, $driverMock, new Configuration());

tests/Tools/DsnParserTest.php

@@ -185,7 +185,7 @@ public static function databaseUrls(): iterable
 
     public function testDriverClassScheme(): void
     {
-        $driverClass = get_class($this->createMock(Driver::class));
+        $driverClass = get_class(self::createStub(Driver::class));
         $parser      = new DsnParser(['custom' => $driverClass]);
         $actual      = $parser->parse('custom://foo:bar@localhost/baz');
 

tests/Types/BinaryTest.php

@@ -10,7 +10,7 @@
 use Doctrine\DBAL\Types\ConversionException;
 use Override;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 
 use function array_map;
@@ -21,13 +21,13 @@
 
 class BinaryTest extends TestCase
 {
-    protected AbstractPlatform&MockObject $platform;
+    protected AbstractPlatform&Stub $platform;
     protected BinaryType $type;
 
     #[Override]
     protected function setUp(): void
     {
-        $this->platform = $this->createMock(AbstractPlatform::class);
+        $this->platform = self::createStub(AbstractPlatform::class);
         $this->type     = new BinaryType();
     }
 

tests/Types/BlobTest.php

@@ -7,18 +7,18 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\BlobType;
 use Override;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 
 class BlobTest extends TestCase
 {
-    protected AbstractPlatform&MockObject $platform;
+    protected AbstractPlatform&Stub $platform;
     protected BlobType $type;
 
     #[Override]
     protected function setUp(): void
     {
-        $this->platform = $this->createMock(AbstractPlatform::class);
+        $this->platform = self::createStub(AbstractPlatform::class);
         $this->type     = new BlobType();
     }
 

tests/Types/ConversionExceptionTest.php

@@ -20,7 +20,7 @@ class ConversionExceptionTest extends TestCase
 {
     public function testConversionFailedPreviousException(): void
     {
-        $previous = $this->createMock(Throwable::class);
+        $previous = self::createStub(Throwable::class);
 
         $exception = ValueNotConvertible::new('foo', 'foo', null, $previous);
 
@@ -55,7 +55,7 @@ public function testConversionFailedInvalidTypeWithNonScalar(mixed $nonScalar):
 
     public function testConversionFailedInvalidTypePreviousException(): void
     {
-        $previous = $this->createMock(Throwable::class);
+        $previous = self::createStub(Throwable::class);
 
         $exception = InvalidType::new('foo', 'foo', ['bar', 'baz'], $previous);
 
@@ -64,7 +64,7 @@ public function testConversionFailedInvalidTypePreviousException(): void
 
     public function testConversionFailedFormatPreservesPreviousException(): void
     {
-        $previous = $this->createMock(Throwable::class);
+        $previous = self::createStub(Throwable::class);
 
         $exception = InvalidFormat::new('foo', 'bar', 'baz', $previous);
 

tests/Types/DateImmutableTypeTest.php

@@ -6,6 +6,7 @@
 
 use DateTime;
 use DateTimeImmutable;
+use DateTimeZone;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
@@ -38,15 +39,11 @@ public function testReturnsBindingType(): void
 
     public function testConvertsDateTimeImmutableInstanceToDatabaseValue(): void
     {
-        $date = $this->createMock(DateTimeImmutable::class);
+        $date = new DateTimeImmutable('2016-01-01 12:34:56', new DateTimeZone('UTC'));
 
         $this->platform->expects(self::once())
             ->method('getDateFormatString')
             ->willReturn('Y-m-d');
-        $date->expects(self::once())
-            ->method('format')
-            ->with('Y-m-d')
-            ->willReturn('2016-01-01');
 
         self::assertSame(
             '2016-01-01',

tests/Types/DateIntervalTest.php

@@ -11,19 +11,19 @@
 use Doctrine\DBAL\Types\DateIntervalType;
 use Override;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
 final class DateIntervalTest extends TestCase
 {
-    private AbstractPlatform&MockObject $platform;
+    private AbstractPlatform&Stub $platform;
     private DateIntervalType $type;
 
     #[Override]
     protected function setUp(): void
     {
-        $this->platform = $this->createMock(AbstractPlatform::class);
+        $this->platform = self::createStub(AbstractPlatform::class);
         $this->type     = new DateIntervalType();
     }
 

tests/Types/DateTimeImmutableTypeTest.php

@@ -6,6 +6,7 @@
 
 use DateTime;
 use DateTimeImmutable;
+use DateTimeZone;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
@@ -38,15 +39,11 @@ public function testReturnsBindingType(): void
 
     public function testConvertsDateTimeImmutableInstanceToDatabaseValue(): void
     {
-        $date = $this->createMock(DateTimeImmutable::class);
+        $date = new DateTimeImmutable('2016-01-01 15:58:59', new DateTimeZone('UTC'));
 
         $this->platform->expects(self::once())
             ->method('getDateTimeFormatString')
             ->willReturn('Y-m-d H:i:s');
-        $date->expects(self::once())
-            ->method('format')
-            ->with('Y-m-d H:i:s')
-            ->willReturn('2016-01-01 15:58:59');
 
         self::assertSame(
             '2016-01-01 15:58:59',

tests/Types/DateTimeTzImmutableTypeTest.php

@@ -6,6 +6,7 @@
 
 use DateTime;
 use DateTimeImmutable;
+use DateTimeZone;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
@@ -38,15 +39,11 @@ public function testReturnsBindingType(): void
 
     public function testConvertsDateTimeImmutableInstanceToDatabaseValue(): void
     {
-        $date = $this->createMock(DateTimeImmutable::class);
+        $date = new DateTimeImmutable('2016-01-01 15:58:59', new DateTimeZone('UTC'));
 
         $this->platform->expects(self::once())
             ->method('getDateTimeTzFormatString')
             ->willReturn('Y-m-d H:i:s T');
-        $date->expects(self::once())
-            ->method('format')
-            ->with('Y-m-d H:i:s T')
-            ->willReturn('2016-01-01 15:58:59 UTC');
 
         self::assertSame(
             '2016-01-01 15:58:59 UTC',

tests/Types/DecimalTest.php

@@ -7,18 +7,18 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\DecimalType;
 use Override;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 
 class DecimalTest extends TestCase
 {
-    private AbstractPlatform&MockObject $platform;
+    private AbstractPlatform&Stub $platform;
     private DecimalType $type;
 
     #[Override]
     protected function setUp(): void
     {
-        $this->platform = $this->createMock(AbstractPlatform::class);
+        $this->platform = self::createStub(AbstractPlatform::class);
         $this->type     = new DecimalType();
     }