Merge branch '6.1' into 6.2

* 6.1:
  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

@@ -133,7 +133,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

@@ -145,9 +145,9 @@ configuration:
     .. code-block:: php
 
         // config/packages/framework.php
-        use Symfony\Config\FrameworkConfig;
         use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
         use Symfony\Component\Serializer\Encoder\YamlEncoder;
+        use Symfony\Config\FrameworkConfig;
 
         return static function (FrameworkConfig $framework) {
             $framework->serializer()
@@ -412,7 +412,7 @@ their paths using a :doc:`valid PropertyAccess syntax </components/property_acce
             attributes:
                 dob:
                     serialized_path: '[profile][information][birthday]'
-        
+
     .. code-block:: xml
 
         <?xml version="1.0" encoding="UTF-8" ?>
@@ -430,8 +430,8 @@ their paths using a :doc:`valid PropertyAccess syntax </components/property_acce
 
     The option to configure a ``SerializedPath`` was introduced in Symfony 6.2.
 
-Using the configuration from above, denormalizing with a metadata-aware 
-normalizer will write the ``birthday`` field from ``$data`` onto the ``Person`` 
+Using the configuration from above, denormalizing with a metadata-aware
+normalizer will write the ``birthday`` field from ``$data`` onto the ``Person``
 object::
 
     $data = [
@@ -441,10 +441,10 @@ object::
             ],
         ],
     ];
-    $person = $normalizer->denormalize($data, Person::class, 'any'); 
+    $person = $normalizer->denormalize($data, Person::class, 'any');
     $person->getBirthday(); // 01-01-1970
 
-When using annotations or attributes, the ``SerializedPath`` can either 
+When using annotations or attributes, the ``SerializedPath`` can either
 be set on the property or the associated _getter_ method. The ``SerializedPath``
 cannot be used in combination with a ``SerializedName`` for the same property.
 

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) {
             // ...