minor symfony#57226 [DoctrineBridge][MonologBridge][TwigBridge] use constructor property promotion (xabbuh)

This PR was merged into the 7.2 branch.

Discussion
----------

[DoctrineBridge][MonologBridge][TwigBridge] use constructor property promotion

| Q             | A
| ------------- | ---
| Branch?       | 7.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Issues        |
| License       | MIT

Commits
-------

5be6afc use constructor property promotion

Author: fabpot

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -23,25 +23,18 @@
  */
 class ContainerAwareEventManager extends EventManager
 {
-    /**
-     * Map of registered listeners.
-     *
-     * <event> => <listeners>
-     */
-    private array $listeners = [];
     private array $initialized = [];
     private bool $initializedSubscribers = false;
     private array $initializedHashMapping = [];
     private array $methods = [];
-    private ContainerInterface $container;
 
     /**
      * @param list<array{string[], string|object}> $listeners List of [events, listener] tuples
      */
-    public function __construct(ContainerInterface $container, array $listeners = [])
-    {
-        $this->container = $container;
-        $this->listeners = $listeners;
+    public function __construct(
+        private ContainerInterface $container,
+        private array $listeners = [],
+    ) {
     }
 
     public function dispatchEvent(string $eventName, ?EventArgs $eventArgs = null): void

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -32,41 +32,6 @@
  */
 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.
-     */
-    protected Definition|Reference $driver;
-
-    /**
-     * List of namespaces handled by the driver.
-     *
-     * @var string[]
-     */
-    protected array $namespaces;
-
-    /**
-     * List of potential container parameters that hold the object manager name
-     * to register the mappings with the correct metadata driver, for example
-     * ['acme.manager', 'doctrine.default_entity_manager'].
-     *
-     * @var string[]
-     */
-    protected array $managerParameters;
-
-    /**
-     * Naming pattern of the metadata chain driver service ids, for example
-     * 'doctrine.orm.%s_metadata_driver'.
-     */
-    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.
-     */
-    protected string|false $enabledParameter;
-
     /**
      * The $managerParameters is an ordered list of container parameters that could provide the
      * name of the manager to register these namespaces and alias on. The first non-empty name
@@ -79,10 +44,10 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * @param string[]             $namespaces              List of namespaces handled by $driver
      * @param string[]             $managerParameters       list of container parameters that could
      *                                                      hold the manager name
-     * @param string               $driverPattern           Pattern for the metadata driver service name
+     * @param string               $driverPattern           Pattern for the metadata chain driver service ids (e.g. "doctrine.orm.%s_metadata_driver")
      * @param string|false         $enabledParameter        Service container parameter that must be
-     *                                                      present to enable the mapping. Set to false
-     *                                                      to not do any check, optional.
+     *                                                      present to enable the mapping (regardless of the
+     *                                                      parameter value). Pass false to not do any check.
      * @param string               $configurationPattern    Pattern for the Configuration service name,
      *                                                      for example 'doctrine.orm.%s_configuration'.
      * @param string               $registerAliasMethodName Method name to call on the configuration service. This
@@ -91,21 +56,15 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * @param string[]             $aliasMap                Map of alias to namespace
      */
     public function __construct(
-        Definition|Reference $driver,
-        array $namespaces,
-        array $managerParameters,
-        string $driverPattern,
-        string|false $enabledParameter = false,
+        protected Definition|Reference $driver,
+        protected array $namespaces,
+        protected array $managerParameters,
+        protected string $driverPattern,
+        protected string|false $enabledParameter = false,
         private readonly string $configurationPattern = '',
         private readonly string $registerAliasMethodName = '',
         private readonly array $aliasMap = [],
     ) {
-        $this->driver = $driver;
-        $this->namespaces = $namespaces;
-        $this->managerParameters = $managerParameters;
-        $this->driverPattern = $driverPattern;
-        $this->enabledParameter = $enabledParameter;
-
         if ($aliasMap && (!$configurationPattern || !$registerAliasMethodName)) {
             throw new \InvalidArgumentException('configurationPattern and registerAliasMethodName are required to register namespace alias.');
         }

src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php

@@ -18,11 +18,9 @@
 
 class DoctrineOrmExtension extends AbstractExtension
 {
-    protected ManagerRegistry $registry;
-
-    public function __construct(ManagerRegistry $registry)
-    {
-        $this->registry = $registry;
+    public function __construct(
+        protected ManagerRegistry $registry,
+    ) {
     }
 
     protected function loadTypes(): array

src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php

@@ -38,13 +38,11 @@
 
 class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
 {
-    protected ManagerRegistry $registry;
-
     private array $cache = [];
 
-    public function __construct(ManagerRegistry $registry)
-    {
-        $this->registry = $registry;
+    public function __construct(
+        protected ManagerRegistry $registry,
+    ) {
     }
 
     public function guessType(string $class, string $property): ?TypeGuess

src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

@@ -31,8 +31,6 @@
 
 abstract class DoctrineType extends AbstractType implements ResetInterface
 {
-    protected ManagerRegistry $registry;
-
     /**
      * @var IdReader[]
      */
@@ -89,9 +87,9 @@ public function getQueryBuilderPartsForCachingHash(object $queryBuilder): ?array
         return null;
     }
 
-    public function __construct(ManagerRegistry $registry)
-    {
-        $this->registry = $registry;
+    public function __construct(
+        protected ManagerRegistry $registry,
+    ) {
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void

src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php

@@ -25,13 +25,10 @@
  */
 abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
 {
-    protected ManagerRegistry $managerRegistry;
-    protected ?string $entityManagerName;
-
-    public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null)
-    {
-        $this->managerRegistry = $managerRegistry;
-        $this->entityManagerName = $entityManagerName;
+    public function __construct(
+        protected ManagerRegistry $managerRegistry,
+        protected ?string $entityManagerName = null,
+    ) {
     }
 
     final public function handle(Envelope $envelope, StackInterface $stack): Envelope

src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php

@@ -21,11 +21,9 @@
  */
 class DoctrineInitializer implements ObjectInitializerInterface
 {
-    protected ManagerRegistry $registry;
-
-    public function __construct(ManagerRegistry $registry)
-    {
-        $this->registry = $registry;
+    public function __construct(
+        protected ManagerRegistry $registry,
+    ) {
     }
 
     public function initialize(object $object): void

src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

@@ -44,15 +44,13 @@
  */
 final class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
 {
-    private ?OutputInterface $output;
     private array $verbosityLevelMap = [
         OutputInterface::VERBOSITY_QUIET => Level::Error,
         OutputInterface::VERBOSITY_NORMAL => Level::Warning,
         OutputInterface::VERBOSITY_VERBOSE => Level::Notice,
         OutputInterface::VERBOSITY_VERY_VERBOSE => Level::Info,
         OutputInterface::VERBOSITY_DEBUG => Level::Debug,
     ];
-    private array $consoleFormatterOptions;
 
     /**
      * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
@@ -61,16 +59,17 @@ final class ConsoleHandler extends AbstractProcessingHandler implements EventSub
      * @param array                $verbosityLevelMap Array that maps the OutputInterface verbosity to a minimum logging
      *                                                level (leave empty to use the default mapping)
      */
-    public function __construct(?OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormatterOptions = [])
-    {
+    public function __construct(
+        private ?OutputInterface $output = null,
+        bool $bubble = true,
+        array $verbosityLevelMap = [],
+        private array $consoleFormatterOptions = [],
+    ) {
         parent::__construct(Level::Debug, $bubble);
-        $this->output = $output;
 
         if ($verbosityLevelMap) {
             $this->verbosityLevelMap = $verbosityLevelMap;
         }
-
-        $this->consoleFormatterOptions = $consoleFormatterOptions;
     }
 
     public function isHandling(LogRecord $record): bool

src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

@@ -46,28 +46,28 @@ final class ElasticsearchLogstashHandler extends AbstractHandler
     use FormattableHandlerTrait;
     use ProcessableHandlerTrait;
 
-    private string $endpoint;
-    private string $index;
     private HttpClientInterface $client;
-    private string $elasticsearchVersion;
 
     /**
      * @var \SplObjectStorage<ResponseInterface, null>
      */
     private \SplObjectStorage $responses;
 
-    public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', ?HttpClientInterface $client = null, string|int|Level $level = Level::Debug, bool $bubble = true, string $elasticsearchVersion = '1.0.0')
-    {
+    public function __construct(
+        private string $endpoint = 'http://127.0.0.1:9200',
+        private string $index = 'monolog',
+        ?HttpClientInterface $client = null,
+        string|int|Level $level = Level::Debug,
+        bool $bubble = true,
+        private string $elasticsearchVersion = '1.0.0',
+    ) {
         if (!interface_exists(HttpClientInterface::class)) {
             throw new \LogicException(sprintf('The "%s" handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__));
         }
 
         parent::__construct($level, $bubble);
-        $this->endpoint = $endpoint;
-        $this->index = $index;
         $this->client = $client ?: HttpClient::create(['timeout' => 1]);
         $this->responses = new \SplObjectStorage();
-        $this->elasticsearchVersion = $elasticsearchVersion;
     }
 
     public function handle(LogRecord $record): bool

src/Symfony/Bridge/Monolog/Handler/MailerHandler.php

@@ -25,14 +25,16 @@
  */
 final class MailerHandler extends AbstractProcessingHandler
 {
-    private MailerInterface $mailer;
     private \Closure|Email $messageTemplate;
 
-    public function __construct(MailerInterface $mailer, callable|Email $messageTemplate, string|int|Level $level = Level::Debug, bool $bubble = true)
-    {
+    public function __construct(
+        private MailerInterface $mailer,
+        callable|Email $messageTemplate,
+        string|int|Level $level = Level::Debug,
+        bool $bubble = true,
+    ) {
         parent::__construct($level, $bubble);
 
-        $this->mailer = $mailer;
         $this->messageTemplate = $messageTemplate instanceof Email ? $messageTemplate : $messageTemplate(...);
     }