From 3887cea490b0a2bc6dcf2e579660868dcb70deeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Fri, 1 Apr 2022 22:56:03 +0200
Subject: [PATCH 1/4] Drop support for DBAL 2 and PHP 7.2

DBAL 3 requires PHP 7.3
---
 .appveyor.yml                                 |   3 +-
 .github/workflows/continuous-integration.yml  |  14 +--
 .github/workflows/static-analysis.yml         |  18 +--
 composer.json                                 |   6 +-
 download-box.sh                               |   2 +-
 lib/Doctrine/Migrations/AbstractMigration.php |   5 +-
 lib/Doctrine/Migrations/DependencyFactory.php |  23 +---
 lib/Doctrine/Migrations/FileQueryWriter.php   |   2 +-
 .../Generator/ConcatenationFileBuilder.php    |   2 +-
 .../Migrations/Generator/DiffGenerator.php    |  13 +-
 .../Metadata/Storage/TableMetadataStorage.php |   9 +-
 .../Provider/DBALSchemaDiffProvider.php       |   6 -
 .../Tools/Console/ConsoleRunner.php           |   9 --
 .../Migrations/Tools/TransactionHelper.php    |   8 +-
 phpcs.xml.dist                                |   6 +-
 phpstan-dbal-2.neon.dist                      |  42 -------
 phpstan-dbal-3.neon.dist                      |  57 ---------
 phpstan-common.neon.dist => phpstan.neon.dist |  10 +-
 .../Tests/AbstractMigrationTest.php           |   6 +-
 .../ConnectionRegistryLoaderTest.php          |   3 +-
 .../EntityManagerRegistryLoaderTest.php       |   3 +-
 .../Tests/DependencyFactoryTest.php           |   5 +-
 ...dencyFactoryWithConnectionRegistryTest.php |   9 +-
 ...cyFactoryWithEntityManagerRegistryTest.php |   9 +-
 .../Migrations/Tests/Event/EventArgsTest.php  |   3 +-
 .../Listeners/AutoCommitListenerTest.php      |   3 +-
 .../Tests/Finder/FinderTestCase.php           |   3 +-
 .../Generator/ClassNameGeneratorTest.php      |   8 +-
 .../ConcatenationFileBuilderTest.php          |   3 +-
 .../Tests/Generator/DiffGeneratorTest.php     | 117 +++++++-----------
 .../Tests/Generator/GeneratorTest.php         |   6 +-
 .../Tests/Generator/SqlGeneratorTest.php      |  11 +-
 .../Tests/InlineParameterFormatterTest.php    |   9 +-
 .../Metadata/AvailableMigrationListTest.php   |   3 +-
 .../Tests/Metadata/MigrationPlanListTest.php  |  17 +--
 .../Tests/Metadata/Storage/DebugLogger.php    |  23 ++++
 .../ExistingTableMetadataStorageTest.php      |  20 ++-
 .../Storage/TableMetadataStorageTest.php      |  39 +++---
 .../FilesystemMigrationsRepositoryTest.php    |   3 +-
 .../Tests/MigratorConfigurationTest.php       |   3 +-
 .../Migrations/Tests/MigratorTest.php         |  15 +--
 .../Doctrine/Migrations/Tests/Provider/A.php  |   3 +-
 .../Doctrine/Migrations/Tests/Provider/B.php  |   3 +-
 .../Doctrine/Migrations/Tests/Provider/C.php  |   3 +-
 .../Provider/EmptySchemaProviderTest.php      |   3 +-
 .../Tests/Provider/OrmSchemaProviderTest.php  |  12 +-
 .../Tests/Provider/SchemaDiffProviderTest.php |   5 +-
 .../Doctrine/Migrations/Tests/RollupTest.php  |   3 +-
 .../Migrations/Tests/SchemaDumperTest.php     |   3 +-
 .../Stub/CustomClassNameMigrationFactory.php  |   3 +-
 .../Tests/Stub/DoctrineRegistry.php           |   4 +-
 .../Doctrine/Migrations/Tests/TestLogger.php  |   2 +-
 .../Console/Command/CurrentCommandTest.php    |  12 +-
 .../Tools/Console/Command/DiffCommandTest.php |   9 +-
 .../Console/Command/DoctrineCommandTest.php   |   6 +-
 .../Console/Command/DumpSchemaCommandTest.php |   9 +-
 .../Console/Command/ExecuteCommandTest.php    |  15 +--
 .../Console/Command/GenerateCommandTest.php   |   9 +-
 .../Console/Command/LatestCommandTest.php     |  12 +-
 .../Tools/Console/Command/ListCommandTest.php |  12 +-
 .../Console/Command/MigrateCommandTest.php    |  43 +++----
 .../Console/Command/MigrationVersionTest.php  |  12 +-
 .../Console/Command/RollupCommandTest.php     |   6 +-
 .../Console/Command/StatusCommandTest.php     |   9 +-
 .../Command/SyncMetadataCommandTest.php       |   6 +-
 .../Console/Command/UpToDateCommandTest.php   |  18 +--
 .../Tests/Tools/Console/ConsoleLoggerTest.php |   3 +-
 .../Tests/Tools/Console/ConsoleRunnerTest.php |  57 +--------
 .../Helper/MigrationDirectoryHelperTest.php   |   9 +-
 .../Console/legacy-config-dbal/cli-config.php |  13 --
 .../Console/legacy-config-dbal/migrations.php |   5 -
 .../legacy-config-wrong/cli-config.php        |  13 --
 .../Tests/Tools/TransactionHelperTest.php     |  14 +--
 .../Tests/Version/AliasResolverTest.php       |  15 +--
 .../Tests/Version/DbalFactoryTest.php         |   3 +-
 .../Tests/Version/ExecutionResultTest.php     |   3 +-
 .../Migrations/Tests/Version/ExecutorTest.php |  54 +++-----
 .../Fixture/VersionExecutorTestMigration.php  |  21 ++--
 .../Version/MigrationPlanCalculatorTest.php   |   3 +-
 .../Version/MigrationStatusCalculatorTest.php |   3 +-
 80 files changed, 278 insertions(+), 716 deletions(-)
 delete mode 100644 phpstan-dbal-2.neon.dist
 delete mode 100644 phpstan-dbal-3.neon.dist
 rename phpstan-common.neon.dist => phpstan.neon.dist (83%)
 create mode 100644 tests/Doctrine/Migrations/Tests/Metadata/Storage/DebugLogger.php
 delete mode 100644 tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php
 delete mode 100644 tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/migrations.php
 delete mode 100644 tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php

diff --git a/.appveyor.yml b/.appveyor.yml
index 4066d57336..e051afa0a0 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,8 +13,7 @@ cache:
 
 environment:
   matrix:
-    - php: 7.2.25
-    - php: 7.3.12
+    - php: 7.4.28
 
 init:
   - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;C:\tools\composer;%PATH%
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 01581276ac..2ada42d84e 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -25,22 +25,14 @@ jobs:
 
     strategy:
       matrix:
-        dbal-version:
-          - "^2.11"
-          - "^3.0"
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
         dependencies:
           - "highest"
         include:
           - deps: "lowest"
-            php-version: "7.2"
-        exclude:
-          - dbal-version: "^3.0"
-            php-version: "7.2"
+            php-version: "7.4"
 
     steps:
       - name: "Checkout"
@@ -59,10 +51,6 @@ jobs:
       - name: "Download box"
         run: "./download-box.sh"
 
-      - name: "Require the right DBAL version"
-        run: "composer require doctrine/dbal:${{ matrix.dbal-version }} --no-update"
-        if: "${{ matrix.dbal-version }}"
-
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 029dc0c3f3..8b120727ca 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -16,16 +16,9 @@ jobs:
 
     strategy:
       matrix:
-        dbal-version:
-          - "^2.11"
-          - "^3.0"
         php-version:
-          - "7.2"
           - "7.4"
           - "8.0"
-        exclude:
-          - dbal-version: "^3.0"
-            php-version: "7.2"
 
     steps:
       - name: "Checkout code"
@@ -38,17 +31,10 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           extensions: "pdo_sqlite"
 
-      - name: "Require the right DBAL version"
-        run: "composer require doctrine/dbal:${{ matrix.dbal-version }} --no-update"
-
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
 
-      - name: "Run a static analysis with phpstan/phpstan (dbal v2)"
-        run: "vendor/bin/phpstan analyse -c phpstan-dbal-2.neon.dist"
-        if: "contains(matrix.dbal-version, '^2.')"
-      - name: "Run a static analysis with phpstan/phpstan (dbal v3)"
-        run: "vendor/bin/phpstan analyse -c phpstan-dbal-3.neon.dist"
-        if: "contains(matrix.dbal-version, '^3.')"
+      - name: "Run a static analysis with phpstan/phpstan"
+        run: "vendor/bin/phpstan analyse -c phpstan.neon.dist"
diff --git a/composer.json b/composer.json
index 80023f2412..ba6a904d72 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,9 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "composer-runtime-api": "^2",
-        "doctrine/dbal": "^2.11 || ^3.0",
+        "doctrine/dbal": "^3.3",
         "doctrine/deprecations": "^0.5.3",
         "doctrine/event-manager": "^1.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
@@ -46,7 +46,7 @@
         "phpstan/phpstan-phpunit": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-symfony": "^1.1",
-        "phpunit/phpunit": "^8.5 || ^9.4",
+        "phpunit/phpunit": "^9.4",
         "symfony/cache": "^3.4.26 || ^4.2.12 || ^5.0 || ^6.0",
         "symfony/process": "^3.4 || ^4.0 || ^5.0 || ^6.0",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0"
diff --git a/download-box.sh b/download-box.sh
index 554a0dc725..ee610f9cdf 100755
--- a/download-box.sh
+++ b/download-box.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 if [ ! -f box.phar ]; then
-    wget https://github.com/box-project/box/releases/download/$(php -r 'echo PHP_VERSION_ID >= 70300 ? "3.11.0" : "3.9.1";')/box.phar -O box.phar
+    wget https://github.com/box-project/box/releases/download/3.11.0/box.phar -O box.phar
 fi
diff --git a/lib/Doctrine/Migrations/AbstractMigration.php b/lib/Doctrine/Migrations/AbstractMigration.php
index 04981bbff5..0f4d9b5e5a 100644
--- a/lib/Doctrine/Migrations/AbstractMigration.php
+++ b/lib/Doctrine/Migrations/AbstractMigration.php
@@ -16,7 +16,6 @@
 use Doctrine\Migrations\Query\Query;
 use Psr\Log\LoggerInterface;
 
-use function method_exists;
 use function sprintf;
 
 /**
@@ -43,9 +42,7 @@ abstract class AbstractMigration
     public function __construct(Connection $connection, LoggerInterface $logger)
     {
         $this->connection = $connection;
-        $this->sm         = method_exists($this->connection, 'createSchemaManager')
-                             ? $this->connection->createSchemaManager()
-                             : $this->connection->getSchemaManager();
+        $this->sm         = $this->connection->createSchemaManager();
         $this->platform   = $this->connection->getDatabasePlatform();
         $this->logger     = $logger;
     }
diff --git a/lib/Doctrine/Migrations/DependencyFactory.php b/lib/Doctrine/Migrations/DependencyFactory.php
index fbba91f5b9..1f5fe25a1a 100644
--- a/lib/Doctrine/Migrations/DependencyFactory.php
+++ b/lib/Doctrine/Migrations/DependencyFactory.php
@@ -5,8 +5,6 @@
 namespace Doctrine\Migrations;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\Migrations\Configuration\Configuration;
 use Doctrine\Migrations\Configuration\Connection\ConnectionLoader;
 use Doctrine\Migrations\Configuration\EntityManager\EntityManagerLoader;
@@ -53,7 +51,6 @@
 
 use function array_key_exists;
 use function call_user_func;
-use function method_exists;
 use function preg_quote;
 use function sprintf;
 
@@ -234,7 +231,7 @@ public function getSchemaDumper(): SchemaDumper
 
             return new SchemaDumper(
                 $this->getConnection()->getDatabasePlatform(),
-                $this->getSchemaManager($this->getConnection()),
+                $this->getConnection()->createSchemaManager(),
                 $this->getMigrationGenerator(),
                 $this->getMigrationSqlGenerator(),
                 $excludedTables
@@ -242,22 +239,10 @@ public function getSchemaDumper(): SchemaDumper
         });
     }
 
-    /**
-     * @return AbstractSchemaManager<AbstractPlatform>
-     */
-    private function getSchemaManager(Connection $connection): AbstractSchemaManager
-    {
-        return method_exists($connection, 'createSchemaManager')
-            ? $connection->createSchemaManager()
-            : $connection->getSchemaManager();
-    }
-
     private function getEmptySchemaProvider(): SchemaProvider
     {
         return $this->getDependency(EmptySchemaProvider::class, function (): SchemaProvider {
-            return new EmptySchemaProvider(
-                $this->getSchemaManager($this->getConnection())
-            );
+            return new EmptySchemaProvider($this->connection->createSchemaManager());
         });
     }
 
