From f5887f0e705ae9258b45a0ec7e2b4745335ccd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 4 Apr 2022 20:29:06 +0200 Subject: [PATCH] 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 */ - 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 */ - private $configurations; + private array $configurations; /** * @param array $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 */ 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 */ - 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 */ - 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 $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 */ - 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 */ - private $schemaManager; + private AbstractSchemaManager $schemaManager; /** * @param AbstractSchemaManager $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 */ - private $schemaManager; + private AbstractSchemaManager $schemaManager; /** * @param AbstractSchemaManager $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 */ - 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 $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 */ - 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 */ - 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) {