diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 391a0798c1..5d77bcf8b2 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -13809,15 +13809,6 @@ parameters: count: 1 path: tests/test_data/config.inc.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: tests/unit/AbstractTestCase.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 7ab11575f7..c353ba0f11 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -8792,9 +8792,6 @@ - - - diff --git a/tests/unit/AbstractTestCase.php b/tests/unit/AbstractTestCase.php index d719c81dcb..563bf09916 100644 --- a/tests/unit/AbstractTestCase.php +++ b/tests/unit/AbstractTestCase.php @@ -65,7 +65,6 @@ abstract class AbstractTestCase extends TestCase ExportSql::$noConstraintsComments = false; // Config before DBI - $this->setGlobalConfig(); Cache::purge(); Tracker::disable(); @@ -93,14 +92,6 @@ abstract class AbstractTestCase extends TestCase return $config; } - protected function setGlobalConfig(): void - { - Config::$instance = null; - $config = Config::getInstance(); - $config->loadFromFile(); - $config->set('environment', 'development'); - } - protected function setLanguage(string $code = 'en'): void { Current::$lang = $code; diff --git a/tests/unit/Advisory/AdvisorTest.php b/tests/unit/Advisory/AdvisorTest.php index e24b4943da..3ce928fb95 100644 --- a/tests/unit/Advisory/AdvisorTest.php +++ b/tests/unit/Advisory/AdvisorTest.php @@ -20,8 +20,6 @@ class AdvisorTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); } diff --git a/tests/unit/Config/DescriptionTest.php b/tests/unit/Config/DescriptionTest.php index 7736dd3b79..d39e35bbf5 100644 --- a/tests/unit/Config/DescriptionTest.php +++ b/tests/unit/Config/DescriptionTest.php @@ -20,13 +20,6 @@ use function in_array; #[RunTestsInSeparateProcesses] class DescriptionTest extends AbstractTestCase { - protected function setUp(): void - { - parent::setUp(); - - $this->setGlobalConfig(); - } - /** * @param string $item item * @param string $type type diff --git a/tests/unit/Config/FormDisplayTest.php b/tests/unit/Config/FormDisplayTest.php index 7382bc3ba9..124526c9e5 100644 --- a/tests/unit/Config/FormDisplayTest.php +++ b/tests/unit/Config/FormDisplayTest.php @@ -31,8 +31,6 @@ class FormDisplayTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - Current::$server = 2; $this->object = new FormDisplay(new ConfigFile()); Form::resetGroupCounter(); diff --git a/tests/unit/Config/FormTest.php b/tests/unit/Config/FormTest.php index 6a29c82716..a1cdf2ced8 100644 --- a/tests/unit/Config/FormTest.php +++ b/tests/unit/Config/FormTest.php @@ -28,8 +28,6 @@ class FormTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->object = new Form( 'pma_form_name', ['pma_form1', 'pma_form2'], diff --git a/tests/unit/Config/Forms/FormListTest.php b/tests/unit/Config/Forms/FormListTest.php index 4689926229..e779cbd8fe 100644 --- a/tests/unit/Config/Forms/FormListTest.php +++ b/tests/unit/Config/Forms/FormListTest.php @@ -24,13 +24,6 @@ use PHPUnit\Framework\Attributes\DataProvider; #[CoversClass(UserFormList::class)] class FormListTest extends AbstractTestCase { - protected function setUp(): void - { - parent::setUp(); - - $this->setGlobalConfig(); - } - /** * Tests for preferences forms. * diff --git a/tests/unit/Config/PageSettingsTest.php b/tests/unit/Config/PageSettingsTest.php index 56af0b79d1..57e348a3e8 100644 --- a/tests/unit/Config/PageSettingsTest.php +++ b/tests/unit/Config/PageSettingsTest.php @@ -30,8 +30,6 @@ class PageSettingsTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); Current::$database = 'db'; Current::$table = ''; diff --git a/tests/unit/Config/ServerConfigChecksTest.php b/tests/unit/Config/ServerConfigChecksTest.php index 8462e628bc..5419a9c853 100644 --- a/tests/unit/Config/ServerConfigChecksTest.php +++ b/tests/unit/Config/ServerConfigChecksTest.php @@ -30,8 +30,6 @@ class ServerConfigChecksTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->configFile = new ConfigFile(); $reflection = new ReflectionProperty(ConfigFile::class, 'id'); diff --git a/tests/unit/Controllers/Server/BinlogControllerTest.php b/tests/unit/Controllers/Server/BinlogControllerTest.php index be1e5bd2c2..efc5cfd689 100644 --- a/tests/unit/Controllers/Server/BinlogControllerTest.php +++ b/tests/unit/Controllers/Server/BinlogControllerTest.php @@ -27,8 +27,6 @@ class BinlogControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/CollationsControllerTest.php b/tests/unit/Controllers/Server/CollationsControllerTest.php index f55203f813..b701928aff 100644 --- a/tests/unit/Controllers/Server/CollationsControllerTest.php +++ b/tests/unit/Controllers/Server/CollationsControllerTest.php @@ -28,8 +28,6 @@ class CollationsControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/DatabasesControllerTest.php b/tests/unit/Controllers/Server/DatabasesControllerTest.php index b3fb1e66ae..6287687a4c 100644 --- a/tests/unit/Controllers/Server/DatabasesControllerTest.php +++ b/tests/unit/Controllers/Server/DatabasesControllerTest.php @@ -28,8 +28,6 @@ class DatabasesControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/EnginesControllerTest.php b/tests/unit/Controllers/Server/EnginesControllerTest.php index 4e578727cf..c49a8105e1 100644 --- a/tests/unit/Controllers/Server/EnginesControllerTest.php +++ b/tests/unit/Controllers/Server/EnginesControllerTest.php @@ -28,8 +28,6 @@ class EnginesControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/PluginsControllerTest.php b/tests/unit/Controllers/Server/PluginsControllerTest.php index 1fa2a9d69a..de312d09df 100644 --- a/tests/unit/Controllers/Server/PluginsControllerTest.php +++ b/tests/unit/Controllers/Server/PluginsControllerTest.php @@ -30,8 +30,6 @@ class PluginsControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/ShowEngineControllerTest.php b/tests/unit/Controllers/Server/ShowEngineControllerTest.php index d136e9d2a7..5ee9f06319 100644 --- a/tests/unit/Controllers/Server/ShowEngineControllerTest.php +++ b/tests/unit/Controllers/Server/ShowEngineControllerTest.php @@ -30,8 +30,6 @@ class ShowEngineControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php b/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php index 959e2cbd9a..85fdcd66e3 100644 --- a/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php +++ b/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php @@ -29,8 +29,6 @@ class AdvisorControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); $config = Config::getInstance(); diff --git a/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php index a9b80adae0..db5fb584be 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php @@ -30,8 +30,6 @@ class GeneralLogControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php index 13e0b5cc06..06a7a7a269 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php @@ -30,8 +30,6 @@ class LogVarsControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php index 2ed1bde1e2..8dca32598a 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php @@ -30,8 +30,6 @@ class SlowLogControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/MonitorControllerTest.php b/tests/unit/Controllers/Server/Status/MonitorControllerTest.php index 68bcd7eefb..46e7ecb340 100644 --- a/tests/unit/Controllers/Server/Status/MonitorControllerTest.php +++ b/tests/unit/Controllers/Server/Status/MonitorControllerTest.php @@ -31,8 +31,6 @@ class MonitorControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php b/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php index 74ede6e831..1d17a16fff 100644 --- a/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php @@ -31,8 +31,6 @@ class RefreshControllerTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); - $this->setGlobalConfig(); - Current::$database = 'db'; Current::$table = 'table'; $config = Config::getInstance(); diff --git a/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php b/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php index 26ca5ebfa1..ae4726c89f 100644 --- a/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php @@ -31,8 +31,6 @@ class ProcessesControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/QueriesControllerTest.php b/tests/unit/Controllers/Server/Status/QueriesControllerTest.php index 3814a998a1..1a6482c5ed 100644 --- a/tests/unit/Controllers/Server/Status/QueriesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/QueriesControllerTest.php @@ -34,8 +34,6 @@ class QueriesControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/StatusControllerTest.php b/tests/unit/Controllers/Server/Status/StatusControllerTest.php index d0762c9ec5..25c52599ec 100644 --- a/tests/unit/Controllers/Server/Status/StatusControllerTest.php +++ b/tests/unit/Controllers/Server/Status/StatusControllerTest.php @@ -29,8 +29,6 @@ class StatusControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/Status/VariablesControllerTest.php b/tests/unit/Controllers/Server/Status/VariablesControllerTest.php index 9d62da0cda..886e878a17 100644 --- a/tests/unit/Controllers/Server/Status/VariablesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/VariablesControllerTest.php @@ -29,8 +29,6 @@ class VariablesControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Controllers/Server/VariablesControllerTest.php b/tests/unit/Controllers/Server/VariablesControllerTest.php index 083c6cc779..c5297c903b 100644 --- a/tests/unit/Controllers/Server/VariablesControllerTest.php +++ b/tests/unit/Controllers/Server/VariablesControllerTest.php @@ -35,8 +35,6 @@ class VariablesControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->setLanguage(); Current::$database = 'db'; diff --git a/tests/unit/Controllers/Transformation/OverviewControllerTest.php b/tests/unit/Controllers/Transformation/OverviewControllerTest.php index 4d21d3ca19..dc01b38168 100644 --- a/tests/unit/Controllers/Transformation/OverviewControllerTest.php +++ b/tests/unit/Controllers/Transformation/OverviewControllerTest.php @@ -25,8 +25,6 @@ class OverviewControllerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - Current::$database = 'db'; Current::$table = 'table'; } diff --git a/tests/unit/Database/CentralColumnsTest.php b/tests/unit/Database/CentralColumnsTest.php index 831c911253..d74eba1a51 100644 --- a/tests/unit/Database/CentralColumnsTest.php +++ b/tests/unit/Database/CentralColumnsTest.php @@ -103,8 +103,6 @@ class CentralColumnsTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $config = Config::getInstance(); $config->selectedServer['user'] = 'pma_user'; $config->selectedServer['DisableIS'] = true; diff --git a/tests/unit/Database/EventsTest.php b/tests/unit/Database/EventsTest.php index 3677f30ead..a1576ec716 100644 --- a/tests/unit/Database/EventsTest.php +++ b/tests/unit/Database/EventsTest.php @@ -24,8 +24,6 @@ class EventsTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->setLanguage(); DatabaseInterface::$instance = $this->createDatabaseInterface(); diff --git a/tests/unit/Database/RoutinesTest.php b/tests/unit/Database/RoutinesTest.php index 8b08d3b9ab..ffd03868f5 100644 --- a/tests/unit/Database/RoutinesTest.php +++ b/tests/unit/Database/RoutinesTest.php @@ -28,8 +28,6 @@ class RoutinesTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->setLanguage(); DatabaseInterface::$instance = $this->createDatabaseInterface(); diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php index 54eef12c64..1c473a4df9 100644 --- a/tests/unit/Display/ResultsTest.php +++ b/tests/unit/Display/ResultsTest.php @@ -73,8 +73,6 @@ class ResultsTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Export/OptionsTest.php b/tests/unit/Export/OptionsTest.php index 71ccbc6cce..883842cc45 100644 --- a/tests/unit/Export/OptionsTest.php +++ b/tests/unit/Export/OptionsTest.php @@ -35,8 +35,6 @@ class OptionsTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; diff --git a/tests/unit/FooterTest.php b/tests/unit/FooterTest.php index d0a354cec5..0d8a093509 100644 --- a/tests/unit/FooterTest.php +++ b/tests/unit/FooterTest.php @@ -34,8 +34,6 @@ class FooterTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); $_SERVER['SCRIPT_NAME'] = 'index.php'; Current::$database = ''; diff --git a/tests/unit/HeaderTest.php b/tests/unit/HeaderTest.php index 677f2d3a87..6a7429ff69 100644 --- a/tests/unit/HeaderTest.php +++ b/tests/unit/HeaderTest.php @@ -44,8 +44,6 @@ class HeaderTest extends AbstractTestCase Current::$database = 'db'; Current::$table = ''; - $this->setGlobalConfig(); - $config = Config::getInstance(); $config->settings['Servers'] = []; $config->selectedServer['DisableIS'] = false; diff --git a/tests/unit/InsertEditTest.php b/tests/unit/InsertEditTest.php index 87d0f4cc44..3de6b4e706 100644 --- a/tests/unit/InsertEditTest.php +++ b/tests/unit/InsertEditTest.php @@ -65,8 +65,6 @@ class InsertEditTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - $this->dummyDbi = $this->createDbiDummy(); $this->dbi = $this->createDatabaseInterface($this->dummyDbi); DatabaseInterface::$instance = $this->dbi; diff --git a/tests/unit/Navigation/NavigationTreeTest.php b/tests/unit/Navigation/NavigationTreeTest.php index baa4424a3b..999f7bba14 100644 --- a/tests/unit/Navigation/NavigationTreeTest.php +++ b/tests/unit/Navigation/NavigationTreeTest.php @@ -28,8 +28,6 @@ class NavigationTreeTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $config = Config::getInstance(); diff --git a/tests/unit/PdfTest.php b/tests/unit/PdfTest.php index 182a83139b..fb0981dbcd 100644 --- a/tests/unit/PdfTest.php +++ b/tests/unit/PdfTest.php @@ -12,16 +12,6 @@ use PHPUnit\Framework\Attributes\Large; #[Large] class PdfTest extends AbstractTestCase { - /** - * SetUp for test cases - */ - protected function setUp(): void - { - parent::setUp(); - - $this->setGlobalConfig(); - } - /** * Test for Pdf::getPDFData */ diff --git a/tests/unit/Plugins/Auth/AuthenticationConfigTest.php b/tests/unit/Plugins/Auth/AuthenticationConfigTest.php index 1e6788958d..a01fa8f1c8 100644 --- a/tests/unit/Plugins/Auth/AuthenticationConfigTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationConfigTest.php @@ -32,8 +32,6 @@ class AuthenticationConfigTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); Current::$server = 2; Current::$database = 'db'; diff --git a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php index 75e104537c..96253b57d9 100644 --- a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php @@ -52,8 +52,6 @@ class AuthenticationCookieTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); Current::$database = 'db'; Current::$table = 'table'; diff --git a/tests/unit/Plugins/Auth/AuthenticationHttpTest.php b/tests/unit/Plugins/Auth/AuthenticationHttpTest.php index 0aa53ea2da..ad1a758ad8 100644 --- a/tests/unit/Plugins/Auth/AuthenticationHttpTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationHttpTest.php @@ -33,8 +33,6 @@ class AuthenticationHttpTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); Config::getInstance()->settings['Servers'] = []; Current::$database = 'db'; diff --git a/tests/unit/Plugins/Auth/AuthenticationSignonTest.php b/tests/unit/Plugins/Auth/AuthenticationSignonTest.php index fe05587f00..7b03943e3a 100644 --- a/tests/unit/Plugins/Auth/AuthenticationSignonTest.php +++ b/tests/unit/Plugins/Auth/AuthenticationSignonTest.php @@ -37,8 +37,6 @@ class AuthenticationSignonTest extends AbstractTestCase $this->setLanguage(); - $this->setGlobalConfig(); - DatabaseInterface::$instance = $this->createDatabaseInterface(); Current::$database = 'db'; Current::$table = 'table'; diff --git a/tests/unit/Setup/ConfigGeneratorTest.php b/tests/unit/Setup/ConfigGeneratorTest.php index 27d499f64d..1e631a76a6 100644 --- a/tests/unit/Setup/ConfigGeneratorTest.php +++ b/tests/unit/Setup/ConfigGeneratorTest.php @@ -31,8 +31,6 @@ class ConfigGeneratorTest extends AbstractTestCase { unset($_SESSION['eol']); - $this->setGlobalConfig(); - Current::$server = 2; $cf = new ConfigFile(); $_SESSION['ConfigFile2'] = ['a', 'b', 'c']; diff --git a/tests/unit/Theme/ThemeManagerTest.php b/tests/unit/Theme/ThemeManagerTest.php index ddaf113572..59804fe991 100644 --- a/tests/unit/Theme/ThemeManagerTest.php +++ b/tests/unit/Theme/ThemeManagerTest.php @@ -19,8 +19,6 @@ class ThemeManagerTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - Current::$server = 99; } diff --git a/tests/unit/Theme/ThemeTest.php b/tests/unit/Theme/ThemeTest.php index 2b3e26da07..3b1374586a 100644 --- a/tests/unit/Theme/ThemeTest.php +++ b/tests/unit/Theme/ThemeTest.php @@ -32,8 +32,6 @@ class ThemeTest extends AbstractTestCase parent::setUp(); $this->object = new Theme(); - - $this->setGlobalConfig(); } /** diff --git a/tests/unit/Triggers/TriggersTest.php b/tests/unit/Triggers/TriggersTest.php index 77ab0b3023..126e703d5d 100644 --- a/tests/unit/Triggers/TriggersTest.php +++ b/tests/unit/Triggers/TriggersTest.php @@ -26,8 +26,6 @@ class TriggersTest extends AbstractTestCase { parent::setUp(); - $this->setGlobalConfig(); - $this->setLanguage(); DatabaseInterface::$instance = $this->createDatabaseInterface();