diff --git a/doc/setup.rst b/doc/setup.rst
index 417670539634..3df207e410b3 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -519,7 +519,7 @@ To manually create the file, simply use your text editor to create the
file :file:`config.inc.php` (you can copy :file:`config.sample.inc.php` to get
a minimal configuration file) in the main (top-level) phpMyAdmin
directory (the one that contains :file:`index.php`). phpMyAdmin first
-loads :file:`libraries/config.default.php` and then overrides those values
+loads the default configuration values and then overrides those values
with anything found in :file:`config.inc.php`. If the default value is
okay for a particular setting, there is no need to include it in
:file:`config.inc.php`. You'll probably need only a few directives to get going; a
@@ -852,10 +852,6 @@ For compatibility with PHP 5.3 and later, remove a
``set_magic_quotes_runtime(0);`` statement that you might find near
the end of your configuration file.
-You should **not** copy :file:`libraries/config.default.php` over
-:file:`config.inc.php` because the default configuration file is version-
-specific.
-
The complete upgrade can be performed in a few simple steps:
1. Download the latest phpMyAdmin version from .
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index b092ec4bf9c5..b322bdac735e 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -1,12 +1,11 @@
$cfg */
- $cfg = [];
- if (! @file_exists($this->defaultSource)) {
- $this->errorConfigDefaultFile = true;
-
- return false;
- }
-
- $canUseErrorReporting = Util::isErrorReportingAvailable();
- $oldErrorReporting = null;
- if ($canUseErrorReporting) {
- $oldErrorReporting = error_reporting(0);
- }
+ $settings = new Settings([]);
+ $cfg = $settings->toArray();
- ob_start();
- $isConfigLoading = true;
- $eval_result = include $this->defaultSource;
- $isConfigLoading = false;
- ob_end_clean();
-
- if ($canUseErrorReporting) {
- error_reporting($oldErrorReporting);
- }
-
- if ($eval_result === false) {
- $this->errorConfigDefaultFile = true;
-
- return false;
- }
-
- $this->defaultSourceMtime = filemtime($this->defaultSource);
-
- $this->defaultServer = $cfg['Servers'][1];
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+ $this->defaultServer = get_object_vars($settings->Servers[1]);
unset($cfg['Servers']);
$this->default = $cfg;
$this->settings = array_replace_recursive($this->settings, $cfg);
-
- $this->errorConfigDefaultFile = false;
-
- return true;
}
/**
@@ -427,7 +383,7 @@ public function load(?string $source = null): bool
$this->errorConfigFile = true;
} else {
$this->errorConfigFile = false;
- $this->sourceMtime = filemtime($this->getSource());
+ $this->sourceMtime = (int) filemtime($this->getSource());
}
/**
@@ -485,17 +441,16 @@ public function loadUserPreferences(): void
: 0);
$cache_key = 'server_' . $server;
if ($server > 0 && ! isset($isMinimumCommon)) {
- $config_mtime = max($this->defaultSourceMtime, $this->sourceMtime);
// cache user preferences, use database only when needed
if (
! isset($_SESSION['cache'][$cache_key]['userprefs'])
- || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime
+ || $_SESSION['cache'][$cache_key]['config_mtime'] < $this->sourceMtime
) {
$prefs = $userPreferences->load();
$_SESSION['cache'][$cache_key]['userprefs'] = $userPreferences->apply($prefs['config_data']);
$_SESSION['cache'][$cache_key]['userprefs_mtime'] = $prefs['mtime'];
$_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type'];
- $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime;
+ $_SESSION['cache'][$cache_key]['config_mtime'] = $this->sourceMtime;
}
} elseif ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) {
$this->set('user_preferences', false);
@@ -738,15 +693,6 @@ public function checkPermissions(): void
*/
public function checkErrors(): void
{
- if ($this->errorConfigDefaultFile) {
- Core::fatalError(
- sprintf(
- __('Could not load default configuration from: %1$s'),
- $this->defaultSource
- )
- );
- }
-
if (! $this->errorConfigFile) {
return;
}
diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php
index 2a947195fa02..5b99a96c9738 100644
--- a/libraries/classes/Config/ConfigFile.php
+++ b/libraries/classes/Config/ConfigFile.php
@@ -24,7 +24,9 @@
class ConfigFile
{
/**
- * Stores default PMA config from config.default.php
+ * Stores default phpMyAdmin config
+ *
+ * @see Settings
*
* @var array
*/
@@ -96,8 +98,8 @@ class ConfigFile
public function __construct($baseConfig = null)
{
// load default config values
- $cfg = &$this->defaultCfg;
- include ROOT_PATH . 'libraries/config.default.php';
+ $settings = new Settings([]);
+ $this->defaultCfg = $settings->toArray();
// load additional config information
$this->cfgDb = include ROOT_PATH . 'libraries/config.values.php';
@@ -105,7 +107,7 @@ public function __construct($baseConfig = null)
// apply default values overrides
if (count($this->cfgDb['_overrides'])) {
foreach ($this->cfgDb['_overrides'] as $path => $value) {
- Core::arrayWrite($path, $cfg, $value);
+ Core::arrayWrite($path, $this->defaultCfg, $value);
}
}
@@ -291,7 +293,7 @@ function ($value, $key, $prefix): void {
/**
* Updates config with values read from given array
- * (config will contain differences to defaults from config.defaults.php).
+ * (config will contain differences to defaults from {@see \PhpMyAdmin\Config\Settings}).
*
* @param array $cfg Configuration
*/
@@ -336,7 +338,7 @@ public function get($path, $default = null)
/**
* Returns default config value or $default it it's not set ie. it doesn't
- * exist in config.default.php ($cfg) and config.values.php
+ * exist in {@see \PhpMyAdmin\Config\Settings} ($cfg) and config.values.php
* ($_cfg_db['_overrides'])
*
* @param string $canonicalPath Canonical path
diff --git a/libraries/classes/Config/Settings.php b/libraries/classes/Config/Settings.php
index 16a2ceb866e4..f4fe4d9e3c7e 100644
--- a/libraries/classes/Config/Settings.php
+++ b/libraries/classes/Config/Settings.php
@@ -13,8 +13,10 @@
use PhpMyAdmin\Config\Settings\SqlQueryBox;
use PhpMyAdmin\Config\Settings\Transformations;
+use function array_keys;
use function count;
use function defined;
+use function get_object_vars;
use function in_array;
use function is_array;
use function is_int;
@@ -139,9 +141,6 @@ final class Settings
*/
public $Servers;
- /** @var Server */
- public $Server;
-
/**
* Default server (0 = no default server)
*
@@ -1559,44 +1558,6 @@ final class Settings
*/
public $FirstDayOfCalendar;
- /** @var bool */
- public $is_setup;
-
- /** @var bool */
- public $PMA_IS_WINDOWS;
-
- /**
- * @var int
- * @psalm-var 0|1
- */
- public $PMA_IS_IIS;
-
- /**
- * @var int
- * @psalm-var 0|1
- */
- public $PMA_IS_GD2;
-
- /** @var string */
- public $PMA_USR_OS;
-
- /** @var string|int */
- public $PMA_USR_BROWSER_VER;
-
- /** @var string */
- public $PMA_USR_BROWSER_AGENT;
-
- /** @var bool */
- public $enable_upload;
-
- /**
- * Default: 2M (2 * 1024 * 1024)
- *
- * @var int
- * @psalm-var positive-int
- */
- public $max_upload_size;
-
/**
* @param array $settings
*/
@@ -1791,16 +1752,27 @@ public function __construct(array $settings)
$this->Console = $this->setConsole($settings);
$this->DefaultTransformations = $this->setDefaultTransformations($settings);
$this->FirstDayOfCalendar = $this->setFirstDayOfCalendar($settings);
- $this->is_setup = $this->setIsSetup($settings);
- $this->PMA_IS_WINDOWS = $this->setIsWindows($settings);
- $this->PMA_IS_IIS = $this->setIsIIS($settings);
- $this->PMA_IS_GD2 = $this->setIsGD2($settings);
- $this->PMA_USR_OS = $this->setUserOperatingSystem($settings);
- $this->PMA_USR_BROWSER_VER = $this->setUserBrowserVersion($settings);
- $this->PMA_USR_BROWSER_AGENT = $this->setUserBrowserAgent($settings);
- $this->enable_upload = $this->setEnableUpload($settings);
- $this->max_upload_size = $this->setMaxUploadSize($settings);
- $this->Server = $this->setServer($settings);
+ }
+
+ /**
+ * @return array
+ */
+ public function toArray(): array
+ {
+ $settings = get_object_vars($this);
+ $settings['Console'] = get_object_vars($this->Console);
+ $settings['DBG'] = get_object_vars($this->DBG);
+ $settings['SQLQuery'] = get_object_vars($this->SQLQuery);
+ $settings['Export'] = get_object_vars($this->Export);
+ $settings['Import'] = get_object_vars($this->Import);
+ $settings['Schema'] = get_object_vars($this->Schema);
+ $settings['DefaultTransformations'] = get_object_vars($this->DefaultTransformations);
+
+ foreach (array_keys($settings['Servers']) as $key) {
+ $settings['Servers'][$key] = get_object_vars($this->Servers[$key]);
+ }
+
+ return $settings;
}
/**
@@ -4582,143 +4554,4 @@ private function setFirstDayOfCalendar(array $settings): int
return $firstDayOfCalendar >= 1 && $firstDayOfCalendar <= 7 ? $firstDayOfCalendar : 0;
}
-
- /**
- * @param array $settings
- */
- private function setIsSetup(array $settings): bool
- {
- if (! isset($settings['is_setup'])) {
- return false;
- }
-
- return (bool) $settings['is_setup'];
- }
-
- /**
- * @param array $settings
- */
- private function setIsWindows(array $settings): bool
- {
- if (! isset($settings['PMA_IS_WINDOWS'])) {
- return false;
- }
-
- return (bool) $settings['PMA_IS_WINDOWS'];
- }
-
- /**
- * @param array $settings
- *
- * @psalm-return 0|1
- */
- private function setIsIIS(array $settings): int
- {
- if (! isset($settings['PMA_IS_IIS'])) {
- return 0;
- }
-
- return (int) (bool) $settings['PMA_IS_IIS'];
- }
-
- /**
- * @param array $settings
- *
- * @psalm-return 0|1
- */
- private function setIsGD2(array $settings): int
- {
- if (! isset($settings['PMA_IS_GD2'])) {
- return 0;
- }
-
- return (int) (bool) $settings['PMA_IS_GD2'];
- }
-
- /**
- * @param array $settings
- */
- private function setUserOperatingSystem(array $settings): string
- {
- if (! isset($settings['PMA_USR_OS'])) {
- return 'Other';
- }
-
- return (string) $settings['PMA_USR_OS'];
- }
-
- /**
- * @param array $settings
- *
- * @return int|string
- */
- private function setUserBrowserVersion(array $settings)
- {
- if (! isset($settings['PMA_USR_BROWSER_VER'])) {
- return 0;
- }
-
- if (is_int($settings['PMA_USR_BROWSER_VER'])) {
- return $settings['PMA_USR_BROWSER_VER'];
- }
-
- return (string) $settings['PMA_USR_BROWSER_VER'];
- }
-
- /**
- * @param array $settings
- */
- private function setUserBrowserAgent(array $settings): string
- {
- if (! isset($settings['PMA_USR_BROWSER_AGENT'])) {
- return 'OTHER';
- }
-
- return (string) $settings['PMA_USR_BROWSER_AGENT'];
- }
-
- /**
- * @param array $settings
- */
- private function setEnableUpload(array $settings): bool
- {
- if (! isset($settings['enable_upload'])) {
- return false;
- }
-
- return (bool) $settings['enable_upload'];
- }
-
- /**
- * @param array $settings
- *
- * @psalm-return positive-int
- */
- private function setMaxUploadSize(array $settings): int
- {
- // Default: 2M (2 * 1024 * 1024)
- $default = 2097152;
- if (! isset($settings['max_upload_size'])) {
- return $default;
- }
-
- $maxUploadSize = (int) $settings['max_upload_size'];
- if ($maxUploadSize >= 1) {
- return $maxUploadSize;
- }
-
- return $default;
- }
-
- /**
- * @param array $settings
- */
- private function setServer(array $settings): Server
- {
- if (isset($settings['Server']) && is_array($settings['Server'])) {
- return new Server($settings['Server']);
- }
-
- return new Server();
- }
}
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6ce562baec70..f18d7862bfb0 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -15,16 +15,6 @@ parameters:
count: 1
path: libraries/classes/Config.php
- -
- message: "#^Property PhpMyAdmin\\\\Config\\:\\:\\$defaultSourceMtime \\(int\\) does not accept int\\|false\\.$#"
- count: 1
- path: libraries/classes/Config.php
-
- -
- message: "#^Property PhpMyAdmin\\\\Config\\:\\:\\$sourceMtime \\(int\\) does not accept int\\|false\\.$#"
- count: 1
- path: libraries/classes/Config.php
-
-
message: "#^Empty array passed to foreach\\.$#"
count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 4268357a57e4..edb136875474 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -470,12 +470,11 @@
$url
$url
-
+
$_SESSION['cache'][$cacheKey]['userprefs']['LoginCookieValidity']
$_SESSION['cache'][$cache_key]['userprefs']
$_SESSION['cache'][$cache_key]['userprefs_mtime']
$_SESSION['cache'][$cache_key]['userprefs_type']
- $cfg['Servers'][1]
$config_data['lang']
$server['host']
$server['verbose']
@@ -494,7 +493,7 @@
$this->settings['Servers'][$server]
$this->settings['Servers'][$this->settings['ServerDefault']]
-
+
$_SESSION['cache'][$cache_key]['userprefs_mtime']
$_SESSION['cache'][$cache_key]['userprefs_type']
$cfg['LoginCookieValidity']
@@ -504,7 +503,6 @@
$default_value
$each_server
$eval_result
- $eval_result
$i
$password
$path
@@ -518,7 +516,6 @@
$server['host']
$server['port']
$server[substr($key, 8)]
- $this->defaultServer
$url
$url
$user
@@ -537,8 +534,7 @@
$default_value
$request
-
- $oldErrorReporting
+
$oldErrorReporting
@@ -640,15 +636,9 @@
$this->baseCfg
-
- $defaultCfg
-
count($this->cfgDb['_overrides'])
-
- $this->defaultCfg
-
@@ -17448,29 +17438,16 @@
-
- $key
-
-
- $value[1]
-
-
- $item
- $item
- $key
+
$second
$val
$val
$val2
- $value
array
-
- $item
- $item
- $item
+
$second
@@ -17544,9 +17521,6 @@
$gd_nfo['GD Version']
-
- $loadedConf['Servers'][1]
-
array
array
@@ -17557,9 +17531,6 @@
array
array
-
- include $this->object->defaultSource
-
diff --git a/test/bootstrap-static.php b/test/bootstrap-static.php
index 8045c2aedcda..8f35341a9f59 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 @@
// 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 ca69d0529306..db7838b46409 100644
--- a/test/classes/AbstractNetworkTestCase.php
+++ b/test/classes/AbstractNetworkTestCase.php
@@ -7,6 +7,7 @@
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 1a2dd938a55a..a1fa9579c096 100644
--- a/test/classes/AbstractTestCase.php
+++ b/test/classes/AbstractTestCase.php
@@ -92,13 +92,6 @@ protected function setUp(): void
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 @@ protected function setGlobalConfig(): void
{
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 51b82cd83091..81c245933c29 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -70,7 +70,6 @@ public function advisorTimes(): array
*/
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 8f1de1ee3187..d7be3ea2eb0d 100644
--- a/test/classes/Config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -5,6 +5,7 @@
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\Settings;
use PhpMyAdmin\Tests\AbstractTestCase;
use stdClass;
@@ -17,7 +18,7 @@
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 @@ public function testConfigFileSetInUserPreferences(): void
$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 @@ public function testGetFlatDefaultConfig(): void
$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 6a1eb1168dc0..bdd3a93192eb 100644
--- a/test/classes/Config/DescriptionTest.php
+++ b/test/classes/Config/DescriptionTest.php
@@ -5,6 +5,7 @@
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config\Descriptions;
+use PhpMyAdmin\Config\Settings;
use PhpMyAdmin\Tests\AbstractTestCase;
use function in_array;
@@ -85,12 +86,14 @@ public function testAll(): void
'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 @@ public function testAll(): void
}
}
} 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 c6ff5d88cf13..7c0e4b2442e5 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -30,7 +30,6 @@ protected function setUp(): void
{
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 77f0d7d9728f..f0fc316ec98b 100644
--- a/test/classes/Config/FormTest.php
+++ b/test/classes/Config/FormTest.php
@@ -29,7 +29,6 @@ protected function setUp(): void
{
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 c9a6585ef655..a25c8d534efa 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 7be7ec864999..c2470542e814 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,17 +269,36 @@ 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 @@ public function testConstructor(array $values): void
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 @@ public function providerForTestConstructor(): array
['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 @@ public function providerForTestConstructor(): array
['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 @@ public function providerForTestConstructor(): array
['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 @@ public function providerForTestConstructor(): array
['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 @@ public function providerForTestConstructor(): array
['DefaultFunctions', [], []],
['MysqlMinVersion', [], ['internal' => 50500, 'human' => '5.5.0']],
['FirstDayOfCalendar', 0, 0],
- ['PMA_USR_BROWSER_VER', 78, 78],
],
],
'valid values 3' => [
@@ -1052,15 +1044,6 @@ public function providerForTestConstructor(): array
['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 @@ public function providerForTestConstructor(): array
['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 4fb781751262..296e6a60c579 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -5,6 +5,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Config;
+use PhpMyAdmin\Config\Settings;
use PhpMyAdmin\DatabaseInterface;
use function array_merge;
@@ -13,7 +14,6 @@
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 @@ public function testCheckWebServerOs(): void
*/
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 $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 @@ public function testCheckConfigSource(): void
$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 @@ public function configPaths(): array
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 c7bce01764a7..0d74f7be9f8e 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 65d3612bafb1..c5cb8fe20557 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 ec1a30c7d3de..7a191ced8eef 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 99d5506e7873..a79a16ed12f4 100644
--- a/test/classes/Controllers/ImportControllerTest.php
+++ b/test/classes/Controllers/ImportControllerTest.php
@@ -18,7 +18,6 @@ public function testIndexParametrized(): void
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 6a7f23b1cb3a..f3515ab042a2 100644
--- a/test/classes/Controllers/NavigationControllerTest.php
+++ b/test/classes/Controllers/NavigationControllerTest.php
@@ -20,7 +20,6 @@ public function testIndex(): void
parent::loadContainerBuilder();
parent::loadDbiIntoContainerBuilder();
- parent::loadDefaultConfig();
parent::setLanguage();
$GLOBALS['server'] = 1;
@@ -172,7 +171,6 @@ public function testIndexWithPosAndValue(): void
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 42eb26060d1f..0d556e55ebc2 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 589a56a461ee..2ed5ae0b16ea 100644
--- a/test/classes/Controllers/Sql/EnumValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
@@ -18,7 +18,6 @@ protected function setUp(): void
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 89f62cfae31d..7c7570209b7a 100644
--- a/test/classes/Controllers/Sql/SetValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/SetValuesControllerTest.php
@@ -18,7 +18,6 @@ protected function setUp(): void
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 e6016be96804..ae54d1046ad7 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 4eb5288ac22d..7ca7df94d387 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 e1f5bffc4c6e..0c34df8f6261 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 86904d03dd0f..cdc2fde2188e 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 fd78e9207a33..8f5772533c28 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 974afdaff3ae..bafa549a3be0 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -33,7 +33,6 @@ protected function setUp(): void
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 aecc1d101b1d..35eea02f325c 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 0dc56c2e9d81..0389323e8723 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 ce46f8a462df..513be15d5aab 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 89c689d631ab..e1d96a7256b2 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 0ba0ed02007c..dcefad0948b9 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 8b32701b23d1..7add603d0ea2 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 e97cfcb183aa..95f390270b95 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -40,7 +40,6 @@ protected function setUp(): void
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 097d1687dbf4..71360e3229b2 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -19,7 +19,6 @@ protected function setUp(): void
{
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 eb949dde2d6c..2b305ac39c18 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 0e1cc53e09fc..dc7faa2da994 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 43bb8a6ec57a..783be7c7c11a 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 92644eb44822..84d34765160b 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 d03705cf890e..017d407694ea 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 feb5ea03d909..39a5ba03e5af 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 afcb35b0b3a4..2dc273389912 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 6f7c36a242db..be9e9cd89293 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 8a66a7ffa4bd..d5769ae9c6ba 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 a77381840a2e..a0db18b57906 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 0c65a6dd0894..3b431dd19321 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 4e4196478ab4..79ab299be793 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 323da2a52f9f..ef0c7a27b06d 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 979d13234bd2..739d868854e3 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 fad0a5afa744..ba1be71751d5 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 d290efd11c9e..2817dc341c98 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 c40f5941809b..37d94e927811 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 9a992ff6d311..9cbcd9b8528b 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 84b383e966b3..f6158dae3fc7 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 159c6ae6e7b4..6599c71fd39e 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 e2566df70f18..6060fc5f7f33 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 583776c20771..30f52f243a48 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 18513108179e..0d50d8305a61 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 258c9a82bea2..40bf9e82f85c 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 4ee367520e8c..75e805a521b8 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 143dad2f1ce9..1bd7633d5ac6 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 1dd0ad4fb35f..9d6733954b2f 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 602119c74f10..626f392b1198 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 cc92e68f0c10..975459b2389c 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 728ca89687b9..c0cadfe6aa02 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 857967be2a92..79cab2d2e82e 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 f920edc78b21..b588cdd0994d 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 68f4dbeb26dd..85875d20bf25 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 3c2b485244f3..6f9dbe498d02 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 5ed48d679c87..edb750194192 100644
--- a/test/classes/PluginsTest.php
+++ b/test/classes/PluginsTest.php
@@ -11,12 +11,6 @@
*/
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 cd4e616e8603..890c845fb406 100644
--- a/test/classes/RelationTest.php
+++ b/test/classes/RelationTest.php
@@ -282,7 +282,6 @@ public function testPMASearchColumnInForeigners(): void
public function testFixPmaTablesNothingWorks(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$this->relation = new Relation($this->dbi);
@@ -296,7 +295,6 @@ public function testFixPmaTablesNothingWorks(): void
public function testFixPmaTablesNormal(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$GLOBALS['db'] = '';
$GLOBALS['server'] = 1;
@@ -387,7 +385,6 @@ public function testFixPmaTablesNormal(): void
public function testFixPmaTablesNormalFixTables(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$GLOBALS['db'] = '';
$GLOBALS['server'] = 1;
@@ -686,7 +683,6 @@ public function testFixPmaTablesNormalFixTables(): void
public function testFixPmaTablesNormalFixTablesWithCustomOverride(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$GLOBALS['db'] = '';
$GLOBALS['server'] = 1;
@@ -991,7 +987,6 @@ public function testFixPmaTablesNormalFixTablesWithCustomOverride(): void
public function testFixPmaTablesNormalFixTablesFails(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$GLOBALS['db'] = '';
$GLOBALS['server'] = 1;
@@ -1065,7 +1060,6 @@ public function testFixPmaTablesNormalFixTablesFails(): void
public function testCreatePmaDatabase(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$this->relation = new Relation($this->dbi);
$this->dummyDbi->removeDefaultResults();
@@ -1097,7 +1091,6 @@ public function testCreatePmaDatabase(): void
public function testCreatePmaDatabaseFailsError1044(): void
{
parent::setGlobalDbi();
- parent::loadDefaultConfig();
$this->relation = new Relation($this->dbi);
$this->dummyDbi->removeDefaultResults();
@@ -1125,7 +1118,6 @@ public function testCreatePmaDatabaseFailsError1044(): void
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 cd0e7712fa76..7aaaa10ec0f8 100644
--- a/test/classes/Setup/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -15,16 +15,6 @@
*/
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
*
diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php
index 638c2f717c91..3d14f6e776c3 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 622696f32650..2b1ec49f6a11 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -28,7 +28,6 @@ protected function setUp(): void
{
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 7931ec586041..a71da5456c0a 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 d9b030cdbfc4..ad127fd868e7 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 e5d18ada8304..6217bf569c83 100644
--- a/test/classes/TwoFactorTest.php
+++ b/test/classes/TwoFactorTest.php
@@ -250,7 +250,6 @@ public function testConfigureSimple(): void
public function testApplication(): void
{
parent::setLanguage();
- parent::loadDefaultConfig();
$object = $this->getTwoFactorAndLoadConfig('user', null);
if (! in_array('application', $object->getAvailable())) {
@@ -304,7 +303,6 @@ public function testApplication(): void
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 b72f48502089..b0b795990c75 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 e036d4d27279..7882829c4c2b 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -53,7 +53,6 @@ protected function setUp(): void
parent::setUp();
parent::setLanguage();
parent::setTheme();
- parent::loadDefaultConfig();
}
/**