Merge pull request #703 from driehle/feature/typed-properties

Use typed properties where possible

Author: driehle

phpcs.xml

@@ -6,8 +6,8 @@
     <arg name="cache" value=".phpcs.cache"/>
     <arg name="colors"/>
 
-    <!-- set minimal required PHP version (7.3) -->
-    <config name="php_version" value="70300"/>
+    <!-- set minimal required PHP version (7.4) -->
+    <config name="php_version" value="70400"/>
 
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>

src/CliConfigurator.php

@@ -21,11 +21,10 @@
 
 class CliConfigurator
 {
-    /** @var string */
-    private $defaultObjectManagerName = 'doctrine.entitymanager.orm_default';
+    private string $defaultObjectManagerName = 'doctrine.entitymanager.orm_default';
 
     /** @var string[] */
-    private $commands = [
+    private array $commands = [
         'doctrine.dbal_cmd.runsql',
         'doctrine.dbal_cmd.reserved_words',
         'doctrine.orm_cmd.clear_cache_metadata',
@@ -46,7 +45,7 @@ class CliConfigurator
     ];
 
     /** @var string[] */
-    private $migrationCommands = [
+    private array $migrationCommands = [
         'doctrine.migrations_cmd.current',
         'doctrine.migrations_cmd.diff',
         'doctrine.migrations_cmd.dumpschema',
@@ -62,8 +61,7 @@ class CliConfigurator
         'doctrine.migrations_cmd.uptodate',
     ];
 
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {

src/Collector/MappingCollector.php

@@ -25,14 +25,12 @@ class MappingCollector implements CollectorInterface, AutoHideInterface, Seriali
      */
     public const PRIORITY = 10;
 
-    /** @var string */
-    protected $name;
+    protected string $name;
 
-    /** @var ClassMetadataFactory|null */
-    protected $classMetadataFactory = null;
+    protected ?ClassMetadataFactory $classMetadataFactory = null;
 
     /** @var ClassMetadata[] indexed by class name */
-    protected $classes = [];
+    protected array $classes = [];
 
     public function __construct(ClassMetadataFactory $classMetadataFactory, string $name)
     {

src/Collector/SQLLoggerCollector.php

@@ -21,11 +21,9 @@ class SQLLoggerCollector implements CollectorInterface, AutoHideInterface
      */
     public const PRIORITY = 10;
 
-    /** @var DebugStack */
-    protected $sqlLogger;
+    protected DebugStack $sqlLogger;
 
-    /** @var string */
-    protected $name;
+    protected string $name;
 
     public function __construct(DebugStack $sqlLogger, string $name)
     {

src/Form/Annotation/DoctrineAnnotationListener.php

@@ -19,8 +19,7 @@
 
 class DoctrineAnnotationListener extends AbstractListenerAggregate
 {
-    /** @var ObjectManager */
-    protected $objectManager;
+    protected ObjectManager $objectManager;
 
     public function __construct(ObjectManager $objectManager)
     {

src/Form/Annotation/EntityBasedFormBuilder.php

@@ -33,11 +33,9 @@ final class EntityBasedFormBuilder
     public const EVENT_EXCLUDE_FIELD         = 'excludeField';
     public const EVENT_EXCLUDE_ASSOCIATION   = 'excludeAssociation';
 
-    /** @var AbstractBuilder */
-    protected $builder;
+    protected AbstractBuilder $builder;
 
-    /** @var ObjectManager */
-    protected $objectManager;
+    protected ObjectManager $objectManager;
 
     /**
      * Constructor. Ensures ObjectManager is present.

src/Options/Configuration.php

@@ -25,168 +25,148 @@ class Configuration extends DBALConfiguration
      * Set the cache key for the metadata cache. Cache key
      * is assembled as "doctrine.cache.{key}" and pulled from
      * service locator.
-     *
-     * @var string
      */
-    protected $metadataCache = 'array';
+    protected string $metadataCache = 'array';
 
     /**
      * Set the cache key for the query cache. Cache key
      * is assembled as "doctrine.cache.{key}" and pulled from
      * service locator.
-     *
-     * @var string
      */
-    protected $queryCache = 'array';
+    protected string $queryCache = 'array';
 
     /**
      * Set the cache key for the result cache. Cache key
      * is assembled as "doctrine.cache.{key}" and pulled from
      * service locator.
-     *
-     * @var string
      */
-    protected $resultCache = 'array';
+    protected string $resultCache = 'array';
 
     /**
      * Set the cache key for the hydration cache. Cache key
      * is assembled as "doctrine.cache.{key}" and pulled from
      * service locator.
-     *
-     * @var string
      */
-    protected $hydrationCache = 'array';
+    protected string $hydrationCache = 'array';
 
     /**
      * Set the driver key for the metadata driver. Driver key
      * is assembled as "doctrine.driver.{key}" and pulled from
      * service locator.
-     *
-     * @var string
      */
-    protected $driver = 'orm_default';
+    protected string $driver = 'orm_default';
 
     /**
      * Automatic generation of proxies (disable for production!)
-     *
-     * @var bool
      */
-    protected $generateProxies = true;
+    protected bool $generateProxies = true;
 
     /**
      * Proxy directory.
-     *
-     * @var string
      */
-    protected $proxyDir = 'data';
+    protected string $proxyDir = 'data';
 
     /**
      * Proxy namespace.
-     *
-     * @var string
      */
-    protected $proxyNamespace = 'DoctrineORMModule\Proxy';
+    protected string $proxyNamespace = 'DoctrineORMModule\Proxy';
 
     /**
      * Entity alias map.
      *
      * @var mixed[]
      */
-    protected $entityNamespaces = [];
+    protected array $entityNamespaces = [];
 
     /**
      * Keys must be function names and values the FQCN of the implementing class.
      * The function names will be case-insensitive in DQL.
      *
      * @var mixed[]
      */
-    protected $datetimeFunctions = [];
+    protected array $datetimeFunctions = [];
 
     /**
      * Keys must be function names and values the FQCN of the implementing class.
      * The function names will be case-insensitive in DQL.
      *
      * @var mixed[]
      */
-    protected $stringFunctions = [];
+    protected array $stringFunctions = [];
 
     /**
      * Keys must be function names and values the FQCN of the implementing class.
      * The function names will be case-insensitive in DQL.
      *
      * @var mixed[]
      */
-    protected $numericFunctions = [];
+    protected array $numericFunctions = [];
 
     /**
      * Keys must be the name of the custom filter and the value must be
      * the class name for the custom filter.
      *
      * @var mixed[]
      */
-    protected $filters = [];
+    protected array $filters = [];
 
     /**
      * Keys must be the name of the query and values the DQL query string.
      *
      * @var mixed[]
      */
-    protected $namedQueries = [];
+    protected array $namedQueries = [];
 
     /**
      * Keys must be the name of the query and the value is an array containing
      * the keys 'sql' for native SQL query string and 'rsm' for the Query\ResultSetMapping.
      *
      * @var mixed[]
      */
-    protected $namedNativeQueries = [];
+    protected array $namedNativeQueries = [];
 
     /**
      * Keys must be the name of the custom hydration method and the value must be
      * the class name for the custom hydrator
      *
      * @var mixed[]
      */
-    protected $customHydrationModes = [];
+    protected array $customHydrationModes = [];
 
     /**
      * Naming strategy or name of the naming strategy service to be set in ORM
      * configuration (if any)
      *
      * @var string|NamingStrategy|null
      */
-    protected $namingStrategy;
+    protected $namingStrategy = null;
 
     /**
      * Quote strategy or name of the quote strategy service to be set in ORM
      * configuration (if any)
      *
      * @var string|QuoteStrategy|null
      */
-    protected $quoteStrategy;
+    protected $quoteStrategy = null;
 
     /**
      * Default repository class
-     *
-     * @var string|null
      */
-    protected $defaultRepositoryClassName;
+    protected ?string $defaultRepositoryClassName = null;
 
     /**
      * Repository factory or name of the repository factory service to be set in ORM
      * configuration (if any)
      *
      * @var string|RepositoryFactory|null
      */
-    protected $repositoryFactory;
+    protected $repositoryFactory = null;
 
     /**
      * Class name of MetaData factory to be set in ORM.
      * The entityManager will create a new instance on construction.
-     *
-     * @var string
      */
-    protected $classMetadataFactoryName;
+    protected ?string $classMetadataFactoryName = null;
 
     /**
      * Entity listener resolver or service name of the entity listener resolver
@@ -196,23 +176,19 @@ class Configuration extends DBALConfiguration
      *
      * @var string|EntityListenerResolver|null
      */
-    protected $entityListenerResolver;
+    protected $entityListenerResolver = null;
 
     /**
      * Configuration for second level cache
      *
      * @link http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/second-level-cache.html
-     *
-     * @var SecondLevelCacheConfiguration|null
      */
-    protected $secondLevelCache;
+    protected ?SecondLevelCacheConfiguration $secondLevelCache = null;
 
     /**
      * Configuration option for the filter schema assets expression
-     *
-     * @var string|null
      */
-    protected $filterSchemaAssetsExpression;
+    protected ?string $filterSchemaAssetsExpression = null;
 
     /**
      * @param mixed[] $datetimeFunctions

src/Options/DBALConfiguration.php

@@ -15,25 +15,21 @@ class DBALConfiguration extends AbstractOptions
      * Set the cache key for the result cache. Cache key
      * is assembled as "doctrine.cache.{key}" and pulled from
      * service locator.
-     *
-     * @var string
      */
-    protected $resultCache = 'array';
+    protected string $resultCache = 'array';
 
     /**
      * Set the class name of the SQL Logger, or null, to disable.
-     *
-     * @var string
      */
-    protected $sqlLogger = null;
+    protected ?string $sqlLogger = null;
 
     /**
      * Keys must be the name of the type identifier and value is
      * the class name of the Type
      *
      * @var mixed[]
      */
-    protected $types = [];
+    protected array $types = [];
 
     public function setResultCache(string $resultCache): void
     {