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.
doctrine · Apr 4, 2022 · f5887f0 · f5887f0
1 parent b98f242
commit f5887f0
Show file tree

Hide file tree

Showing 54 changed files with 160 additions and 297 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
     {