Fix test cases after backupGlobals = false

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

Hide file tree

Showing 103 changed files with 236 additions and 1 deletion.
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -125,6 +125,11 @@ protected function setProxySettings(): void
         // phpcs:enable
     }
 
+    protected function setUpEnv(): void
+    {
+        require ROOT_PATH . 'test/bootstrap-dist.php';
+    }
+
     /**
      * Desctroys the environment built for the test.
      * Clean all variables

diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
@@ -147,6 +147,8 @@ public function testAdvisorTimespanFormat()
      */
     public function testAddRule($rule, $expected, $error): void
     {
+        parent::loadDefaultConfig();
+        parent::setLanguage();
         $advisor = new Advisor($GLOBALS['dbi'], new ExpressionLanguage());
         $parseResult = $advisor->parseRulesFile(Advisor::GENERIC_RULES_FILE);
         $this->assertEquals($parseResult['errors'], []);

diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php
@@ -17,6 +17,7 @@ class CharsetsTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setUpEnv();
         $GLOBALS['cfg']['DBG']['sql'] = false;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
     }

diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
@@ -39,6 +39,7 @@ class ConfigFileTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
         $GLOBALS['server'] = 1;
         $this->object = new ConfigFile();
     }

diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
@@ -27,6 +27,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setLanguage();
         $this->config = new Config();
         $this->formDisplayTemplate = new FormDisplayTemplate($this->config);
     }

diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
@@ -31,6 +31,8 @@ class FormDisplayTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setTheme();
+        parent::loadDefaultConfig();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 0;

diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
@@ -29,6 +29,8 @@ class FormTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setTheme();
+        parent::loadDefaultConfig();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 0;

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

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

diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -56,6 +56,7 @@ class ConfigTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setTheme();
         $_SERVER['HTTP_USER_AGENT'] = '';
         $this->object = new Config();
         $GLOBALS['server'] = 0;

diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php
@@ -12,6 +12,16 @@
 
 class PrivilegesControllerTest extends PmaTestCase
 {
+    /**
+     * Configures global environment.
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        parent::loadDefaultConfig();
+        parent::setLanguage();
+    }
+
     public function testIndex(): void
     {
         global $dbi, $db, $server, $cfg, $PMA_PHP_SELF, $is_grantuser, $is_createuser;

diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -61,6 +61,8 @@ class StructureControllerTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['table'] = 'table';

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

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

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

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

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

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

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

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

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

diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php
@@ -31,6 +31,7 @@ protected function setUp(): void
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
 
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';

diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -33,12 +33,15 @@ class IndexesControllerTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+
         /**
          * SET these to avoid undefined index error
          */
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $GLOBALS['cfg']['Server']['pmadb'] = '';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;

diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php
@@ -12,8 +12,19 @@
 
 class PrivilegesControllerTest extends PmaTestCase
 {
+
+    /**
+     * Configures global environment.
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        parent::loadDefaultConfig();
+    }
+
     public function testIndex(): void
     {
+
         global $dbi, $db, $table, $server, $cfg, $PMA_PHP_SELF, $is_grantuser, $is_createuser;
 
         $db = 'db';

diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php
@@ -32,9 +32,12 @@ class RelationControllerTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         //$_SESSION

diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php
@@ -35,6 +35,8 @@ class SearchControllerTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+
         /**
          * SET these to avoid undefined index error
          */
@@ -43,6 +45,7 @@ protected function setUp(): void
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'PMA';
         $GLOBALS['table'] = 'PMA_BookMark';
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $relation = new Relation($GLOBALS['dbi']);
         $GLOBALS['cfgRelation'] = $relation->getRelationsParam();

diff --git a/test/classes/Controllers/Table/StructureControllerTest.php b/test/classes/Controllers/Table/StructureControllerTest.php
@@ -39,6 +39,8 @@ class StructureControllerTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+        $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';

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

diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
@@ -30,6 +30,8 @@ class CoreTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = '';
         $GLOBALS['table'] = '';

diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php
@@ -23,6 +23,7 @@ class CreateAddFieldTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setUpEnv();
         $this->createAddField = new CreateAddField($GLOBALS['dbi']);
     }
 

diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
@@ -30,6 +30,7 @@ class QbeTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setUpEnv();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'pma_test';
         $this->object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');

diff --git a/test/classes/Database/RoutinesTest.php b/test/classes/Database/RoutinesTest.php
@@ -23,6 +23,7 @@ class RoutinesTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setUpEnv();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
@@ -31,6 +32,7 @@ protected function setUp(): void
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
+        $GLOBALS['text_dir'] = 'ltr';
 
         $this->routines = new Routines(
             $GLOBALS['dbi'],

diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
@@ -29,6 +29,8 @@ class SearchTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
+
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'pma';
         $GLOBALS['_POST'] = [];

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

diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
@@ -27,6 +27,7 @@ class DatabaseInterfaceTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
         $GLOBALS['server'] = 0;
         $extension = new DbiDummy();
         $this->_dbi = new DatabaseInterface($extension);

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

diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
@@ -37,6 +37,7 @@ class ResultsTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setLanguage();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';

diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
@@ -26,6 +26,7 @@ class InnodbTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::setUpEnv();
         $GLOBALS['server'] = 0;
         $this->object = new Innodb('innodb');
     }

diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
@@ -28,6 +28,8 @@ class PbxtTest extends PmaTestCase
     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
@@ -30,8 +30,11 @@ class ErrorHandlerTest extends PmaTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDefaultConfig();
         $this->object = new ErrorHandler();
+        $_SESSION['errors'] = [];
         $GLOBALS['server'] = 0;
+        $GLOBALS['cfg']['SendErrorReports'] = 'always';
     }
 
     /**
@@ -167,7 +170,6 @@ public function testGetDispErrorsForDisplayTrue(
      */
     public function testCheckSavedErrors()
     {
-        $_SESSION['errors'] = [];
 
         $this->_callProtectedFunction(
             'checkSavedErrors',