diff options
| author | Simon Rettberg | 2023-11-14 14:47:55 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-11-14 14:47:55 +0100 |
| commit | 06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0 (patch) | |
| tree | 7e5493b102074672d8cfd8fe1a61e49f080edbe8 /inc/database.inc.php | |
| parent | Update phpstorm config (diff) | |
| download | slx-admin-06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0.tar.gz slx-admin-06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0.tar.xz slx-admin-06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0.zip | |
Add function param/return types, fix a lot more phpstorm complaints
Diffstat (limited to 'inc/database.inc.php')
| -rw-r--r-- | inc/database.inc.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/inc/database.inc.php b/inc/database.inc.php index 0c8f40ae..7805b508 100644 --- a/inc/database.inc.php +++ b/inc/database.inc.php @@ -12,8 +12,10 @@ class Database */ private static $dbh = false; - private static $returnErrors; - private static $lastError = false; + /** @var bool */ + private static $returnErrors = false; + /** @var ?string */ + private static $lastError = null; private static $explainList = array(); private static $queryCount = 0; /** @var float */ @@ -165,9 +167,9 @@ class Database } /** - * @return string|false return last error returned by query + * @return ?string return last error returned by query */ - public static function lastError() + public static function lastError(): ?string { return self::$lastError; } @@ -183,7 +185,7 @@ class Database public static function simpleQuery(string $query, array $args = [], bool $ignoreError = null) { self::init(); - if (CONFIG_DEBUG && !isset(self::$explainList[$query]) && preg_match('/^\s*SELECT/is', $query)) { + if (CONFIG_DEBUG && !isset(self::$explainList[$query]) && preg_match('/^\s*SELECT/i', $query)) { self::$explainList[$query] = [$args]; } // Support passing nested arrays for IN statements, automagically refactor @@ -225,7 +227,6 @@ class Database return false; ErrorHandler::traceError("Database Error: \n" . self::$lastError); } - return false; } public static function examineLoggedQueries() |