diff --git a/src/Mysql/MysqlStorage.php b/src/Mysql/MysqlStorage.php index 5391bbc..5e8920d 100644 --- a/src/Mysql/MysqlStorage.php +++ b/src/Mysql/MysqlStorage.php @@ -115,7 +115,7 @@ class MysqlStorage implements MysqlStorageInterface { /** @inheritDoc */ - public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): bool|MysqlResultData { + public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): ?MysqlResultData { if ($ln > 1) { $cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows; @@ -128,7 +128,7 @@ class MysqlStorage implements MysqlStorageInterface { } $result = $this->query($sql.$limit); - if (!$result || $result->num_rows == 0) return false; + if (!$result || $result->num_rows == 0) return null; $data = new MysqlResultData($result); $data->count = $cnts ?? 0; @@ -137,17 +137,17 @@ class MysqlStorage implements MysqlStorageInterface { } /** @inheritDoc */ - public function findOne(string $sql) : bool|MysqlResultData { + public function findOne(string $sql) : ?MysqlResultData { $result = $this->query($sql." limit 0, 1"); - if (!$result || $result->num_rows == 0) return false; + if (!$result || $result->num_rows == 0) return null; return new MysqlResultData($result); } /** @inheritDoc */ - public function findById(string $table, mixed $id, string $name = 'id') : bool|array { + public function findById(string $table, mixed $id, string $name = 'id') : ?array { $id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id); $result = $this->query("select * from ".$this->escapeStr($table)." where `$name`='$id' limit 0, 1"); - if (!$result || $result->num_rows == 0) return false; + if (!$result || $result->num_rows == 0) return null; $data = new MysqlResultData($result); return $data->fetchOne(); } diff --git a/src/Mysql/MysqlStorageInterface.php b/src/Mysql/MysqlStorageInterface.php index 23f08a9..3c7fc36 100644 --- a/src/Mysql/MysqlStorageInterface.php +++ b/src/Mysql/MysqlStorageInterface.php @@ -82,13 +82,13 @@ interface MysqlStorageInterface { * @param int $count * @return bool|MysqlResultData */ - public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : bool|MysqlResultData; + public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : ?MysqlResultData; /** * @param string $sql * @return bool|array */ - public function findOne(string $sql) : bool|MysqlResultData; + public function findOne(string $sql) : ?MysqlResultData; /** * @param string $table @@ -96,7 +96,7 @@ interface MysqlStorageInterface { * @param string $name * @return bool|array */ - public function findById(string $table, mixed $id, string $name = 'id') : bool|array; + public function findById(string $table, mixed $id, string $name = 'id') : ?array; /** * Метод экранирования данных с учетом текущего подключения в т.ч для LIKE