Merge branch '5.4' into 6.0

* 5.4:
  Global variable in TwigConfig should be passed by service function

Author: javiereguiluz

templating/global_variables.rst

@@ -92,19 +92,20 @@ the ``@`` character, which is the usual syntax to
 
             <twig:config>
                 <!-- ... -->
-                <twig:global key="uuid">@App\Generator\UuidGenerator</twig:global>
+                <twig:global key="foo" id="App\Generator\UuidGenerator" type="service"/>
             </twig:config>
         </container>
 
     .. code-block:: php
 
         // config/packages/twig.php
         use Symfony\Config\TwigConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
         return static function (TwigConfig $twig) {
             // ...
 
-            $twig->global('uuid')->value('@App\Generator\UuidGenerator');
+            $twig->global('uuid')->value(service('App\Generator\UuidGenerator'));
         };
 
 Now you can use the ``uuid`` variable in any Twig template to access to the