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

Merge #15248 - #15247 exit handing in the codebase

Browse Source
This commit is contained in:
William Desportes 2020-07-21 23:46:01 +02:00
commit 3174048943
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/classes/Sql.php
View File

@ -1361,7 +1361,7 @@ class Sql
*
* @return void
*/
private function sendResponseForGridEdit($result)
private function getResponseForGridEdit($result): void
{
$row = $GLOBALS['dbi']->fetchRow($result);
$field_flags = $GLOBALS['dbi']->fieldFlags($result, 0);
@ -1370,7 +1370,6 @@ class Sql
}
$response = Response::getInstance();
$response->addJSON('value', $row[0]);
exit;
}
/**
@ -1681,8 +1680,8 @@ class Sql
// If we are retrieving the full value of a truncated field or the original
// value of a transformed field, show it here
if (isset($_POST['grid_edit']) && $_POST['grid_edit'] == true) {
$this->sendResponseForGridEdit($result);
// script has exited at this point
$this->getResponseForGridEdit($result);
exit;
}
// Gets the list of fields properties

2
phpstan-baseline.neon
View File

@ -3001,7 +3001,7 @@ parameters:
path: libraries/classes/Sql.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\Sql\\:\\:sendResponseForGridEdit\\(\\) expects object, object\\|null given\\.$#"
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\Sql\\:\\:getResponseForGridEdit\\(\\) expects object, object\\|null given\\.$#"
count: 1
path: libraries/classes/Sql.php