From bfa6910707210c52ee448716f1e2b71cdda11d33 Mon Sep 17 00:00:00 2001 From: Antoine Lamirault Date: Sat, 7 Jan 2023 19:20:51 +0100 Subject: [PATCH] Standardize the name of the container builder variable 6.1 --- bundles/configuration.rst | 2 +- bundles/extension.rst | 2 +- bundles/prepend_extension.rst | 4 ++-- configuration/micro_kernel_trait.rst | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/configuration.rst b/bundles/configuration.rst index 35379d6d0d9..738c2affefb 100644 --- a/bundles/configuration.rst +++ b/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. diff --git a/bundles/extension.rst b/bundles/extension.rst index 474de1dd3b2..9e5da5632be 100644 --- a/bundles/extension.rst +++ b/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'); diff --git a/bundles/prepend_extension.rst b/bundles/prepend_extension.rst index 52bf9d0e5f2..bc3c8342b58 100644 --- a/bundles/prepend_extension.rst +++ b/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'], ]); diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst index c7755790764..fca778f2e6a 100644 --- a/configuration/micro_kernel_trait.rst +++ b/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); } } }