Merge branch '5.4' into 6.0

* 5.4:
  Enable argument_variable_must_match_type doctor-rst rule

Author: OskarStark

.doctor-rst.yaml

@@ -1,5 +1,9 @@
 rules:
     american_english: ~
+    argument_variable_must_match_type:
+        arguments:
+            - { type: 'ContainerBuilder', name: 'containerBuilder' }
+            - { type: 'ContainerConfigurator', name: 'containerConfigurator' }
     avoid_repetetive_words: ~
     blank_line_after_anchor: ~
     blank_line_after_directive: ~
@@ -96,6 +100,5 @@ whitelist:
         - '.. versionadded:: 3.6' # MonologBundle
         - '// bin/console'
         - 'End to End Tests (E2E)'
-        - '.. code-block:: php'
         - '.. _`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)'

components/uid.rst

@@ -118,7 +118,7 @@ configure the behavior of the factory using configuration files::
 
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        return static function (ContainerConfigurator $configurator): void {
+        return static function (ContainerConfigurator $containerConfigurator): void {
             $services = $configurator->services()
                 ->defaults()
                 ->autowire()

security/entry_point.rst

@@ -60,8 +60,8 @@ You can configure this using the ``entry_point`` setting:
     .. code-block:: php
 
         // config/packages/security.php
-        use Symfony\Config\SecurityConfig;
         use App\Security\SocialConnectAuthenticator;
+        use Symfony\Config\SecurityConfig;
 
         return static function (SecurityConfig $security) {
             $security->enableAuthenticatorManager(true);

serializer.rst

@@ -146,8 +146,8 @@ configuration:
     .. code-block:: php
 
         // config/packages/framework.php
-        use Symfony\Config\FrameworkConfig;
         use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
+        use Symfony\Config\FrameworkConfig;
 
         return static function (FrameworkConfig $framework) {
             $framework->serializer()

templating/global_variables.rst

@@ -99,8 +99,8 @@ the ``@`` character, which is the usual syntax to
     .. code-block:: php
 
         // config/packages/twig.php
-        use Symfony\Config\TwigConfig;
         use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+        use Symfony\Config\TwigConfig;
 
         return static function (TwigConfig $twig) {
             // ...