Merge branch '4.4' into 5.0

* 4.4:
  [DI] Improve an example about automatic tags and bundles
  Remove references to the secret env processors

Author: javiereguiluz

configuration/secrets.rst

@@ -111,7 +111,7 @@ If you stored a ``DATABASE_PASSWORD`` secret, you can reference by:
         # config/packages/doctrine.yaml
         doctrine:
             dbal:
-                password: '%env(secret:DATABASE_PASSWORD)%'
+                password: '%env(DATABASE_PASSWORD)%'
                 # ...
             # ...
 
@@ -129,7 +129,7 @@ If you stored a ``DATABASE_PASSWORD`` secret, you can reference by:
 
             <doctrine:config>
                 <doctrine:dbal
-                    password="%env(secret:DATABASE_PASSWORD)%"
+                    password="%env(DATABASE_PASSWORD)%"
                 />
             </doctrine:config>
 
@@ -140,7 +140,7 @@ If you stored a ``DATABASE_PASSWORD`` secret, you can reference by:
         // config/packages/doctrine.php
         $container->loadFromExtension('doctrine', [
             'dbal' => [
-                'password' => '%env(secret:DATABASE_PASSWORD)%',
+                'password' => '%env(DATABASE_PASSWORD)%',
             ]
         ]);
 

service_container/tags.rst

@@ -117,8 +117,9 @@ If you want to apply tags automatically for your own services, use the
 
 
 For more advanced needs, you can define the automatic tags using the
-:method:`Symfony\\Component\\DependencyInjection\\ContainerBuilder::registerForAutoconfiguration`
-method in an :doc:`extension </bundles/extension>` or from your kernel::
+:method:`Symfony\\Component\\DependencyInjection\\ContainerBuilder::registerForAutoconfiguration` method.
+
+In a Symfony application, call this method in your kernel class::
 
     // src/Kernel.php
     class Kernel extends BaseKernel
@@ -133,6 +134,22 @@ method in an :doc:`extension </bundles/extension>` or from your kernel::
         }
     }
 
+In a Symfony bundle, call this method in the ``load()`` method of the
+:doc:`bundle extension class </bundles/extension>`::
+
+    // src/DependencyInjection/MyBundleExtension.php
+    class MyBundleExtension extends Extension
+    {
+        // ...
+
+        public function load(array $configs, ContainerBuilder $container)
+        {
+            $container->registerForAutoconfiguration(CustomInterface::class)
+                ->addTag('app.custom_tag')
+            ;
+        }
+    }
+
 Creating custom Tags
 --------------------