Get default config values from `Config\Settings` classes

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

77 files changed, 67 insertions, 194 deletions

diff --git a/test/bootstrap-static.php b/test/bootstrap-static.php
index 8045c2aedc..8f35341a9f 100644
--- a/test/bootstrap-static.php
+++ b/test/bootstrap-static.php
@@ -7,6 +7,8 @@
 
 declare(strict_types=1);
 
+use PhpMyAdmin\Config\Settings;
+
 if (! defined('ROOT_PATH')) {
     // phpcs:disable PSR1.Files.SideEffects
     define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
@@ -24,14 +26,12 @@ if (! defined('TESTSUITE')) {
 
 // phpcs:enable
 
-$cfg = [];
-
 include_once ROOT_PATH . 'examples/signon-script.php';
-require_once ROOT_PATH . 'libraries/config.default.php';
 require_once ROOT_PATH . 'libraries/vendor_config.php';
 require_once AUTOLOAD_FILE;
 
-$GLOBALS['cfg'] = $cfg;
+$settings = new Settings([]);
+$GLOBALS['cfg'] = $settings->toArray();
 $GLOBALS['server'] = 0;
 
 // phpcs:disable PSR1.Files.SideEffects
diff --git a/test/classes/AbstractNetworkTestCase.php b/test/classes/AbstractNetworkTestCase.php
index ca69d05293..db7838b464 100644
--- a/test/classes/AbstractNetworkTestCase.php
+++ b/test/classes/AbstractNetworkTestCase.php
@@ -7,6 +7,7 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Tests;
 
+use PhpMyAdmin\Config\Settings;
 use PhpMyAdmin\ResponseRenderer;
 use PHPUnit\Framework\Constraint\StringContains;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -29,9 +30,10 @@ abstract class AbstractNetworkTestCase extends AbstractTestCase
      */
     public static function setUpBeforeClass(): void
     {
-        $cfg = [];
-        require ROOT_PATH . 'libraries/config.default.php';
-        $GLOBALS['cfg'] = $cfg;
+        global $cfg;
+
+        $settings = new Settings([]);
+        $cfg = $settings->toArray();
     }
 
     /**
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
index 1a2dd938a5..a1fa9579c0 100644
--- a/test/classes/AbstractTestCase.php
+++ b/test/classes/AbstractTestCase.php
@@ -92,13 +92,6 @@ abstract class AbstractTestCase extends TestCase
         Cache::purge();
     }
 
-    protected function loadDefaultConfig(): void
-    {
-        global $cfg;
-
-        require ROOT_PATH . 'libraries/config.default.php';
-    }
-
     protected function assertAllQueriesConsumed(): void
     {
         $unUsedQueries = $this->dummyDbi->getUnUsedQueries();
@@ -210,6 +203,7 @@ abstract class AbstractTestCase extends TestCase
     {
         global $config, $cfg;
         $config = new Config();
+        $config->checkServers();
         $config->set('environment', 'development');
         $cfg = $config->settings;
     }
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
index 51b82cd830..81c245933c 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -70,7 +70,6 @@ class AdvisorTest extends AbstractTestCase
      */
     public function testAddRule(array $rule, array $expected, ?string $error): void
     {
-        parent::loadDefaultConfig();
         parent::setLanguage();
         $advisor = new Advisor($GLOBALS['dbi'], new ExpressionLanguage());
         $parseResult = include ROOT_PATH . 'libraries/advisory_rules_generic.php';
diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
index 8f1de1ee31..d7be3ea2eb 100644
--- a/test/classes/Config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Tests\Config;
 
 use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\Settings;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use stdClass;
 
@@ -17,7 +18,7 @@ use function count;
 class ConfigFileTest extends AbstractTestCase
 {
     /**
-     * Any valid key that exists in config.default.php and isn't empty
+     * Any valid key that exists in {@see \PhpMyAdmin\Config\Settings} and isn't empty
      */
     public const SIMPLE_KEY_WITH_DEFAULT_VALUE = 'DefaultQueryTable';
 
@@ -36,7 +37,6 @@ class ConfigFileTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 1;
         $this->object = new ConfigFile();
     }
@@ -283,8 +283,8 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
         $this->assertEmpty($this->object->getConfig());
 
-        // but if config.inc.php differs from config.default.php,
-        // allow to overwrite with value from config.default.php
+        // but if config.inc.php differs from the default values,
+        // allow to overwrite with value from the default values
         $config_inc_php_value = $default_value . 'suffix';
         $this->object = new ConfigFile(
             [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $config_inc_php_value]
@@ -311,9 +311,9 @@ class ConfigFileTest extends AbstractTestCase
         $localhost_value = $this->object->getDefault('Servers/1/host');
         $this->assertEquals($localhost_value, $flat_default_config['Servers/1/host']);
 
-        $cfg = [];
-        include ROOT_PATH . 'libraries/config.default.php';
-        // verify that $cfg read from config.default.php is valid
+        $settings = new Settings([]);
+        $cfg = $settings->toArray();
+
         $this->assertGreaterThanOrEqual(100, count($cfg));
         $this->assertGreaterThanOrEqual(count($cfg), count($flat_default_config));
     }
diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
index 6a1eb1168d..bdd3a93192 100644
--- a/test/classes/Config/DescriptionTest.php
+++ b/test/classes/Config/DescriptionTest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Tests\Config;
 
 use PhpMyAdmin\Config\Descriptions;
+use PhpMyAdmin\Config\Settings;
 use PhpMyAdmin\Tests\AbstractTestCase;
 
 use function in_array;
@@ -85,12 +86,14 @@ class DescriptionTest extends AbstractTestCase
             'SQLQuery',
         ];
 
-        $cfg = [];
-        include ROOT_PATH . 'libraries/config.default.php';
-        // @phpstan-ignore-next-line
+        $settings = new Settings([]);
+        $cfg = $settings->toArray();
+
         foreach ($cfg as $key => $value) {
             $this->assertGet($key);
             if ($key == 'Servers') {
+                $this->assertIsArray($value);
+                $this->assertIsArray($value[1]);
                 foreach ($value[1] as $item => $val) {
                     $this->assertGet($key . '/1/' . $item);
                     if ($item != 'AllowDeny') {
@@ -103,6 +106,7 @@ class DescriptionTest extends AbstractTestCase
                     }
                 }
             } elseif (in_array($key, $nested)) {
+                $this->assertIsArray($value);
                 foreach ($value as $item => $val) {
                     $this->assertGet($key . '/' . $item);
                 }
diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
index c6ff5d88cf..7c0e4b2442 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -30,7 +30,6 @@ class FormDisplayTest extends AbstractTestCase
     {
         parent::setUp();
         parent::setTheme();
-        parent::loadDefaultConfig();
         parent::setGlobalConfig();
         $GLOBALS['server'] = 0;
         $this->object = new FormDisplay(new ConfigFile());
diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
index 77f0d7d972..f0fc316ec9 100644
--- a/test/classes/Config/FormTest.php
+++ b/test/classes/Config/FormTest.php
@@ -29,7 +29,6 @@ class FormTest extends AbstractTestCase
     {
         parent::setUp();
         parent::setTheme();
-        parent::loadDefaultConfig();
         parent::setGlobalConfig();
         $GLOBALS['server'] = 0;
         $this->object = new Form(
diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php
index c9a6585ef6..a25c8d534e 100644
--- a/test/classes/Config/Forms/FormListTest.php
+++ b/test/classes/Config/Forms/FormListTest.php
@@ -23,7 +23,6 @@ class FormListTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setGlobalConfig();
         $GLOBALS['server'] = 1;
     }
diff --git a/test/classes/Config/SettingsTest.php b/test/classes/Config/SettingsTest.php
index 7be7ec8649..c2470542e8 100644
--- a/test/classes/Config/SettingsTest.php
+++ b/test/classes/Config/SettingsTest.php
@@ -49,7 +49,6 @@ class SettingsTest extends TestCase
         'AllowThirdPartyFraming' => false,
         'blowfish_secret' => '',
         'Servers' => [],
-        'Server' => null,
         'ServerDefault' => 1,
         'VersionCheck' => true,
         'ProxyUrl' => '',
@@ -270,18 +269,37 @@ class SettingsTest extends TestCase
         'Console' => null,
         'DefaultTransformations' => null,
         'FirstDayOfCalendar' => 0,
-        'is_setup' => false,
-        'PMA_IS_WINDOWS' => false,
-        'PMA_IS_IIS' => 0,
-        'PMA_IS_GD2' => 0,
-        'PMA_USR_OS' => 'Other',
-        'PMA_USR_BROWSER_VER' => 0,
-        'PMA_USR_BROWSER_AGENT' => 'OTHER',
-        'enable_upload' => false,
-        'max_upload_size' => 2097152,
     ];
 
     /**
+     * @psalm-suppress UnusedVariable, PossiblyNullArrayAssignment, PossiblyInvalidArrayAssignment
+     */
+    public function testConfigDefaultFile(): void
+    {
+        $cfg = [];
+        include ROOT_PATH . 'libraries/config.default.php';
+        $settings = new Settings($cfg);
+        $config = $settings->toArray();
+        $config['Servers'][1]['SignonCookieParams'] = [];
+        $this->assertEquals($config, $cfg);
+    }
+
+    public function testToArray(): void
+    {
+        $settings = new Settings([]);
+        $config = $settings->toArray();
+        $this->assertIsArray($config['Console']);
+        $this->assertIsArray($config['DBG']);
+        $this->assertIsArray($config['Export']);
+        $this->assertIsArray($config['Import']);
+        $this->assertIsArray($config['Schema']);
+        $this->assertIsArray($config['SQLQuery']);
+        $this->assertIsArray($config['DefaultTransformations']);
+        $this->assertIsArray($config['Servers']);
+        $this->assertIsArray($config['Servers'][1]);
+    }
+
+    /**
      * @param mixed[][] $values
      * @psalm-param (array{0: string, 1: mixed, 2: mixed})[] $values
      *
@@ -307,11 +325,6 @@ class SettingsTest extends TestCase
                 continue;
             }
 
-            if ($key === 'Server') {
-                $this->assertInstanceOf(Server::class, $settings->Server);
-                continue;
-            }
-
             if ($key === 'Console') {
                 $this->assertInstanceOf(Console::class, $settings->Console);
                 continue;
@@ -373,7 +386,6 @@ class SettingsTest extends TestCase
                     ['AllowThirdPartyFraming', null, false],
                     ['blowfish_secret', null, ''],
                     ['Servers', null, [1 => null]],
-                    ['Server', null, null],
                     ['ServerDefault', null, 1],
                     ['VersionCheck', null, true],
                     ['ProxyUrl', null, ''],
@@ -552,15 +564,6 @@ class SettingsTest extends TestCase
                     ['Console', null, null],
                     ['DefaultTransformations', null, null],
                     ['FirstDayOfCalendar', null, 0],
-                    ['is_setup', null, false],
-                    ['PMA_IS_WINDOWS', null, false],
-                    ['PMA_IS_IIS', null, 0],
-                    ['PMA_IS_GD2', null, 0],
-                    ['PMA_USR_OS', null, 'Other'],
-                    ['PMA_USR_BROWSER_VER', null, 0],
-                    ['PMA_USR_BROWSER_AGENT', null, 'OTHER'],
-                    ['enable_upload', null, false],
-                    ['max_upload_size', null, 2097152],
                 ],
             ],
             'valid values' => [
@@ -576,7 +579,6 @@ class SettingsTest extends TestCase
                     ['AllowThirdPartyFraming', 'sameorigin', 'sameorigin'],
                     ['blowfish_secret', 'blowfish_secret', 'blowfish_secret'],
                     ['Servers', [1 => [], 2 => []], [1 => null, 2 => null]],
-                    ['Server', [], null],
                     ['ServerDefault', 0, 0],
                     ['VersionCheck', false, false],
                     ['ProxyUrl', 'test', 'test'],
@@ -755,15 +757,6 @@ class SettingsTest extends TestCase
                     ['Console', [], null],
                     ['DefaultTransformations', [], null],
                     ['FirstDayOfCalendar', 7, 7],
-                    ['is_setup', true, true],
-                    ['PMA_IS_WINDOWS', true, true],
-                    ['PMA_IS_IIS', 1, 1],
-                    ['PMA_IS_GD2', 1, 1],
-                    ['PMA_USR_OS', 'Linux', 'Linux'],
-                    ['PMA_USR_BROWSER_VER', '78.0', '78.0'],
-                    ['PMA_USR_BROWSER_AGENT', 'FIREFOX', 'FIREFOX'],
-                    ['enable_upload', true, true],
-                    ['max_upload_size', 1, 1],
                 ],
             ],
             'valid values 2' => [
@@ -799,7 +792,6 @@ class SettingsTest extends TestCase
                     ['DefaultFunctions', [], []],
                     ['MysqlMinVersion', [], ['internal' => 50500, 'human' => '5.5.0']],
                     ['FirstDayOfCalendar', 0, 0],
-                    ['PMA_USR_BROWSER_VER', 78, 78],
                 ],
             ],
             'valid values 3' => [
@@ -1052,15 +1044,6 @@ class SettingsTest extends TestCase
                     ['MysqlMinVersion', ['internal' => '50500', 'human' => 550], ['internal' => 50500, 'human' => '550']],
                     ['DisableShortcutKeys', 1, true],
                     ['FirstDayOfCalendar', '1', 1],
-                    ['is_setup', 1, true],
-                    ['PMA_IS_WINDOWS', 1, true],
-                    ['PMA_IS_IIS', '2', 1],
-                    ['PMA_IS_GD2', '2', 1],
-                    ['PMA_USR_OS', 1234, '1234'],
-                    ['PMA_USR_BROWSER_VER', true, '1'],
-                    ['PMA_USR_BROWSER_AGENT', 1234, '1234'],
-                    ['enable_upload', 1, true],
-                    ['max_upload_size', '1', 1],
                 ],
             ],
             'invalid values' => [
@@ -1138,7 +1121,6 @@ class SettingsTest extends TestCase
                     ['MysqlMinVersion', 'invalid', ['internal' => 50500, 'human' => '5.5.0']],
                     ['Console', 'invalid', null],
                     ['FirstDayOfCalendar', 8, 0],
-                    ['max_upload_size', 0, 2097152],
                 ],
             ],
             'invalid values 2' => [
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index 4fb7817512..296e6a60c5 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Config;
+use PhpMyAdmin\Config\Settings;
 use PhpMyAdmin\DatabaseInterface;
 
 use function array_merge;
@@ -13,7 +14,6 @@ use function define;
 use function defined;
 use function file_exists;
 use function file_put_contents;
-use function filemtime;
 use function fileperms;
 use function function_exists;
 use function gd_info;
@@ -462,36 +462,23 @@ class ConfigTest extends AbstractTestCase
      */
     public function testLoadDefaults(): void
     {
-        $prevDefaultSource = $this->object->defaultSource;
+        $this->object->defaultServer = [];
+        $this->object->default = [];
+        $this->object->settings = ['is_setup' => false, 'AvailableCharsets' => ['test']];
 
-        $this->object->defaultSource = 'unexisted.file.php';
-        $this->assertFalse($this->object->loadDefaults());
+        $this->object->loadDefaults();
 
-        $this->object->defaultSource = $prevDefaultSource;
-
-        /** @var array<string,mixed> $cfg */
-        $cfg = [];
-        include $this->object->defaultSource;
-        $loadedConf = $cfg;
-        unset($cfg);
-
-        $this->assertTrue($this->object->loadDefaults());
+        $settings = new Settings([]);
+        $config = $settings->toArray();
 
+        $this->assertIsArray($config['Servers']);
+        $this->assertEquals($config['Servers'][1], $this->object->defaultServer);
+        unset($config['Servers']);
+        $this->assertEquals($config, $this->object->default);
         $this->assertEquals(
-            $this->object->defaultSourceMtime,
-            filemtime($prevDefaultSource)
+            array_replace_recursive(['is_setup' => false, 'AvailableCharsets' => ['test']], $config),
+            $this->object->settings
         );
-        $this->assertEquals($loadedConf['Servers'][1], $this->object->defaultServer);
-
-        unset($loadedConf['Servers']);
-
-        $this->assertEquals($loadedConf, $this->object->default);
-
-        $expectedSettings = array_replace_recursive($this->object->settings, $loadedConf);
-
-        $this->assertEquals($expectedSettings, $this->object->settings, 'Settings loaded wrong');
-
-        $this->assertFalse($this->object->errorConfigDefaultFile);
     }
 
     /**
@@ -503,7 +490,7 @@ class ConfigTest extends AbstractTestCase
         $this->assertFalse($this->object->checkConfigSource());
         $this->assertEquals(0, $this->object->sourceMtime);
 
-        $this->object->setSource(ROOT_PATH . 'libraries/config.default.php');
+        $this->object->setSource(ROOT_PATH . 'test/test_data/config.inc.php');
 
         $this->assertNotEmpty($this->object->getSource());
         $this->assertTrue($this->object->checkConfigSource());
@@ -943,10 +930,6 @@ class ConfigTest extends AbstractTestCase
                 ROOT_PATH . 'test/test_data/config-nonexisting.inc.php',
                 false,
             ],
-            [
-                ROOT_PATH . 'libraries/config.default.php',
-                true,
-            ],
         ];
     }
 
diff --git a/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php b/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
index c7bce01764..0d74f7be9f 100644
--- a/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
+++ b/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
@@ -15,7 +15,6 @@ class TablesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         parent::setGlobalDbi();
         parent::loadContainerBuilder();
diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php
index 65d3612baf..c5cb8fe205 100644
--- a/test/classes/Controllers/Database/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Database/PrivilegesControllerTest.php
@@ -25,7 +25,6 @@ class PrivilegesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         parent::setTheme();
     }
diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
index ec1a30c7d3..7a191ced8e 100644
--- a/test/classes/Controllers/Database/StructureControllerTest.php
+++ b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -50,7 +50,6 @@ class StructureControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setTheme();
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['server'] = 1;
diff --git a/test/classes/Controllers/ImportControllerTest.php b/test/classes/Controllers/ImportControllerTest.php
index 99d5506e78..a79a16ed12 100644
--- a/test/classes/Controllers/ImportControllerTest.php
+++ b/test/classes/Controllers/ImportControllerTest.php
@@ -18,7 +18,6 @@ class ImportControllerTest extends AbstractTestCase
 
         parent::loadContainerBuilder();
         parent::loadDbiIntoContainerBuilder();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         parent::setTheme();
 
diff --git a/test/classes/Controllers/NavigationControllerTest.php b/test/classes/Controllers/NavigationControllerTest.php
index 6a7f23b1cb..f3515ab042 100644
--- a/test/classes/Controllers/NavigationControllerTest.php
+++ b/test/classes/Controllers/NavigationControllerTest.php
@@ -20,7 +20,6 @@ class NavigationControllerTest extends AbstractTestCase
 
         parent::loadContainerBuilder();
         parent::loadDbiIntoContainerBuilder();
-        parent::loadDefaultConfig();
         parent::setLanguage();
 
         $GLOBALS['server'] = 1;
@@ -172,7 +171,6 @@ class NavigationControllerTest extends AbstractTestCase
 
         parent::loadContainerBuilder();
         parent::loadDbiIntoContainerBuilder();
-        parent::loadDefaultConfig();
         parent::setLanguage();
 
         $GLOBALS['server'] = 1;
diff --git a/test/classes/Controllers/NormalizationControllerTest.php b/test/classes/Controllers/NormalizationControllerTest.php
index 42eb26060d..0d556e55eb 100644
--- a/test/classes/Controllers/NormalizationControllerTest.php
+++ b/test/classes/Controllers/NormalizationControllerTest.php
@@ -17,7 +17,6 @@ class NormalizationControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         parent::setTheme();
         parent::setGlobalDbi();
diff --git a/test/classes/Controllers/Sql/EnumValuesControllerTest.php b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
index 589a56a461..2ed5ae0b16 100644
--- a/test/classes/Controllers/Sql/EnumValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
@@ -18,7 +18,6 @@ class EnumValuesControllerTest extends AbstractTestCase
         parent::setGlobalDbi();
         parent::loadContainerBuilder();
         parent::loadDbiIntoContainerBuilder();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 1;
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
diff --git a/test/classes/Controllers/Sql/SetValuesControllerTest.php b/test/classes/Controllers/Sql/SetValuesControllerTest.php
index 89f62cfae3..7c7570209b 100644
--- a/test/classes/Controllers/Sql/SetValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/SetValuesControllerTest.php
@@ -18,7 +18,6 @@ class SetValuesControllerTest extends AbstractTestCase
         parent::setGlobalDbi();
         parent::loadContainerBuilder();
         parent::loadDbiIntoContainerBuilder();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 1;
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
index e6016be968..ae54d1046a 100644
--- a/test/classes/Controllers/Table/IndexesControllerTest.php
+++ b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -34,7 +34,6 @@ class IndexesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setTheme();
 
         /**
diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php
index 4eb5288ac2..7ca7df94d3 100644
--- a/test/classes/Controllers/Table/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Table/PrivilegesControllerTest.php
@@ -25,7 +25,6 @@ class PrivilegesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         parent::setTheme();
     }
diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php
index e1f5bffc4c..0c34df8f62 100644
--- a/test/classes/Controllers/Table/RelationControllerTest.php
+++ b/test/classes/Controllers/Table/RelationControllerTest.php
@@ -30,7 +30,6 @@ class RelationControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setTheme();
 
         $GLOBALS['server'] = 0;
diff --git a/test/classes/Controllers/Table/ReplaceControllerTest.php b/test/classes/Controllers/Table/ReplaceControllerTest.php
index 86904d03dd..cdc2fde218 100644
--- a/test/classes/Controllers/Table/ReplaceControllerTest.php
+++ b/test/classes/Controllers/Table/ReplaceControllerTest.php
@@ -17,7 +17,6 @@ class ReplaceControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         parent::setTheme();
         parent::setGlobalDbi();
diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php
index fd78e9207a..8f5772533c 100644
--- a/test/classes/Controllers/Table/SearchControllerTest.php
+++ b/test/classes/Controllers/Table/SearchControllerTest.php
@@ -38,7 +38,6 @@ class SearchControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setTheme();
 
         /**
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index 974afdaff3..bafa549a3b 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -33,7 +33,6 @@ class CoreTest extends AbstractNetworkTestCase
         parent::setUp();
         parent::setTheme();
         parent::setLanguage();
-        parent::loadDefaultConfig();
 
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = '';
diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index aecc1d101b..35eea02f32 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -26,7 +26,6 @@ class SearchTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
 
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'pma';
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index 0dc56c2e9d..0389323e87 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -21,7 +21,6 @@ class DatabaseInterfaceTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setGlobalDbi();
         $GLOBALS['server'] = 0;
     }
diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
index ce46f8a462..513be15d5a 100644
--- a/test/classes/Engines/PbxtTest.php
+++ b/test/classes/Engines/PbxtTest.php
@@ -28,7 +28,6 @@ class PbxtTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
 
         $GLOBALS['server'] = 0;
         $this->object = new Pbxt('pbxt');
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index 89c689d631..e1d96a7256 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -31,10 +31,10 @@ class ErrorHandlerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $this->object = new ErrorHandler();
         $_SESSION['errors'] = [];
         $GLOBALS['server'] = 0;
+        $GLOBALS['cfg']['environment'] = 'production';
         $GLOBALS['cfg']['SendErrorReports'] = 'always';
     }
 
diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php
index 0ba0ed0200..dcefad0948 100644
--- a/test/classes/FileTest.php
+++ b/test/classes/FileTest.php
@@ -20,7 +20,6 @@ class FileTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['charset_conversion'] = false;
     }
 
diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php
index 8b32701b23..7add603d0e 100644
--- a/test/classes/Html/GeneratorTest.php
+++ b/test/classes/Html/GeneratorTest.php
@@ -25,7 +25,6 @@ class GeneratorTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
     }
 
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index e97cfcb183..95f390270b 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -40,7 +40,6 @@ class InsertEditTest extends AbstractTestCase
         parent::setUp();
         parent::setLanguage();
         parent::setGlobalConfig();
-        parent::loadDefaultConfig();
         parent::setTheme();
         $GLOBALS['server'] = 1;
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index 097d1687db..71360e3229 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -19,7 +19,6 @@ class MenuTest extends AbstractTestCase
     {
         parent::setUp();
         parent::setTheme();
-        parent::loadDefaultConfig();
 
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['server'] = 0;
diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php
index eb949dde2d..2b305ac39c 100644
--- a/test/classes/Navigation/NavigationTest.php
+++ b/test/classes/Navigation/NavigationTest.php
@@ -27,7 +27,6 @@ class NavigationTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
diff --git a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
index 0e1cc53e09..dc7faa2da9 100644
--- a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
@@ -18,7 +18,6 @@ class NodeColumnContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php
index 43bb8a6ec5..783be7c7c1 100644
--- a/test/classes/Navigation/Nodes/NodeColumnTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnTest.php
@@ -18,7 +18,6 @@ class NodeColumnTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
index 92644eb448..84d3476516 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
@@ -19,7 +19,6 @@ class NodeDatabaseTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
         $GLOBALS['cfg']['MaxNavigationItems'] = 250;
diff --git a/test/classes/Navigation/Nodes/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
index d03705cf89..017d407694 100644
--- a/test/classes/Navigation/Nodes/NodeEventContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
@@ -18,7 +18,6 @@ class NodeEventContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php
index feb5ea03d9..39a5ba03e5 100644
--- a/test/classes/Navigation/Nodes/NodeEventTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventTest.php
@@ -18,7 +18,6 @@ class NodeEventTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
index afcb35b0b3..2dc2733899 100644
--- a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
@@ -18,7 +18,6 @@ class NodeFunctionContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php
index 6f7c36a242..be9e9cd892 100644
--- a/test/classes/Navigation/Nodes/NodeFunctionTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php
@@ -18,7 +18,6 @@ class NodeFunctionTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
index 8a66a7ffa4..d5769ae9c6 100644
--- a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
@@ -18,7 +18,6 @@ class NodeIndexContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php
index a77381840a..a0db18b579 100644
--- a/test/classes/Navigation/Nodes/NodeIndexTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexTest.php
@@ -18,7 +18,6 @@ class NodeIndexTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
index 0c65a6dd08..3b431dd193 100644
--- a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
@@ -18,7 +18,6 @@ class NodeProcedureContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php
index 4e4196478a..79ab299be7 100644
--- a/test/classes/Navigation/Nodes/NodeProcedureTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php
@@ -18,7 +18,6 @@ class NodeProcedureTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
index 323da2a52f..ef0c7a27b0 100644
--- a/test/classes/Navigation/Nodes/NodeTableContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
@@ -18,7 +18,6 @@ class NodeTableContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
         $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php
index 979d13234b..739d868854 100644
--- a/test/classes/Navigation/Nodes/NodeTableTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableTest.php
@@ -18,7 +18,6 @@ class NodeTableTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
 
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'search';
diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php
index fad0a5afa7..ba1be71751 100644
--- a/test/classes/Navigation/Nodes/NodeTest.php
+++ b/test/classes/Navigation/Nodes/NodeTest.php
@@ -21,7 +21,6 @@ class NodeTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
     }
diff --git a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
index d290efd11c..2817dc341c 100644
--- a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
@@ -18,7 +18,6 @@ class NodeTriggerContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php
index c40f594180..37d94e9278 100644
--- a/test/classes/Navigation/Nodes/NodeTriggerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php
@@ -18,7 +18,6 @@ class NodeTriggerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
index 9a992ff6d3..9cbcd9b852 100644
--- a/test/classes/Navigation/Nodes/NodeViewContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
@@ -18,7 +18,6 @@ class NodeViewContainerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
         $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
diff --git a/test/classes/Navigation/Nodes/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php
index 84b383e966..f6158dae3f 100644
--- a/test/classes/Navigation/Nodes/NodeViewTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewTest.php
@@ -18,7 +18,6 @@ class NodeViewTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
     }
 
diff --git a/test/classes/Plugins/Export/ExportCsvTest.php b/test/classes/Plugins/Export/ExportCsvTest.php
index 159c6ae6e7..6599c71fd3 100644
--- a/test/classes/Plugins/Export/ExportCsvTest.php
+++ b/test/classes/Plugins/Export/ExportCsvTest.php
@@ -34,7 +34,6 @@ class ExportCsvTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = '';
         $GLOBALS['table'] = '';
diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php
index e2566df70f..6060fc5f7f 100644
--- a/test/classes/Plugins/Export/ExportHtmlwordTest.php
+++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php
@@ -38,7 +38,6 @@ class ExportHtmlwordTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $this->object = new ExportHtmlword();
         $GLOBALS['output_kanji_conversion'] = false;
diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php
index 583776c207..30f52f243a 100644
--- a/test/classes/Plugins/Export/ExportLatexTest.php
+++ b/test/classes/Plugins/Export/ExportLatexTest.php
@@ -37,7 +37,6 @@ class ExportLatexTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['output_charset_conversion'] = false;
diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php
index 1851310817..0d50d8305a 100644
--- a/test/classes/Plugins/Export/ExportMediawikiTest.php
+++ b/test/classes/Plugins/Export/ExportMediawikiTest.php
@@ -36,7 +36,6 @@ class ExportMediawikiTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['output_charset_conversion'] = false;
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
index 258c9a82be..40bf9e82f8 100644
--- a/test/classes/Plugins/Export/ExportOdtTest.php
+++ b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -44,7 +44,6 @@ class ExportOdtTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['output_charset_conversion'] = false;
diff --git a/test/classes/Plugins/Export/ExportPhparrayTest.php b/test/classes/Plugins/Export/ExportPhparrayTest.php
index 4ee367520e..75e805a521 100644
--- a/test/classes/Plugins/Export/ExportPhparrayTest.php
+++ b/test/classes/Plugins/Export/ExportPhparrayTest.php
@@ -32,7 +32,6 @@ class ExportPhparrayTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['output_charset_conversion'] = false;
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index 143dad2f1c..1bd7633d5a 100644
--- a/test/classes/Plugins/Export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -50,7 +50,6 @@ class ExportSqlTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = '';
         $GLOBALS['table'] = '';
diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php
index 1dd0ad4fb3..9d6733954b 100644
--- a/test/classes/Plugins/Export/ExportTexytextTest.php
+++ b/test/classes/Plugins/Export/ExportTexytextTest.php
@@ -37,7 +37,6 @@ class ExportTexytextTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['buffer_needed'] = false;
diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php
index 602119c74f..626f392b11 100644
--- a/test/classes/Plugins/Export/ExportXmlTest.php
+++ b/test/classes/Plugins/Export/ExportXmlTest.php
@@ -35,7 +35,6 @@ class ExportXmlTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['buffer_needed'] = false;
diff --git a/test/classes/Plugins/Export/ExportYamlTest.php b/test/classes/Plugins/Export/ExportYamlTest.php
index cc92e68f0c..975459b238 100644
--- a/test/classes/Plugins/Export/ExportYamlTest.php
+++ b/test/classes/Plugins/Export/ExportYamlTest.php
@@ -32,7 +32,6 @@ class ExportYamlTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['buffer_needed'] = false;
diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php
index 728ca89687..c0cadfe6aa 100644
--- a/test/classes/Plugins/Import/ImportCsvTest.php
+++ b/test/classes/Plugins/Import/ImportCsvTest.php
@@ -29,7 +29,6 @@ class ImportCsvTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['plugin_param'] = 'csv';
         $this->object = new ImportCsv();
diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php
index 857967be2a..79cab2d2e8 100644
--- a/test/classes/Plugins/Import/ImportMediawikiTest.php
+++ b/test/classes/Plugins/Import/ImportMediawikiTest.php
@@ -28,7 +28,6 @@ class ImportMediawikiTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['plugin_param'] = 'database';
         $this->object = new ImportMediawiki();
diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php
index f920edc78b..b588cdd099 100644
--- a/test/classes/Plugins/Import/ImportOdsTest.php
+++ b/test/classes/Plugins/Import/ImportOdsTest.php
@@ -29,7 +29,6 @@ class ImportOdsTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['plugin_param'] = 'csv';
         $this->object = new ImportOds();
diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php
index 68f4dbeb26..85875d20bf 100644
--- a/test/classes/Plugins/Import/ImportShpTest.php
+++ b/test/classes/Plugins/Import/ImportShpTest.php
@@ -30,7 +30,6 @@ class ImportShpTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
 
         $GLOBALS['server'] = 0;
         //setting
diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php
index 3c2b485244..6f9dbe498d 100644
--- a/test/classes/Plugins/Import/ImportXmlTest.php
+++ b/test/classes/Plugins/Import/ImportXmlTest.php
@@ -30,7 +30,6 @@ class ImportXmlTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
 
         $this->object = new ImportXml();
diff --git a/test/classes/PluginsTest.php b/test/classes/PluginsTest.php
index 5ed48d679c..edb7501941 100644
--- a/test/classes/PluginsTest.php
+++ b/test/classes/PluginsTest.php
@@ -11,12 +11,6 @@ use PhpMyAdmin\Plugins;
  */
 class PluginsTest extends AbstractTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-        parent::loadDefaultConfig();
-    }
-
     public function testGetExport(): void
     {
         global $plugin_param;
diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php
index cd4e616e86..890c845fb4 100644
--- a/test/classes/RelationTest.php
+++ b/test/classes/RelationTest.php
@@ -282,7 +282,6 @@ class RelationTest extends AbstractTestCase
     public function testFixPmaTablesNothingWorks(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
 
         $this->relation = new Relation($this->dbi);
 
@@ -296,7 +295,6 @@ class RelationTest extends AbstractTestCase
     public function testFixPmaTablesNormal(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
 
         $GLOBALS['db'] = '';
         $GLOBALS['server'] = 1;
@@ -387,7 +385,6 @@ class RelationTest extends AbstractTestCase
     public function testFixPmaTablesNormalFixTables(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
 
         $GLOBALS['db'] = '';
         $GLOBALS['server'] = 1;
@@ -686,7 +683,6 @@ class RelationTest extends AbstractTestCase
     public function testFixPmaTablesNormalFixTablesWithCustomOverride(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
 
         $GLOBALS['db'] = '';
         $GLOBALS['server'] = 1;
@@ -991,7 +987,6 @@ class RelationTest extends AbstractTestCase
     public function testFixPmaTablesNormalFixTablesFails(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
 
         $GLOBALS['db'] = '';
         $GLOBALS['server'] = 1;
@@ -1065,7 +1060,6 @@ class RelationTest extends AbstractTestCase
     public function testCreatePmaDatabase(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
         $this->relation = new Relation($this->dbi);
 
         $this->dummyDbi->removeDefaultResults();
@@ -1097,7 +1091,6 @@ class RelationTest extends AbstractTestCase
     public function testCreatePmaDatabaseFailsError1044(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
         $this->relation = new Relation($this->dbi);
 
         $this->dummyDbi->removeDefaultResults();
@@ -1125,7 +1118,6 @@ class RelationTest extends AbstractTestCase
     public function testCreatePmaDatabaseFailsError1040(): void
     {
         parent::setGlobalDbi();
-        parent::loadDefaultConfig();
         $this->relation = new Relation($this->dbi);
 
         $this->dummyDbi->removeDefaultResults();
diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
index cd0e7712fa..7aaaa10ec0 100644
--- a/test/classes/Setup/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -16,16 +16,6 @@ use ReflectionClass;
 class ConfigGeneratorTest extends AbstractTestCase
 {
     /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-        parent::loadDefaultConfig();
-    }
-
-    /**
      * Test for ConfigGenerator::getConfigFile
      *
      * @group medium
diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php
index 638c2f717c..3d14f6e776 100644
--- a/test/classes/Setup/FormProcessingTest.php
+++ b/test/classes/Setup/FormProcessingTest.php
@@ -22,7 +22,6 @@ class FormProcessingTest extends AbstractNetworkTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setLanguage();
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
index 622696f326..2b1ec49f6a 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -28,7 +28,6 @@ class SqlTest extends AbstractTestCase
     {
         parent::setUp();
         parent::setLanguage();
-        parent::loadDefaultConfig();
         parent::setTheme();
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
diff --git a/test/classes/Table/IndexesTest.php b/test/classes/Table/IndexesTest.php
index 7931ec5860..a71da5456c 100644
--- a/test/classes/Table/IndexesTest.php
+++ b/test/classes/Table/IndexesTest.php
@@ -21,7 +21,6 @@ class IndexesTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         parent::setTheme();
 
         /**
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index d9b030cdbf..ad127fd868 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -23,7 +23,6 @@ class TableTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
 
         /**
          * SET these to avoid undefined index error
diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php
index e5d18ada83..6217bf569c 100644
--- a/test/classes/TwoFactorTest.php
+++ b/test/classes/TwoFactorTest.php
@@ -250,7 +250,6 @@ class TwoFactorTest extends AbstractTestCase
     public function testApplication(): void
     {
         parent::setLanguage();
-        parent::loadDefaultConfig();
 
         $object = $this->getTwoFactorAndLoadConfig('user', null);
         if (! in_array('application', $object->getAvailable())) {
@@ -304,7 +303,6 @@ class TwoFactorTest extends AbstractTestCase
 
     public function testKey(): void
     {
-        parent::loadDefaultConfig();
         parent::setLanguage();
 
         $object = $this->getTwoFactorAndLoadConfig('user', null);
diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php
index b72f485020..b0b795990c 100644
--- a/test/classes/UserPreferencesTest.php
+++ b/test/classes/UserPreferencesTest.php
@@ -28,7 +28,6 @@ class UserPreferencesTest extends AbstractNetworkTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = '/phpmyadmin/';
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index e036d4d272..7882829c4c 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -53,7 +53,6 @@ class UtilTest extends AbstractTestCase
         parent::setUp();
         parent::setLanguage();
         parent::setTheme();
-        parent::loadDefaultConfig();
     }
 
     /**