Merge branch '6.4' into 7.3

* 6.4:
  [DependencyInjection] Updated the explanation of the inner argument renaming

Author: javiereguiluz

service_container/service_decoration.rst

@@ -209,78 +209,106 @@ automatically changed to ``'.inner'``):
                 ->args([service('.inner')]);
         };
 
-.. note::
+When decorating a service, the original service (e.g. ``App\Mailer``) is available
+inside the decorating service (e.g. ``App\DecoratingMailer``) using an ID constructed
+as "Decorating service ID" + the ``.inner`` suffix (e.g. in the previous example,
+the ID is ``'App\DecoratingMailer.inner'``). You can control the inner service
+name via the ``decoration_inner_name`` option:
 
-    The visibility of the decorated ``App\Mailer`` service (which is an alias
-    for the new service) will still be the same as the original ``App\Mailer``
-    visibility.
+.. configuration-block::
 
-.. note::
+    .. code-block:: php-attributes
 
-    All custom :doc:`service tags </service_container/tags>` from the decorated
-    service are removed in the new service. Only certain built-in service tags
-    defined by Symfony are retained: ``container.service_locator``, ``container.service_subscriber``,
-    ``kernel.event_subscriber``, ``kernel.event_listener``, ``kernel.locale_aware``,
-    and ``kernel.reset``.
+        // when using the #[AutowireDecorated] attribute, you can name the argument
+        // that holds the decorated service however you like, without needing to
+        // configure that name explicitly
+        #[AutowireDecorated] private Mailer $originalMailer,
 
-.. note::
+    .. code-block:: yaml
 
-    The generated inner id is based on the id of the decorator service
-    (``App\DecoratingMailer`` here), not of the decorated service (``App\Mailer``
-    here). You can control the inner service name via the ``decoration_inner_name``
-    option:
+        # config/services.yaml
+        services:
+            App\DecoratingMailer:
+                # ...
+                decoration_inner_name: 'original_mailer'
+                arguments: ['@original_mailer']
 
-    .. configuration-block::
+                # if you decorate a lot of services, consider adding the full
+                # original service ID as part of the new ID
+                decoration_inner_name: 'App\Mailer.original'
+                arguments: ['@App\Mailer.original']
 
-        .. code-block:: yaml
+    .. code-block:: xml
 
-            # config/services.yaml
-            services:
-                App\DecoratingMailer:
-                    # ...
-                    decoration_inner_name: App\DecoratingMailer.wooz
-                    arguments: ['@App\DecoratingMailer.wooz']
+        <!-- config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
+            xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
-        .. code-block:: xml
+            <services>
+                <!-- ... -->
 
-            <!-- config/services.xml -->
-            <?xml version="1.0" encoding="UTF-8" ?>
-            <container xmlns="http://symfony.com/schema/dic/services"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
-                xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
-
-                <services>
-                    <!-- ... -->
-
-                    <service
-                        id="App\DecoratingMailer"
-                        decorates="App\Mailer"
-                        decoration-inner-name="App\DecoratingMailer.wooz"
-                        public="false"
-                    >
-                        <argument type="service" id="App\DecoratingMailer.wooz"/>
-                    </service>
+                <service
+                    id="App\DecoratingMailer"
+                    decorates="App\Mailer"
+                    decoration-inner-name="original_mailer"
+                    public="false"
+                >
+                    <argument type="service" id="original_mailer"/>
+                </service>
 
-                </services>
-            </container>
+                <!-- if you decorate a lot of services, consider adding the full
+                     original service ID as part of the new ID -->
+                <service
+                    id="App\DecoratingMailer"
+                    decorates="App\Mailer"
+                    decoration-inner-name="App\Mailer.original"
+                    public="false"
+                >
+                    <argument type="service" id="App\Mailer.original"/>
+                </service>
 
-        .. code-block:: php
+            </services>
+        </container>
 
-            // config/services.php
-            namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    .. code-block:: php
 
-            use App\DecoratingMailer;
-            use App\Mailer;
+        // config/services.php
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-            return function(ContainerConfigurator $container): void {
-                $services = $container->services();
+        use App\DecoratingMailer;
+        use App\Mailer;
+
+        return function(ContainerConfigurator $container): void {
+            $services = $container->services();
+
+            $services->set(Mailer::class);
 
-                $services->set(Mailer::class);
+            $services->set(DecoratingMailer::class)
+                ->decorate(Mailer::class, 'original_mailer')
+                ->args([service('original_mailer')]);
 
-                $services->set(DecoratingMailer::class)
-                    ->decorate(Mailer::class, DecoratingMailer::class.'.wooz')
-                    ->args([service(DecoratingMailer::class.'.wooz')]);
-            };
+            // if you decorate a lot of services, consider adding the full
+            // original service ID as part of the new ID
+            $services->set(DecoratingMailer::class)
+                ->decorate(Mailer::class, DecoratingMailer::class.'.original')
+                ->args([service(DecoratingMailer::class.'.original')]);
+        };
+
+.. note::
+
+    The visibility of the decorated ``App\Mailer`` service (which is an alias
+    for the new service) will still be the same as the original ``App\Mailer``
+    visibility.
+
+.. note::
+
+    All custom :doc:`service tags </service_container/tags>` from the decorated
+    service are removed in the new service. Only certain built-in service tags
+    defined by Symfony are retained: ``container.service_locator``, ``container.service_subscriber``,
+    ``kernel.event_subscriber``, ``kernel.event_listener``, ``kernel.locale_aware``,
+    and ``kernel.reset``.
 
 Decoration Priority
 -------------------