Merge branch '6.4' into 7.1

* 6.4:
  [TwigBridge] Avoid calling deprecated mergeGlobals()

Author: derrabus

src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php

@@ -34,7 +34,7 @@ public function renderBlock(FormView $view, mixed $resource, string $blockName,
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
-        $context = $this->environment->mergeGlobals($variables);
+        $context = $variables + $this->environment->getGlobals();
 
         ob_start();
 
@@ -149,7 +149,7 @@ protected function loadResourcesFromTheme(string $cacheKey, mixed &$theme): void
         // theme is a reference and we don't want to change it.
         $currentTheme = $theme;
 
-        $context = $this->environment->mergeGlobals([]);
+        $context = $this->environment->getGlobals();
 
         // The do loop takes care of template inheritance.
         // Add blocks from all templates in the inheritance tree, but avoid