Drop test constants PROXY_{URL,USER,PASS} in favor of existing ENV ht…

…tp_proxy Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Mar 5, 2021 · abdeb98 · abdeb98
1 parent b5263d4
commit abdeb98
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/test/bootstrap-static.php b/test/bootstrap-static.php
@@ -34,9 +34,6 @@
 
 // phpcs:disable PSR1.Files.SideEffects
 define('PMA_VERSION', $GLOBALS['PMA_Config']->get('PMA_VERSION'));
-define('PROXY_URL', '');
-define('PROXY_USER', '');
-define('PROXY_PASS', '');
 define('PMA_PATH_TO_BASEDIR', '');
 // phpcs:enable
 

diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -128,14 +128,6 @@ protected function setProxySettings(): void
             $GLOBALS['cfg']['ProxyUser'] = $proxyUser;
             $GLOBALS['cfg']['ProxyPass'] = $proxyPass;
         }
-
-        // phpcs:disable PSR1.Files.SideEffects
-        if (! defined('PROXY_URL')) {
-            define('PROXY_URL', $proxyUrl ?? '');
-            define('PROXY_USER', $proxyUser ?? '');
-            define('PROXY_PASS', $proxyPass ?? '');
-        }
-        // phpcs:enable
     }
 
     protected function defineVersionConstants(): void

diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
@@ -52,9 +52,7 @@ protected function setUp(): void
      */
     public function testGetLatestVersion(): void
     {
-        $GLOBALS['cfg']['ProxyUrl'] = PROXY_URL;
-        $GLOBALS['cfg']['ProxyUser'] = PROXY_USER;
-        $GLOBALS['cfg']['ProxyPass'] = PROXY_PASS;
+        $this->setProxySettings();
         $GLOBALS['cfg']['VersionCheck'] = true;
         $versionInformation = new VersionInformation();
         $version = $versionInformation->getLatestVersion();

diff --git a/test/phpstan-constants.php b/test/phpstan-constants.php
@@ -4,9 +4,6 @@
 
 define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
 define('PMA_VERSION', '5.1.0-dev');
-define('PROXY_URL', '');
-define('PROXY_USER', '');
-define('PROXY_PASS', '');
 define('PMA_USR_BROWSER_AGENT', 'Other');
 define('PMA_USR_BROWSER_VER', 1);
 define('PMA_USR_OS', 'os');