From 3830c97ac296f9b0cab0e05223b14300dbb53ec3 Mon Sep 17 00:00:00 2001
From: Ivor Barhansky <me@lopar.space>
Date: Fri, 26 Apr 2024 16:08:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=B2=D0=BE=D0=B7=D0=B2?=
 =?UTF-8?q?=D1=80=D0=B0=D1=82=D1=8B=20false=20=D0=B8=D0=B7=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B9=20=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _incl_data/class/Core/Db.php | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/_incl_data/class/Core/Db.php b/_incl_data/class/Core/Db.php
index 813a20bc..6413b42d 100644
--- a/_incl_data/class/Core/Db.php
+++ b/_incl_data/class/Core/Db.php
@@ -53,11 +53,15 @@ class Db
     /**
      * @param string $query
      * @param array $args
-     * @return false|array
+     * @return array
      */
-    public static function getRows(string $query, array $args = []): false|array
+    public static function getRows(string $query, array $args = []): array
     {
-        return self::run($query, $args)->fetchAll();
+        $stmt = self::run($query, $args)->fetchAll();
+        if (!$stmt) {
+            return [];
+        }
+        return $stmt;
     }
 
     /**
@@ -108,19 +112,23 @@ class Db
     {
         $result = self::getRow($query, $args);
         if (!empty($result)) {
-            $result = array_shift($result);
+            return array_shift($result);
         }
-        return $result;
+        return '';
     }
 
     /**
      * @param string $query
      * @param array $args
-     * @return mixed
+     * @return array
      */
-    public static function getRow(string $query, array $args = []): mixed
+    public static function getRow(string $query, array $args = []): array
     {
-        return self::run($query, $args)->fetch();
+        $stmt = self::run($query, $args)->fetch();
+        if (!$stmt) {
+            return [];
+        }
+        return $stmt;
     }
 
     /**
@@ -130,7 +138,11 @@ class Db
      */
     public static function getColumn(string $query, array $args = []): array
     {
-        return self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN);
+        $stmt = self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN);
+        if (!$stmt) {
+            return [];
+        }
+        return $stmt;
     }
 
     /**