Skip to content

Commit 561d9ca

Browse files
MauricioFauthMauricioFauth
committed
Remove containerBuilder global variable from Common class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent b783681 commit 561d9ca

2 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎libraries/classes/Common.php‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ public static function run(bool $isSetupPage = false): void
9696

9797
$isMinimumCommon = $isSetupPage || $route === '/import-status' || $route === '/url' || $route === '/messages';
9898

99-
$GLOBALS['containerBuilder'] = Core::getContainerBuilder();
99+
$container = Core::getContainerBuilder();
100100

101101
/** @var ErrorHandler $errorHandler */
102-
$errorHandler = $GLOBALS['containerBuilder']->get('error_handler');
102+
$errorHandler = $container->get('error_handler');
103103
$GLOBALS['errorHandler'] = $errorHandler;
104104

105105
try {
@@ -114,7 +114,7 @@ public static function run(bool $isSetupPage = false): void
114114
self::cleanupPathInfo();
115115

116116
/** @var Config $config */
117-
$config = $GLOBALS['containerBuilder']->get('config');
117+
$config = $container->get('config');
118118
$GLOBALS['config'] = $config;
119119

120120
try {
@@ -142,12 +142,12 @@ public static function run(bool $isSetupPage = false): void
142142
* @global array $urlParams
143143
*/
144144
$GLOBALS['urlParams'] = [];
145-
$GLOBALS['containerBuilder']->setParameter('url_params', $GLOBALS['urlParams']);
145+
$container->setParameter('url_params', $GLOBALS['urlParams']);
146146

147-
self::setGotoAndBackGlobals($GLOBALS['containerBuilder'], $config);
147+
self::setGotoAndBackGlobals($container, $config);
148148
self::checkTokenRequestParam();
149-
self::setDatabaseAndTableFromRequest($GLOBALS['containerBuilder'], $request);
150-
self::setSQLQueryGlobalFromRequest($request);
149+
self::setDatabaseAndTableFromRequest($container, $request);
150+
self::setSQLQueryGlobalFromRequest($container, $request);
151151

152152
//$_REQUEST['set_theme'] // checked later in this file LABEL_theme_setup
153153
//$_REQUEST['server']; // checked later in this file
@@ -183,7 +183,7 @@ public static function run(bool $isSetupPage = false): void
183183
return;
184184
}
185185

186-
self::setCurrentServerGlobal($config);
186+
self::setCurrentServerGlobal($container, $config);
187187

188188
$GLOBALS['cfg'] = $config->settings;
189189

@@ -195,7 +195,7 @@ public static function run(bool $isSetupPage = false): void
195195

196196
if ($isMinimumCommon) {
197197
$config->loadUserPreferences(true);
198-
$GLOBALS['containerBuilder']->set('theme_manager', ThemeManager::getInstance());
198+
$container->set('theme_manager', ThemeManager::getInstance());
199199
Tracker::enable();
200200

201201
if ($route === '/url') {
@@ -209,7 +209,7 @@ public static function run(bool $isSetupPage = false): void
209209
return;
210210
}
211211

212-
Routing::callControllerForRoute($request, Routing::getDispatcher(), $GLOBALS['containerBuilder']);
212+
Routing::callControllerForRoute($request, Routing::getDispatcher(), $container);
213213

214214
return;
215215
}
@@ -222,8 +222,8 @@ public static function run(bool $isSetupPage = false): void
222222
ThemeManager::getInstance()->setThemeCookie();
223223

224224
$GLOBALS['dbi'] = DatabaseInterface::load();
225-
$GLOBALS['containerBuilder']->set(DatabaseInterface::class, $GLOBALS['dbi']);
226-
$GLOBALS['containerBuilder']->setAlias('dbi', DatabaseInterface::class);
225+
$container->set(DatabaseInterface::class, $GLOBALS['dbi']);
226+
$container->setAlias('dbi', DatabaseInterface::class);
227227

228228
if (! empty($GLOBALS['cfg']['Server'])) {
229229
$config->getLoginCookieValidityFromCache($GLOBALS['server']);
@@ -290,23 +290,23 @@ public static function run(bool $isSetupPage = false): void
290290

291291
Profiling::check($GLOBALS['dbi'], $response);
292292

293-
$GLOBALS['containerBuilder']->set('response', ResponseRenderer::getInstance());
293+
$container->set('response', ResponseRenderer::getInstance());
294294

295295
// load user preferences
296296
$config->loadUserPreferences();
297297

298-
$GLOBALS['containerBuilder']->set('theme_manager', ThemeManager::getInstance());
298+
$container->set('theme_manager', ThemeManager::getInstance());
299299

300300
/* Tell tracker that it can actually work */
301301
Tracker::enable();
302302

303303
if (! empty($GLOBALS['server']) && isset($GLOBALS['cfg']['ZeroConf']) && $GLOBALS['cfg']['ZeroConf']) {
304304
/** @var Relation $relation */
305-
$relation = $GLOBALS['containerBuilder']->get('relation');
305+
$relation = $container->get('relation');
306306
$GLOBALS['dbi']->postConnectControl($relation);
307307
}
308308

309-
Routing::callControllerForRoute($request, Routing::getDispatcher(), $GLOBALS['containerBuilder']);
309+
Routing::callControllerForRoute($request, Routing::getDispatcher(), $container);
310310
}
311311

312312
/**
@@ -517,10 +517,8 @@ public static function checkTokenRequestParam(): void
517517
Sanitize::removeRequestVars($allowList);
518518
}
519519

520-
private static function setDatabaseAndTableFromRequest(
521-
ContainerInterface $containerBuilder,
522-
ServerRequest $request
523-
): void {
520+
private static function setDatabaseAndTableFromRequest(ContainerInterface $container, ServerRequest $request): void
521+
{
524522
$GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;
525523

526524
$db = DatabaseName::tryFromValue($request->getParam('db'));
@@ -535,7 +533,7 @@ private static function setDatabaseAndTableFromRequest(
535533

536534
$GLOBALS['urlParams']['db'] = $GLOBALS['db'];
537535
$GLOBALS['urlParams']['table'] = $GLOBALS['table'];
538-
$containerBuilder->setParameter('url_params', $GLOBALS['urlParams']);
536+
$container->setParameter('url_params', $GLOBALS['urlParams']);
539537
}
540538

541539
/**
@@ -658,7 +656,7 @@ private static function setupPageBootstrap(Config $config): void
658656
ob_start();
659657
}
660658

661-
private static function setSQLQueryGlobalFromRequest(ServerRequest $request): void
659+
private static function setSQLQueryGlobalFromRequest(ContainerInterface $container, ServerRequest $request): void
662660
{
663661
$sqlQuery = '';
664662
if ($request->isPost()) {
@@ -670,17 +668,17 @@ private static function setSQLQueryGlobalFromRequest(ServerRequest $request): vo
670668
}
671669

672670
$GLOBALS['sql_query'] = $sqlQuery;
673-
$GLOBALS['containerBuilder']->setParameter('sql_query', $sqlQuery);
671+
$container->setParameter('sql_query', $sqlQuery);
674672
}
675673

676-
private static function setCurrentServerGlobal(Config $config): void
674+
private static function setCurrentServerGlobal(ContainerInterface $container, Config $config): void
677675
{
678676
$config->checkServers();
679677
$server = $config->selectServer();
680678
$GLOBALS['server'] = $server;
681679
$GLOBALS['urlParams']['server'] = $server;
682-
$GLOBALS['containerBuilder']->setParameter('server', $server);
683-
$GLOBALS['containerBuilder']->setParameter('url_params', $GLOBALS['urlParams']);
680+
$container->setParameter('server', $server);
681+
$container->setParameter('url_params', $GLOBALS['urlParams']);
684682
}
685683

686684
private static function getGenericError(string $message): string

‎libraries/classes/Core.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,8 @@ public static function getContainerBuilder(): ContainerBuilder
862862
$loader = new PhpFileLoader($containerBuilder, new FileLocator(ROOT_PATH . 'libraries'));
863863
$loader->load('services_loader.php');
864864

865+
$GLOBALS['containerBuilder'] = $containerBuilder;
866+
865867
return $containerBuilder;
866868
}
867869

0 commit comments

Comments
 (0)