Merge branch '5.4' into 6.2

* 5.4:
  Reword
  [DependencyInjection] Typo on how default defaultIndexMethod work

Author: javiereguiluz

service_container/tags.rst

@@ -1000,97 +1000,110 @@ array element. For example, to retrieve the ``handler_two`` handler::
         }
     }
 
-.. tip::
+You can omit the index attribute (``key`` in the previous example) by setting
+the ``index_by`` attribute on the ``tagged_iterator`` tag. In this case, you
+must define a static method whose name follows the pattern:
+``getDefault<CamelCase index_by value>Name``.
+
+For example, if ``index_by`` is ``handler``, the method name must be
+``getDefaultHandlerName()``:
+
+.. code-block:: yaml
+
+    # config/services.yaml
+        services:
+            # ...
+
+            App\HandlerCollection:
+                arguments: [!tagged_iterator { tag: 'app.handler', index_by: 'handler' }]
 
-    Just like the priority, you can also implement a static
-    ``getDefaultIndexName()`` method in the handlers and omit the
-    index attribute (``key``)::
+.. code-block:: php
 
-        // src/Handler/One.php
-        namespace App\Handler;
+    // src/Handler/One.php
+    namespace App\Handler;
 
-        class One
+    class One
+    {
+        // ...
+        public static function getDefaultHandlerName(): string
         {
-            // ...
-            public static function getDefaultIndexName(): string
-            {
-                return 'handler_one';
-            }
+            return 'handler_one';
         }
+    }
 
-    You also can define the name of the static method to implement on each service
-    with the ``default_index_method`` attribute on the tagged argument:
+You also can define the name of the static method to implement on each service
+with the ``default_index_method`` attribute on the tagged argument:
 
-    .. configuration-block::
+.. configuration-block::
 
-        .. code-block:: php-attributes
+    .. code-block:: php-attributes
 
-            // src/HandlerCollection.php
-            namespace App;
+        // src/HandlerCollection.php
+        namespace App;
 
-            use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+        use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 
-            class HandlerCollection
-            {
-                public function __construct(
-                    #[TaggedIterator('app.handler', defaultIndexMethod: 'getIndex')]
-                    iterable $handlers
-                ) {
-                }
+        class HandlerCollection
+        {
+            public function __construct(
+                #[TaggedIterator('app.handler', defaultIndexMethod: 'getIndex')]
+                iterable $handlers
+            ) {
             }
+        }
 
-        .. code-block:: yaml
+    .. code-block:: yaml
 
-            # config/services.yaml
-            services:
-                # ...
+        # config/services.yaml
+        services:
+            # ...
 
-                App\HandlerCollection:
-                    # use getIndex() instead of getDefaultIndexName()
-                    arguments: [!tagged_iterator { tag: 'app.handler', default_index_method: 'getIndex' }]
+            App\HandlerCollection:
+                # use getIndex() instead of getDefaultIndexName()
+                arguments: [!tagged_iterator { tag: 'app.handler', default_index_method: 'getIndex' }]
 
-        .. code-block:: xml
+    .. code-block:: xml
 
-            <!-- config/services.xml -->
-            <?xml version="1.0" encoding="UTF-8" ?>
-            <container xmlns="http://symfony.com/schema/dic/services"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://symfony.com/schema/dic/services
-                    https://symfony.com/schema/dic/services/services-1.0.xsd">
+        <!-- config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
 
-                <services>
-                    <!-- ... -->
+            <services>
+                <!-- ... -->
 
-                    <service id="App\HandlerCollection">
-                        <!-- use getIndex() instead of getDefaultIndexName() -->
-                        <argument type="tagged_iterator"
-                            tag="app.handler"
-                            default-index-method="someFunctionName"
-                        />
-                    </service>
-                </services>
-            </container>
+                <service id="App\HandlerCollection">
+                    <!-- use getIndex() instead of getDefaultIndexName() -->
+                    <argument type="tagged_iterator"
+                        tag="app.handler"
+                        default-index-method="someFunctionName"
+                    />
+                </service>
+            </services>
+        </container>
 
-        .. code-block:: php
+    .. code-block:: php
 
-            // config/services.php
-            namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+        // config/services.php
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-            use App\HandlerCollection;
-            use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+        use App\HandlerCollection;
+        use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 
-            return function (ContainerConfigurator $container): void {
-                $services = $container->services();
+        return function (ContainerConfigurator $container) {
+            $services = $container->services();
 
-                // ...
+            // ...
 
-                // use getIndex() instead of getDefaultIndexName()
-                $services->set(HandlerCollection::class)
-                    ->args([
-                        tagged_iterator('app.handler', null, 'getIndex'),
-                    ])
-                ;
-            };
+            // use getIndex() instead of getDefaultIndexName()
+            $services->set(HandlerCollection::class)
+                ->args([
+                    tagged_iterator('app.handler', null, 'getIndex'),
+                ])
+            ;
+        };
 
 .. _tags_as-tagged-item: