Add types to public and protected properties

Author: nicolas-grekas

DependencyInjection/AbstractDoctrineExtension.php

@@ -28,12 +28,12 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Used inside metadata driver method to simplify aggregation of data.
      */
-    protected $aliasMap = [];
+    protected array $aliasMap = [];
 
     /**
      * Used inside metadata driver method to simplify aggregation of data.
      */
-    protected $drivers = [];
+    protected array $drivers = [];
 
     /**
      * @param array $objectManager A configured object manager

DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -35,17 +35,15 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
     /**
      * DI object for the driver to use, either a service definition for a
      * private service or a reference for a public service.
-     *
-     * @var Definition|Reference
      */
-    protected $driver;
+    protected Definition|Reference $driver;
 
     /**
      * List of namespaces handled by the driver.
      *
      * @var string[]
      */
-    protected $namespaces;
+    protected array $namespaces;
 
     /**
      * List of potential container parameters that hold the object manager name
@@ -54,24 +52,20 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      *
      * @var string[]
      */
-    protected $managerParameters;
+    protected array $managerParameters;
 
     /**
      * Naming pattern of the metadata chain driver service ids, for example
      * 'doctrine.orm.%s_metadata_driver'.
-     *
-     * @var string
      */
-    protected $driverPattern;
+    protected string $driverPattern;
 
     /**
      * A name for a parameter in the container. If set, this compiler pass will
      * only do anything if the parameter is present. (But regardless of the
      * value of that parameter.
-     *
-     * @var string|false
      */
-    protected $enabledParameter;
+    protected string|false $enabledParameter;
 
     /**
      * Naming pattern for the configuration service id, for example

Form/DoctrineOrmExtension.php

@@ -18,7 +18,7 @@
 
 class DoctrineOrmExtension extends AbstractExtension
 {
-    protected $registry;
+    protected ManagerRegistry $registry;
 
     public function __construct(ManagerRegistry $registry)
     {

Form/DoctrineOrmTypeGuesser.php

@@ -36,7 +36,7 @@
 
 class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
 {
-    protected $registry;
+    protected ManagerRegistry $registry;
 
     private array $cache = [];
 

Form/Type/DoctrineType.php

@@ -31,10 +31,7 @@
 
 abstract class DoctrineType extends AbstractType implements ResetInterface
 {
-    /**
-     * @var ManagerRegistry
-     */
-    protected $registry;
+    protected ManagerRegistry $registry;
 
     /**
      * @var IdReader[]

ManagerRegistry.php

@@ -24,10 +24,7 @@
  */
 abstract class ManagerRegistry extends AbstractManagerRegistry
 {
-    /**
-     * @var Container
-     */
-    protected $container;
+    protected Container $container;
 
     protected function getService($name): object
     {

Validator/Constraints/UniqueEntity.php

@@ -27,21 +27,21 @@ class UniqueEntity extends Constraint
         self::NOT_UNIQUE_ERROR => 'NOT_UNIQUE_ERROR',
     ];
 
-    public $message = 'This value is already used.';
-    public $service = 'doctrine.orm.validator.unique';
-    public $em;
-    public $entityClass;
-    public $repositoryMethod = 'findBy';
-    public $fields = [];
-    public $errorPath;
-    public $ignoreNull = true;
+    public string $message = 'This value is already used.';
+    public string $service = 'doctrine.orm.validator.unique';
+    public ?string $em = null;
+    public ?string $entityClass = null;
+    public string $repositoryMethod = 'findBy';
+    public array|string $fields = [];
+    public ?string $errorPath = null;
+    public bool|array|string $ignoreNull = true;
 
     /**
      * @param array|string      $fields     The combination of fields that must contain unique values or a set of options
      * @param bool|array|string $ignoreNull The combination of fields that ignore null values
      */
     public function __construct(
-        $fields,
+        array|string $fields,
         string $message = null,
         string $service = null,
         string $em = null,

Validator/DoctrineInitializer.php

@@ -21,7 +21,7 @@
  */
 class DoctrineInitializer implements ObjectInitializerInterface
 {
-    protected $registry;
+    protected ManagerRegistry $registry;
 
     public function __construct(ManagerRegistry $registry)
     {