Load DBI into container only when needed by the test

MauricioFauth · MauricioFauth · commit 8543e0abe5bc · 2022-07-11T13:42:22.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -98,7 +98,6 @@ protected function setUp(): void
         $this->setGlobalConfig();
         $this->loadContainerBuilder();
         $this->setGlobalDbi();
-        $this->loadDbiIntoContainerBuilder();
         $this->setTheme();
         Cache::purge();
     }
diff --git a/test/classes/Controllers/Export/ExportControllerTest.php b/test/classes/Controllers/Export/ExportControllerTest.php
@@ -27,6 +27,8 @@ class ExportControllerTest extends AbstractTestCase
 {
     public function testExportController(): void
     {
+        parent::loadDbiIntoContainerBuilder();
+
         $GLOBALS['server'] = 1;
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['lang'] = 'en';
diff --git a/test/classes/Controllers/Table/ExportControllerTest.php b/test/classes/Controllers/Table/ExportControllerTest.php
@@ -22,6 +22,8 @@ class ExportControllerTest extends AbstractTestCase
 {
     public function testExportController(): void
     {
+        parent::loadDbiIntoContainerBuilder();
+
         $GLOBALS['db'] = 'test_db';
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['cfg']['Server'] = $GLOBALS['config']->defaultServer;
diff --git a/test/classes/Export/OptionsTest.php b/test/classes/Export/OptionsTest.php
@@ -27,6 +27,8 @@ protected function setUp(): void
         parent::setUp();
         parent::setLanguage();
         parent::setGlobalConfig();
+        parent::loadDbiIntoContainerBuilder();
+
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['user'] = 'pma_user';
         $GLOBALS['server'] = 0;
diff --git a/test/classes/PluginsTest.php b/test/classes/PluginsTest.php
@@ -14,6 +14,12 @@
  */
 class PluginsTest extends AbstractTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        parent::loadDbiIntoContainerBuilder();
+    }
+
     public function testGetExport(): void
     {
         $GLOBALS['server'] = 1;
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
@@ -23,6 +23,8 @@ class TrackerTest extends AbstractTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        parent::loadDbiIntoContainerBuilder();
+
         /**
          * SET these to avoid undefined index error
          */

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ protected function setUp(): void`
`98`	`98`	`$this->setGlobalConfig();`
`99`	`99`	`$this->loadContainerBuilder();`
`100`	`100`	`$this->setGlobalDbi();`
`101`		`- $this->loadDbiIntoContainerBuilder();`
`102`	`101`	`$this->setTheme();`
`103`	`102`	`Cache::purge();`
`104`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ class ExportControllerTest extends AbstractTestCase`
`27`	`27`	`{`
`28`	`28`	`public function testExportController(): void`
`29`	`29`	`{`
	`30`	`+ parent::loadDbiIntoContainerBuilder();`
	`31`	`+`
`30`	`32`	`$GLOBALS['server'] = 1;`
`31`	`33`	`$GLOBALS['text_dir'] = 'ltr';`
`32`	`34`	`$GLOBALS['lang'] = 'en';`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ class ExportControllerTest extends AbstractTestCase`
`22`	`22`	`{`
`23`	`23`	`public function testExportController(): void`
`24`	`24`	`{`
	`25`	`+ parent::loadDbiIntoContainerBuilder();`
	`26`	`+`
`25`	`27`	`$GLOBALS['db'] = 'test_db';`
`26`	`28`	`$GLOBALS['table'] = 'test_table';`
`27`	`29`	`$GLOBALS['cfg']['Server'] = $GLOBALS['config']->defaultServer;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,12 @@`
`14`	`14`	`*/`
`15`	`15`	`class PluginsTest extends AbstractTestCase`
`16`	`16`	`{`
	`17`	`+ protected function setUp(): void`
	`18`	`+ {`
	`19`	`+ parent::setUp();`
	`20`	`+ parent::loadDbiIntoContainerBuilder();`
	`21`	`+ }`
	`22`	`+`
`17`	`23`	`public function testGetExport(): void`
`18`	`24`	`{`
`19`	`25`	`$GLOBALS['server'] = 1;`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ class TrackerTest extends AbstractTestCase`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`parent::setUp();`
	`26`	`+ parent::loadDbiIntoContainerBuilder();`
	`27`	`+`
`26`	`28`	`/**`
`27`	`29`	`* SET these to avoid undefined index error`
`28`	`30`	`*/`