Merge branch '6.1' into 6.2

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

Author: javiereguiluz

bundles/configuration.rst

@@ -352,11 +352,11 @@ add this logic to the bundle class directly::
             ;
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
+        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
         {
             // Contrary to the Extension class, the "$config" variable is already merged
             // and processed. You can use it directly to configure the service container.
-            $container->services()
+            $containerConfigurator->services()
                 ->get('acme.social.twitter_client')
                 ->arg(0, $config['twitter']['client_id'])
                 ->arg(1, $config['twitter']['client_secret'])

bundles/extension.rst

@@ -131,18 +131,18 @@ method::
 
     class AcmeHelloBundle extends AbstractBundle
     {
-        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
+        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
         {
             // load an XML, PHP or Yaml file
-            $container->import('../config/services.xml');
+            $containerConfigurator->import('../config/services.xml');
 
             // you can also add or replace parameters and services
-            $container->parameters()
+            $containerConfigurator->parameters()
                 ->set('acme_hello.phrase', $config['phrase'])
             ;
 
             if ($config['scream']) {
-                $container->services()
+                $containerConfigurator->services()
                     ->get('acme_hello.printer')
                         ->class(ScreamingPrinter::class)
                 ;

bundles/prepend_extension.rst

@@ -173,20 +173,20 @@ method::
 
     class FooBundle extends AbstractBundle
     {
-        public function prependExtension(ContainerConfigurator $container, ContainerBuilder $builder): void
+        public function prependExtension(ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
         {
             // prepend
             $builder->prependExtensionConfig('framework', [
                 'cache' => ['prefix_seed' => 'foo/bar'],
             ]);
 
             // append
-            $container->extension('framework', [
+            $containerConfigurator->extension('framework', [
                 'cache' => ['prefix_seed' => 'foo/bar'],
             ]);
 
             // append from file
-            $container->import('../config/packages/cache.php');
+            $containerConfigurator->import('../config/packages/cache.php');
         }
     }
 

configuration/micro_kernel_trait.rst

@@ -93,10 +93,10 @@ Next, create an ``index.php`` file that defines the kernel class and runs it:
                 ];
             }
 
-            protected function configureContainer(ContainerConfigurator $c): void
+            protected function configureContainer(ContainerConfigurator $containerConfigurator): void
             {
                 // PHP equivalent of config/packages/framework.yaml
-                $c->extension('framework', [
+                $containerConfigurator->extension('framework', [
                     'secret' => 'S0ME_SECRET'
                 ]);
             }
@@ -325,7 +325,7 @@ add a service conditionally based on the ``foo`` value::
                 ->end();
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
+        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
         {
             if ($config['foo']) {
                 $builder->register('foo_service', \stdClass::class);

notifier.rst

@@ -753,8 +753,8 @@ typical alert levels, which you can implement immediately using:
 
         use Symfony\Component\Notifier\FlashMessage\BootstrapFlashMessageImportanceMapper;
 
-        return function(ContainerConfigurator $configurator) {
-            $configurator->services()
+        return function(ContainerConfigurator $containerConfigurator) {
+            $containerConfigurator->services()
                 ->set('notifier.flash_message_importance_mapper', BootstrapFlashMessageImportanceMapper::class)
             ;
         };

service_container/factories.rst

@@ -298,8 +298,8 @@ e.g. change the service based on a parameter:
         use App\Email\NewsletterManagerInterface;
         use App\Email\NewsletterManagerFactory;
 
-        return function(ContainerConfigurator $configurator) {
-            $services = $configurator->services();
+        return function(ContainerConfigurator $containerConfigurator) {
+            $services = $containerConfigurator->services();
 
             $services->set(NewsletterManagerInterface::class)
                 // use the "tracable_newsletter" service when debug is enabled, "newsletter" otherwise.

service_container/tags.rst

@@ -672,8 +672,8 @@ iterator, add the ``exclude`` option:
         // config/services.php
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        return function(ContainerConfigurator $configurator) {
-            $services = $configurator->services();
+        return function(ContainerConfigurator $containerConfigurator) {
+            $services = $containerConfigurator->services();
 
             // ...