From 540805ae35c10a796e8536d076a55c1ee9b280cf Mon Sep 17 00:00:00 2001 From: "origami11@yandex.ru" Date: Wed, 5 Nov 2025 11:01:56 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=90=D0=BD=D0=BD=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BA=20=D1=82=D0=B8=D0=BF=D0=B0=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Database.php | 13 ++++++++----- src/Database/Statement.php | 2 +- src/Tools/TemplateImage.php | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/Database.php b/src/Database.php index 94fb840..8d7807d 100644 --- a/src/Database.php +++ b/src/Database.php @@ -1,8 +1,8 @@ setAttribute(PDO::ATTR_STATEMENT_CLASS, [PDOStatement::class, []]); } - function prepare(string $sql, array $options = []): PDOStatement|false + /** + * prepare возвращает только PDOStatement т.к установлен PDO::ERRMODE_EXCEPTION + */ + function prepare(string $sql, array $options = []): PDOStatement { - /** @var PDOStatement $result */ + /** @var PDOStatement */ $result = parent::prepare($sql, $options); return $result; } @@ -106,7 +109,7 @@ namespace ctiso { * @param string $query - запрос * @param ?array $values - значения */ - public function executeQuery($query, $values = null): PDOStatement|bool + public function executeQuery($query, $values = null): PDOStatement { $stmt = $this->prepare($query); diff --git a/src/Database/Statement.php b/src/Database/Statement.php index 90b6619..e270822 100644 --- a/src/Database/Statement.php +++ b/src/Database/Statement.php @@ -71,7 +71,7 @@ class Statement } /** - * @return ?PDOStatement + * @return PDOStatement */ function executeQuery() { if ($this->limit) { diff --git a/src/Tools/TemplateImage.php b/src/Tools/TemplateImage.php index 01f3f99..66d5460 100644 --- a/src/Tools/TemplateImage.php +++ b/src/Tools/TemplateImage.php @@ -129,6 +129,21 @@ class TemplateImage return ""; } + /** + * @param string $text + * @param object{ + * fontFamily: string, + * fontSize: int, + * fontStyle: array{string, string}, + * color: string, + * align: array, + * valign: array, + * left: int, + * top: int, + * width: int, + * height: int + * } $value + */ function imageText(string $text, object $value): void { $text = strtr($text, $this->context);