Remove side effects from Config class

Moves the side effects to the common.inc.php file. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jan 19, 2020 · 33477fe · 33477fe
1 parent ae0577a
commit 33477fe
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -18,11 +18,6 @@
 use PhpMyAdmin\UserPreferences;
 use PhpMyAdmin\Utils\HttpRequest;
 
-/**
- * Indication for error handler (see end of this file).
- */
-$GLOBALS['pma_config_loading'] = false;
-
 /**
  * Configuration class
  *
@@ -773,6 +768,8 @@ public function checkGitRevision(): void
      */
     public function loadDefaults(): bool
     {
+        global $isConfigLoading;
+
         /** @var array<string,mixed> $cfg */
         $cfg = [];
         if (! @file_exists($this->default_source)) {
@@ -784,11 +781,13 @@ public function loadDefaults(): bool
         if ($canUseErrorReporting) {
             $oldErrorReporting = error_reporting(0);
         }
+
         ob_start();
-        $GLOBALS['pma_config_loading'] = true;
+        $isConfigLoading = true;
         $eval_result = include $this->default_source;
-        $GLOBALS['pma_config_loading'] = false;
+        $isConfigLoading = false;
         ob_end_clean();
+
         if ($canUseErrorReporting) {
             error_reporting($oldErrorReporting);
         }
@@ -821,6 +820,8 @@ public function loadDefaults(): bool
      */
     public function load(?string $source = null): bool
     {
+        global $isConfigLoading;
+
         $this->loadDefaults();
 
         if (null !== $source) {
@@ -842,11 +843,13 @@ public function load(?string $source = null): bool
         if ($canUseErrorReporting) {
             $oldErrorReporting = error_reporting(0);
         }
+
         ob_start();
-        $GLOBALS['pma_config_loading'] = true;
+        $isConfigLoading = true;
         $eval_result = include $this->getSource();
-        $GLOBALS['pma_config_loading'] = false;
+        $isConfigLoading = false;
         ob_end_clean();
+
         if ($canUseErrorReporting) {
             error_reporting($oldErrorReporting);
         }
@@ -1560,9 +1563,9 @@ public function issetCookie(string $cookieName): bool
      */
     public static function fatalErrorHandler(): void
     {
-        if (! isset($GLOBALS['pma_config_loading'])
-            || ! $GLOBALS['pma_config_loading']
-        ) {
+        global $isConfigLoading;
+
+        if (! isset($isConfigLoading) || ! $isConfigLoading) {
             return;
         }
 
@@ -1775,7 +1778,3 @@ public function checkServers(): void
         }
     }
 }
-
-if (! defined('TESTSUITE')) {
-    register_shutdown_function([Config::class, 'fatalErrorHandler']);
-}
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -51,7 +51,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-global $containerBuilder, $error_handler, $PMA_Config, $server, $dbi, $lang, $cfg;
+global $containerBuilder, $error_handler, $PMA_Config, $server, $dbi, $lang, $cfg, $isConfigLoading;
 
 /**
  * block attempts to directly run this script
@@ -127,6 +127,9 @@
 /******************************************************************************/
 /* parsing configuration file                  LABEL_parsing_config_file      */
 
+/** @var bool $isConfigLoading Indication for the error handler */
+$isConfigLoading = false;
+
 /**
  * Force reading of config file, because we removed sensitive values
  * in the previous iteration.
@@ -135,6 +138,8 @@
  */
 $PMA_Config = $containerBuilder->get('config');
 
+register_shutdown_function([Config::class, 'fatalErrorHandler']);
+
 /**
  * include session handling after the globals, to prevent overwriting
  */