Merge branch '5.4' into 6.0

* 5.4:
  Merged the new example into the existing configuration block
  [DependencyInjection] Autowire arguments using the #[TaggedLocator] attribute
  [DependencyInjection] Autowire arguments using the #[TaggedIterator] attribute

Author: javiereguiluz

service_container/service_subscribers_locators.rst

@@ -247,10 +247,45 @@ Defining a Service Locator
 --------------------------
 
 To manually define a service locator and inject it to another service, create an
-argument of type ``service_locator``:
+argument of type ``service_locator``.
+
+Consider the following ``CommandBus`` class where you want to inject
+some services into it via a service locator::
+
+    // src/HandlerCollection.php
+    namespace App;
+
+    use Symfony\Component\DependencyInjection\ServiceLocator;
+
+    class CommandBus
+    {
+        public function __construct(ServiceLocator $locator)
+        {
+        }
+    }
+
+Symfony allows you to inject the service locator using YAML/XML/PHP configuration
+or directly via PHP attributes:
 
 .. configuration-block::
 
+    .. conde-block:: php-attributes
+
+        // src/CommandBus.php
+        namespace App;
+
+        use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
+        use Symfony\Component\DependencyInjection\ServiceLocator;
+
+        class CommandBus
+        {
+            public function __construct(
+                // creates a service locator with all the services tagged with 'app.handler'
+                #[TaggedLocator('app.handler')] ServiceLocator $locator
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml
@@ -304,6 +339,10 @@ As shown in the previous sections, the constructor of the ``CommandBus`` class
 must type-hint its argument with ``ContainerInterface``. Then, you can get any of
 the service locator services via their ID (e.g. ``$this->locator->get('App\FooCommand')``).
 
+.. versionadded:: 5.3
+
+    The ``#[TaggedLocator]`` attribute was introduced in Symfony 5.3 and requires PHP 8.
+
 Reusing a Service Locator in Multiple Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -457,7 +496,7 @@ will share identical locators among all the services referencing them::
             // ...
             'logger' => new Reference('logger'),
         ];
-        
+
         $myService = $container->findDefinition(MyService::class);
 
         $myService->addArgument(ServiceLocatorTagPass::register($container, $locateableServices));

service_container/tags.rst

@@ -511,11 +511,40 @@ Symfony provides a shortcut to inject all services tagged with a specific tag,
 which is a common need in some applications, so you don't have to write a
 compiler pass just for that.
 
-In the following example, all services tagged with ``app.handler`` are passed as
-first  constructor argument to the ``App\HandlerCollection`` service:
+Consider the following ``HandlerCollection`` class where you want to inject
+all services tagged with ``app.handler`` into its constructor argument::
+
+    // src/HandlerCollection.php
+    namespace App;
+
+    class HandlerCollection
+    {
+        public function __construct(iterable $handlers)
+        {
+        }
+    }
+
+Symfony allows you to inject the services using YAML/XML/PHP configuration or
+directly via PHP attributes:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/HandlerCollection.php
+        namespace App;
+
+        use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+
+        class HandlerCollection
+        {
+            public function __construct(
+                // the attribute must be applied directly to the argument to autowire
+                #[TaggedIterator('app.handler')] iterable $handlers
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml
@@ -578,18 +607,9 @@ first  constructor argument to the ``App\HandlerCollection`` service:
             ;
         };
 
-After compilation the ``HandlerCollection`` service is able to iterate over your
-application handlers::
-
-    // src/HandlerCollection.php
-    namespace App;
+.. versionadded:: 5.3
 
-    class HandlerCollection
-    {
-        public function __construct(iterable $handlers)
-        {
-        }
-    }
+    The ``#[TaggedIterator]`` attribute was introduced in Symfony 5.3 and requires PHP 8.
 
 .. seealso::