From 3ed7066c6de3798c107d6b33a5f1e731e307b75b Mon Sep 17 00:00:00 2001
From: m1mir <19989320-m1mir@users.noreply.gitlab.com>
Date: Wed, 13 Mar 2024 02:07:22 +0100
Subject: [PATCH 1/3] fix: Corrected the argument names of loadExtension
 function examples.

---
 bundles/configuration.rst            | 2 +-
 bundles/extension.rst                | 2 +-
 configuration/micro_kernel_trait.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/configuration.rst b/bundles/configuration.rst
index c155fe8a56a..a3a8408a56f 100644
--- a/bundles/configuration.rst
+++ b/bundles/configuration.rst
@@ -353,7 +353,7 @@ logic to the bundle class directly::
             ;
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
+        public function loadExtension(array $config, ContainerConfigurator $container, 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.
diff --git a/bundles/extension.rst b/bundles/extension.rst
index 8b2928358ad..293f6091c69 100644
--- a/bundles/extension.rst
+++ b/bundles/extension.rst
@@ -127,7 +127,7 @@ method::
 
     class AcmeHelloBundle extends AbstractBundle
     {
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
+        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             // load an XML, PHP or Yaml file
             $containerConfigurator->import('../config/services.xml');
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
index 4b538f1b6e4..0094df323ee 100644
--- a/configuration/micro_kernel_trait.rst
+++ b/configuration/micro_kernel_trait.rst
@@ -330,7 +330,7 @@ add a service conditionally based on the ``foo`` value::
                 ->end();
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
+        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             if ($config['foo']) {
                 $containerBuilder->register('foo_service', \stdClass::class);

From 096b340d700ee48cf51fc783d6ce1fcf1517eb5e Mon Sep 17 00:00:00 2001
From: m1mir <19989320-m1mir@users.noreply.gitlab.com>
Date: Wed, 13 Mar 2024 02:34:05 +0100
Subject: [PATCH 2/3] fix: Fixed the variable names in the fixed loadExtension
 bodies.

---
 bundles/configuration.rst            | 2 +-
 bundles/extension.rst                | 6 +++---
 configuration/micro_kernel_trait.rst | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/configuration.rst b/bundles/configuration.rst
index a3a8408a56f..8f182f113b7 100644
--- a/bundles/configuration.rst
+++ b/bundles/configuration.rst
@@ -357,7 +357,7 @@ logic to the bundle class directly::
         {
             // Contrary to the Extension class, the "$config" variable is already merged
             // and processed. You can use it directly to configure the service container.
-            $containerConfigurator->services()
+            $container->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 293f6091c69..861c7b60807 100644
--- a/bundles/extension.rst
+++ b/bundles/extension.rst
@@ -130,15 +130,15 @@ method::
         public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             // load an XML, PHP or Yaml file
-            $containerConfigurator->import('../config/services.xml');
+            $container->import('../config/services.xml');
 
             // you can also add or replace parameters and services
-            $containerConfigurator->parameters()
+            $container->parameters()
                 ->set('acme_hello.phrase', $config['phrase'])
             ;
 
             if ($config['scream']) {
-                $containerConfigurator->services()
+                $container->services()
                     ->get('acme_hello.printer')
                         ->class(ScreamingPrinter::class)
                 ;
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
index 0094df323ee..9617d837673 100644
--- a/configuration/micro_kernel_trait.rst
+++ b/configuration/micro_kernel_trait.rst
@@ -333,7 +333,7 @@ add a service conditionally based on the ``foo`` value::
         public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             if ($config['foo']) {
-                $containerBuilder->register('foo_service', \stdClass::class);
+                $builder->register('foo_service', \stdClass::class);
             }
         }
     }

From d3d142686136b72b3d2d79b0c1ddc8043fbfb6ab Mon Sep 17 00:00:00 2001
From: m1mir <19989320-m1mir@users.noreply.gitlab.com>
Date: Sat, 16 Mar 2024 03:12:37 +0100
Subject: [PATCH 3/3] Removed the naming enforcement rule for ContainterBuilder

Removed the rule because it's not consistent with
ConfigurableExtensionInterface::loadExtension
---
 .doctor-rst.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
index e926a3cc77d..50a78ed21fb 100644
--- a/.doctor-rst.yaml
+++ b/.doctor-rst.yaml
@@ -2,7 +2,6 @@ rules:
     american_english: ~
     argument_variable_must_match_type:
         arguments:
-            - { type: 'ContainerBuilder', name: 'container' }
             - { type: 'ContainerConfigurator', name: 'container' }
     avoid_repetetive_words: ~
     blank_line_after_anchor: ~