minor #13545 [DI] Updated the way inner services are referrer to in decoration (javiereguiluz)

javiereguiluz · javiereguiluz · commit 2a58ea2d2605 · 2020-04-20T09:51:39.000+02:00
This PR was merged into the master branch. Discussion ---------- [DI] Updated the way inner services are referrer to in decoration Fixes #13525. Commits ------- 0456253 [DI] Updated the way inner services are referrer to in decoration
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -2866,7 +2866,7 @@ Name of the lock you want to create.
         lock.invoice.retry_till_save.store:
             class: Symfony\Component\Lock\Store\RetryTillSaveStore
             decorates: lock.invoice.store
-            arguments: ['@lock.invoice.retry_till_save.store.inner', 100, 50]
+            arguments: ['@.inner', 100, 50]
 
 workflows
 ~~~~~~~~~
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
@@ -58,7 +58,7 @@ Most of the time, that's exactly what you want to do. But sometimes,
 you might want to decorate the old one instead (i.e. apply the `Decorator pattern`_).
 In this case, the old service should be kept around to be able to reference
 it in the new one. This configuration replaces ``App\Mailer`` with a new one,
-but keeps a reference of the old one as ``App\DecoratingMailer.inner``:
+but keeps a reference of the old one as ``.inner``:
 
 .. configuration-block::
 
@@ -70,7 +70,7 @@ but keeps a reference of the old one as ``App\DecoratingMailer.inner``:
 
             App\DecoratingMailer:
                 # overrides the App\Mailer service
-                # but that service is still available as App\DecoratingMailer.inner
+                # but that service is still available as ".inner"
                 decorates: App\Mailer
 
     .. code-block:: xml
@@ -84,6 +84,8 @@ but keeps a reference of the old one as ``App\DecoratingMailer.inner``:
             <services>
                 <service id="App\Mailer"/>
 
+                <!-- overrides the App\Mailer service
+                     but that service is still available as ".inner" -->
                 <service id="App\DecoratingMailer"
                     decorates="App\Mailer"
                 />
@@ -106,7 +108,7 @@ but keeps a reference of the old one as ``App\DecoratingMailer.inner``:
 
             $services->set(DecoratingMailer::class)
                 // overrides the App\Mailer service
-                // but that service is still available as App\DecoratingMailer.inner
+                // but that service is still available as ".inner"
                 ->decorate(Mailer::class);
         };
 
@@ -119,7 +121,7 @@ decorating service has one argument type-hinted with the decorated service class
 If you are not using autowiring or the decorating service has more than one
 constructor argument type-hinted with the decorated service class, you must
 inject the decorated service explicitly (the ID of the decorated service is
-automatically changed to ``decorating_service_id + '.inner'``):
+automatically changed to ``'.inner'``):
 
 .. configuration-block::
 
@@ -132,7 +134,7 @@ automatically changed to ``decorating_service_id + '.inner'``):
             App\DecoratingMailer:
                 decorates: App\Mailer
                 # pass the old service as an argument
-                arguments: ['@App\DecoratingMailer.inner']
+                arguments: ['@.inner']
 
     .. code-block:: xml
 
@@ -148,7 +150,7 @@ automatically changed to ``decorating_service_id + '.inner'``):
                 <service id="App\DecoratingMailer"
                     decorates="App\Mailer"
                 >
-                    <argument type="service" id="App\DecoratingMailer.inner"/>
+                    <argument type="service" id=".inner"/>
                 </service>
 
             </services>
@@ -170,9 +172,13 @@ automatically changed to ``decorating_service_id + '.inner'``):
             $services->set(DecoratingMailer::class)
                 ->decorate(Mailer::class)
                 // pass the old service as an argument
-                ->args([ref(DecoratingMailer::class.'.inner')]);
+                ->args([ref('.inner')]);
         };
 
+.. versionadded:: 5.1
+
+    The special ``.inner`` value was introduced in Symfony 5.1. In previous
+    versions you needed to use: ``decorating_service_id + '.inner'``.
 
 .. tip::
 
@@ -256,12 +262,12 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
         Bar:
             decorates: Foo
             decoration_priority: 5
-            arguments: ['@Bar.inner']
+            arguments: ['@.inner']
 
         Baz:
             decorates: Foo
             decoration_priority: 1
-            arguments: ['@Baz.inner']
+            arguments: ['@.inner']
 
     .. code-block:: xml
 
@@ -276,11 +282,11 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
                 <service id="Foo"/>
 
                 <service id="Bar" decorates="Foo" decoration-priority="5">
-                    <argument type="service" id="Bar.inner"/>
+                    <argument type="service" id=".inner"/>
                 </service>
 
                 <service id="Baz" decorates="Foo" decoration-priority="1">
-                    <argument type="service" id="Baz.inner"/>
+                    <argument type="service" id=".inner"/>
                 </service>
             </services>
         </container>
@@ -297,11 +303,11 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
 
             $services->set(Bar::class)
                 ->decorate(Foo::class, null, 5)
-                ->args([ref(Bar::class.'.inner')]);
+                ->args([ref('.inner')]);
 
             $services->set(Baz::class)
                 ->decorate(Foo::class, null, 1)
-                ->args([ref(Baz::class.'.inner')]);
+                ->args([ref('.inner')]);
         };
 
 
@@ -331,7 +337,7 @@ Three different behaviors are available:
         Bar:
             decorates: Foo
             decoration_on_invalid: ignore
-            arguments: ['@Bar.inner']
+            arguments: ['@.inner']
 
     .. code-block:: xml
 
@@ -346,7 +352,7 @@ Three different behaviors are available:
                 <service id="Foo"/>
 
                 <service id="Bar" decorates="Foo" decoration-on-invalid="ignore">
-                    <argument type="service" id="Bar.inner"/>
+                    <argument type="service" id=".inner"/>
                 </service>
             </services>
         </container>
@@ -365,7 +371,7 @@ Three different behaviors are available:
 
             $services->set(Bar::class)
                 ->decorate(Foo::class, null, 0, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)
-                ->args([ref(Bar::class.'.inner')])
+                ->args([ref('.inner')])
             ;
         };
 
