minor #16992 Ensure config blocks are consistent (HeahDude)

This PR was merged into the 4.4 branch.

Discussion
----------

Ensure config blocks are consistent

Given some more love to 4.4 before it's EOL.

To avoid tons of conflict when merging upstream, if accepted, it should be reverted in 5.4, I'll send PRs dedicated to 5.4..

Commits
-------

68aa9e1 Ensure config blocks are consistent

Author: javiereguiluz

bundles/best_practices.rst

@@ -421,8 +421,8 @@ The end user can provide values in any configuration file:
         <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">
-
+                https://symfony.com/schema/dic/services/services-1.0.xsd"
+        >
             <parameters>
                 <parameter key="acme_blog.author.email">fabien@example.com</parameter>
             </parameters>
@@ -432,7 +432,13 @@ The end user can provide values in any configuration file:
     .. code-block:: php
 
         // config/services.php
-        $container->setParameter('acme_blog.author.email', 'fabien@example.com');
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+        return static function (ContainerConfigurator $container) {
+            $container->parameters()
+                ->set('acme_blog.author.email', 'fabien@example.com')
+            ;
+        };
 
 Retrieve the configuration parameters in your code from the container::
 

bundles/configuration.rst

@@ -20,29 +20,37 @@ as integration of other related components:
 
     .. code-block:: yaml
 
+        # config/packages/framework.yaml
         framework:
             form: true
 
     .. code-block:: xml
 
+        <!-- config/packages/framework.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"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 https://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/symfony
-                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
+        >
             <framework:config>
                 <framework:form/>
             </framework:config>
         </container>
 
     .. code-block:: php
 
-        $container->loadFromExtension('framework', [
-            'form' => true,
-        ]);
+        // config/packages/framework.php
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+        return static function (ContainerConfigurator $container) {
+            $container->extension('framework', [
+                'form' => true,
+            ]);
+        };
 
 Using the Bundle Extension
 --------------------------
@@ -69,24 +77,28 @@ can add some configuration that looks like this:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:acme-social="http://example.org/schema/dic/acme_social"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
-
+                https://symfony.com/schema/dic/services/services-1.0.xsd"
+        >
             <acme-social:config>
-                <acme-social:twitter client-id="123" client-secret="your_secret"/>
+                <acme-social:twitter client-id="123"
+                    client-secret="your_secret"
+                />
             </acme-social:config>
-
-            <!-- ... -->
         </container>
 
     .. code-block:: php
 
         // config/packages/acme_social.php
-        $container->loadFromExtension('acme_social', [
-            'twitter' => [
-                'client_id'     => 123,
-                'client_secret' => 'your_secret',
-            ],
-        ]);
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+        return static function (ContainerConfigurator $container) {
+            $container->extension('acme_social', [
+                'twitter' => [
+                    'client_id'     => 123,
+                    'client_secret' => 'your_secret',
+                ],
+            ]);
+        };
 
 The basic idea is that instead of having the user override individual
 parameters, you let the user configure just a few, specifically created,
@@ -242,8 +254,8 @@ For example, imagine your bundle has the following example config:
     <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">
-
+            https://symfony.com/schema/dic/services/services-1.0.xsd"
+    >
         <services>
             <service id="acme.social.twitter_client" class="Acme\SocialBundle\TwitterClient">
                 <argument></argument> <!-- will be filled in with client_id dynamically -->
@@ -423,8 +435,8 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
         xsi:schemaLocation="http://symfony.com/schema/dic/services
             https://symfony.com/schema/dic/services/services-1.0.xsd
             http://acme_company.com/schema/dic/hello
-            https://acme_company.com/schema/dic/hello/hello-1.0.xsd">
-
+            https://acme_company.com/schema/dic/hello/hello-1.0.xsd"
+    >
         <acme-hello:config>
             <!-- ... -->
         </acme-hello:config>

bundles/override.rst

@@ -139,8 +139,8 @@ to a new validation group:
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
-                https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
-
+                https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"
+        >
             <class name="FOS\UserBundle\Model\User">
                 <property name="plainPassword">
                     <constraint name="NotBlank">

bundles/prepend_extension.rst

@@ -127,29 +127,35 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
                 http://example.org/schema/dic/acme_something
                 https://example.org/schema/dic/acme_something/acme_something-1.0.xsd
                 http://example.org/schema/dic/acme_other
-                https://example.org/schema/dic/acme_something/acme_other-1.0.xsd">
-
+                https://example.org/schema/dic/acme_something/acme_other-1.0.xsd"
+        >
             <acme-something:config use-acme-goodbye="false">
                 <!-- ... -->
                 <acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>
             </acme-something:config>
 
-            <acme-other:config use-acme-goodbye="false"/>
+            <acme-other:config use-acme-goodbye="false">
+                <!-- ... -->
+            </acme-other:config>
 
         </container>
 
     .. code-block:: php
 
         // config/packages/acme_something.php
-        $container->loadFromExtension('acme_something', [
-            // ...
-            'use_acme_goodbye' => false,
-            'entity_manager_name' => 'non_default',
-        ]);
-        $container->loadFromExtension('acme_other', [
-            // ...
-            'use_acme_goodbye' => false,
-        ]);
+        namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+        return static function (ContainerConfigurator $container) {
+            $container->extension('acme_something', [
+                // ...
+                'use_acme_goodbye' => false,
+                'entity_manager_name' => 'non_default',
+            ]);
+            $container->extension('acme_other', [
+                // ...
+                'use_acme_goodbye' => false,
+            ]);
+        };
 
 More than one Bundle using PrependExtensionInterface
 ----------------------------------------------------