From 975e88c09f12b6779d4fa785678205504aff2c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 29 Sep 2022 20:06:34 -0300 Subject: Remove the containerBuilder global var from the Template class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Core.php | 8 +++++--- libraries/classes/Template.php | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libraries') 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(); -- cgit v1.2.3