Merge branch '5.3' into 5.4

* 5.3:
  Specified camelCase format limitation for logger channel autowiring
  [HTTP Client][CS] Add missing commas
  Fixed the use of Session with RequesStack
  add missing mapping type (PHP Attributes)
  Update bootstrap5.rst

Author: javiereguiluz

form/bootstrap5.rst

@@ -187,7 +187,7 @@ class to the ``row_attr`` option.
 
     .. code-block:: php
 
-        $builder->add('email', CheckboxType::class, [
+        $builder->add('email', EmailType::class, [
             'label' => '@',
             'row_attr' => [
                 'class' => 'input-group',

http_client.rst

@@ -840,9 +840,9 @@ Add an ``extra.curl`` option in your configuration to pass those extra options::
         // ...
         'extra' => [
             'curl' => [
-                CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V6
-            ]
-        ]
+                CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V6,
+            ],
+        ],
     ]);
 
 .. note::

logging/channels_handlers.rst

@@ -177,18 +177,18 @@ How to Autowire Logger Channels
 
 Starting from `MonologBundle`_ 3.5 you can autowire different Monolog channels
 by type-hinting your service arguments with the following syntax:
-``Psr\Log\LoggerInterface $<channel>Logger``. The ``<channel>`` must have been
-:ref:`predefined in your Monolog configuration <monolog-channels-config>`.
+``Psr\Log\LoggerInterface $<camelCased channel name> + Logger``. The ``<channel>``
+must have been :ref:`predefined in your Monolog configuration <monolog-channels-config>`.
 
-For example to inject the service related to the ``app`` logger channel,
+For example to inject the service related to the ``foo_bar`` logger channel,
 change your constructor like this:
 
 .. code-block:: diff
 
     -     public function __construct(LoggerInterface $logger)
-    +     public function __construct(LoggerInterface $appLogger)
+    +     public function __construct(LoggerInterface $fooBarLogger)
         {
-            $this->logger = $appLogger;
+            $this->logger = $fooBarLogger;
         }
 
 .. _`MonologBundle`: https://github.com/symfony/monolog-bundle

reference/configuration/doctrine.rst

@@ -265,9 +265,12 @@ you can control. The following configuration options exist for a mapping:
 ``type``
 ........
 
-One of ``annotation`` (the default value), ``xml``, ``yml``, ``php`` or
+One of ``annotation`` (for PHP annotations; it's the default value),
+``attribute`` (for PHP attributes), ``xml``, ``yml``, ``php`` or
 ``staticphp``. This specifies which type of metadata type your mapping uses.
 
+See `Doctrine Metadata Drivers`_ for more information about this option.
+
 ``dir``
 .......
 
@@ -453,3 +456,4 @@ is ``true``, the DoctrineBundle will prefix the ``dir`` configuration with
 the path of the bundle.
 
 .. _DBAL documentation: https://www.doctrine-project.org/projects/doctrine-dbal/en/current/reference/configuration.html
+.. _`Doctrine Metadata Drivers`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/metadata-drivers.html

session.rst

@@ -149,14 +149,16 @@ controllers if you type-hint an argument with
 
         public function someMethod()
         {
+            $session = $this->requestStack->getSession();
+
             // stores an attribute in the session for later reuse
-            $this->requestStack->getSession()->set('attribute-name', 'attribute-value');
+            $session->set('attribute-name', 'attribute-value');
 
             // gets an attribute by name
-            $foo = $this->session->get('foo');
+            $foo = $session->get('foo');
 
             // the second argument is the value returned when the attribute doesn't exist
-            $filters = $this->session->get('filters', []);
+            $filters = $session->get('filters', []);
 
             // ...
         }