Merge branch '6.1' into 6.2

* 6.1:
  Standardize the name of the container builder variable 6.1

Author: javiereguiluz

bundles/configuration.rst

@@ -352,7 +352,7 @@ add this logic to the bundle class directly::
             ;
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
+        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
         {
             // Contrary to the Extension class, the "$config" variable is already merged
             // and processed. You can use it directly to configure the service container.

bundles/extension.rst

@@ -131,7 +131,7 @@ method::
 
     class AcmeHelloBundle extends AbstractBundle
     {
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
+        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
         {
             // load an XML, PHP or Yaml file
             $containerConfigurator->import('../config/services.xml');

bundles/prepend_extension.rst

@@ -173,10 +173,10 @@ method::
 
     class FooBundle extends AbstractBundle
     {
-        public function prependExtension(ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
+        public function prependExtension(ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
         {
             // prepend
-            $builder->prependExtensionConfig('framework', [
+            $containerBuilder->prependExtensionConfig('framework', [
                 'cache' => ['prefix_seed' => 'foo/bar'],
             ]);
 

configuration/micro_kernel_trait.rst

@@ -247,9 +247,9 @@ Now it looks like this::
             return $bundles;
         }
 
-        protected function build(ContainerBuilder $container)
+        protected function build(ContainerBuilder $containerBuilder)
         {
-            $container->registerExtension(new AppExtension());
+            $containerBuilder->registerExtension(new AppExtension());
         }
 
         protected function configureContainer(ContainerConfigurator $containerConfigurator): void
@@ -325,10 +325,10 @@ add a service conditionally based on the ``foo`` value::
                 ->end();
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
+        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
         {
             if ($config['foo']) {
-                $builder->register('foo_service', \stdClass::class);
+                $containerBuilder->register('foo_service', \stdClass::class);
             }
         }
     }