diff options
Diffstat (limited to 'lib/Minz/ModelPdo.php')
| -rw-r--r-- | lib/Minz/ModelPdo.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php index 26b5269a5..86f6df306 100644 --- a/lib/Minz/ModelPdo.php +++ b/lib/Minz/ModelPdo.php @@ -176,8 +176,8 @@ class Minz_ModelPdo { /** * @param array<string,int|string|null> $values - * @phpstan-return ($mode is PDO::FETCH_ASSOC ? array<array<string,int|string|null>>|null : array<int|string|null>|null) - * @return array<array<string,int|string|null>>|array<int|string|null>|null + * @phpstan-return ($mode is PDO::FETCH_ASSOC ? list<array<string,int|string|null>>|null : list<int|string|null>|null) + * @return list<array<string,int|string|null>>|list<int|string|null>|null */ private function fetchAny(string $sql, array $values, int $mode, int $column = 0): ?array { $stm = $this->pdo->prepare($sql); @@ -204,15 +204,15 @@ class Minz_ModelPdo { switch ($mode) { case PDO::FETCH_COLUMN: $res = $stm->fetchAll(PDO::FETCH_COLUMN, $column); + /** @var list<int|string|null> $res */ break; case PDO::FETCH_ASSOC: default: $res = $stm->fetchAll(PDO::FETCH_ASSOC); + /** @var list<array<string,int|string|null>> $res */ break; } - if ($res !== false) { - return $res; - } + return $res; } $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6); @@ -231,7 +231,7 @@ class Minz_ModelPdo { /** * @param array<string,int|string|null> $values - * @return array<array<string,int|string|null>>|null + * @return list<array<string,int|string|null>>|null */ public function fetchAssoc(string $sql, array $values = []): ?array { return $this->fetchAny($sql, $values, PDO::FETCH_ASSOC); @@ -239,7 +239,7 @@ class Minz_ModelPdo { /** * @param array<string,int|string|null> $values - * @return array<int|string|null>|null + * @return list<int|string|null>|null */ public function fetchColumn(string $sql, int $column, array $values = []): ?array { return $this->fetchAny($sql, $values, PDO::FETCH_COLUMN, $column); @@ -257,6 +257,6 @@ class Minz_ModelPdo { Minz_Log::error('SQL error ' . json_encode($stm->errorInfo()) . ' during ' . $sql); return null; } - return isset($columns[0]) ? (string)$columns[0] : null; + return is_scalar($columns[0] ?? null) ? (string)$columns[0] : null; } } |