Call parent's setUp and tearDown

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 20, 2020 · 6eaa55e · 6eaa55e
1 parent 8ef5143
commit 6eaa55e
Show file tree

Hide file tree

Showing 184 changed files with 271 additions and 1 deletion.
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -12,6 +12,19 @@
  */
 abstract class AbstractTestCase extends TestCase
 {
+    /**
+     * Prepares environment for the test.
+     * Clean all variables
+     */
+    protected function setUp(): void
+    {
+    }
 
-
+    /**
+     * Desctroys the environment built for the test.
+     * Clean all variables
+     */
+    protected function tearDown(): void
+    {
+    }
 }
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
@@ -21,6 +21,7 @@ class AdvisorTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 1;
     }

diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php
@@ -22,6 +22,7 @@ class BookmarkTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['cfg']['Server']['user'] = 'root';
         $GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin';
         $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma_bookmark';

diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
@@ -23,6 +23,7 @@ class BrowseForeignersTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['cfg']['LimitChars'] = 50;
         $GLOBALS['cfg']['MaxRows'] = 25;
         $GLOBALS['cfg']['RepeatCells'] = 100;

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

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

diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php
@@ -22,6 +22,7 @@ class CheckUserPrivilegesTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['col_priv'] = false;

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

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

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

diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
@@ -30,6 +30,7 @@ class FormDisplayTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 0;
@@ -42,6 +43,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
+        parent::tearDown();
         unset($this->object);
     }
 

diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
@@ -28,6 +28,7 @@ class FormTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 0;
@@ -47,6 +48,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
+        parent::tearDown();
         unset($this->object);
     }
 

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

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

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

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

diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -60,6 +60,7 @@ class StructureControllerTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -25,6 +25,7 @@ class BinlogControllerTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
 

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

diff --git a/test/classes/Controllers/Server/DatabasesControllerTest.php b/test/classes/Controllers/Server/DatabasesControllerTest.php
@@ -25,6 +25,7 @@ class DatabasesControllerTest extends AbstractTestCase
 {
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -25,6 +25,7 @@ class EnginesControllerTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -24,6 +24,7 @@ class PluginsControllerTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -30,6 +30,7 @@ class AdvisorControllerTest extends AbstractTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -22,6 +22,7 @@ class MonitorControllerTest extends AbstractTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -23,6 +23,7 @@ class ProcessesControllerTest extends AbstractTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -24,6 +24,7 @@ class QueriesControllerTest extends AbstractTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -20,6 +20,7 @@ class StatusControllerTest extends AbstractTestCase
 {
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -21,6 +21,7 @@ class VariablesControllerTest extends AbstractTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
 

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

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

diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -32,6 +32,7 @@ class IndexesControllerTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         /**
          * SET these to avoid undefined index error
          */

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

diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php
@@ -34,6 +34,7 @@ class SearchControllerTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         /**
          * SET these to avoid undefined index error
          */

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

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

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

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

diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php
@@ -24,6 +24,7 @@ class CommonTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['server'] = 1;
         $_SESSION = [
             'relation' => [

diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
@@ -26,6 +26,7 @@ class DesignerTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $GLOBALS['cfg']['PDFPageSizes'] = [

diff --git a/test/classes/Database/EventsTest.php b/test/classes/Database/EventsTest.php
@@ -21,6 +21,7 @@ class EventsTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
@@ -42,6 +43,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
+        parent::tearDown();
         if ($GLOBALS['tear_down']['server']) {
             unset($GLOBALS['cfg']['ServerDefault']);
         }

diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
@@ -29,6 +29,7 @@ class QbeTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $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
@@ -22,6 +22,7 @@ class RoutinesTest extends AbstractTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['DisableIS'] = false;

diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
@@ -28,6 +28,7 @@ class SearchTest extends PmaTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'pma';
         $GLOBALS['_POST'] = [];
@@ -61,6 +62,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
+        parent::tearDown();
         unset($this->object);
     }