From 6943bc7ae2749ca610752af9d5655449d346ca21 Mon Sep 17 00:00:00 2001 From: Antoine Lamirault Date: Sat, 7 Jan 2023 16:31:02 +0100 Subject: [PATCH] Standardize the name of the container configurator variable 6.1 --- bundles/configuration.rst | 4 ++-- bundles/extension.rst | 8 ++++---- bundles/prepend_extension.rst | 6 +++--- configuration/micro_kernel_trait.rst | 6 +++--- notifier.rst | 4 ++-- service_container/factories.rst | 4 ++-- service_container/tags.rst | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bundles/configuration.rst b/bundles/configuration.rst index d8c7a44d7bd..2556546e2d0 100644 --- a/bundles/configuration.rst +++ b/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']) diff --git a/bundles/extension.rst b/bundles/extension.rst index de5dee53c0c..6dca67b82e2 100644 --- a/bundles/extension.rst +++ b/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) ; diff --git a/bundles/prepend_extension.rst b/bundles/prepend_extension.rst index a1b559abd85..0c743a42c12 100644 --- a/bundles/prepend_extension.rst +++ b/bundles/prepend_extension.rst @@ -173,7 +173,7 @@ 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', [ @@ -181,12 +181,12 @@ method:: ]); // 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'); } } diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst index ec62277e224..c7755790764 100644 --- a/configuration/micro_kernel_trait.rst +++ b/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); diff --git a/notifier.rst b/notifier.rst index d689d7972b2..ebe9de39054 100644 --- a/notifier.rst +++ b/notifier.rst @@ -741,8 +741,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) ; }; diff --git a/service_container/factories.rst b/service_container/factories.rst index d8ca852e6e9..d5164e03b05 100644 --- a/service_container/factories.rst +++ b/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. diff --git a/service_container/tags.rst b/service_container/tags.rst index bf20981504f..08dbb862744 100644 --- a/service_container/tags.rst +++ b/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(); // ...