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

Remove allowDeny_forbidden global

Browse Source 
Fixes issue introduced by 2327dbf3c3.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2024-03-26 16:08:42 -03:00
parent d54981f013
commit 1d8367368e
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Plugins/Auth/AuthenticationConfig.php
View File

@ -99,7 +99,7 @@ class AuthenticationConfig extends AuthenticationPlugin
<table class="table table-borderless text-start w-75 mx-auto">
<tr>
<td>';
if (isset($GLOBALS['allowDeny_forbidden']) && $GLOBALS['allowDeny_forbidden']) {
if ($failure === 'allow-denied') {
trigger_error(__('Access denied!'), E_USER_NOTICE);
} else {
// Check whether user has configured something

14
phpstan-baseline.neon
View File

@ -465,11 +465,6 @@ parameters:
count: 1
path: libraries/classes/Config/FormDisplay.php
-
message: "#^Parameter \\#1 \\$path of method PhpMyAdmin\\\\Config\\\\ConfigFile\\:\\:set\\(\\) expects string, int\\|string given\\.$#"
count: 1
path: libraries/classes/Config/FormDisplay.php
-
message: "#^Parameter \\#1 \\$string of static method PhpMyAdmin\\\\Sanitize\\:\\:escapeJsString\\(\\) expects string, mixed given\\.$#"
count: 2
@ -1316,7 +1311,7 @@ parameters:
path: libraries/classes/Controllers/Import/ImportController.php
-
message: "#^Parameter \\#2 \\$replace of function preg_replace expects array\\|string, float\\|int\\|string\\|string given\\.$#"
message: "#^Parameter \\#2 \\$replace of function preg_replace expects array\\|string, float\\|int\\|string given\\.$#"
count: 1
path: libraries/classes/Controllers/Import/ImportController.php
@ -1550,11 +1545,6 @@ parameters:
count: 1
path: libraries/classes/Controllers/Table/RelationController.php
-
message: "#^Parameter \\#2 \\$callback of function uksort expects callable\\(int\\|string, int\\|string\\)\\: int, 'strnatcasecmp' given\\.$#"
count: 1
path: libraries/classes/Controllers/Table/RelationController.php
-
message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(string\\|null, string\\|null\\)\\: int, 'strnatcasecmp' given\\.$#"
count: 1
@ -2937,7 +2927,7 @@ parameters:
-
message: "#^Method PhpMyAdmin\\\\Dbal\\\\MysqliResult\\:\\:fetchAllKeyPair\\(\\) should return array\\<string, string\\|null\\> but returns array\\<int\\|string, mixed\\>\\.$#"
count: 2
count: 1
path: libraries/classes/Dbal/MysqliResult.php
-

1
test/classes/Plugins/Auth/AuthenticationConfigTest.php
View File

@ -76,7 +76,6 @@ class AuthenticationConfigTest extends AbstractTestCase
{
$GLOBALS['errorHandler'] = new ErrorHandler();
$GLOBALS['cfg']['Servers'] = [1];
$GLOBALS['allowDeny_forbidden'] = false;
$dbi = $this->getMockBuilder(DatabaseInterface::class)
->disableOriginalConstructor()

1
test/classes/Plugins/Auth/AuthenticationCookieTest.php
View File

@ -823,7 +823,6 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
$GLOBALS['server'] = 2;
$_COOKIE['pmaAuth-2'] = 'pass';
$GLOBALS['allowDeny_forbidden'] = '';
$GLOBALS['cfg']['LoginCookieValidity'] = 10;
$this->mockResponse(