Merge branch '6.1' into 6.2

* 6.1:
  [DependencyInjection] Complete examples with TaggedIterator and TaggedLocator attributes
  [DependencyInjection] Autowire union and intersection types
  [Monolog] List available built-in formatters

Author: OskarStark

logging/formatter.rst

@@ -55,3 +55,17 @@ configure your handler to use it:
                 ->formatter('monolog.formatter.json')
             ;
         };
+
+Many built-in formatters are available in Monolog. A lot of them are declared as services
+and can be used in the ``formatter`` option:
+
+* ``monolog.formatter.chrome_php``: formats a record according to the ChromePHP array format
+* ``monolog.formatter.gelf_message``: serializes a format to GELF format
+* ``monolog.formatter.html``: formats a record into an HTML table
+* ``monolog.formatter.json``: serializes a record into a JSON object
+* ``monolog.formatter.line``: formats a record into a one-line string
+* ``monolog.formatter.loggly``: formats a record information into JSON in a format compatible with Loggly
+* ``monolog.formatter.logstash``: serializes a record to Logstash Event Format
+* ``monolog.formatter.normalizer``: normalizes a record to remove objects/resources so it's easier to dump to various targets
+* ``monolog.formatter.scalar``: formats a record into an associative array of scalar (+ null) values (objects and arrays will be JSON encoded)
+* ``monolog.formatter.wildfire``: serializes a record according to Wildfire's header requirements

service_container/autowiring.rst

@@ -372,6 +372,30 @@ dealing with the ``TransformerInterface``.
     discovered that implements an interface, configuring the alias is not mandatory
     and Symfony will automatically create one.
 
+.. tip::
+
+    Autowiring is powerful enough to guess which service to inject even when using
+    union and intersection types. This means you're able to type-hint argument with
+    complex types like this::
+
+        use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+        use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+        use Symfony\Component\Serializer\SerializerInterface;
+
+        class DataFormatter
+        {
+            public function __construct((NormalizerInterface&DenormalizerInterface)|SerializerInterface $transformer)
+            {
+                // ...
+            }
+
+            // ...
+        }
+
+.. versionadded:: 5.4
+
+    The support of union and intersection types was introduced in Symfony 5.4.
+
 Dealing with Multiple Implementations of the Same Type
 ------------------------------------------------------
 

service_container/service_subscribers_locators.rst

@@ -563,6 +563,23 @@ of the ``key`` tag attribute (as defined in the ``index_by`` locator option):
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/CommandBus.php
+        namespace App;
+
+        use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
+        use Symfony\Component\DependencyInjection\ServiceLocator;
+
+        class CommandBus
+        {
+            public function __construct(
+                #[TaggedLocator('app.handler', indexAttribute: 'key')]
+                ServiceLocator $locator
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml
@@ -666,6 +683,23 @@ attribute to the locator service defining the name of this custom method:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/CommandBus.php
+        namespace App;
+
+        use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
+        use Symfony\Component\DependencyInjection\ServiceLocator;
+
+        class CommandBus
+        {
+            public function __construct(
+                #[TaggedLocator('app.handler', 'key', defaultIndexMethod: 'myOwnMethodName')]
+                ServiceLocator $locator
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml

service_container/tags.rst

@@ -784,6 +784,22 @@ you can define it in the configuration of the collecting service:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/HandlerCollection.php
+        namespace App;
+
+        use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+
+        class HandlerCollection
+        {
+            public function __construct(
+                #[TaggedIterator('app.handler', defaultPriorityMethod: 'getPriority')]
+                iterable $handlers
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml
@@ -839,6 +855,22 @@ indexed by the ``key`` attribute:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/HandlerCollection.php
+        namespace App;
+
+        use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+
+        class HandlerCollection
+        {
+            public function __construct(
+                #[TaggedIterator('app.handler', indexAttribute: 'key')]
+                iterable $handlers
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml
@@ -945,6 +977,22 @@ array element. For example, to retrieve the ``handler_two`` handler::
 
     .. configuration-block::
 
+        .. code-block:: php-attributes
+
+            // src/HandlerCollection.php
+            namespace App;
+
+            use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+
+            class HandlerCollection
+            {
+                public function __construct(
+                    #[TaggedIterator('app.handler', defaultIndexMethod: 'getIndex')]
+                    iterable $handlers
+                ) {
+                }
+            }
+
         .. code-block:: yaml
 
             # config/services.yaml