Merge branch '5.4' into 6.2

* 5.4:
  [Fix pipeline] multiple_kernels.rst must respect doctor-rst

Author: javiereguiluz

.doctor-rst.yaml

@@ -102,3 +102,17 @@ whitelist:
         - '// bin/console'
         - '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
         - '..  End to End Tests (E2E)'
+        - 'First, create a new ``apps`` directory at the root of your project, which will' # configuration/multiple_kernels.rst
+        - '├─ apps/' # configuration/multiple_kernels.rst
+        - '``apps/`` directory. Therefore, you should carefully consider what is' # configuration/multiple_kernels.rst
+        - 'Since the new ``apps/api/src/`` directory will host the PHP code related to the' # configuration/multiple_kernels.rst
+        - '"Api\\": "apps/api/src/"' # configuration/multiple_kernels.rst
+        - "return $this->getProjectDir().'/apps/'.$this->id.'/config';" # configuration/multiple_kernels.rst
+        - '``apps/`` as it is used in the Kernel to load the specific application' # configuration/multiple_kernels.rst
+        - '``apps/admin/templates/`` which you will need to manually configure under the' # configuration/multiple_kernels.rst
+        - '# apps/admin/config/packages/twig.yaml' # configuration/multiple_kernels.rst
+        - "'%kernel.project_dir%/apps/admin/templates': Admin" # configuration/multiple_kernels.rst
+        - '// apps/api/tests/ApiTestCase.php' # configuration/multiple_kernels.rst
+        - 'Now, create a ``tests/`` directory inside the ``apps/api/`` application. Then,' # configuration/multiple_kernels.rst
+        - '"Api\\Tests\\": "apps/api/tests/"' # configuration/multiple_kernels.rst
+        - '<directory>apps/api/tests</directory>' # configuration/multiple_kernels.rst

configuration/multiple_kernels.rst

@@ -164,12 +164,12 @@ resources::
             return ($_SERVER['APP_LOG_DIR'] ?? $this->getProjectDir().'/var/log').'/'.$this->id;
         }
 
-        protected function configureContainer(ContainerConfigurator $container): void
+        protected function configureContainer(ContainerConfigurator $containerConfigurator): void
         {
             // load common config files, such as the framework.yaml, as well as
             // specific configs required exclusively for the app itself
-            $this->doConfigureContainer($container, $this->getSharedConfigDir());
-            $this->doConfigureContainer($container, $this->getAppConfigDir());
+            $this->doConfigureContainer($containerConfigurator, $this->getSharedConfigDir());
+            $this->doConfigureContainer($containerConfigurator, $this->getAppConfigDir());
         }
 
         protected function configureRoutes(RoutingConfigurator $routes): void
@@ -180,16 +180,16 @@ resources::
             $this->doConfigureRoutes($routes, $this->getAppConfigDir());
         }
 
-        private function doConfigureContainer(ContainerConfigurator $container, string $configDir): void
+        private function doConfigureContainer(ContainerConfigurator $containerConfigurator, string $configDir): void
         {
-            $container->import($configDir.'/{packages}/*.{php,yaml}');
-            $container->import($configDir.'/{packages}/'.$this->environment.'/*.{php,yaml}');
+            $containerConfigurator->import($configDir.'/{packages}/*.{php,yaml}');
+            $containerConfigurator->import($configDir.'/{packages}/'.$this->environment.'/*.{php,yaml}');
 
             if (is_file($configDir.'/services.yaml')) {
-                $container->import($configDir.'/services.yaml');
-                $container->import($configDir.'/{services}_'.$this->environment.'.yaml');
+                $containerConfigurator->import($configDir.'/services.yaml');
+                $containerConfigurator->import($configDir.'/{services}_'.$this->environment.'.yaml');
             } else {
-                $container->import($configDir.'/{services}.php');
+                $containerConfigurator->import($configDir.'/{services}.php');
             }
         }