Remove the containerBuilder global var from the Template class

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

2 files changed, 6 insertions, 6 deletions

diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index 94b5b6ff3d..e899376eb4 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -963,11 +963,13 @@ class Core
         return hash_equals($hmac, $signature);
     }
 
-    /**
-     * Get the container builder
-     */
     public static function getContainerBuilder(): ContainerBuilder
     {
+        $containerBuilder = $GLOBALS['containerBuilder'] ?? null;
+        if ($containerBuilder instanceof ContainerBuilder) {
+            return $containerBuilder;
+        }
+
         $containerBuilder = new ContainerBuilder();
         $loader = new PhpFileLoader($containerBuilder, new FileLocator(ROOT_PATH . 'libraries'));
         $loader->load('services_loader.php');
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
index eb04e5ba57..a42c3c13f3 100644
--- a/libraries/classes/Template.php
+++ b/libraries/classes/Template.php
@@ -63,8 +63,6 @@ class Template
 
     public static function getTwigEnvironment(?string $cacheDir): Environment
     {
-        $GLOBALS['containerBuilder'] = $GLOBALS['containerBuilder'] ?? null;
-
         /* Twig expects false when cache is not configured */
         if ($cacheDir === null) {
             $cacheDir = false;
@@ -76,7 +74,7 @@ class Template
             'cache' => $cacheDir,
         ]);
 
-        $twig->addRuntimeLoader(new ContainerRuntimeLoader($GLOBALS['containerBuilder']));
+        $twig->addRuntimeLoader(new ContainerRuntimeLoader(Core::getContainerBuilder()));
 
         if (is_array($GLOBALS['cfg']) && ($GLOBALS['cfg']['environment'] ?? '') === 'development') {
             $twig->enableDebug();