From d75b83d4525c8ddbed07ab8357fb65e014a699b5 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 15 May 2020 23:07:57 +0200 Subject: [PATCH] Fix #15247 - Move and rename the exit for sendResponseForGridEdit to getResponseForGridEdit Signed-off-by: William Desportes --- libraries/classes/Sql.php | 7 +++---- phpstan-baseline.neon | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 47a33f75b7..b698a56356 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -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 diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index cd81d43bd1..4d3500920c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -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