Use parent::setGlobalConfig();

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 21, 2020 · 0964470 · 0964470
1 parent a6c4696
commit 0964470
Show file tree

Hide file tree

Showing 44 changed files with 48 additions and 48 deletions.
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
@@ -22,7 +22,7 @@ class AdvisorTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['server'] = 1;
     }
 

diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php
@@ -95,7 +95,7 @@ class CentralColumnsTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['cfg']['Server']['user'] = 'pma_user';
         $GLOBALS['cfg']['Server']['DisableIS'] = true;
         $GLOBALS['cfg']['MaxRows'] = 10;

diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
@@ -22,7 +22,7 @@ class DescriptionTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
     }
 
     /**

diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
         parent::setTheme();
         parent::loadDefaultConfig();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['server'] = 0;
         $this->object = new FormDisplay(new ConfigFile());
         Form::resetGroupCounter();

diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
         parent::setTheme();
         parent::loadDefaultConfig();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['server'] = 0;
         $this->object = new Form(
             'pma_form_name',

diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::loadDefaultConfig();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['server'] = 1;
     }
 

diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::setLanguage();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';

diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php
@@ -28,7 +28,7 @@ class ServerConfigChecksTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['cfg']['AvailableCharsets'] = [];
         $GLOBALS['cfg']['ServerDefault'] = 0;
         $GLOBALS['server'] = 0;

diff --git a/test/classes/Controllers/Server/BinlogControllerTest.php b/test/classes/Controllers/Server/BinlogControllerTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['cfg']['MaxRows'] = 10;

diff --git a/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/DatabasesControllerTest.php b/test/classes/Controllers/Server/DatabasesControllerTest.php
@@ -26,7 +26,7 @@ class DatabasesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/PluginsControllerTest.php b/test/classes/Controllers/Server/PluginsControllerTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/Status/MonitorControllerTest.php b/test/classes/Controllers/Server/Status/MonitorControllerTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/Status/QueriesControllerTest.php b/test/classes/Controllers/Server/Status/QueriesControllerTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/Status/StatusControllerTest.php b/test/classes/Controllers/Server/Status/StatusControllerTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php
@@ -22,7 +22,7 @@ class VariablesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['text_dir'] = 'ltr';

diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php
@@ -28,7 +28,7 @@ class VariablesControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['text_dir'] = 'ltr';

diff --git a/test/classes/Controllers/Table/FindReplaceControllerTest.php b/test/classes/Controllers/Table/FindReplaceControllerTest.php
@@ -16,7 +16,7 @@ class FindReplaceControllerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/Controllers/TransformationOverviewControllerTest.php b/test/classes/Controllers/TransformationOverviewControllerTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
 
         $GLOBALS['server'] = 1;

diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
@@ -598,7 +598,7 @@ public function providerTestLinkURL()
     public function testSendHeaderLocationWithoutSidWithIis()
     {
         $GLOBALS['server'] = 0;
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['PMA_Config']->set('PMA_IS_IIS', true);
 
@@ -621,7 +621,7 @@ public function testSendHeaderLocationWithoutSidWithIis()
     public function testSendHeaderLocationWithoutSidWithoutIis()
     {
         $GLOBALS['server'] = 0;
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['PMA_Config']->set('PMA_IS_IIS', null);
 
@@ -639,7 +639,7 @@ public function testSendHeaderLocationWithoutSidWithoutIis()
     public function testSendHeaderLocationIisLongUri()
     {
         $GLOBALS['server'] = 0;
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['PMA_Config']->set('PMA_IS_IIS', true);
 

diff --git a/test/classes/Database/EventsTest.php b/test/classes/Database/EventsTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';

diff --git a/test/classes/Database/RoutinesTest.php b/test/classes/Database/RoutinesTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::setUpEnv();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';

diff --git a/test/classes/Database/TriggersTest.php b/test/classes/Database/TriggersTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::setUpEnv();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['db'] = 'pma_test';

diff --git a/test/classes/Display/ChangePasswordTest.php b/test/classes/Display/ChangePasswordTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
         //$GLOBALS
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = 'PMA_server';

diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::setLanguage();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['user'] = 'pma_user';

diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
@@ -43,7 +43,7 @@ protected function setUp(): void
         $GLOBALS['table'] = 'table';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $this->object = new DisplayResults('as', '', 0, '', '');
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;

diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
         $GLOBALS['db'] = '';
         $GLOBALS['table'] = '';
         $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';

diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
         $GLOBALS['server'] = 'server';
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = '';
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';

diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
@@ -65,7 +65,7 @@ protected function setUp(): void
         $GLOBALS['cfg']['Confirm'] = true;
         $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
         $GLOBALS['cfg']['enable_drag_drop_import'] = true;
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
 
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
     }

diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $GLOBALS['server'] = 1;
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['user'] = 'user';

diff --git a/test/classes/PdfTest.php b/test/classes/PdfTest.php
@@ -20,7 +20,7 @@ class PdfTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
     }
 

diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::setLanguage();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';

diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
         parent::setUp();
         parent::setLanguage();
         parent::setTheme();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['text_dir'] = 'ltr';

diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
@@ -30,7 +30,7 @@ class AuthenticationHttpTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Servers'] = [];
         $GLOBALS['server'] = 0;

diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
@@ -31,7 +31,7 @@ class AuthenticationSignonTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';

diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
@@ -55,7 +55,7 @@ protected function setUp(): void
         ];
 
         // For Image_*_Inline plugin
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['Server'] = 1;
 

diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
     {
         parent::setUp();
         parent::setLanguage();
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfgRelation'] = [];

diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
@@ -38,7 +38,7 @@ public function testGetConfigFile()
     {
         unset($_SESSION['eol']);
 
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
 
         $GLOBALS['server'] = 0;
         $cf = new ConfigFile();

diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         $GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
         $GLOBALS['cfg']['ServerDefault'] = 0;
         $GLOBALS['server'] = 99;
-        $GLOBALS['PMA_Config'] = new Config();
+        parent::setGlobalConfig();
 
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()