Merge branch '4.1' into 4.2

javiereguiluz · javiereguiluz · commit 75ce70a6061d · 2019-01-14T09:28:06.000+01:00
* 4.1:
  Fixing another typo for .env.local file
  Fixing typo for .env.local file
  Update service_decoration.rst
  Update optional_dependencies.rst
  Update injection_types.rst
  Update alias_private.rst
diff --git a/best_practices/configuration.rst b/best_practices/configuration.rst
@@ -44,7 +44,7 @@ application doesn't care about the location of your database or the credentials
 to access to it, as long as the database is correctly configured.
 
 To override these variables with machine-specific or sensitive values, create a
-``env.local`` file. This file should not be added to version control.
+``.env.local`` file. This file should not be added to version control.
 
 .. caution::
 
diff --git a/configuration.rst b/configuration.rst
@@ -256,7 +256,7 @@ sensible, non-secret *default* values for all of your environment variables and
 *should* be commited to your repository.
 
 To override these variables with machine-specific or sensitive values, create a
-``env.local`` file. This file is **not committed to the shared repository** and
+``.env.local`` file. This file is **not committed to the shared repository** and
 is only stored on your machine. In fact, the ``.gitignore`` file that comes with
 Symfony prevents it from being committed.
 
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
@@ -168,7 +168,7 @@ The following example shows how to inject an anonymous service into another serv
 
     .. code-block:: yaml
 
-        # app/config/services.yaml
+        # config/services.yaml
         services:
             App\Foo:
                 arguments:
@@ -177,7 +177,7 @@ The following example shows how to inject an anonymous service into another serv
 
     .. code-block:: xml
 
-        <!-- app/config/services.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"
@@ -199,14 +199,14 @@ Using an anonymous service as a factory looks like this:
 
     .. code-block:: yaml
 
-        # app/config/services.yaml
+        # config/services.yaml
         services:
             App\Foo:
                 factory: [ !service { class: App\FooFactory }, 'constructFoo' ]
 
     .. code-block:: xml
 
-        <!-- app/config/services.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"
diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst
@@ -60,7 +60,7 @@ service container configuration:
             <services>
                 <!-- ... -->
 
-                <service id="app.newsletter_manager" class="App\Mail\NewsletterManager">
+                <service id="App\Mail\NewsletterManager">
                     <argument type="service" id="mailer"/>
                 </service>
             </services>
@@ -73,7 +73,7 @@ service container configuration:
         use Symfony\Component\DependencyInjection\Reference;
 
         // ...
-        $container->register('app.newsletter_manager', NewsletterManager::class)
+        $container->register(NewsletterManager::class)
             ->addArgument(new Reference('mailer'));
 
 .. tip::
diff --git a/service_container/optional_dependencies.rst b/service_container/optional_dependencies.rst
@@ -66,8 +66,7 @@ call if the service exists and remove the method call if it does not:
 
         # config/services.yaml
         services:
-            app.newsletter_manager:
-                class: App\Newsletter\NewsletterManager
+            App\Newsletter\NewsletterManager:
                 calls:
                     - [setLogger, ['@?logger']]
 
@@ -81,10 +80,6 @@ call if the service exists and remove the method call if it does not:
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.mailer">
-                <!-- ... -->
-                </service>
-
                 <service id="App\Newsletter\NewsletterManager">
                     <call method="setLogger">
                         <argument type="service" id="logger" on-invalid="ignore"/>
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
@@ -271,12 +271,12 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
         $container->register(Foo:class)
 
         $container->register(Bar:class)
-            ->addArgument(new Reference(Bar:class.'inner'))
+            ->addArgument(new Reference(Bar:class.'.inner'))
             ->setPublic(false)
             ->setDecoratedService(Foo:class, null, 5);
 
         $container->register(Baz:class)
-            ->addArgument(new Reference(Baz:class.'inner'))
+            ->addArgument(new Reference(Baz:class.'.inner'))
             ->setPublic(false)
             ->setDecoratedService(Foo:class, null, 1);
 
