Remove the containerBuilder global var from the Template class

MauricioFauth · MauricioFauth · commit 975e88c09f12 · 2022-09-29T20:06:34.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
@@ -963,11 +963,13 @@ public static function checkSqlQuerySignature($sqlQuery, $signature): bool
         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
@@ -63,8 +63,6 @@ public function __construct()
 
     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 @@ public static function getTwigEnvironment(?string $cacheDir): Environment
             '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();
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -13245,12 +13245,6 @@
     </PossiblyNullOperand>
   </file>
   <file src="libraries/classes/Template.php">
-    <PossiblyNullArgument occurrences="1">
-      <code>$GLOBALS['containerBuilder']</code>
-    </PossiblyNullArgument>
-    <PossiblyUndefinedArrayOffset occurrences="1">
-      <code>$GLOBALS['cfg']['environment']</code>
-    </PossiblyUndefinedArrayOffset>
     <RedundantCondition occurrences="1">
       <code>is_array($GLOBALS['cfg'])</code>
     </RedundantCondition>
