[TwigBridge] Avoid calling deprecated mergeGlobals()

symfony · Sep 9, 2024 · 978b78a · 978b78a
1 parent 0057d05
commit 978b78a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Form/TwigRendererEngine.php b/Form/TwigRendererEngine.php
@@ -44,7 +44,7 @@ public function renderBlock(FormView $view, $resource, string $blockName, array
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
-        $context = $this->environment->mergeGlobals($variables);
+        $context = $variables + $this->environment->getGlobals();
 
         ob_start();
 
@@ -164,7 +164,7 @@ protected function loadResourcesFromTheme(string $cacheKey, &$theme)
         // 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