Merge branch '7.4' into 8.0

* 7.4:
  Use DOCtor-RST 1.69.1

Author: OskarStark

.github/workflows/ci.yaml

@@ -72,7 +72,7 @@ jobs:
                     key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
 
             -   name: "Run DOCtor-RST"
-                uses: docker://oskarstark/doctor-rst:1.69.0
+                uses: docker://oskarstark/doctor-rst:1.69.1
                 with:
                     args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
 

cache.rst

@@ -952,9 +952,9 @@ a message bus to compute values in a worker:
     .. code-block:: php
 
         // config/framework/framework.php
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
         use Symfony\Component\Cache\Messenger\EarlyExpirationMessage;
         use Symfony\Config\FrameworkConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
 
         return static function (FrameworkConfig $framework): void {
             $framework->cache()

mailer.rst

@@ -54,8 +54,8 @@ over SMTP by configuring the DSN in your ``.env`` file (the ``user``,
     .. code-block:: php
 
         // config/packages/mailer.php
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
         use Symfony\Config\FrameworkConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
 
         return static function (FrameworkConfig $framework): void {
             $framework->mailer()->dsn(env('MAILER_DSN'));
@@ -1663,8 +1663,8 @@ This can be configured by replacing the ``dsn`` configuration entry with a
     .. code-block:: php
 
         // config/packages/mailer.php
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
         use Symfony\Config\FrameworkConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
 
         return static function (FrameworkConfig $framework): void {
             $framework->mailer()

reference/configuration/framework.rst

@@ -3200,8 +3200,8 @@ and also to configure the session handler with a DSN:
     .. code-block:: php
 
         // config/packages/framework.php
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
         use Symfony\Config\FrameworkConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
 
         return static function (FrameworkConfig $framework): void {
             // ...

templates.rst

@@ -497,8 +497,8 @@ in container parameters <service-container-parameters>`:
     .. code-block:: php
 
         // config/packages/twig.php
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
         use Symfony\Config\TwigConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
         return static function (TwigConfig $twig): void {
             // ...