gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PMA_IS_WINDOWS constant

Browse Source 
Gets the value from the Config class instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2022-04-24 20:37:55 -03:00
parent 8de8236726
commit b17700dd09
8 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/classes/Config.php
View File

@ -1028,7 +1028,6 @@ class Config
'PMA_MAJOR_VERSION',
'PMA_THEME_VERSION',
'PMA_THEME_GENERATION',
'PMA_IS_WINDOWS',
'PMA_IS_GD2',
'PMA_USR_OS',
'PMA_USR_BROWSER_VER',

2
libraries/classes/Controllers/Setup/HomeController.php
View File

@ -152,7 +152,7 @@ class HomeController extends AbstractController
],
'values_escaped' => true,
];
$eol = Core::ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix'));
$eol = Core::ifSetOr($_SESSION['eol'], ($GLOBALS['PMA_Config']->get('PMA_IS_WINDOWS') ? 'win' : 'unix'));
$eolInput = $formDisplayTemplate->displayInput(
'eol',
__('End of line'),

5
phpstan-baseline.neon
View File

@ -280,11 +280,6 @@ parameters:
count: 1
path: libraries/classes/Controllers/Setup/HomeController.php
-
message: "#^Ternary operator condition is always false\\.$#"
count: 1
path: libraries/classes/Controllers/Setup/HomeController.php
-
message: "#^Comparison operation \"\\>\" between 0 and 0 is always false\\.$#"
count: 1

1
test/classes/ConfigTest.php
View File

@ -752,7 +752,6 @@ class ConfigTest extends AbstractTestCase
$defines = [
'PMA_VERSION',
'PMA_MAJOR_VERSION',
'PMA_IS_WINDOWS',
'PMA_IS_GD2',
'PMA_USR_OS',
'PMA_USR_BROWSER_VER',

5
test/classes/HeaderTest.php
View File

@ -7,8 +7,6 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Core;
use PhpMyAdmin\Header;
use ReflectionProperty;
use function define;
use function defined;
/**
* @group medium
@ -24,9 +22,6 @@ class HeaderTest extends AbstractTestCase
parent::defineVersionConstants();
parent::setTheme();
parent::setLanguage();
if (! defined('PMA_IS_WINDOWS')) {
define('PMA_IS_WINDOWS', false);
}
$GLOBALS['server'] = 0;
$GLOBALS['message'] = 'phpmyadminmessage';
$GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');

5
test/classes/MenuTest.php
View File

@ -6,8 +6,6 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Core;
use PhpMyAdmin\Menu;
use function define;
use function defined;
class MenuTest extends AbstractTestCase
{
@ -21,9 +19,6 @@ class MenuTest extends AbstractTestCase
parent::setTheme();
parent::loadDefaultConfig();
if (! defined('PMA_IS_WINDOWS')) {
define('PMA_IS_WINDOWS', false);
}
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['Server']['verbose'] = 'verbose host';

5
test/classes/Plugins/Import/ImportShpTest.php
View File

@ -8,8 +8,6 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\File;
use PhpMyAdmin\Plugins\Import\ImportShp;
use PhpMyAdmin\Tests\AbstractTestCase;
use function define;
use function defined;
use function extension_loaded;
/**
@ -30,9 +28,6 @@ class ImportShpTest extends AbstractTestCase
{
parent::setUp();
parent::loadDefaultConfig();
if (! defined('PMA_IS_WINDOWS')) {
define('PMA_IS_WINDOWS', false);
}
$GLOBALS['server'] = 0;
//setting
$GLOBALS['plugin_param'] = 'table';

1
test/phpstan-constants.php
View File

@ -11,4 +11,3 @@ define('PROXY_PASS', '');
define('PMA_USR_BROWSER_AGENT', 'Other');
define('PMA_USR_BROWSER_VER', 1);
define('PMA_USR_OS', 'os');
define('PMA_IS_WINDOWS', false);