phpmyadmin
diff --git a/‎src/Controllers/Import/ImportController.php‎
Lines changed: 0 additions & 2 deletions b/‎src/Controllers/Import/ImportController.php‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/Controllers/Table/GetFieldController.php‎
Lines changed: 0 additions & 2 deletions b/‎src/Controllers/Table/GetFieldController.php‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/DatabaseInterface.php‎
Lines changed: 0 additions & 3 deletions b/‎src/DatabaseInterface.php‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎src/Html/Generator.php‎
Lines changed: 2 additions & 0 deletions b/‎src/Html/Generator.php‎
Lines changed: 2 additions & 0 deletions
@@ -641,8 +641,6 @@ public function __invoke(ServerRequest $request): Response
                         false,
                         $_SESSION['Import_message']['go_back_url'],
                     );
-
-                    return $this->response->response();
                 }
 
                 if (Current::$table != $tableFromSql && $tableFromSql !== '') {
 
@@ -81,8 +81,6 @@ public function __invoke(ServerRequest $request): Response
                 __('MySQL returned an empty result set (i.e. zero rows).'),
                 $sql,
             );
-
-            return $this->response->response();
         }
 
         $result ??= '';
 
@@ -180,10 +180,7 @@ public function query(
         $result = $this->tryQuery($query, $connectionType, $options, $cacheAffectedRows);
 
         if (! $result) {
-            // The following statement will exit
             Generator::mysqlDie($this->getError($connectionType), $query);
-
-            ResponseRenderer::getInstance()->callExit();
         }
 
         return $result;
 
@@ -679,6 +679,8 @@ public static function showDocumentationLink(
      * @param string $backUrl       URL for the "back" link (full path is not required).
      * @param bool   $exit          Whether execution should be stopped or the error message should be returned.
      *
+     * @psalm-return ($exit is true ? never : string|null)
+     *
      * @global string $table The current table.
      * @global string $db    The current database.
      */
Original file line number	Diff line number	Diff line change
`@@ -641,8 +641,6 @@ public function __invoke(ServerRequest $request): Response`
`641`	`641`	`false,`
`642`	`642`	`$_SESSION['Import_message']['go_back_url'],`
`643`	`643`	`);`
`644`		`-`
`645`		`- return $this->response->response();`
`646`	`644`	`}`
`647`	`645`
`648`	`646`	`if (Current::$table != $tableFromSql && $tableFromSql !== '') {`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ public function __invoke(ServerRequest $request): Response`
`81`	`81`	`__('MySQL returned an empty result set (i.e. zero rows).'),`
`82`	`82`	`$sql,`
`83`	`83`	`);`
`84`		`-`
`85`		`- return $this->response->response();`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`$result ??= '';`
Original file line number	Diff line number	Diff line change
`@@ -180,10 +180,7 @@ public function query(`
`180`	`180`	`$result = $this->tryQuery($query, $connectionType, $options, $cacheAffectedRows);`
`181`	`181`
`182`	`182`	`if (! $result) {`
`183`		`- // The following statement will exit`
`184`	`183`	`Generator::mysqlDie($this->getError($connectionType), $query);`
`185`		`-`
`186`		`- ResponseRenderer::getInstance()->callExit();`
`187`	`184`	`}`
`188`	`185`
`189`	`186`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -679,6 +679,8 @@ public static function showDocumentationLink(`
`679`	`679`	`* @param string $backUrl URL for the "back" link (full path is not required).`
`680`	`680`	`* @param bool $exit Whether execution should be stopped or the error message should be returned.`
`681`	`681`	`*`
	`682`	`+ * @psalm-return ($exit is true ? never : string\|null)`
	`683`	`+ *`
`682`	`684`	`* @global string $table The current table.`
`683`	`685`	`* @global string $db The current database.`
`684`	`686`	`*/`