@@ -288,7 +273,7 @@ public function getDiffGenerator(): DiffGenerator
         return $this->getDependency(DiffGenerator::class, function (): DiffGenerator {
             return new DiffGenerator(
                 $this->getConnection()->getConfiguration(),
-                $this->getSchemaManager($this->getConnection()),
+                $this->getConnection()->createSchemaManager(),
                 $this->getSchemaProvider(),
                 $this->getConnection()->getDatabasePlatform(),
                 $this->getMigrationGenerator(),
@@ -303,7 +288,7 @@ public function getSchemaDiffProvider(): SchemaDiffProvider
         return $this->getDependency(SchemaDiffProvider::class, function (): LazySchemaDiffProvider {
             return LazySchemaDiffProvider::fromDefaultProxyFactoryConfiguration(
                 new DBALSchemaDiffProvider(
-                    $this->getSchemaManager($this->getConnection()),
+                    $this->getConnection()->createSchemaManager(),
                     $this->getConnection()->getDatabasePlatform()
                 )
             );
diff --git a/lib/Doctrine/Migrations/FileQueryWriter.php b/lib/Doctrine/Migrations/FileQueryWriter.php
index 5502834951..741db2bd88 100644
--- a/lib/Doctrine/Migrations/FileQueryWriter.php
+++ b/lib/Doctrine/Migrations/FileQueryWriter.php
@@ -44,7 +44,7 @@ public function write(
         array $queriesByVersion,
         ?DateTimeInterface $now = null
     ): bool {
-        $now = $now ?? new DateTimeImmutable();
+        $now ??= new DateTimeImmutable();
 
         $string = $this->migrationFileBuilder
             ->buildMigrationFile($queriesByVersion, $direction, $now);
diff --git a/lib/Doctrine/Migrations/Generator/ConcatenationFileBuilder.php b/lib/Doctrine/Migrations/Generator/ConcatenationFileBuilder.php
index 3faec9a6de..3b12a0050a 100644
--- a/lib/Doctrine/Migrations/Generator/ConcatenationFileBuilder.php
+++ b/lib/Doctrine/Migrations/Generator/ConcatenationFileBuilder.php
@@ -23,7 +23,7 @@ public function buildMigrationFile(
         string $direction,
         ?DateTimeInterface $now = null
     ): string {
-        $now    = $now ?? new DateTimeImmutable();
+        $now  ??= new DateTimeImmutable();
         $string = sprintf("-- Doctrine Migration File Generated on %s\n", $now->format('Y-m-d H:i:s'));
 
         foreach ($queriesByVersion as $version => $queries) {
diff --git a/lib/Doctrine/Migrations/Generator/DiffGenerator.php b/lib/Doctrine/Migrations/Generator/DiffGenerator.php
index 7777557007..48e8e68c14 100644
--- a/lib/Doctrine/Migrations/Generator/DiffGenerator.php
+++ b/lib/Doctrine/Migrations/Generator/DiffGenerator.php
@@ -12,7 +12,6 @@
 use Doctrine\Migrations\Generator\Exception\NoChangesDetected;
 use Doctrine\Migrations\Provider\SchemaProvider;
 
-use function method_exists;
 use function preg_match;
 use function strpos;
 use function substr;
@@ -96,13 +95,9 @@ static function ($assetName) use ($filterExpression) {
 
         $toSchema = $this->createToSchema();
 
-        if (method_exists($this->schemaManager, 'createComparator')) {
-            $comparator = $this->schemaManager->createComparator();
-        }
+        $comparator = $this->schemaManager->createComparator();
 
-        $upSql = isset($comparator) ?
-            $comparator->compareSchemas($fromSchema, $toSchema)->toSql($this->platform) :
-            $fromSchema->getMigrateToSql($toSchema, $this->platform);
+        $upSql = $comparator->compareSchemas($fromSchema, $toSchema)->toSql($this->platform);
 
         $up = $this->migrationSqlGenerator->generate(
             $upSql,
@@ -111,9 +106,7 @@ static function ($assetName) use ($filterExpression) {
             $checkDbPlatform
         );
 
-        $downSql = isset($comparator) ?
-            $comparator->compareSchemas($toSchema, $fromSchema)->toSql($this->platform) :
-            $fromSchema->getMigrateFromSql($toSchema, $this->platform);
+        $downSql = $comparator->compareSchemas($toSchema, $fromSchema)->toSql($this->platform);
 
         $down = $this->migrationSqlGenerator->generate(
             $downSql,
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php b/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
index 9b0dc8a07a..2a82fb90a3 100644
--- a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
+++ b/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
@@ -9,7 +9,6 @@
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\Types;
@@ -26,7 +25,6 @@
 
 use function array_change_key_case;
 use function floatval;
-use function method_exists;
 use function round;
 use function sprintf;
 use function strlen;
@@ -70,7 +68,7 @@ public function __construct(
     ) {
         $this->migrationRepository = $migrationRepository;
         $this->connection          = $connection;
-        $this->schemaManager       = $connection->getSchemaManager();
+        $this->schemaManager       = $connection->createSchemaManager();
         $this->platform            = $connection->getDatabasePlatform();
 
         if ($configuration !== null && ! ($configuration instanceof TableMetadataStorageConfiguration)) {
@@ -185,11 +183,8 @@ private function needsUpdate(Table $expectedTable): ?TableDiff
             return null;
         }
 
-        $comparator   = method_exists($this->schemaManager, 'createComparator') ?
-            $this->schemaManager->createComparator() :
-            new Comparator();
         $currentTable = $this->schemaManager->listTableDetails($this->configuration->getTableName());
-        $diff         = $comparator->diffTable($currentTable, $expectedTable);
+        $diff         = $this->schemaManager->createComparator()->diffTable($currentTable, $expectedTable);
 
         return $diff instanceof TableDiff ? $diff : null;
     }
diff --git a/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php b/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
index ba9db67789..dd9459921d 100644
--- a/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
+++ b/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
@@ -8,8 +8,6 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Schema;
 
-use function method_exists;
-
 /**
  * The SchemaDiffProvider class is responsible for providing a Doctrine\DBAL\Schema\Schema instance that
  * represents the current state of your database. A clone of this Schema instance is passed to each of your migrations
@@ -50,10 +48,6 @@ public function createToSchema(Schema $fromSchema): Schema
     /** @return string[] */
     public function getSqlDiffToMigrate(Schema $fromSchema, Schema $toSchema): array
     {
-        if (! method_exists($this->schemaManager, 'createComparator')) {
-            return $fromSchema->getMigrateToSql($toSchema, $this->platform);
-        }
-
         return $this->schemaManager->createComparator()->compareSchemas(
             $fromSchema,
             $toSchema
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php b/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
index 35c38f6030..62203df067 100644
--- a/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
+++ b/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
@@ -5,8 +5,6 @@
 namespace Doctrine\Migrations\Tools\Console;
 
 use Composer\InstalledVersions;
-use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
-use Doctrine\Migrations\Configuration\Connection\ExistingConnection;
 use Doctrine\Migrations\Configuration\EntityManager\ExistingEntityManager;
 use Doctrine\Migrations\Configuration\Migration\ConfigurationFileWithFallback;
 use Doctrine\Migrations\DependencyFactory;
@@ -153,13 +151,6 @@ private static function checkLegacyConfiguration($dependencyFactory, string $con
             );
         }
 
-        if ($dependencyFactory->has('db') && $dependencyFactory->get('db') instanceof ConnectionHelper) {
-            return DependencyFactory::fromConnection(
-                $configurations,
-                new ExistingConnection($dependencyFactory->get('db')->getConnection())
-            );
-        }
-
         throw new RuntimeException(sprintf(
             'Configuration HelperSet returned by "%s" does not have a valid "em" or the "db" helper.',
             $configurationFile
diff --git a/lib/Doctrine/Migrations/Tools/TransactionHelper.php b/lib/Doctrine/Migrations/Tools/TransactionHelper.php
index 1f1f26f18d..581088d188 100644
--- a/lib/Doctrine/Migrations/Tools/TransactionHelper.php
+++ b/lib/Doctrine/Migrations/Tools/TransactionHelper.php
@@ -72,11 +72,9 @@ private static function inTransaction(Connection $connection): bool
      */
     private static function getInnerConnection(Connection $connection)
     {
-        if (method_exists($connection, 'getNativeConnection')) {
-            try {
-                return $connection->getNativeConnection();
-            } catch (LogicException $e) {
-            }
+        try {
+            return $connection->getNativeConnection();
+        } catch (LogicException $e) {
         }
 
         $innermostConnection = $connection;
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 4a4a3c53c7..f5e8cd7fdf 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -6,7 +6,7 @@
     <arg name="cache" value=".phpcs-cache"/>
     <arg name="colors"/>
 
-    <config name="php_version" value="70200"/>
+    <config name="php_version" value="70400"/>
 
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>
@@ -17,6 +17,10 @@
 
     <rule ref="Doctrine"/>
 
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint">
+        <exclude-pattern>*/lib/*</exclude-pattern>
+    </rule>
+
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
diff --git a/phpstan-dbal-2.neon.dist b/phpstan-dbal-2.neon.dist
deleted file mode 100644
index bda8951e2c..0000000000
--- a/phpstan-dbal-2.neon.dist
+++ /dev/null
@@ -1,42 +0,0 @@
-includes:
-    - phpstan-common.neon.dist
-
-parameters:
-    ignoreErrors:
-
-        -
-            message: '~^Fetching class constant class of deprecated class Doctrine\\DBAL\\Tools\\Console\\Helper\\ConnectionHelper~'
-            path: %currentWorkingDirectory%/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
-
-        -
-            message: "~^Casting to string something that's already string~"
-            path: %currentWorkingDirectory%/lib/Doctrine/Migrations/Tools/Console/Command/*Command.php
-
-        -
-            message: '~^Instantiation of deprecated class~'
-            paths:
-                - tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php
-                - tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php
-
-        -
-            message: '~.*AbstractSchemaManager.*is not generic\.$~'
-            paths:
-                - lib/Doctrine/Migrations/SchemaDumper.php
-                - lib/Doctrine/Migrations/AbstractMigration.php
-                - lib/Doctrine/Migrations/DependencyFactory.php
-                - lib/Doctrine/Migrations/Generator/DiffGenerator.php
-                - lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
-                - lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
-                - lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php
-                - tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php
-                - tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
-                - tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
-                - tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php
-                - tests/Doctrine/Migrations/Tests/SchemaDumperTest.php
-
-        - '~Trying to mock an undefined method getNativeConnection\(\) on class Doctrine\\DBAL\\Connection~'
-
-        -
-            message: '~^Expression on left side of \?\? is not nullable\.$~'
-            paths:
-                - lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php
diff --git a/phpstan-dbal-3.neon.dist b/phpstan-dbal-3.neon.dist
deleted file mode 100644
index 753903fee5..0000000000
--- a/phpstan-dbal-3.neon.dist
+++ /dev/null
@@ -1,57 +0,0 @@
-includes:
-    - phpstan-common.neon.dist
-
-parameters:
-
-    ignoreErrors:
-        - "~Call to function method_exists\\(\\) with Doctrine\\\\DBAL\\\\Connection and 'createSchemaManager' will always evaluate to true~"
-        - '~^Call to deprecated method getSchemaManager\(\) of class Doctrine\\DBAL\\Connection~'
-        -
-            message: '~^Parameter.* class Symfony\\Component\\Console\\Helper\\HelperSet constructor expects ~'
-            paths:
-                - tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php
-                - tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php
-        -
-            message: '~^Class Doctrine\\DBAL\\Tools\\Console\\Helper\\ConnectionHelper not found~'
-            path: lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
-        -
-            message: '~^Call to method getConnection\(\) on an unknown class Doctrine\\DBAL\\Tools\\Console\\Helper\\ConnectionHelper~'
-            path: lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
-        -
-            message: '~Instantiated class Doctrine\\DBAL\\Tools\\Console\\Helper\\ConnectionHelper not found~'
-            paths:
-                - tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php
-                - tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php
-
-        # Compatibility with DBAL 2
-        -
-            message: '~Call to deprecated method getMigrate(From|ToSql)~'
-            paths:
-                - lib/Doctrine/Migrations/Generator/DiffGenerator.php
-                - lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
-
-        -
-            message: '~Call to deprecated method getWrappedConnection~'
-            paths:
-                - tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
-
-        -
-            message: "~Call to function method_exists.*'getNativeConnection' will always evaluate to true.~"
-            paths:
-                - lib/Doctrine/Migrations/Tools/TransactionHelper.php
-                - tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
-                - tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php
-
-        -
-            message: "~Call to function method_exists.*'createComparator' will always evaluate to true.~"
-            paths:
-                - lib/Doctrine/Migrations/Generator/DiffGenerator.php
-                - lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
-                - lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
-                - tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php
-                - tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
-
-        # Switch to Logging\Connection after dropping compatibility with DBAL 2
-        -
-            message: '~deprecated.*DebugStack~'
-            path: tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
diff --git a/phpstan-common.neon.dist b/phpstan.neon.dist
similarity index 83%
rename from phpstan-common.neon.dist
rename to phpstan.neon.dist
index 3c45292446..9e738289e4 100644
--- a/phpstan-common.neon.dist
+++ b/phpstan.neon.dist
@@ -24,19 +24,11 @@ parameters:
             message: '~^Method Doctrine\\Migrations\\Tests\\Stub\\DoctrineRegistry::getService\(\) should return Doctrine\\Persistence\\ObjectManager but returns Doctrine\\DBAL\\Connection\|Doctrine\\ORM\\EntityManager~'
             path: tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
 
-        - '~^Property Doctrine\\Migrations\\Tests\\Provider\\\w+::\$id is never written, only read\.$~'
-
         # https://github.com/phpstan/phpstan/issues/5982
         -
             message: '~^Cannot call method getWrappedConnection\(\) on class-string\|object\.~'
             path: lib/Doctrine/Migrations/Tools/TransactionHelper.php
 
-        # Requires PHPUnit 9
-        -
-            message: '~assert.*Reg~'
-            paths:
-                - tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php
-
         # TODO: Be more precise about class-strings
         -
             message: '~^Method Doctrine\\Migrations\\Version\\DbalMigrationFactory::createVersion\(\) should return Doctrine\\Migrations\\AbstractMigration but returns object\.$~'
@@ -44,7 +36,7 @@ parameters:
                 - lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
 
     symfony:
-            console_application_loader: %currentWorkingDirectory%/tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
+            console_application_loader: tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
 includes:
     - vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
diff --git a/tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php b/tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php
index 6af33c4591..b7c9c23380 100644
--- a/tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php
+++ b/tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php
@@ -14,11 +14,9 @@
 
 class AbstractMigrationTest extends MigrationTestCase
 {
-    /** @var AbstractMigrationStub */
-    private $migration;
+    private AbstractMigrationStub $migration;
 
-    /** @var TestLogger */
-    private $logger;
+    private TestLogger $logger;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionRegistryLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionRegistryLoaderTest.php
index 689a2b56e2..da7141a268 100644
--- a/tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionRegistryLoaderTest.php
+++ b/tests/Doctrine/Migrations/Tests/Configuration/Connection/ConnectionRegistryLoaderTest.php
@@ -20,8 +20,7 @@ final class ConnectionRegistryLoaderTest extends TestCase
     /** @var Connection|MockObject */
     private $connection2;
 
-    /** @var AbstractManagerRegistry */
-    private $registry;
+    private AbstractManagerRegistry $registry;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php
index 509c6f7190..d2a2ba1fe5 100644
--- a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php
+++ b/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/EntityManagerRegistryLoaderTest.php
@@ -20,8 +20,7 @@ final class EntityManagerRegistryLoaderTest extends TestCase
     /** @var EntityManager|MockObject */
     private $em2;
 
-    /** @var AbstractManagerRegistry */
-    private $registry;
+    private AbstractManagerRegistry $registry;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php b/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php
index b4ec786a8e..7b6da44290 100644
--- a/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php
+++ b/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php
@@ -31,8 +31,7 @@ final class DependencyFactoryTest extends MigrationTestCase
     /** @var MockObject|Connection */
     private $connection;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
     /** @var EntityManager|MockObject */
     private $entityManager;
@@ -256,7 +255,7 @@ public function testMetadataConfigurationIsPassedToTableStorage(): void
         $di = DependencyFactory::fromConnection(new ExistingConfiguration($configuration), new ExistingConnection($connection));
         $di->getMetadataStorage()->ensureInitialized();
 
-        self::assertTrue($connection->getSchemaManager()->tablesExist(['foo']));
+        self::assertTrue($connection->createSchemaManager()->tablesExist(['foo']));
         self::assertTrue($di->isFrozen());
     }
 }
diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryWithConnectionRegistryTest.php b/tests/Doctrine/Migrations/Tests/DependencyFactoryWithConnectionRegistryTest.php
index 4761947353..a8f17ba9e1 100644
--- a/tests/Doctrine/Migrations/Tests/DependencyFactoryWithConnectionRegistryTest.php
+++ b/tests/Doctrine/Migrations/Tests/DependencyFactoryWithConnectionRegistryTest.php
@@ -21,14 +21,11 @@ final class DependencyFactoryWithConnectionRegistryTest extends MigrationTestCas
     /** @var MockObject|Connection */
     private $connection2;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var AbstractManagerRegistry */
-    private $registry;
+    private AbstractManagerRegistry $registry;
 
-    /** @var DependencyFactory */
-    private $di;
+    private DependencyFactory $di;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryWithEntityManagerRegistryTest.php b/tests/Doctrine/Migrations/Tests/DependencyFactoryWithEntityManagerRegistryTest.php
index 1c2f55b729..93b6c4eb8e 100644
--- a/tests/Doctrine/Migrations/Tests/DependencyFactoryWithEntityManagerRegistryTest.php
+++ b/tests/Doctrine/Migrations/Tests/DependencyFactoryWithEntityManagerRegistryTest.php
@@ -28,14 +28,11 @@ final class DependencyFactoryWithEntityManagerRegistryTest extends MigrationTest
     /** @var MockObject|EntityManager */
     private $em2;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var AbstractManagerRegistry */
-    private $registry;
+    private AbstractManagerRegistry $registry;
 
-    /** @var DependencyFactory */
-    private $di;
+    private DependencyFactory $di;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Event/EventArgsTest.php b/tests/Doctrine/Migrations/Tests/Event/EventArgsTest.php
index 67ecb5a7c0..4975f8e5b3 100644
--- a/tests/Doctrine/Migrations/Tests/Event/EventArgsTest.php
+++ b/tests/Doctrine/Migrations/Tests/Event/EventArgsTest.php
@@ -24,8 +24,7 @@ class EventArgsTest extends TestCase
     /** @var MockObject|MigratorConfiguration */
     private $config;
 
-    /** @var MigrationPlan */
-    private $plan;
+    private MigrationPlan $plan;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Event/Listeners/AutoCommitListenerTest.php b/tests/Doctrine/Migrations/Tests/Event/Listeners/AutoCommitListenerTest.php
index 6045adabad..b2d2e46f28 100644
--- a/tests/Doctrine/Migrations/Tests/Event/Listeners/AutoCommitListenerTest.php
+++ b/tests/Doctrine/Migrations/Tests/Event/Listeners/AutoCommitListenerTest.php
@@ -19,8 +19,7 @@ class AutoCommitListenerTest extends MigrationTestCase
     /** @var Connection|MockObject */
     private $conn;
 
-    /** @var AutoCommitListener */
-    private $listener;
+    private AutoCommitListener $listener;
 
     public function testListenerDoesNothingDuringADryRun(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Finder/FinderTestCase.php b/tests/Doctrine/Migrations/Tests/Finder/FinderTestCase.php
index 6fb9d71f1a..87a7ba0f55 100644
--- a/tests/Doctrine/Migrations/Tests/Finder/FinderTestCase.php
+++ b/tests/Doctrine/Migrations/Tests/Finder/FinderTestCase.php
@@ -9,8 +9,7 @@
 
 abstract class FinderTestCase extends MigrationTestCase
 {
-    /** @var MigrationFinder */
-    protected $finder;
+    protected MigrationFinder $finder;
 
     public function testClassesInMultipleNamespacesCanBeLoadedByTheFinder(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php b/tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php
index cdfdc8fa74..b67b282720 100644
--- a/tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Generator/ClassNameGeneratorTest.php
@@ -7,8 +7,6 @@
 use Doctrine\Migrations\Generator\ClassNameGenerator;
 use PHPUnit\Framework\TestCase;
 
-use function method_exists;
-
 class ClassNameGeneratorTest extends TestCase
 {
     public function testName(): void
@@ -16,10 +14,6 @@ public function testName(): void
         $generator = new ClassNameGenerator();
         $fqcn      = $generator->generateClassName('Foo');
 
-        if (method_exists($this, 'assertMatchesRegularExpression')) {
-            self::assertMatchesRegularExpression('/^Foo\\\\Version[0-9]{14}$/', $fqcn);
-        } else {
-            self::assertRegExp('/^Foo\\\\Version[0-9]{14}$/', $fqcn);
-        }
+        self::assertMatchesRegularExpression('/^Foo\\\\Version[0-9]{14}$/', $fqcn);
     }
 }
diff --git a/tests/Doctrine/Migrations/Tests/Generator/ConcatenationFileBuilderTest.php b/tests/Doctrine/Migrations/Tests/Generator/ConcatenationFileBuilderTest.php
index 20fda9c460..06f7bc18d3 100644
--- a/tests/Doctrine/Migrations/Tests/Generator/ConcatenationFileBuilderTest.php
+++ b/tests/Doctrine/Migrations/Tests/Generator/ConcatenationFileBuilderTest.php
@@ -18,8 +18,7 @@ class ConcatenationFileBuilderTest extends TestCase
     /** @var AbstractPlatform|MockObject */
     private $platform;
 
-    /** @var FileBuilder */
-    private $migrationFileBuilder;
+    private FileBuilder $migrationFileBuilder;
 
     public function testBuildMigrationFile(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php b/tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php
index a614e10474..15facc5ae8 100644
--- a/tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Generator/DiffGeneratorTest.php
@@ -18,8 +18,6 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-use function method_exists;
-
 class DiffGeneratorTest extends TestCase
 {
     /** @var DBALConfiguration|MockObject */
@@ -40,8 +38,7 @@ class DiffGeneratorTest extends TestCase
     /** @var SqlGenerator|MockObject */
     private $migrationSqlGenerator;
 
-    /** @var DiffGenerator */
-    private $migrationDiffGenerator;
+    private DiffGenerator $migrationDiffGenerator;
 
     /** @var SchemaProvider|MockObject */
     private $emptySchemaProvider;
@@ -96,42 +93,29 @@ static function ($name): bool {
             ->method('dropTable')
             ->will(self::onConsecutiveCalls('schema.table_name2', 'schema.table_name3'));
 
-        if (method_exists($this->schemaManager, 'createComparator')) {
-            $schemaDiff = $this->createStub(SchemaDiff::class);
-            $schemaDiff->method('toSql')->willReturn(self::onConsecutiveCalls(
-                ['UPDATE table SET value = 2'],
-                ['UPDATE table SET value = 1']
-            ));
-
-            // regular mocks cannot be used here, because the method is static
-            $comparator = new class extends Comparator {
-                /** @var SchemaDiff */
-                public static $schemaDiff;
-
-                public static function compareSchemas(
-                    Schema $fromSchema,
-                    Schema $toSchema
-                ): SchemaDiff {
-                    return self::$schemaDiff;
-                }
-            };
+        $schemaDiff = $this->createStub(SchemaDiff::class);
+        $schemaDiff->method('toSql')->willReturn(self::onConsecutiveCalls(
+            ['UPDATE table SET value = 2'],
+            ['UPDATE table SET value = 1']
+        ));
 
-            $comparator::$schemaDiff = $schemaDiff;
+        // regular mocks cannot be used here, because the method is static
+        $comparator = new class extends Comparator {
+            public static SchemaDiff $schemaDiff;
 
-            $this->schemaManager->expects(self::once())
-                ->method('createComparator')
-                ->willReturn($comparator);
-        } else {
-            $fromSchema->expects(self::once())
-                ->method('getMigrateToSql')
-                ->with($toSchema, $this->platform)
-                ->willReturn(['UPDATE table SET value = 2']);
+            public static function compareSchemas(
+                Schema $fromSchema,
+                Schema $toSchema
+            ): SchemaDiff {
+                return self::$schemaDiff;
+            }
+        };
 
-            $fromSchema->expects(self::once())
-                ->method('getMigrateFromSql')
-                ->with($toSchema, $this->platform)
-                ->willReturn(['UPDATE table SET value = 1']);
-        }
+        $comparator::$schemaDiff = $schemaDiff;
+
+        $this->schemaManager->expects(self::once())
+            ->method('createComparator')
+            ->willReturn($comparator);
 
         $this->migrationSqlGenerator->expects(self::exactly(2))
             ->method('generate')
@@ -183,42 +167,29 @@ public function testGenerateFromEmptySchema(): void
         $toSchema->expects(self::never())
             ->method('dropTable');
 
-        if (method_exists($this->schemaManager, 'createComparator')) {
-            $schemaDiff = $this->createStub(SchemaDiff::class);
-            $schemaDiff->method('toSql')->willReturn(self::onConsecutiveCalls(
-                ['CREATE TABLE table_name'],
-                ['DROP TABLE table_name']
-            ));
-
-            // regular mocks cannot be used here, because the method is static
-            $comparator = new class extends Comparator {
-                /** @var SchemaDiff */
-                public static $schemaDiff;
-
-                public static function compareSchemas(
-                    Schema $fromSchema,
-                    Schema $toSchema
-                ): SchemaDiff {
-                    return self::$schemaDiff;
-                }
-            };
-
-            $comparator::$schemaDiff = $schemaDiff;
-
-            $this->schemaManager->expects(self::once())
-                ->method('createComparator')
-                ->willReturn($comparator);
-        } else {
-            $emptySchema->expects(self::once())
-                ->method('getMigrateToSql')
-                ->with($toSchema, $this->platform)
-                ->willReturn(['CREATE TABLE table_name']);
-
-            $emptySchema->expects(self::once())
-                ->method('getMigrateFromSql')
-                ->with($toSchema, $this->platform)
-                ->willReturn(['DROP TABLE table_name']);
-        }
+        $schemaDiff = $this->createStub(SchemaDiff::class);
+        $schemaDiff->method('toSql')->willReturn(self::onConsecutiveCalls(
+            ['CREATE TABLE table_name'],
+            ['DROP TABLE table_name']
+        ));
+
+        // regular mocks cannot be used here, because the method is static
+        $comparator = new class extends Comparator {
+            public static SchemaDiff $schemaDiff;
+
+            public static function compareSchemas(
+                Schema $fromSchema,
+                Schema $toSchema
+            ): SchemaDiff {
+                return self::$schemaDiff;
+            }
+        };
+
+        $comparator::$schemaDiff = $schemaDiff;
+
+        $this->schemaManager->expects(self::once())
+            ->method('createComparator')
+            ->willReturn($comparator);
 
         $this->migrationSqlGenerator->expects(self::exactly(2))
             ->method('generate')
diff --git a/tests/Doctrine/Migrations/Tests/Generator/GeneratorTest.php b/tests/Doctrine/Migrations/Tests/Generator/GeneratorTest.php
index 19f7f19d08..3fb2f2e6e8 100644
--- a/tests/Doctrine/Migrations/Tests/Generator/GeneratorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Generator/GeneratorTest.php
@@ -22,11 +22,9 @@
 
 final class GeneratorTest extends TestCase
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var Generator */
-    private $migrationGenerator;
+    private Generator $migrationGenerator;
 
     public function testGenerateMigration(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Generator/SqlGeneratorTest.php b/tests/Doctrine/Migrations/Tests/Generator/SqlGeneratorTest.php
index 618d5f3f62..5f9cfaaa19 100644
--- a/tests/Doctrine/Migrations/Tests/Generator/SqlGeneratorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Generator/SqlGeneratorTest.php
@@ -18,20 +18,17 @@
 
 final class SqlGeneratorTest extends TestCase
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
     /** @var AbstractPlatform|MockObject */
     private $platform;
 
-    /** @var SqlGenerator */
-    private $migrationSqlGenerator;
+    private SqlGenerator $migrationSqlGenerator;
 
     /** @var string[] */
-    private $sql;
+    private array $sql;
 
-    /** @var TableMetadataStorageConfiguration */
-    private $metadataConfig;
+    private TableMetadataStorageConfiguration $metadataConfig;
 
     public function testGenerate(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/InlineParameterFormatterTest.php b/tests/Doctrine/Migrations/Tests/InlineParameterFormatterTest.php
index 65f93d8312..b2e3525fa3 100644
--- a/tests/Doctrine/Migrations/Tests/InlineParameterFormatterTest.php
+++ b/tests/Doctrine/Migrations/Tests/InlineParameterFormatterTest.php
@@ -12,14 +12,11 @@
 
 class InlineParameterFormatterTest extends TestCase
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var AbstractPlatform */
-    private $platform;
+    private AbstractPlatform $platform;
 
-    /** @var InlineParameterFormatter */
-    private $parameterFormatter;
+    private InlineParameterFormatter $parameterFormatter;
 
     public function testFormatParameters(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/AvailableMigrationListTest.php b/tests/Doctrine/Migrations/Tests/Metadata/AvailableMigrationListTest.php
index 3695d3a313..bb9cee3bc7 100644
--- a/tests/Doctrine/Migrations/Tests/Metadata/AvailableMigrationListTest.php
+++ b/tests/Doctrine/Migrations/Tests/Metadata/AvailableMigrationListTest.php
@@ -16,8 +16,7 @@
 
 class AvailableMigrationListTest extends TestCase
 {
-    /** @var AbstractMigration */
-    private $abstractMigration;
+    private AbstractMigration $abstractMigration;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/MigrationPlanListTest.php b/tests/Doctrine/Migrations/Tests/Metadata/MigrationPlanListTest.php
index 43e480aea8..fe76727e5b 100644
--- a/tests/Doctrine/Migrations/Tests/Metadata/MigrationPlanListTest.php
+++ b/tests/Doctrine/Migrations/Tests/Metadata/MigrationPlanListTest.php
@@ -16,17 +16,12 @@
 
 class MigrationPlanListTest extends TestCase
 {
-    /** @var AbstractMigration */
-    private $abstractMigration;
-
-    /** @var MigrationPlanList */
-    private $set;
-    /** @var MigrationPlan */
-    private $m1;
-    /** @var MigrationPlan */
-    private $m2;
-    /** @var MigrationPlan */
-    private $m3;
+    private AbstractMigration $abstractMigration;
+
+    private MigrationPlanList $set;
+    private MigrationPlan $m1;
+    private MigrationPlan $m2;
+    private MigrationPlan $m3;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/DebugLogger.php b/tests/Doctrine/Migrations/Tests/Metadata/Storage/DebugLogger.php
new file mode 100644
index 0000000000..11af3e4f5e
--- /dev/null
+++ b/tests/Doctrine/Migrations/Tests/Metadata/Storage/DebugLogger.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Migrations\Tests\Metadata\Storage;
+
+use Psr\Log\AbstractLogger;
+use Stringable;
+
+final class DebugLogger extends AbstractLogger
+{
+    public int $count = 0;
+
+    /**
+     * @param mixed                   $level
+     * @param string|Stringable       $message
+     * @param array<array-key, mixed> $context
+     */
+    public function log($level, $message, array $context = []): void
+    {
+        $this->count++;
+    }
+}
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php b/tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
index 5528d9bfc9..d4787856d1 100644
--- a/tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
+++ b/tests/Doctrine/Migrations/Tests/Metadata/Storage/ExistingTableMetadataStorageTest.php
@@ -26,20 +26,16 @@
 
 class ExistingTableMetadataStorageTest extends TestCase
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var TableMetadataStorage */
-    private $storage;
+    private TableMetadataStorage $storage;
 
-    /** @var TableMetadataStorageConfiguration */
-    private $config;
+    private TableMetadataStorageConfiguration $config;
 
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
     private function getSqliteConnection(): Connection
     {
@@ -51,7 +47,7 @@ private function getSqliteConnection(): Connection
     public function setUp(): void
     {
         $this->connection    = $this->getSqliteConnection();
-        $this->schemaManager = $this->connection->getSchemaManager();
+        $this->schemaManager = $this->connection->createSchemaManager();
 
         $migration                 = $this->createMock(AbstractMigration::class);
         $versionFactory            = $this->createMock(MigrationFactory::class);
@@ -88,8 +84,8 @@ public function testPrimaryReadReplicaConnectionGetsConnected(): void
 
         $connection
             ->expects(self::atLeastOnce())
-            ->method('getSchemaManager')
-            ->willReturn($this->connection->getSchemaManager());
+            ->method('createSchemaManager')
+            ->willReturn($this->connection->createSchemaManager());
 
         $connection
             ->expects(self::atLeastOnce())
diff --git a/tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php b/tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
index 146290a6b2..4b69efff72 100644
--- a/tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
+++ b/tests/Doctrine/Migrations/Tests/Metadata/Storage/TableMetadataStorageTest.php
@@ -10,7 +10,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\PDO\SQLite\Driver as SQLiteDriver;
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Logging\DebugStack;
+use Doctrine\DBAL\Logging\Middleware;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Table;
@@ -27,25 +27,22 @@
 use Doctrine\Migrations\Version\Version;
 use PHPUnit\Framework\TestCase;
 
-use function method_exists;
 use function sprintf;
 
 class TableMetadataStorageTest extends TestCase
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var Configuration */
-    private $connectionConfig;
+    private Configuration $connectionConfig;
 
-    /** @var TableMetadataStorage */
-    private $storage;
+    private TableMetadataStorage $storage;
 
-    /** @var TableMetadataStorageConfiguration */
-    private $config;
+    private TableMetadataStorageConfiguration $config;
 
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
+
+    private DebugLogger $debugLogger;
 
     private function getSqliteConnection(?Configuration $configuration = null): Connection
     {
@@ -57,8 +54,10 @@ private function getSqliteConnection(?Configuration $configuration = null): Conn
     public function setUp(): void
     {
         $this->connectionConfig = new Configuration();
-        $this->connection       = $this->getSqliteConnection($this->connectionConfig);
-        $this->schemaManager    = $this->connection->getSchemaManager();
+        $this->debugLogger      = new DebugLogger();
+        $this->connectionConfig->setMiddlewares([new Middleware($this->debugLogger)]);
+        $this->connection    = $this->getSqliteConnection($this->connectionConfig);
+        $this->schemaManager = $this->connection->createSchemaManager();
 
         $this->config  = new TableMetadataStorageConfiguration();
         $this->storage = new TableMetadataStorage($this->connection, new AlphabeticalComparator(), $this->config);
@@ -66,17 +65,15 @@ public function setUp(): void
 
     public function testSchemaIntrospectionExecutedOnlyOnce(): void
     {
-        $stack = new DebugStack();
-        $this->connectionConfig->setSQLLogger($stack);
         $this->storage->ensureInitialized();
 
-        $oldQueryCount = $stack->currentQuery;
+        $oldQueryCount = $this->debugLogger->count;
         $this->storage->ensureInitialized();
-        self::assertSame(0, $stack->currentQuery - $oldQueryCount);
+        self::assertSame(0, $this->debugLogger->count - $oldQueryCount);
 
-        $oldQueryCount = $stack->currentQuery;
+        $oldQueryCount = $this->debugLogger->count;
         $this->storage->getExecutedMigrations();
-        self::assertSame(1, $stack->currentQuery - $oldQueryCount);
+        self::assertSame(1, $this->debugLogger->count - $oldQueryCount);
     }
 
     public function testDifferentTableNotUpdatedOnRead(): void
@@ -218,9 +215,7 @@ public function testCompleteWillAlwaysCastTimeToInteger(): void
         $executedAt = new DateTimeImmutable('2010-01-05 10:30:21');
 
         $connection = $this->getSqliteConnection();
-        $pdo        = method_exists($connection, 'getNativeConnection')
-            ? $connection->getNativeConnection()
-            : $connection->getWrappedConnection();
+        $pdo        = $connection->getNativeConnection();
 
         $connection = $this->getMockBuilder(Connection::class)
             ->setConstructorArgs([
diff --git a/tests/Doctrine/Migrations/Tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php b/tests/Doctrine/Migrations/Tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php
index c0db9fb71c..be782a798a 100644
--- a/tests/Doctrine/Migrations/Tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php
+++ b/tests/Doctrine/Migrations/Tests/MigrationRepository/FilesystemMigrationsRepositoryTest.php
@@ -25,8 +25,7 @@ class FilesystemMigrationsRepositoryTest extends TestCase
     /** @var MigrationFactory|MockObject */
     private $versionFactory;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
     public function testCheckNonExistentMigration(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/MigratorConfigurationTest.php b/tests/Doctrine/Migrations/Tests/MigratorConfigurationTest.php
index 8dd2294f80..0be2a95ecd 100644
--- a/tests/Doctrine/Migrations/Tests/MigratorConfigurationTest.php
+++ b/tests/Doctrine/Migrations/Tests/MigratorConfigurationTest.php
@@ -9,8 +9,7 @@
 
 class MigratorConfigurationTest extends TestCase
 {
-    /** @var MigratorConfiguration */
-    private $migratorConfiguration;
+    private MigratorConfiguration $migratorConfiguration;
 
     public function testDryRun(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/MigratorTest.php b/tests/Doctrine/Migrations/Tests/MigratorTest.php
index f4d0685c35..a2cd34f18a 100644
--- a/tests/Doctrine/Migrations/Tests/MigratorTest.php
+++ b/tests/Doctrine/Migrations/Tests/MigratorTest.php
@@ -38,20 +38,15 @@ class MigratorTest extends MigrationTestCase
     /** @var Connection|MockObject */
     private $conn;
 
-    /** @var Configuration */
-    private $config;
+    private Configuration $config;
 
-    /** @var StreamOutput */
-    protected $output;
+    protected StreamOutput $output;
 
-    /** @var MigratorConfiguration */
-    private $migratorConfiguration;
+    private MigratorConfiguration $migratorConfiguration;
 
-    /** @var Executor */
-    private $executor;
+    private Executor $executor;
 
-    /** @var TestLogger */
-    private $logger;
+    private TestLogger $logger;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Provider/A.php b/tests/Doctrine/Migrations/Tests/Provider/A.php
index 890cf663a1..8207c61682 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/A.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/A.php
@@ -6,8 +6,7 @@
 
 class A
 {
-    /** @var int|null */
-    private $id;
+    private ?int $id = null;
 
     public function getId(): ?int
     {
diff --git a/tests/Doctrine/Migrations/Tests/Provider/B.php b/tests/Doctrine/Migrations/Tests/Provider/B.php
index 57c6b6b1c7..72d6c31c85 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/B.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/B.php
@@ -6,8 +6,7 @@
 
 class B
 {
-    /** @var int|null */
-    private $id;
+    private ?int $id = null;
 
     public function getId(): ?int
     {
diff --git a/tests/Doctrine/Migrations/Tests/Provider/C.php b/tests/Doctrine/Migrations/Tests/Provider/C.php
index 6d97ab3be2..1738764186 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/C.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/C.php
@@ -6,8 +6,7 @@
 
 class C
 {
-    /** @var int|null */
-    private $id;
+    private ?int $id = null;
 
     public function getId(): ?int
     {
diff --git a/tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php b/tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php
index f713e55fbf..4303dcc491 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/EmptySchemaProviderTest.php
@@ -19,8 +19,7 @@ class EmptySchemaProviderTest extends MigrationTestCase
     /** @var AbstractSchemaManager<AbstractPlatform>|MockObject */
     private $schemaManager;
 
-    /** @var EmptySchemaProvider */
-    private $emptyProvider;
+    private EmptySchemaProvider $emptyProvider;
 
     public function testCreateSchema(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php b/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php
index 1de6cd8695..07f40fbeba 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php
@@ -19,17 +19,13 @@
  */
 class OrmSchemaProviderTest extends MigrationTestCase
 {
-    /** @var  Connection */
-    private $conn;
+    private Connection $conn;
 
-    /** @var  Configuration */
-    private $config;
+    private Configuration $config;
 
-    /** @var  EntityManagerInterface */
-    private $entityManager;
+    private EntityManagerInterface $entityManager;
 
-    /** @var  OrmSchemaProvider */
-    private $ormProvider;
+    private OrmSchemaProvider $ormProvider;
 
     public function testCreateSchemaFetchesMetadataFromEntityManager(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Provider/SchemaDiffProviderTest.php b/tests/Doctrine/Migrations/Tests/Provider/SchemaDiffProviderTest.php
index 19d450d882..408b1fa6ea 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/SchemaDiffProviderTest.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/SchemaDiffProviderTest.php
@@ -14,8 +14,7 @@
  */
 class SchemaDiffProviderTest extends MigrationTestCase
 {
-    /** @var SchemaDiffProvider */
-    private $provider;
+    private SchemaDiffProvider $provider;
 
     public function testCreateFromSchema(): void
     {
@@ -40,7 +39,7 @@ public function testGetSqlDiffToMigrate(): void
     protected function setUp(): void
     {
         $conn           = $this->getSqliteConnection();
-        $schemaManager  = $conn->getSchemaManager();
+        $schemaManager  = $conn->createSchemaManager();
         $this->provider = new DBALSchemaDiffProvider($schemaManager, $conn->getDatabasePlatform());
 
         $schemaChangelog = new Table('foo');
diff --git a/tests/Doctrine/Migrations/Tests/RollupTest.php b/tests/Doctrine/Migrations/Tests/RollupTest.php
index 6f30c1cc1c..58ccafd085 100644
--- a/tests/Doctrine/Migrations/Tests/RollupTest.php
+++ b/tests/Doctrine/Migrations/Tests/RollupTest.php
@@ -28,8 +28,7 @@ class RollupTest extends TestCase
     /** @var MetadataStorage|MockObject */
     private $storage;
 
-    /** @var Rollup */
-    private $rollup;
+    private Rollup $rollup;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/SchemaDumperTest.php b/tests/Doctrine/Migrations/Tests/SchemaDumperTest.php
index 35918f1648..4c54b05f00 100644
--- a/tests/Doctrine/Migrations/Tests/SchemaDumperTest.php
+++ b/tests/Doctrine/Migrations/Tests/SchemaDumperTest.php
@@ -30,8 +30,7 @@ class SchemaDumperTest extends TestCase
     /** @var SqlGenerator|MockObject */
     private $migrationSqlGenerator;
 
-    /** @var SchemaDumper */
-    private $schemaDumper;
+    private SchemaDumper $schemaDumper;
 
     public function testDumpNoTablesException(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Stub/CustomClassNameMigrationFactory.php b/tests/Doctrine/Migrations/Tests/Stub/CustomClassNameMigrationFactory.php
index bceae29e87..8092855db5 100644
--- a/tests/Doctrine/Migrations/Tests/Stub/CustomClassNameMigrationFactory.php
+++ b/tests/Doctrine/Migrations/Tests/Stub/CustomClassNameMigrationFactory.php
@@ -9,8 +9,7 @@
 
 class CustomClassNameMigrationFactory implements MigrationFactory
 {
-    /** @var MigrationFactory */
-    private $parentMigrationFactory;
+    private MigrationFactory $parentMigrationFactory;
 
     /** @psalm-var class-string<AbstractMigration> */
     private $migrationClassName;
diff --git a/tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php b/tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
index a74415f3f0..09b438f46b 100644
--- a/tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
+++ b/tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
@@ -16,10 +16,10 @@
 class DoctrineRegistry extends AbstractManagerRegistry
 {
     /** @var EntityManager[] */
-    private $realEntityManagers;
+    private array $realEntityManagers;
 
     /** @var Connection[] */
-    private $connections;
+    private array $connections;
 
     /**
      * @param array<string,Connection>    $connections
diff --git a/tests/Doctrine/Migrations/Tests/TestLogger.php b/tests/Doctrine/Migrations/Tests/TestLogger.php
index 62b83de596..9365d8bff8 100644
--- a/tests/Doctrine/Migrations/Tests/TestLogger.php
+++ b/tests/Doctrine/Migrations/Tests/TestLogger.php
@@ -20,7 +20,7 @@
 class TestLogger extends AbstractLogger
 {
     /** @var string[] */
-    public $logs = [];
+    public array $logs = [];
 
     /**
      * {@inheritdoc}
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CurrentCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CurrentCommandTest.php
index 2259c691fa..2a6a098df4 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CurrentCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CurrentCommandTest.php
@@ -26,17 +26,13 @@
 
 class CurrentCommandTest extends MigrationTestCase
 {
-    /** @var CurrentCommand */
-    private $command;
+    private CurrentCommand $command;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var CommandTester */
-    private $commandTester;
+    private CommandTester $commandTester;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DiffCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DiffCommandTest.php
index a945a93055..b909776528 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DiffCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DiffCommandTest.php
@@ -33,17 +33,14 @@ final class DiffCommandTest extends TestCase
     /** @var MigrationStatusCalculator|MockObject */
     private $migrationStatusCalculator;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var DiffCommand */
-    private $diffCommand;
+    private DiffCommand $diffCommand;
 
     /** @var MockObject|DependencyFactory */
     private $dependencyFactory;
 
-    /** @var CommandTester */
-    private $diffCommandTester;
+    private CommandTester $diffCommandTester;
 
     /** @var ClassNameGenerator|MockObject */
     private $classNameGenerator;
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DoctrineCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DoctrineCommandTest.php
index be0ea41d2b..d354291d61 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DoctrineCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DoctrineCommandTest.php
@@ -110,8 +110,7 @@ public function testCustomEntityManager(): void
 
         $command       = new class ($em2, $dependencyFactory) extends DoctrineCommand
         {
-            /** @var EntityManager */
-            private $expectedEm;
+            private EntityManager $expectedEm;
 
             public function __construct(EntityManager $entityManager, DependencyFactory $dependencyFactory)
             {
@@ -151,8 +150,7 @@ public function testCustomConnection(): void
 
         $command       = new class ($conn2, $dependencyFactory) extends DoctrineCommand
         {
-            /** @var Connection */
-            private $expectedConnection;
+            private Connection $expectedConnection;
 
             public function __construct(Connection $connection, DependencyFactory $dependencyFactory)
             {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DumpSchemaCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DumpSchemaCommandTest.php
index e91fc10a66..d965df757d 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DumpSchemaCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DumpSchemaCommandTest.php
@@ -27,8 +27,7 @@
 
 final class DumpSchemaCommandTest extends TestCase
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
     /** @var DependencyFactory|MockObject */
     private $dependencyFactory;
@@ -39,11 +38,9 @@ final class DumpSchemaCommandTest extends TestCase
     /** @var SchemaDumper|MockObject */
     private $schemaDumper;
 
-    /** @var DumpSchemaCommand */
-    private $dumpSchemaCommand;
+    private DumpSchemaCommand $dumpSchemaCommand;
 
-    /** @var CommandTester */
-    private $dumpSchemaCommandTester;
+    private CommandTester $dumpSchemaCommandTester;
 
     public function testExecuteThrowsRuntimeException(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php
index f299f44fd1..b6991af868 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ExecuteCommandTest.php
@@ -29,20 +29,15 @@
 
 class ExecuteCommandTest extends MigrationTestCase
 {
-    /** @var ExecuteCommand */
-    private $executeCommand;
+    private ExecuteCommand $executeCommand;
 
-    /** @var DependencyFactory */
-    private $dependencyFactory;
+    private DependencyFactory $dependencyFactory;
 
-    /** @var CommandTester */
-    private $executeCommandTester;
+    private CommandTester $executeCommandTester;
 
-    /** @var MockObject */
-    private $migrator;
+    private MockObject $migrator;
 
-    /** @var MockObject */
-    private $queryWriter;
+    private MockObject $queryWriter;
 
     /** @var MigrationPlanCalculator|MockObject */
     private $planCalculator;
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/GenerateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/GenerateCommandTest.php
index 119dd27d69..c738edc4a5 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/GenerateCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/GenerateCommandTest.php
@@ -20,8 +20,7 @@
 
 final class GenerateCommandTest extends TestCase
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
     /** @var DependencyFactory|MockObject */
     private $dependencyFactory;
@@ -29,11 +28,9 @@ final class GenerateCommandTest extends TestCase
     /** @var Generator|MockObject */
     private $migrationGenerator;
 
-    /** @var GenerateCommand */
-    private $generateCommand;
+    private GenerateCommand $generateCommand;
 
-    /** @var CommandTester */
-    private $generateCommandTest;
+    private CommandTester $generateCommandTest;
 
     public function testExecute(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php
index a99e9d7ff8..071489a299 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php
@@ -26,17 +26,13 @@
 
 class LatestCommandTest extends MigrationTestCase
 {
-    /** @var LatestCommand */
-    private $command;
+    private LatestCommand $command;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var CommandTester */
-    private $commandTester;
+    private CommandTester $commandTester;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ListCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ListCommandTest.php
index e8e1d7e7c1..f5cdec4547 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ListCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/ListCommandTest.php
@@ -28,17 +28,13 @@
 
 class ListCommandTest extends MigrationTestCase
 {
-    /** @var ListCommand */
-    private $command;
+    private ListCommand $command;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var CommandTester */
-    private $commandTester;
+    private CommandTester $commandTester;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
index be94168153..2dcb15a3c9 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Migrations\Tests\Tools\Console\Command;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -39,42 +38,32 @@
 
 use function getcwd;
 use function in_array;
-use function method_exists;
 use function sprintf;
 use function strpos;
 use function trim;
 
 class MigrateCommandTest extends MigrationTestCase
 {
-    /** @var DependencyFactory */
-    private $dependencyFactory;
+    private DependencyFactory $dependencyFactory;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var MigrateCommand */
-    private $migrateCommand;
+    private MigrateCommand $migrateCommand;
 
-    /** @var CommandTester */
-    private $migrateCommandTester;
+    private CommandTester $migrateCommandTester;
 
-    /** @var MetadataStorage */
-    private $storage;
+    private MetadataStorage $storage;
 
-    /** @var MockObject */
-    private $queryWriter;
+    private MockObject $queryWriter;
 
     /** @var MockObject|QuestionHelper */
     private $questions;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var TableMetadataStorageConfiguration */
-    private $metadataConfiguration;
+    private TableMetadataStorageConfiguration $metadataConfiguration;
 
     public function testTargetUnknownVersion(): void
     {
@@ -322,7 +311,7 @@ public function testExecuteMigrateUpdatesMigrationsTableWhenNeeded(): void
 
         $this->migrateCommandTester->execute([], ['interactive' => false]);
 
-        $refreshedTable = $this->connection->getSchemaManager()
+        $refreshedTable = $this->connection->createSchemaManager()
             ->listTableDetails($this->metadataConfiguration->getTableName());
 
         self::assertFalse($refreshedTable->hasColumn('extra'));
@@ -336,7 +325,7 @@ public function testExecuteMigrateDoesNotUpdateMigrationsTableWhenSyaingNo(): vo
 
         $this->migrateCommandTester->execute([]);
 
-        $refreshedTable = $this->connection->getSchemaManager()
+        $refreshedTable = $this->connection->createSchemaManager()
             ->listTableDetails($this->metadataConfiguration->getTableName());
 
         self::assertTrue($refreshedTable->hasColumn('extra'));
@@ -502,22 +491,18 @@ protected function setUp(): void
 
     private function alterMetadataTable(): void
     {
-        $schemaManager = $this->connection->getSchemaManager();
+        $schemaManager = $this->connection->createSchemaManager();
         $originalTable = $schemaManager
             ->listTableDetails($this->metadataConfiguration->getTableName());
 
         $modifiedTable = clone $originalTable;
         $modifiedTable->addColumn('extra', Types::STRING, ['notnull' => false]);
 
-        $comparator = method_exists($schemaManager, 'createComparator') ?
-            $schemaManager->createComparator() :
-            new Comparator();
-
-        $diff = $comparator->diffTable($originalTable, $modifiedTable);
+        $diff = $schemaManager->createComparator()->diffTable($originalTable, $modifiedTable);
         if (! ($diff instanceof TableDiff)) {
             return;
         }
 
-        $this->connection->getSchemaManager()->alterTable($diff);
+        $this->connection->createSchemaManager()->alterTable($diff);
     }
 }
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php
index faea2a3e5b..64a21a7fe9 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php
@@ -27,17 +27,13 @@
 
 class MigrationVersionTest extends MigrationTestCase
 {
-    /** @var VersionCommand */
-    private $command;
+    private VersionCommand $command;
 
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var CommandTester */
-    private $commandTester;
+    private CommandTester $commandTester;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/RollupCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/RollupCommandTest.php
index c50d968b61..69ac695681 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/RollupCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/RollupCommandTest.php
@@ -22,11 +22,9 @@ final class RollupCommandTest extends TestCase
     /** @var Rollup|MockObject */
     private $rollup;
 
-    /** @var RollupCommand */
-    private $rollupCommand;
+    private RollupCommand $rollupCommand;
 
-    /** @var CommandTester */
-    private $rollupCommandTest;
+    private CommandTester $rollupCommandTest;
 
     public function testExecute(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php
index c62275bff0..da9d6b9ae0 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php
@@ -27,14 +27,11 @@
 
 class StatusCommandTest extends MigrationTestCase
 {
-    /** @var StatusCommand */
-    private $command;
+    private StatusCommand $command;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var CommandTester */
-    private $commandTester;
+    private CommandTester $commandTester;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/SyncMetadataCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/SyncMetadataCommandTest.php
index b7616d427d..cfa01b9c17 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/SyncMetadataCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/SyncMetadataCommandTest.php
@@ -19,11 +19,9 @@ final class SyncMetadataCommandTest extends TestCase
     /** @var MetadataStorage|MockObject */
     private $storage;
 
-    /** @var SyncMetadataCommand */
-    private $storageCommand;
+    private SyncMetadataCommand $storageCommand;
 
-    /** @var CommandTester */
-    private $storageCommandTester;
+    private CommandTester $storageCommandTester;
 
     public function testExecute(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
index 0f15b98aa2..0ac4fe88f6 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
@@ -30,23 +30,17 @@
 
 class UpToDateCommandTest extends MigrationTestCase
 {
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var CommandTester */
-    private $commandTester;
+    private CommandTester $commandTester;
 
-    /** @var UpToDateCommand */
-    private $command;
+    private UpToDateCommand $command;
 
-    /** @var Connection */
-    private $conn;
+    private Connection $conn;
 
-    /** @var TableMetadataStorageConfiguration */
-    private $metadataConfig;
+    private TableMetadataStorageConfiguration $metadataConfig;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleLoggerTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleLoggerTest.php
index bd69118e11..ff233c9122 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleLoggerTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleLoggerTest.php
@@ -18,8 +18,7 @@
 
 class ConsoleLoggerTest extends TestCase
 {
-    /** @var BufferedOutput */
-    private $output;
+    private BufferedOutput $output;
 
     protected function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
index 1c873f99af..ef984e4a6e 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Migrations\Tests\Tools\Console;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
-use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
 use Doctrine\Migrations\DependencyFactory;
 use Doctrine\Migrations\Tools\Console\ConsoleRunner;
 use Doctrine\ORM\EntityManager;
@@ -16,7 +15,6 @@
 use Symfony\Component\Console\Helper\HelperSet;
 
 use function chdir;
-use function class_exists;
 use function getcwd;
 use function realpath;
 use function sprintf;
@@ -26,30 +24,7 @@
  */
 class ConsoleRunnerTest extends TestCase
 {
-    /** @var Application */
-    private $application;
-
-    public function testCreateDependencyFactoryFromLegacyDbalHelper(): void
-    {
-        if (! class_exists(ConnectionHelper::class)) {
-            self::markTestSkipped('DBAL 3.0 does not provide anymore the ConnectionHelper');
-        }
-
-        $dir = getcwd();
-        if ($dir === false) {
-            $dir = '.';
-        }
-
-        chdir(__DIR__ . '/legacy-config-dbal');
-
-        try {
-            $dependencyFactory = ConsoleRunnerStub::findDependencyFactory();
-            self::assertInstanceOf(DependencyFactory::class, $dependencyFactory);
-            self::assertInstanceOf(SqlitePlatform::class, $dependencyFactory->getConnection()->getDatabasePlatform());
-        } finally {
-            chdir($dir);
-        }
-    }
+    private Application $application;
 
     public function testCreateDependencyFactoryFromLegacyOrmHelper(): void
     {
@@ -70,33 +45,6 @@ public function testCreateDependencyFactoryFromLegacyOrmHelper(): void
         }
     }
 
-    public function testCreateDependencyFactoryFromWrongLegacyHelper(): void
-    {
-        if (! class_exists(ConnectionHelper::class)) {
-            self::markTestSkipped('DBAL 3.0 does not provide anymore the ConnectionHelper');
-        }
-
-        $this->expectException(RuntimeException::class);
-
-        $dir = getcwd();
-        if ($dir === false) {
-            $dir = '.';
-        }
-
-        chdir(__DIR__ . '/legacy-config-wrong');
-
-        $this->expectExceptionMessage(sprintf(
-            'Configuration HelperSet returned by "%s" does not have a valid "em" or the "db" helper.',
-            realpath(__DIR__ . '/legacy-config-wrong/cli-config.php')
-        ));
-
-        try {
-            $dependencyFactory = ConsoleRunnerStub::findDependencyFactory();
-        } finally {
-            chdir($dir);
-        }
-    }
-
     /**
      * @dataProvider getDependencyFactoryTestDirectories
      */
@@ -281,8 +229,7 @@ protected function setUp(): void
 
 class ConsoleRunnerStub extends ConsoleRunner
 {
-    /** @var Application */
-    public static $application;
+    public static Application $application;
 
     /**
      * @param Command[] $commands
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php
index 1b6256e9c4..b2ccecf163 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/MigrationDirectoryHelperTest.php
@@ -20,14 +20,11 @@
 
 class MigrationDirectoryHelperTest extends MigrationTestCase
 {
-    /** @var MigrationDirectoryHelper */
-    private $mirationDirectoryHelper;
+    private MigrationDirectoryHelper $mirationDirectoryHelper;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var string */
-    private $tempDir;
+    private string $tempDir;
 
     public function setUp(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php b/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php
deleted file mode 100644
index 664a76e5c3..0000000000
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/cli-config.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
-use Symfony\Component\Console\Helper\HelperSet;
-
-$conn = DriverManager::getConnection(['driver' => 'pdo_sqlite', 'memory' => true]);
-
-return new HelperSet([
-    'db' => new ConnectionHelper($conn),
-]);
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/migrations.php b/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/migrations.php
deleted file mode 100644
index 0dae23dee5..0000000000
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-dbal/migrations.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [];
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php b/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php
deleted file mode 100644
index 18a1957894..0000000000
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-wrong/cli-config.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
-use Symfony\Component\Console\Helper\HelperSet;
-
-$conn = DriverManager::getConnection(['driver' => 'pdo_sqlite', 'memory' => true]);
-
-return new HelperSet([
-    'abc' => new ConnectionHelper($conn),
-]);
diff --git a/tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php b/tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php
index 78988b0fb9..044b14e614 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/TransactionHelperTest.php
@@ -10,8 +10,6 @@
 use PDO;
 use PHPUnit\Framework\TestCase;
 
-use function method_exists;
-
 final class TransactionHelperTest extends TestCase
 {
     use VerifyDeprecations;
@@ -21,11 +19,7 @@ public function testItTriggersADeprecationWhenUseful(): void
         $connection        = $this->createStub(Connection::class);
         $wrappedConnection = $this->createStub(PDO::class);
 
-        if (method_exists(Connection::class, 'getNativeConnection')) {
-            $connection->method('getNativeConnection')->willReturn($wrappedConnection);
-        } else {
-            $connection->method('getWrappedConnection')->willReturn($wrappedConnection);
-        }
+        $connection->method('getNativeConnection')->willReturn($wrappedConnection);
 
         $wrappedConnection->method('inTransaction')->willReturn(false);
 
@@ -45,11 +39,7 @@ public function testItDoesNotTriggerADeprecationWhenUseless(): void
         $connection        = $this->createStub(Connection::class);
         $wrappedConnection = $this->createStub(PDO::class);
 
-        if (method_exists(Connection::class, 'getNativeConnection')) {
-            $connection->method('getNativeConnection')->willReturn($wrappedConnection);
-        } else {
-            $connection->method('getWrappedConnection')->willReturn($wrappedConnection);
-        }
+        $connection->method('getNativeConnection')->willReturn($wrappedConnection);
 
         $wrappedConnection->method('inTransaction')->willReturn(true);
 
diff --git a/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php b/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php
index 4356d57810..f18bbe48a8 100644
--- a/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/AliasResolverTest.php
@@ -33,20 +33,15 @@
 
 final class AliasResolverTest extends TestCase
 {
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MigrationPlanCalculator */
-    private $migrationPlanCalculator;
+    private MigrationPlanCalculator $migrationPlanCalculator;
 
-    /** @var DefaultAliasResolver */
-    private $versionAliasResolver;
+    private DefaultAliasResolver $versionAliasResolver;
 
-    /** @var TableMetadataStorage */
-    private $metadataStorage;
+    private TableMetadataStorage $metadataStorage;
 
-    /** @var MigrationStatusCalculator */
-    private $statusCalculator;
+    private MigrationStatusCalculator $statusCalculator;
 
     /**
      * @param class-string<Throwable>|null $expectedException
diff --git a/tests/Doctrine/Migrations/Tests/Version/DbalFactoryTest.php b/tests/Doctrine/Migrations/Tests/Version/DbalFactoryTest.php
index 7585d490f6..6c30caf287 100644
--- a/tests/Doctrine/Migrations/Tests/Version/DbalFactoryTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/DbalFactoryTest.php
@@ -20,8 +20,7 @@ final class DbalFactoryTest extends TestCase
     /** @var MockObject|LoggerInterface */
     private $logger;
 
-    /** @var DbalMigrationFactory */
-    private $versionFactory;
+    private DbalMigrationFactory $versionFactory;
 
     public function testCreateVersion(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Version/ExecutionResultTest.php b/tests/Doctrine/Migrations/Tests/Version/ExecutionResultTest.php
index a24744b185..7f6dce4f52 100644
--- a/tests/Doctrine/Migrations/Tests/Version/ExecutionResultTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/ExecutionResultTest.php
@@ -16,8 +16,7 @@
 
 class ExecutionResultTest extends TestCase
 {
-    /** @var ExecutionResult */
-    private $versionExecutionResult;
+    private ExecutionResult $versionExecutionResult;
 
     public function testHasSql(): void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php b/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php
index a35862f21e..20158a75a9 100644
--- a/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/ExecutorTest.php
@@ -45,26 +45,19 @@ class ExecutorTest extends TestCase
     /** @var Stopwatch|MockObject */
     private $stopwatch;
 
-    /** @var DbalExecutor */
-    private $versionExecutor;
+    private DbalExecutor $versionExecutor;
 
-    /** @var Version */
-    private $version;
+    private Version $version;
 
-    /** @var VersionExecutorTestMigration */
-    private $migration;
+    private VersionExecutorTestMigration $migration;
 
-    /** @var TestLogger */
-    private $logger;
+    private TestLogger $logger;
 
-    /** @var EventDispatcher */
-    private $eventDispatcher;
+    private EventDispatcher $eventDispatcher;
 
-    /** @var EventManager */
-    private $eventManager;
+    private EventManager $eventManager;
 
-    /** @var MockObject */
-    private $metadataStorage;
+    private MockObject $metadataStorage;
 
     public function testAddSql(): void
     {
@@ -274,12 +267,9 @@ public function testSkipMigration(): void
             ->setTimeAllQueries(true);
 
         $listener = new class () {
-            /** @var bool */
-            public $onMigrationsVersionExecuting = false;
-            /** @var bool */
-            public $onMigrationsVersionExecuted = false;
-            /** @var bool */
-            public $onMigrationsVersionSkipped = false;
+            public bool $onMigrationsVersionExecuting = false;
+            public bool $onMigrationsVersionExecuted  = false;
+            public bool $onMigrationsVersionSkipped   = false;
 
             public function onMigrationsVersionExecuting(): void
             {
@@ -332,10 +322,8 @@ public function testMigrationEvents(): void
         $plan = new MigrationPlan($this->version, $this->migration, Direction::UP);
 
         $listener = new class () {
-            /** @var bool */
-            public $onMigrationsVersionExecuting = false;
-            /** @var bool */
-            public $onMigrationsVersionExecuted = false;
+            public bool $onMigrationsVersionExecuting = false;
+            public bool $onMigrationsVersionExecuted  = false;
 
             public function onMigrationsVersionExecuting(): void
             {
@@ -374,12 +362,9 @@ public function testErrorMigration(): void
         $this->migration->error = true;
 
         $listener = new class () {
-            /** @var bool */
-            public $onMigrationsVersionExecuting = false;
-            /** @var bool */
-            public $onMigrationsVersionExecuted = false;
-            /** @var bool */
-            public $onMigrationsVersionSkipped = false;
+            public bool $onMigrationsVersionExecuting = false;
+            public bool $onMigrationsVersionExecuted  = false;
+            public bool $onMigrationsVersionSkipped   = false;
 
             public function onMigrationsVersionExecuting(): void
             {
@@ -447,12 +432,9 @@ public function testChangesNotCommittedIfMetadataFailure(): void
         $plan = new MigrationPlan($this->version, $this->migration, Direction::UP);
 
         $listener = new class () {
-            /** @var bool */
-            public $onMigrationsVersionExecuting = false;
-            /** @var bool */
-            public $onMigrationsVersionExecuted = false;
-            /** @var bool */
-            public $onMigrationsVersionSkipped = false;
+            public bool $onMigrationsVersionExecuting = false;
+            public bool $onMigrationsVersionExecuted  = false;
+            public bool $onMigrationsVersionSkipped   = false;
 
             public function onMigrationsVersionExecuting(): void
             {
diff --git a/tests/Doctrine/Migrations/Tests/Version/Fixture/VersionExecutorTestMigration.php b/tests/Doctrine/Migrations/Tests/Version/Fixture/VersionExecutorTestMigration.php
index 0d00843689..e02554e15c 100644
--- a/tests/Doctrine/Migrations/Tests/Version/Fixture/VersionExecutorTestMigration.php
+++ b/tests/Doctrine/Migrations/Tests/Version/Fixture/VersionExecutorTestMigration.php
@@ -9,25 +9,18 @@
 
 class VersionExecutorTestMigration extends AbstractMigration
 {
-    /** @var bool */
-    public $preUpExecuted = false;
+    public bool $preUpExecuted = false;
 
-    /** @var bool */
-    public $preDownExecuted = false;
+    public bool $preDownExecuted = false;
 
-    /** @var bool */
-    public $postUpExecuted = false;
+    public bool $postUpExecuted = false;
 
-    /** @var bool */
-    public $postDownExecuted = false;
+    public bool $postDownExecuted = false;
 
-    /** @var string */
-    private $description = '';
+    private string $description = '';
 
-    /** @var bool */
-    public $skip = false;
-    /** @var bool */
-    public $error = false;
+    public bool $skip  = false;
+    public bool $error = false;
 
     public function getDescription(): string
     {
diff --git a/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php b/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php
index ead9e40fd3..f298afe0e4 100644
--- a/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/MigrationPlanCalculatorTest.php
@@ -26,8 +26,7 @@
 
 final class MigrationPlanCalculatorTest extends TestCase
 {
-    /** @var MigrationPlanCalculator */
-    private $migrationPlanCalculator;
+    private MigrationPlanCalculator $migrationPlanCalculator;
 
     /** @var MockObject|MigrationsRepository */
     private $migrationRepository;
diff --git a/tests/Doctrine/Migrations/Tests/Version/MigrationStatusCalculatorTest.php b/tests/Doctrine/Migrations/Tests/Version/MigrationStatusCalculatorTest.php
index 24ff09544c..4b8d86f0a1 100644
--- a/tests/Doctrine/Migrations/Tests/Version/MigrationStatusCalculatorTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/MigrationStatusCalculatorTest.php
@@ -19,8 +19,7 @@
 
 final class MigrationStatusCalculatorTest extends TestCase
 {
-    /** @var MigrationStatusCalculator */
-    private $migrationStatusCalculator;
+    private MigrationStatusCalculator $migrationStatusCalculator;
 
     /** @var MockObject|MigrationPlanCalculator */
     private $migrationPlanCalculator;

From e2883f4766c2457cfbd8b812c92096c027dc5ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Sat, 2 Apr 2022 13:18:42 +0200
Subject: [PATCH 2/4] Drop unmaintained version of Symfony libs

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index ba6a904d72..b30a294904 100644
--- a/composer.json
+++ b/composer.json
@@ -31,8 +31,8 @@
         "doctrine/event-manager": "^1.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "psr/log": "^1.1.3 || ^2 || ^3",
-        "symfony/console": "^3.4 || ^4.4.16 || ^5.0 || ^6.0",
-        "symfony/stopwatch": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+        "symfony/console": "^4.4.16 || ^5.4 || ^6.0",
+        "symfony/stopwatch": "^4.4 || ^5.4 || ^6.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
@@ -47,9 +47,9 @@
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-symfony": "^1.1",
         "phpunit/phpunit": "^9.4",
-        "symfony/cache": "^3.4.26 || ^4.2.12 || ^5.0 || ^6.0",
-        "symfony/process": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+        "symfony/cache": "^4.4 || ^5.4 || ^6.0",
+        "symfony/process": "^4.4 || ^5.4 || ^6.0",
+        "symfony/yaml": "^4.4 || ^5.4 || ^6.0"
     },
     "suggest": {
         "doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.",

From b98f2424c079cbb8688a78af7d0a946ec5d9e2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Sat, 2 Apr 2022 13:19:56 +0200
Subject: [PATCH 3/4] Drop unmaintained version of doctrine/persistence

---
 composer.json                                          | 2 +-
 phpunit.xml.dist                                       | 8 ++++----
 tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index b30a294904..a84fb1818a 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
         "ext-pdo_sqlite": "*",
         "doctrine/coding-standard": "^9",
         "doctrine/orm": "^2.6",
-        "doctrine/persistence": "^1.3 || ^2.0",
+        "doctrine/persistence": "^2.0",
         "doctrine/sql-formatter": "^1.0",
         "ergebnis/composer-normalize": "^2.9",
         "phpstan/phpstan": "^1.5",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a1f7c5d6e5..b3aff66177 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,9 +16,9 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./lib/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php b/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
index 807c7ec4cd..96a76c0cac 100644
--- a/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
+++ b/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
@@ -12,8 +12,6 @@
 use function realpath;
 use function sprintf;
 
-use const PHP_VERSION_ID;
-
 /**
  * @requires OS Linux|Darwin
  */
@@ -21,10 +19,6 @@ class BoxPharCompileTest extends TestCase
 {
     public function testCompile(): void
     {
-        if (PHP_VERSION_ID < 70200) {
-            self::markTestSkipped('https://github.com/box-project/box/issues/489');
-        }
-
         $boxPharPath = __DIR__ . '/../../../../box.phar';
 
         if (! file_exists($boxPharPath)) {

From f5887f0e705ae9258b45a0ec7e2b4745335ccd44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Mon, 4 Apr 2022 20:29:06 +0200
Subject: [PATCH 4/4] Use typed properties where possible

This includes:
- private properties
- public properties of final classes

protected properties must have the same type or lack thereof as their
parent.
---
 lib/Doctrine/Migrations/AbstractMigration.php |  5 +--
 .../Configuration/Configuration.php           | 37 +++++++------------
 .../Connection/ConfigurationFile.php          |  3 +-
 .../ConnectionRegistryConnection.php          |  6 +--
 .../Connection/ExistingConnection.php         |  3 +-
 .../EntityManager/ConfigurationFile.php       |  3 +-
 .../EntityManager/ExistingEntityManager.php   |  3 +-
 .../ManagerRegistryEntityManager.php          |  6 +--
 .../Migration/ConfigurationArray.php          |  2 +-
 .../ConfigurationFileWithFallback.php         |  3 +-
 .../Migration/ExistingConfiguration.php       |  3 +-
 .../Configuration/Migration/FormattedFile.php |  2 +-
 lib/Doctrine/Migrations/DbalMigrator.php      | 15 +++-----
 lib/Doctrine/Migrations/DependencyFactory.php | 25 +++++--------
 .../Migrations/Event/MigrationsEventArgs.php  |  9 ++---
 .../Event/MigrationsVersionEventArgs.php      |  9 ++---
 lib/Doctrine/Migrations/EventDispatcher.php   |  6 +--
 lib/Doctrine/Migrations/FileQueryWriter.php   |  6 +--
 .../FilesystemMigrationsRepository.php        | 13 +++----
 .../Finder/RecursiveRegexFinder.php           |  3 +-
 .../Migrations/Generator/DiffGenerator.php    | 20 ++++------
 .../Migrations/Generator/Generator.php        |  6 +--
 .../Migrations/Generator/SqlGenerator.php     |  6 +--
 .../Migrations/InlineParameterFormatter.php   |  3 +-
 .../Metadata/AvailableMigration.php           |  6 +--
 .../Metadata/AvailableMigrationsList.php      |  2 +-
 .../Metadata/AvailableMigrationsSet.php       |  2 +-
 .../Migrations/Metadata/ExecutedMigration.php | 10 ++---
 .../Metadata/ExecutedMigrationsList.php       |  2 +-
 .../Migrations/Metadata/MigrationPlan.php     | 12 ++----
 .../Migrations/Metadata/MigrationPlanList.php |  5 +--
 .../Metadata/Storage/TableMetadataStorage.php | 23 ++++--------
 .../TableMetadataStorageConfiguration.php     | 15 +++-----
 .../Migrations/MigratorConfiguration.php      | 15 +++-----
 .../Provider/DBALSchemaDiffProvider.php       |  5 +--
 .../Provider/EmptySchemaProvider.php          |  2 +-
 .../Provider/LazySchemaDiffProvider.php       |  6 +--
 .../Migrations/Provider/OrmSchemaProvider.php |  3 +-
 .../Provider/StubSchemaProvider.php           |  3 +-
 lib/Doctrine/Migrations/Query/Query.php       |  7 ++--
 lib/Doctrine/Migrations/Rollup.php            |  6 +--
 lib/Doctrine/Migrations/SchemaDumper.php      | 13 +++----
 .../Tools/Console/Command/DoctrineCommand.php |  3 +-
 .../Tools/Console/Command/VersionCommand.php  |  3 +-
 ...nsoleInputMigratorConfigurationFactory.php |  3 +-
 .../Tools/Console/ConsoleLogger.php           |  7 ++--
 .../Helper/MigrationStatusInfosHelper.php     | 18 +++------
 .../CurrentMigrationStatusCalculator.php      |  6 +--
 .../Migrations/Version/DbalExecutor.php       | 23 ++++--------
 .../Version/DbalMigrationFactory.php          |  6 +--
 .../Version/DefaultAliasResolver.php          |  9 ++---
 .../Migrations/Version/ExecutionResult.php    | 33 ++++++-----------
 .../Version/SortedMigrationPlanCalculator.php |  9 ++---
 lib/Doctrine/Migrations/Version/Version.php   |  3 +-
 54 files changed, 160 insertions(+), 297 deletions(-)

diff --git a/lib/Doctrine/Migrations/AbstractMigration.php b/lib/Doctrine/Migrations/AbstractMigration.php
index 0f4d9b5e5a..6a9066f600 100644
--- a/lib/Doctrine/Migrations/AbstractMigration.php
+++ b/lib/Doctrine/Migrations/AbstractMigration.php
@@ -33,11 +33,10 @@ abstract class AbstractMigration
     /** @var AbstractPlatform */
     protected $platform;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
     /** @var Query[] */
-    private $plannedSql = [];
+    private array $plannedSql = [];
 
     public function __construct(Connection $connection, LoggerInterface $logger)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Configuration.php b/lib/Doctrine/Migrations/Configuration/Configuration.php
index 500d9b91db..acfafb6808 100644
--- a/lib/Doctrine/Migrations/Configuration/Configuration.php
+++ b/lib/Doctrine/Migrations/Configuration/Configuration.php
@@ -21,43 +21,32 @@ final class Configuration
     public const VERSIONS_ORGANIZATION_BY_YEAR_AND_MONTH = 'year_and_month';
 
     /** @var array<string, string> */
-    private $migrationsDirectories = [];
+    private array $migrationsDirectories = [];
 
     /** @var string[] */
-    private $migrationClasses = [];
+    private array $migrationClasses = [];
 
-    /** @var bool */
-    private $migrationsAreOrganizedByYear = false;
+    private bool $migrationsAreOrganizedByYear = false;
 
-    /** @var bool */
-    private $migrationsAreOrganizedByYearAndMonth = false;
+    private bool $migrationsAreOrganizedByYearAndMonth = false;
 
-    /** @var string|null */
-    private $customTemplate;
+    private ?string $customTemplate = null;
 
-    /** @var bool */
-    private $isDryRun = false;
+    private bool $isDryRun = false;
 
-    /** @var bool */
-    private $allOrNothing = false;
+    private bool $allOrNothing = false;
 
-    /** @var bool */
-    private $transactional = true;
+    private bool $transactional = true;
 
-    /** @var string|null */
-    private $connectionName;
+    private ?string $connectionName = null;
 
-    /** @var string|null */
-    private $entityManagerName;
+    private ?string $entityManagerName = null;
 
-    /** @var bool */
-    private $checkDbPlatform = true;
+    private bool $checkDbPlatform = true;
 
-    /** @var MetadataStorageConfiguration */
-    private $metadataStorageConfiguration;
+    private ?MetadataStorageConfiguration $metadataStorageConfiguration = null;
 
-    /** @var bool */
-    private $frozen = false;
+    private bool $frozen = false;
 
     public function freeze(): void
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ConfigurationFile.php b/lib/Doctrine/Migrations/Configuration/Connection/ConfigurationFile.php
index 20c48d5de8..9ee3b64866 100644
--- a/lib/Doctrine/Migrations/Configuration/Connection/ConfigurationFile.php
+++ b/lib/Doctrine/Migrations/Configuration/Connection/ConfigurationFile.php
@@ -18,8 +18,7 @@
  */
 final class ConfigurationFile implements ConnectionLoader
 {
-    /** @var string */
-    private $filename;
+    private string $filename;
 
     public function __construct(string $filename)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ConnectionRegistryConnection.php b/lib/Doctrine/Migrations/Configuration/Connection/ConnectionRegistryConnection.php
index 0bda51a3e7..44f990e56a 100644
--- a/lib/Doctrine/Migrations/Configuration/Connection/ConnectionRegistryConnection.php
+++ b/lib/Doctrine/Migrations/Configuration/Connection/ConnectionRegistryConnection.php
@@ -10,11 +10,9 @@
 
 final class ConnectionRegistryConnection implements ConnectionLoader
 {
-    /** @var ConnectionRegistry */
-    private $registry;
+    private ConnectionRegistry $registry;
 
-    /** @var string|null */
-    private $defaultConnectionName;
+    private ?string $defaultConnectionName = null;
 
     public static function withSimpleDefault(ConnectionRegistry $registry, ?string $connectionName = null): self
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/ExistingConnection.php b/lib/Doctrine/Migrations/Configuration/Connection/ExistingConnection.php
index 70c0a109bb..2d747f2413 100644
--- a/lib/Doctrine/Migrations/Configuration/Connection/ExistingConnection.php
+++ b/lib/Doctrine/Migrations/Configuration/Connection/ExistingConnection.php
@@ -9,8 +9,7 @@
 
 final class ExistingConnection implements ConnectionLoader
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/ConfigurationFile.php b/lib/Doctrine/Migrations/Configuration/EntityManager/ConfigurationFile.php
index eee218144a..87e329e77a 100644
--- a/lib/Doctrine/Migrations/Configuration/EntityManager/ConfigurationFile.php
+++ b/lib/Doctrine/Migrations/Configuration/EntityManager/ConfigurationFile.php
@@ -16,8 +16,7 @@
  */
 final class ConfigurationFile implements EntityManagerLoader
 {
-    /** @var string */
-    private $filename;
+    private string $filename;
 
     public function __construct(string $filename)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/ExistingEntityManager.php b/lib/Doctrine/Migrations/Configuration/EntityManager/ExistingEntityManager.php
index f0098e820a..a047531a47 100644
--- a/lib/Doctrine/Migrations/Configuration/EntityManager/ExistingEntityManager.php
+++ b/lib/Doctrine/Migrations/Configuration/EntityManager/ExistingEntityManager.php
@@ -9,8 +9,7 @@
 
 final class ExistingEntityManager implements EntityManagerLoader
 {
-    /** @var EntityManagerInterface */
-    private $entityManager;
+    private EntityManagerInterface $entityManager;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/EntityManager/ManagerRegistryEntityManager.php b/lib/Doctrine/Migrations/Configuration/EntityManager/ManagerRegistryEntityManager.php
index 8f9b9e40c1..43911eb35d 100644
--- a/lib/Doctrine/Migrations/Configuration/EntityManager/ManagerRegistryEntityManager.php
+++ b/lib/Doctrine/Migrations/Configuration/EntityManager/ManagerRegistryEntityManager.php
@@ -10,11 +10,9 @@
 
 final class ManagerRegistryEntityManager implements EntityManagerLoader
 {
-    /** @var ManagerRegistry */
-    private $registry;
+    private ManagerRegistry $registry;
 
-    /** @var string|null */
-    private $defaultManagerName;
+    private ?string $defaultManagerName = null;
 
     public static function withSimpleDefault(ManagerRegistry $registry, ?string $managerName = null): self
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php
index aa4508d79a..07c33eff32 100644
--- a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php
+++ b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php
@@ -19,7 +19,7 @@
 final class ConfigurationArray implements ConfigurationLoader
 {
     /** @var array<string,mixed> */
-    private $configurations;
+    private array $configurations;
 
     /**
      * @param array<string,mixed> $configurations
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php
index 248f6d91f4..4c06730a5b 100644
--- a/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php
+++ b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php
@@ -18,8 +18,7 @@
  */
 final class ConfigurationFileWithFallback implements ConfigurationLoader
 {
-    /** @var string|null */
-    private $file;
+    private ?string $file = null;
 
     public function __construct(?string $file = null)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php b/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php
index 25ea9d2ec2..a24fa15c4e 100644
--- a/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php
+++ b/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php
@@ -8,8 +8,7 @@
 
 final class ExistingConfiguration implements ConfigurationLoader
 {
-    /** @var Configuration */
-    private $configurations;
+    private Configuration $configurations;
 
     public function __construct(Configuration $configurations)
     {
diff --git a/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php b/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php
index 2d237789c6..7a65927e37 100644
--- a/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php
+++ b/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php
@@ -18,7 +18,7 @@
 final class FormattedFile extends ConfigurationFile
 {
     /** @var callable[] */
-    private $loaders = [];
+    private array $loaders = [];
 
     private function setDefaultLoaders(): void
     {
diff --git a/lib/Doctrine/Migrations/DbalMigrator.php b/lib/Doctrine/Migrations/DbalMigrator.php
index 8271d8bb0f..e0edccdfc2 100644
--- a/lib/Doctrine/Migrations/DbalMigrator.php
+++ b/lib/Doctrine/Migrations/DbalMigrator.php
@@ -27,20 +27,15 @@
  */
 class DbalMigrator implements Migrator
 {
-    /** @var Stopwatch */
-    private $stopwatch;
+    private Stopwatch $stopwatch;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /** @var Executor */
-    private $executor;
+    private Executor $executor;
 
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var EventDispatcher */
-    private $dispatcher;
+    private EventDispatcher $dispatcher;
 
     public function __construct(
         Connection $connection,
diff --git a/lib/Doctrine/Migrations/DependencyFactory.php b/lib/Doctrine/Migrations/DependencyFactory.php
index 1f5fe25a1a..531f597172 100644
--- a/lib/Doctrine/Migrations/DependencyFactory.php
+++ b/lib/Doctrine/Migrations/DependencyFactory.php
@@ -62,32 +62,25 @@ class DependencyFactory
     /** @psalm-var array<string, bool> */
     private $inResolution = [];
 
-    /** @var Configuration */
-    private $configuration;
+    private ?Configuration $configuration = null;
 
     /** @var object[]|callable[] */
-    private $dependencies = [];
+    private array $dependencies = [];
 
-    /** @var Connection */
-    private $connection;
+    private ?Connection $connection = null;
 
-    /** @var EntityManagerInterface|null */
-    private $em;
+    private ?EntityManagerInterface $em = null;
 
-    /** @var bool */
-    private $frozen = false;
+    private bool $frozen = false;
 
-    /** @var ConfigurationLoader */
-    private $configurationLoader;
+    private ConfigurationLoader $configurationLoader;
 
-    /** @var ConnectionLoader */
-    private $connectionLoader;
+    private ConnectionLoader $connectionLoader;
 
-    /** @var EntityManagerLoader|null */
-    private $emLoader;
+    private ?EntityManagerLoader $emLoader = null;
 
     /** @var callable[] */
-    private $factories = [];
+    private array $factories = [];
 
     public static function fromConnection(
         ConfigurationLoader $configurationLoader,
diff --git a/lib/Doctrine/Migrations/Event/MigrationsEventArgs.php b/lib/Doctrine/Migrations/Event/MigrationsEventArgs.php
index 9088e13b7f..05bcf6b570 100644
--- a/lib/Doctrine/Migrations/Event/MigrationsEventArgs.php
+++ b/lib/Doctrine/Migrations/Event/MigrationsEventArgs.php
@@ -14,14 +14,11 @@
  */
 final class MigrationsEventArgs extends EventArgs
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var MigrationPlanList */
-    private $plan;
+    private MigrationPlanList $plan;
 
-    /** @var MigratorConfiguration */
-    private $migratorConfiguration;
+    private MigratorConfiguration $migratorConfiguration;
 
     public function __construct(
         Connection $connection,
diff --git a/lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php b/lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php
index 9448b88b6a..cc78bbbd13 100644
--- a/lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php
+++ b/lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php
@@ -14,14 +14,11 @@
  */
 final class MigrationsVersionEventArgs extends EventArgs
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var MigrationPlan */
-    private $plan;
+    private MigrationPlan $plan;
 
-    /** @var MigratorConfiguration */
-    private $migratorConfiguration;
+    private MigratorConfiguration $migratorConfiguration;
 
     public function __construct(
         Connection $connection,
diff --git a/lib/Doctrine/Migrations/EventDispatcher.php b/lib/Doctrine/Migrations/EventDispatcher.php
index 53b94358d2..c82a8502d6 100644
--- a/lib/Doctrine/Migrations/EventDispatcher.php
+++ b/lib/Doctrine/Migrations/EventDispatcher.php
@@ -19,11 +19,9 @@
  */
 final class EventDispatcher
 {
-    /** @var EventManager */
-    private $eventManager;
+    private EventManager $eventManager;
 
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection, EventManager $eventManager)
     {
diff --git a/lib/Doctrine/Migrations/FileQueryWriter.php b/lib/Doctrine/Migrations/FileQueryWriter.php
index 741db2bd88..db304ce478 100644
--- a/lib/Doctrine/Migrations/FileQueryWriter.php
+++ b/lib/Doctrine/Migrations/FileQueryWriter.php
@@ -21,11 +21,9 @@
  */
 final class FileQueryWriter implements QueryWriter
 {
-    /** @var FileBuilder */
-    private $migrationFileBuilder;
+    private FileBuilder $migrationFileBuilder;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(
         FileBuilder $migrationFileBuilder,
diff --git a/lib/Doctrine/Migrations/FilesystemMigrationsRepository.php b/lib/Doctrine/Migrations/FilesystemMigrationsRepository.php
index e2da8cdafe..c9da14dc0b 100644
--- a/lib/Doctrine/Migrations/FilesystemMigrationsRepository.php
+++ b/lib/Doctrine/Migrations/FilesystemMigrationsRepository.php
@@ -23,20 +23,17 @@
  */
 class FilesystemMigrationsRepository implements MigrationsRepository
 {
-    /** @var bool */
-    private $migrationsLoaded = false;
+    private bool $migrationsLoaded = false;
 
     /** @var array<string, string> */
-    private $migrationDirectories;
+    private array $migrationDirectories;
 
-    /** @var MigrationFinder */
-    private $migrationFinder;
+    private MigrationFinder $migrationFinder;
 
-    /** @var MigrationFactory */
-    private $versionFactory;
+    private MigrationFactory $versionFactory;
 
     /** @var AvailableMigration[] */
-    private $migrations = [];
+    private array $migrations = [];
 
     /**
      * @param string[]              $classes
diff --git a/lib/Doctrine/Migrations/Finder/RecursiveRegexFinder.php b/lib/Doctrine/Migrations/Finder/RecursiveRegexFinder.php
index e3c2d3c3fd..5299d26095 100644
--- a/lib/Doctrine/Migrations/Finder/RecursiveRegexFinder.php
+++ b/lib/Doctrine/Migrations/Finder/RecursiveRegexFinder.php
@@ -18,8 +18,7 @@
  */
 final class RecursiveRegexFinder extends Finder
 {
-    /** @var string */
-    private $pattern;
+    private string $pattern;
 
     public function __construct(?string $pattern = null)
     {
diff --git a/lib/Doctrine/Migrations/Generator/DiffGenerator.php b/lib/Doctrine/Migrations/Generator/DiffGenerator.php
index 48e8e68c14..98dfd0b5d7 100644
--- a/lib/Doctrine/Migrations/Generator/DiffGenerator.php
+++ b/lib/Doctrine/Migrations/Generator/DiffGenerator.php
@@ -24,26 +24,20 @@
  */
 class DiffGenerator
 {
-    /** @var DBALConfiguration */
-    private $dbalConfiguration;
+    private DBALConfiguration $dbalConfiguration;
 
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
 
-    /** @var SchemaProvider */
-    private $schemaProvider;
+    private SchemaProvider $schemaProvider;
 
-    /** @var AbstractPlatform */
-    private $platform;
+    private AbstractPlatform $platform;
 
-    /** @var Generator */
-    private $migrationGenerator;
+    private Generator $migrationGenerator;
 
-    /** @var SqlGenerator */
-    private $migrationSqlGenerator;
+    private SqlGenerator $migrationSqlGenerator;
 
-    /** @var SchemaProvider */
-    private $emptySchemaProvider;
+    private SchemaProvider $emptySchemaProvider;
 
     /**
      * @param AbstractSchemaManager<AbstractPlatform> $schemaManager
diff --git a/lib/Doctrine/Migrations/Generator/Generator.php b/lib/Doctrine/Migrations/Generator/Generator.php
index e99805e705..865f8f3f52 100644
--- a/lib/Doctrine/Migrations/Generator/Generator.php
+++ b/lib/Doctrine/Migrations/Generator/Generator.php
@@ -63,11 +63,9 @@ public function down(Schema $schema): void
 
 TEMPLATE;
 
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var string|null */
-    private $template;
+    private ?string $template = null;
 
     public function __construct(Configuration $configuration)
     {
diff --git a/lib/Doctrine/Migrations/Generator/SqlGenerator.php b/lib/Doctrine/Migrations/Generator/SqlGenerator.php
index feb4e08e2f..918c3cbf8d 100644
--- a/lib/Doctrine/Migrations/Generator/SqlGenerator.php
+++ b/lib/Doctrine/Migrations/Generator/SqlGenerator.php
@@ -27,11 +27,9 @@
  */
 class SqlGenerator
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var AbstractPlatform */
-    private $platform;
+    private AbstractPlatform $platform;
 
     public function __construct(Configuration $configuration, AbstractPlatform $platform)
     {
diff --git a/lib/Doctrine/Migrations/InlineParameterFormatter.php b/lib/Doctrine/Migrations/InlineParameterFormatter.php
index f419b62250..32a82a5b0e 100644
--- a/lib/Doctrine/Migrations/InlineParameterFormatter.php
+++ b/lib/Doctrine/Migrations/InlineParameterFormatter.php
@@ -23,8 +23,7 @@
  */
 final class InlineParameterFormatter implements ParameterFormatter
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
diff --git a/lib/Doctrine/Migrations/Metadata/AvailableMigration.php b/lib/Doctrine/Migrations/Metadata/AvailableMigration.php
index e312c7f7b6..7a8d8478ae 100644
--- a/lib/Doctrine/Migrations/Metadata/AvailableMigration.php
+++ b/lib/Doctrine/Migrations/Metadata/AvailableMigration.php
@@ -13,11 +13,9 @@
  */
 final class AvailableMigration
 {
-    /** @var Version */
-    private $version;
+    private Version $version;
 
-    /** @var AbstractMigration */
-    private $migration;
+    private AbstractMigration $migration;
 
     public function __construct(Version $version, AbstractMigration $migration)
     {
diff --git a/lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php b/lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php
index ec8d271e5c..5ae4f3571d 100644
--- a/lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php
+++ b/lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php
@@ -19,7 +19,7 @@
 final class AvailableMigrationsList implements Countable
 {
     /** @var AvailableMigration[] */
-    private $items = [];
+    private array $items = [];
 
     /**
      * @param AvailableMigration[] $items
diff --git a/lib/Doctrine/Migrations/Metadata/AvailableMigrationsSet.php b/lib/Doctrine/Migrations/Metadata/AvailableMigrationsSet.php
index 12ef4e7ba6..408565dff0 100644
--- a/lib/Doctrine/Migrations/Metadata/AvailableMigrationsSet.php
+++ b/lib/Doctrine/Migrations/Metadata/AvailableMigrationsSet.php
@@ -17,7 +17,7 @@
 final class AvailableMigrationsSet implements Countable
 {
     /** @var AvailableMigration[] */
-    private $items = [];
+    private array $items = [];
 
     /**
      * @param AvailableMigration[] $items
diff --git a/lib/Doctrine/Migrations/Metadata/ExecutedMigration.php b/lib/Doctrine/Migrations/Metadata/ExecutedMigration.php
index 1c72d48ee6..464c9c74ba 100644
--- a/lib/Doctrine/Migrations/Metadata/ExecutedMigration.php
+++ b/lib/Doctrine/Migrations/Metadata/ExecutedMigration.php
@@ -13,18 +13,14 @@
  */
 final class ExecutedMigration
 {
-    /** @var Version */
-    private $version;
+    private Version $version;
 
-    /** @var DateTimeImmutable|null */
-    private $executedAt;
+    private ?DateTimeImmutable $executedAt = null;
 
     /**
      * Seconds
-     *
-     * @var float|null
      */
-    public $executionTime;
+    public ?float $executionTime = null;
 
     public function __construct(Version $version, ?DateTimeImmutable $executedAt = null, ?float $executionTime = null)
     {
diff --git a/lib/Doctrine/Migrations/Metadata/ExecutedMigrationsList.php b/lib/Doctrine/Migrations/Metadata/ExecutedMigrationsList.php
index 97e7ee620a..937f2bdd51 100644
--- a/lib/Doctrine/Migrations/Metadata/ExecutedMigrationsList.php
+++ b/lib/Doctrine/Migrations/Metadata/ExecutedMigrationsList.php
@@ -20,7 +20,7 @@
 final class ExecutedMigrationsList implements Countable
 {
     /** @var ExecutedMigration[] */
-    private $items = [];
+    private array $items = [];
 
     /**
      * @param ExecutedMigration[] $items
diff --git a/lib/Doctrine/Migrations/Metadata/MigrationPlan.php b/lib/Doctrine/Migrations/Metadata/MigrationPlan.php
index 203a77e69f..a38bddacbf 100644
--- a/lib/Doctrine/Migrations/Metadata/MigrationPlan.php
+++ b/lib/Doctrine/Migrations/Metadata/MigrationPlan.php
@@ -14,14 +14,10 @@
  */
 final class MigrationPlan
 {
-    /** @var string */
-    private $direction;
-    /** @var Version */
-    private $version;
-    /** @var AbstractMigration */
-    private $migration;
-    /** @var ExecutionResult */
-    public $result;
+    private string $direction;
+    private Version $version;
+    private AbstractMigration $migration;
+    public ?ExecutionResult $result = null;
 
     public function __construct(Version $version, AbstractMigration $migration, string $direction)
     {
diff --git a/lib/Doctrine/Migrations/Metadata/MigrationPlanList.php b/lib/Doctrine/Migrations/Metadata/MigrationPlanList.php
index 7c32a80e83..8b8b3339d6 100644
--- a/lib/Doctrine/Migrations/Metadata/MigrationPlanList.php
+++ b/lib/Doctrine/Migrations/Metadata/MigrationPlanList.php
@@ -16,11 +16,10 @@
  */
 final class MigrationPlanList implements Countable
 {
-    /** @var string */
-    private $direction;
+    private string $direction;
 
     /** @var MigrationPlan[] */
-    private $items = [];
+    private array $items = [];
 
     /**
      * @param MigrationPlan[] $items
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php b/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
index 2a82fb90a3..2e3135572f 100644
--- a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
+++ b/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorage.php
@@ -36,29 +36,22 @@
 
 final class TableMetadataStorage implements MetadataStorage
 {
-    /** @var bool */
-    private $isInitialized;
+    private bool $isInitialized = false;
 
-    /** @var bool */
-    private $schemaUpToDate = false;
+    private bool $schemaUpToDate = false;
 
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
 
-    /** @var AbstractPlatform */
-    private $platform;
+    private AbstractPlatform $platform;
 
-    /** @var TableMetadataStorageConfiguration */
-    private $configuration;
+    private TableMetadataStorageConfiguration $configuration;
 
-    /** @var MigrationsRepository|null */
-    private $migrationRepository;
+    private ?MigrationsRepository $migrationRepository = null;
 
-    /** @var MigrationsComparator */
-    private $comparator;
+    private MigrationsComparator $comparator;
 
     public function __construct(
         Connection $connection,
diff --git a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorageConfiguration.php b/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorageConfiguration.php
index 655f4357ef..44eb5cd98c 100644
--- a/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorageConfiguration.php
+++ b/lib/Doctrine/Migrations/Metadata/Storage/TableMetadataStorageConfiguration.php
@@ -6,20 +6,15 @@
 
 final class TableMetadataStorageConfiguration implements MetadataStorageConfiguration
 {
-    /** @var string */
-    private $tableName = 'doctrine_migration_versions';
+    private string $tableName = 'doctrine_migration_versions';
 
-    /** @var string */
-    private $versionColumnName = 'version';
+    private string $versionColumnName = 'version';
 
-    /** @var int */
-    private $versionColumnLength = 191;
+    private int $versionColumnLength = 191;
 
-    /** @var string */
-    private $executedAtColumnName = 'executed_at';
+    private string $executedAtColumnName = 'executed_at';
 
-    /** @var string */
-    private $executionTimeColumnName = 'execution_time';
+    private string $executionTimeColumnName = 'execution_time';
 
     public function getTableName(): string
     {
diff --git a/lib/Doctrine/Migrations/MigratorConfiguration.php b/lib/Doctrine/Migrations/MigratorConfiguration.php
index d75ce68601..8121d64683 100644
--- a/lib/Doctrine/Migrations/MigratorConfiguration.php
+++ b/lib/Doctrine/Migrations/MigratorConfiguration.php
@@ -16,20 +16,15 @@
  */
 class MigratorConfiguration
 {
-    /** @var bool */
-    private $dryRun = false;
+    private bool $dryRun = false;
 
-    /** @var bool */
-    private $timeAllQueries = false;
+    private bool $timeAllQueries = false;
 
-    /** @var bool */
-    private $noMigrationException = false;
+    private bool $noMigrationException = false;
 
-    /** @var bool */
-    private $allOrNothing = false;
+    private bool $allOrNothing = false;
 
-    /** @var Schema|null */
-    private $fromSchema;
+    private ?Schema $fromSchema = null;
 
     public function isDryRun(): bool
     {
diff --git a/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php b/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
index dd9459921d..5b41c8b46c 100644
--- a/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
+++ b/lib/Doctrine/Migrations/Provider/DBALSchemaDiffProvider.php
@@ -20,11 +20,10 @@
  */
 class DBALSchemaDiffProvider implements SchemaDiffProvider
 {
-    /** @var AbstractPlatform */
-    private $platform;
+    private AbstractPlatform $platform;
 
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
 
     /**
      * @param AbstractSchemaManager<AbstractPlatform> $schemaManager-
diff --git a/lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php b/lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php
index 7258e7be18..61c422d6f3 100644
--- a/lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php
+++ b/lib/Doctrine/Migrations/Provider/EmptySchemaProvider.php
@@ -17,7 +17,7 @@
 final class EmptySchemaProvider implements SchemaProvider
 {
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
 
     /**
      * @param AbstractSchemaManager<AbstractPlatform> $schemaManager
diff --git a/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php b/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
index b9f88d67a2..ccd79ff8e6 100644
--- a/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
+++ b/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
@@ -18,11 +18,9 @@
  */
 class LazySchemaDiffProvider implements SchemaDiffProvider
 {
-    /** @var LazyLoadingValueHolderFactory */
-    private $proxyFactory;
+    private LazyLoadingValueHolderFactory $proxyFactory;
 
-    /** @var SchemaDiffProvider */
-    private $originalSchemaManipulator;
+    private SchemaDiffProvider $originalSchemaManipulator;
 
     public function __construct(
         LazyLoadingValueHolderFactory $proxyFactory,
diff --git a/lib/Doctrine/Migrations/Provider/OrmSchemaProvider.php b/lib/Doctrine/Migrations/Provider/OrmSchemaProvider.php
index 5f958fd8ae..1f69bb8a9e 100644
--- a/lib/Doctrine/Migrations/Provider/OrmSchemaProvider.php
+++ b/lib/Doctrine/Migrations/Provider/OrmSchemaProvider.php
@@ -22,8 +22,7 @@
  */
 final class OrmSchemaProvider implements SchemaProvider
 {
-    /** @var EntityManagerInterface */
-    private $entityManager;
+    private EntityManagerInterface $entityManager;
 
     public function __construct(EntityManagerInterface $em)
     {
diff --git a/lib/Doctrine/Migrations/Provider/StubSchemaProvider.php b/lib/Doctrine/Migrations/Provider/StubSchemaProvider.php
index 947ba00090..030af5685e 100644
--- a/lib/Doctrine/Migrations/Provider/StubSchemaProvider.php
+++ b/lib/Doctrine/Migrations/Provider/StubSchemaProvider.php
@@ -12,8 +12,7 @@
  */
 final class StubSchemaProvider implements SchemaProvider
 {
-    /** @var Schema */
-    private $toSchema;
+    private Schema $toSchema;
 
     public function __construct(Schema $schema)
     {
diff --git a/lib/Doctrine/Migrations/Query/Query.php b/lib/Doctrine/Migrations/Query/Query.php
index 6388a7616b..660698a8b4 100644
--- a/lib/Doctrine/Migrations/Query/Query.php
+++ b/lib/Doctrine/Migrations/Query/Query.php
@@ -13,14 +13,13 @@
  */
 final class Query
 {
-    /** @var string */
-    private $statement;
+    private string $statement;
 
     /** @var mixed[] */
-    private $parameters;
+    private array $parameters;
 
     /** @var mixed[] */
-    private $types;
+    private array $types;
 
     /**
      * @param mixed[] $parameters
diff --git a/lib/Doctrine/Migrations/Rollup.php b/lib/Doctrine/Migrations/Rollup.php
index 0b6910ff2a..33b16b03aa 100644
--- a/lib/Doctrine/Migrations/Rollup.php
+++ b/lib/Doctrine/Migrations/Rollup.php
@@ -19,11 +19,9 @@
  */
 class Rollup
 {
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
     public function __construct(
         MetadataStorage $metadataStorage,
diff --git a/lib/Doctrine/Migrations/SchemaDumper.php b/lib/Doctrine/Migrations/SchemaDumper.php
index 1ffc9b0cb5..0d81117570 100644
--- a/lib/Doctrine/Migrations/SchemaDumper.php
+++ b/lib/Doctrine/Migrations/SchemaDumper.php
@@ -37,20 +37,17 @@
  */
 class SchemaDumper
 {
-    /** @var AbstractPlatform */
-    private $platform;
+    private AbstractPlatform $platform;
 
     /** @var AbstractSchemaManager<AbstractPlatform> */
-    private $schemaManager;
+    private AbstractSchemaManager $schemaManager;
 
-    /** @var Generator */
-    private $migrationGenerator;
+    private Generator $migrationGenerator;
 
-    /** @var SqlGenerator */
-    private $migrationSqlGenerator;
+    private SqlGenerator $migrationSqlGenerator;
 
     /** @var string[] */
-    private $excludedTablesRegexes;
+    private array $excludedTablesRegexes;
 
     /**
      * @param AbstractSchemaManager<AbstractPlatform> $schemaManager
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php
index f3a6d0bb37..59bb320d46 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php
@@ -25,8 +25,7 @@
  */
 abstract class DoctrineCommand extends Command
 {
-    /** @var DependencyFactory|null */
-    private $dependencyFactory;
+    private ?DependencyFactory $dependencyFactory = null;
 
     /** @var StyleInterface */
     protected $io;
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/VersionCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/VersionCommand.php
index 45064c17b4..d35faad57f 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/VersionCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/VersionCommand.php
@@ -28,8 +28,7 @@ final class VersionCommand extends DoctrineCommand
     /** @var string|null */
     protected static $defaultName = 'migrations:version';
 
-    /** @var bool */
-    private $markMigrated;
+    private bool $markMigrated;
 
     protected function configure(): void
     {
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleInputMigratorConfigurationFactory.php b/lib/Doctrine/Migrations/Tools/Console/ConsoleInputMigratorConfigurationFactory.php
index 9c00e8c247..04ee777b37 100644
--- a/lib/Doctrine/Migrations/Tools/Console/ConsoleInputMigratorConfigurationFactory.php
+++ b/lib/Doctrine/Migrations/Tools/Console/ConsoleInputMigratorConfigurationFactory.php
@@ -10,8 +10,7 @@
 
 class ConsoleInputMigratorConfigurationFactory implements MigratorConfigurationFactory
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
     public function __construct(Configuration $configuration)
     {
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php b/lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
index 885faed262..936ad65464 100644
--- a/lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
+++ b/lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
@@ -34,11 +34,10 @@ final class ConsoleLogger extends AbstractLogger
     public const INFO  = 'info';
     public const ERROR = 'error';
 
-    /** @var OutputInterface */
-    private $output;
+    private OutputInterface $output;
 
     /** @var array<string, int> */
-    private $verbosityLevelMap = [
+    private array $verbosityLevelMap = [
         LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
@@ -49,7 +48,7 @@ final class ConsoleLogger extends AbstractLogger
         LogLevel::DEBUG => OutputInterface::VERBOSITY_VERY_VERBOSE,
     ];
     /** @var array<string, string> */
-    private $formatLevelMap = [
+    private array $formatLevelMap = [
         LogLevel::EMERGENCY => self::ERROR,
         LogLevel::ALERT => self::ERROR,
         LogLevel::CRITICAL => self::ERROR,
diff --git a/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php b/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
index 302b89d18f..4b523f9b81 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
@@ -35,23 +35,17 @@
  */
 class MigrationStatusInfosHelper
 {
-    /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var AliasResolver */
-    private $aliasResolver;
+    private AliasResolver $aliasResolver;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var MigrationPlanCalculator */
-    private $migrationPlanCalculator;
+    private MigrationPlanCalculator $migrationPlanCalculator;
 
-    /** @var MigrationStatusCalculator */
-    private $statusCalculator;
+    private MigrationStatusCalculator $statusCalculator;
 
     public function __construct(
         Configuration $configuration,
diff --git a/lib/Doctrine/Migrations/Version/CurrentMigrationStatusCalculator.php b/lib/Doctrine/Migrations/Version/CurrentMigrationStatusCalculator.php
index 7a575d71fd..ecbd568c11 100644
--- a/lib/Doctrine/Migrations/Version/CurrentMigrationStatusCalculator.php
+++ b/lib/Doctrine/Migrations/Version/CurrentMigrationStatusCalculator.php
@@ -14,11 +14,9 @@
  */
 final class CurrentMigrationStatusCalculator implements MigrationStatusCalculator
 {
-    /** @var MigrationPlanCalculator */
-    private $migrationPlanCalculator;
+    private MigrationPlanCalculator $migrationPlanCalculator;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
     public function __construct(
         MigrationPlanCalculator $migrationPlanCalculator,
diff --git a/lib/Doctrine/Migrations/Version/DbalExecutor.php b/lib/Doctrine/Migrations/Version/DbalExecutor.php
index 92e6e0fe19..fb75954165 100644
--- a/lib/Doctrine/Migrations/Version/DbalExecutor.php
+++ b/lib/Doctrine/Migrations/Version/DbalExecutor.php
@@ -34,29 +34,22 @@
  */
 final class DbalExecutor implements Executor
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var SchemaDiffProvider */
-    private $schemaProvider;
+    private SchemaDiffProvider $schemaProvider;
 
-    /** @var ParameterFormatter */
-    private $parameterFormatter;
+    private ParameterFormatter $parameterFormatter;
 
-    /** @var Stopwatch */
-    private $stopwatch;
+    private Stopwatch $stopwatch;
 
     /** @var Query[] */
-    private $sql = [];
+    private array $sql = [];
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /** @var EventDispatcher */
-    private $dispatcher;
+    private EventDispatcher $dispatcher;
 
     public function __construct(
         MetadataStorage $metadataStorage,
diff --git a/lib/Doctrine/Migrations/Version/DbalMigrationFactory.php b/lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
index 9d8efbf24e..6721041747 100644
--- a/lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
+++ b/lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
@@ -15,11 +15,9 @@
  */
 final class DbalMigrationFactory implements MigrationFactory
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(Connection $connection, LoggerInterface $logger)
     {
diff --git a/lib/Doctrine/Migrations/Version/DefaultAliasResolver.php b/lib/Doctrine/Migrations/Version/DefaultAliasResolver.php
index 192255ff64..517fcde633 100644
--- a/lib/Doctrine/Migrations/Version/DefaultAliasResolver.php
+++ b/lib/Doctrine/Migrations/Version/DefaultAliasResolver.php
@@ -24,14 +24,11 @@ final class DefaultAliasResolver implements AliasResolver
     private const ALIAS_NEXT    = 'next';
     private const ALIAS_LATEST  = 'latest';
 
-    /** @var MigrationPlanCalculator */
-    private $migrationPlanCalculator;
+    private MigrationPlanCalculator $migrationPlanCalculator;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var MigrationStatusCalculator */
-    private $migrationStatusCalculator;
+    private MigrationStatusCalculator $migrationStatusCalculator;
 
     public function __construct(
         MigrationPlanCalculator $migrationPlanCalculator,
diff --git a/lib/Doctrine/Migrations/Version/ExecutionResult.php b/lib/Doctrine/Migrations/Version/ExecutionResult.php
index 50596e8f35..f225316f1d 100644
--- a/lib/Doctrine/Migrations/Version/ExecutionResult.php
+++ b/lib/Doctrine/Migrations/Version/ExecutionResult.php
@@ -20,41 +20,30 @@
 final class ExecutionResult
 {
     /** @var Query[] */
-    private $sql = [];
+    private array $sql = [];
 
     /**
      * Seconds
-     *
-     * @var float|null
      */
-    private $time;
+    private ?float $time = null;
 
-    /** @var float|null */
-    private $memory;
+    private ?float $memory = null;
 
-    /** @var bool */
-    private $skipped = false;
+    private bool $skipped = false;
 
-    /** @var bool */
-    private $error = false;
+    private bool $error = false;
 
-    /** @var Throwable|null */
-    private $exception;
+    private ?Throwable $exception = null;
 
-    /** @var DateTimeImmutable|null */
-    private $executedAt;
+    private ?DateTimeImmutable $executedAt = null;
 
-    /** @var int */
-    private $state;
+    private int $state;
 
-    /** @var Schema|null */
-    private $toSchema;
+    private ?Schema $toSchema = null;
 
-    /** @var Version */
-    private $version;
+    private Version $version;
 
-    /** @var string */
-    private $direction;
+    private string $direction;
 
     public function __construct(Version $version, string $direction = Direction::UP, ?DateTimeImmutable $executedAt = null)
     {
diff --git a/lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php b/lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php
index 475d787db8..688f068ed1 100644
--- a/lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php
+++ b/lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php
@@ -31,14 +31,11 @@
  */
 final class SortedMigrationPlanCalculator implements MigrationPlanCalculator
 {
-    /** @var MigrationsRepository */
-    private $migrationRepository;
+    private MigrationsRepository $migrationRepository;
 
-    /** @var MetadataStorage */
-    private $metadataStorage;
+    private MetadataStorage $metadataStorage;
 
-    /** @var Comparator */
-    private $sorter;
+    private Comparator $sorter;
 
     public function __construct(
         MigrationsRepository $migrationRepository,
diff --git a/lib/Doctrine/Migrations/Version/Version.php b/lib/Doctrine/Migrations/Version/Version.php
index 9d916b2493..675d336ff9 100644
--- a/lib/Doctrine/Migrations/Version/Version.php
+++ b/lib/Doctrine/Migrations/Version/Version.php
@@ -6,8 +6,7 @@
 
 final class Version
 {
-    /** @var string */
-    private $version;
+    private string $version;
 
     public function __construct(string $version)
     {