From 1d509b96325fcdbf62a03d43960d1d679b592883 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 19 Dec 2024 02:12:14 +0000 Subject: [PATCH] Refactor getColumnsCount() Signed-off-by: Kamil Tekiela --- phpstan-baseline.neon | 6 ------ src/Database/CentralColumns.php | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 9518c35b63..e406046675 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -6183,12 +6183,6 @@ parameters: count: 11 path: src/Database/CentralColumns.php - - - message: '#^Cannot cast mixed to int\.$#' - identifier: cast.int - count: 1 - path: src/Database/CentralColumns.php - - message: '#^Cannot cast mixed to string\.$#' identifier: cast.string diff --git a/src/Database/CentralColumns.php b/src/Database/CentralColumns.php index aadafb3439..d09a22b29c 100644 --- a/src/Database/CentralColumns.php +++ b/src/Database/CentralColumns.php @@ -31,6 +31,7 @@ use function implode; use function in_array; use function is_array; use function is_bool; +use function is_string; use function mb_strtoupper; use function sprintf; use function trim; @@ -767,10 +768,10 @@ class CentralColumns $query = 'SELECT COUNT(db_name) FROM ' . Util::backquote($pmadb) . '.' . Util::backquote($centralListTable) . ' WHERE db_name = ' . $this->dbi->quoteString($db, ConnectionType::ControlUser) . ($num === 0 ? '' : 'LIMIT ' . $from . ', ' . $num) . ';'; - $result = $this->dbi->fetchResultSimple($query, ConnectionType::ControlUser); + $result = $this->dbi->fetchValue($query, 0, ConnectionType::ControlUser); - if (isset($result[0])) { - return (int) $result[0]; + if (is_string($result)) { + return (int) $result; } return -1;