Skip to content

Commit b151b40

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents 71c7d73 + 7b2f607 commit b151b40

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/Display/Results.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ private function getTableBody(
18111811
$clauseIsUnique,
18121812
$urlSqlQuery,
18131813
$displayParts->deleteLink,
1814-
(int) self::$row[0],
1814+
self::$row[0],
18151815
);
18161816

18171817
// 1.3 Displays the links at left if required
@@ -2381,10 +2381,10 @@ private function getUrlParams(string $whereClause, bool $clauseIsUnique, string
23812381
*
23822382
* @see getTableBody()
23832383
*
2384-
* @param string $whereClause the where clause of the sql
2385-
* @param bool $clauseIsUnique the unique condition of clause
2386-
* @param string $urlSqlQuery the analyzed sql query
2387-
* @param int $processId Process ID
2384+
* @param string $whereClause the where clause of the sql
2385+
* @param bool $clauseIsUnique the unique condition of clause
2386+
* @param string $urlSqlQuery the analyzed sql query
2387+
* @param string|null $processId Process ID
23882388
*
23892389
* @return array{?string, ?string, ?string, string[]|null}
23902390
*/
@@ -2393,7 +2393,7 @@ private function getDeleteAndKillLinks(
23932393
bool $clauseIsUnique,
23942394
string $urlSqlQuery,
23952395
DeleteLinkEnum $deleteLink,
2396-
int $processId,
2396+
string|null $processId,
23972397
): array {
23982398
if ($deleteLink === DeleteLinkEnum::DELETE_ROW) { // delete row case
23992399
$urlParams = [
@@ -2435,7 +2435,7 @@ private function getDeleteAndKillLinks(
24352435

24362436
$linkGoto = Url::getFromRoute('/sql', $urlParams);
24372437

2438-
$kill = $this->dbi->getKillQuery($processId);
2438+
$kill = $this->dbi->getKillQuery((int) $processId);
24392439

24402440
$urlParams = ['db' => 'mysql', 'sql_query' => $kill, 'goto' => $linkGoto];
24412441

0 commit comments

Comments
 (0)