From d393505ce151b6eba00fb2eddfe40f2f402c3552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 13 Dec 2016 17:34:42 +0100 Subject: [PATCH] Avoid using define() for PMA_IS_IIS in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not used anywhere in the code. Signed-off-by: Michal Čihař --- test/libraries/PMA_user_preferences_test.php | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index 9f283390bf..7ca8b1f1e9 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -384,18 +384,9 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase ->with() ->will($this->returnValue(false)); + $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', ''); - - $GLOBALS['cfg']['ServerDefault'] = 1; - $GLOBALS['lang'] = ''; - - $redefine = null; - if (!defined('PMA_IS_IIS')) { - define('PMA_IS_IIS', false); - } else { - $redefine = PMA_IS_IIS; - runkit_constant_redefine('PMA_IS_IIS', false); - } + $GLOBALS['PMA_Config']->set('PMA_IS_IIS', false); PMA_userprefsRedirect( 'file.html', @@ -403,11 +394,6 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase 'h ash' ); - if ($redefine !== null) { - runkit_constant_redefine('PMA_IS_IIS', $redefine); - } else { - runkit_constant_remove('PMA_IS_IIS'); - } } /** @@ -459,4 +445,4 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase $result ); } -} \ No newline at end of file +}