Move PMA_VERSION calls into defineVersionConstants() for tests

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

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
@@ -77,13 +77,5 @@
 $GLOBALS['PMA_Config']->set('environment', 'development');
 $GLOBALS['cfg']['environment'] = 'development';
 
-// Initialize PMA_VERSION variable
-// phpcs:disable PSR1.Files.SideEffects
-if (! defined('PMA_VERSION')) {
-    define('PMA_VERSION', $GLOBALS['PMA_Config']->get('PMA_VERSION'));
-    define('PMA_MAJOR_VERSION', $GLOBALS['PMA_Config']->get('PMA_MAJOR_VERSION'));
-}
-// phpcs:enable
-
 /* Load Database interface */
 $GLOBALS['dbi'] = DatabaseInterface::load(new DbiDummy());
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -125,6 +125,18 @@ protected function setProxySettings(): void
         // phpcs:enable
     }
 
+    protected function defineVersionConstants(): void
+    {
+        global $PMA_Config;
+        // Initialize PMA_VERSION variable
+        // phpcs:disable PSR1.Files.SideEffects
+        if (! defined('PMA_VERSION')) {
+            define('PMA_VERSION', $PMA_Config->get('PMA_VERSION'));
+            define('PMA_MAJOR_VERSION', $PMA_Config->get('PMA_MAJOR_VERSION'));
+        }
+        // phpcs:enable
+    }
+
     /**
      * Desctroys the environment built for the test.
      * Clean all variables

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

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

diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
@@ -33,6 +33,7 @@ protected function setUp(): void
         parent::setUp();
         parent::setTheme();
         parent::loadDefaultConfig();
+        parent::defineVersionConstants();
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         parent::setGlobalConfig();
         $GLOBALS['server'] = 0;

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