[DoctrineBridge] Add types to private properties

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

CacheWarmer/ProxyCacheWarmer.php

@@ -24,7 +24,7 @@
  */
 class ProxyCacheWarmer implements CacheWarmerInterface
 {
-    private $registry;
+    private ManagerRegistry $registry;
 
     public function __construct(ManagerRegistry $registry)
     {

ContainerAwareEventManager.php

@@ -28,12 +28,12 @@ class ContainerAwareEventManager extends EventManager
      *
      * <event> => <listeners>
      */
-    private $listeners = [];
-    private $subscribers;
-    private $initialized = [];
-    private $initializedSubscribers = false;
-    private $methods = [];
-    private $container;
+    private array $listeners = [];
+    private array $subscribers;
+    private array $initialized = [];
+    private bool $initializedSubscribers = false;
+    private array $methods = [];
+    private ContainerInterface $container;
 
     /**
      * @param list<string|EventSubscriber|array{string[], string|object}> $subscriberIds List of subscribers, subscriber ids, or [events, listener] tuples

DataCollector/DoctrineDataCollector.php

@@ -28,14 +28,14 @@
  */
 class DoctrineDataCollector extends DataCollector
 {
-    private $registry;
-    private $connections;
-    private $managers;
+    private ManagerRegistry $registry;
+    private array $connections;
+    private array $managers;
 
     /**
-     * @var DebugStack[]
+     * @var array<string, DebugStack>
      */
-    private $loggers = [];
+    private array $loggers = [];
 
     public function __construct(ManagerRegistry $registry)
     {

DataCollector/ObjectParameter.php

@@ -13,10 +13,10 @@
 
 final class ObjectParameter
 {
-    private $object;
-    private $error;
-    private $stringable;
-    private $class;
+    private object $object;
+    private ?\Throwable $error;
+    private bool $stringable;
+    private string $class;
 
     public function __construct(object $object, ?\Throwable $error)
     {

DataFixtures/ContainerAwareLoader.php

@@ -25,7 +25,7 @@
  */
 class ContainerAwareLoader extends Loader
 {
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {

DependencyInjection/CompilerPass/DoctrineValidationPass.php

@@ -21,7 +21,7 @@
  */
 class DoctrineValidationPass implements CompilerPassInterface
 {
-    private $managerType;
+    private string $managerType;
 
     public function __construct(string $managerType)
     {

DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php

@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
@@ -29,20 +30,25 @@
  */
 class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
 {
-    private $connections;
-    private $eventManagers;
-    private $managerTemplate;
-    private $tagPrefix;
+    private string $connectionsParameter;
+    private array $connections;
+
+    /**
+     * @var array<string, Definition>
+     */
+    private array $eventManagers = [];
+
+    private string $managerTemplate;
+    private string $tagPrefix;
 
     /**
-     * @param string $connections     Parameter ID for connections
      * @param string $managerTemplate sprintf() template for generating the event
      *                                manager's service ID for a connection name
      * @param string $tagPrefix       Tag prefix for listeners and subscribers
      */
-    public function __construct(string $connections, string $managerTemplate, string $tagPrefix)
+    public function __construct(string $connectionsParameter, string $managerTemplate, string $tagPrefix)
     {
-        $this->connections = $connections;
+        $this->connectionsParameter = $connectionsParameter;
         $this->managerTemplate = $managerTemplate;
         $this->tagPrefix = $tagPrefix;
     }
@@ -52,11 +58,11 @@ public function __construct(string $connections, string $managerTemplate, string
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasParameter($this->connections)) {
+        if (!$container->hasParameter($this->connectionsParameter)) {
             return;
         }
 
-        $this->connections = $container->getParameter($this->connections);
+        $this->connections = $container->getParameter($this->connectionsParameter);
         $listenerRefs = $this->addTaggedServices($container);
 
         // replace service container argument of event managers with smaller service locator

DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -76,25 +76,21 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
     /**
      * Naming pattern for the configuration service id, for example
      * 'doctrine.orm.%s_configuration'.
-     *
-     * @var string
      */
-    private $configurationPattern;
+    private string $configurationPattern;
 
     /**
      * Method name to call on the configuration service. This depends on the
      * Doctrine implementation. For example addEntityNamespace.
-     *
-     * @var string
      */
-    private $registerAliasMethodName;
+    private string $registerAliasMethodName;
 
     /**
      * Map of alias to namespace.
      *
      * @var string[]
      */
-    private $aliasMap;
+    private array $aliasMap;
 
     /**
      * The $managerParameters is an ordered list of container parameters that could provide the

DependencyInjection/Security/UserProvider/EntityFactory.php

@@ -24,8 +24,8 @@
  */
 class EntityFactory implements UserProviderFactoryInterface
 {
-    private $key;
-    private $providerId;
+    private string $key;
+    private string $providerId;
 
     public function __construct(string $key, string $providerId)
     {

Form/ChoiceList/DoctrineChoiceLoader.php

@@ -21,10 +21,10 @@
  */
 class DoctrineChoiceLoader extends AbstractChoiceLoader
 {
-    private $manager;
-    private $class;
-    private $idReader;
-    private $objectLoader;
+    private ObjectManager $manager;
+    private string $class;
+    private ?IdReader $idReader;
+    private ?EntityLoaderInterface $objectLoader;
 
     /**
      * Creates a new choice loader.