valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address PHPStan warnings in 'classes/prefs.php'.

This commit is contained in:
wn_ 2021-11-11 16:47:51 +00:00
parent bf2bb875ab
commit eb068fbc47
1 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
classes/prefs.php
View File

@ -141,7 +141,10 @@ class Prefs {
Prefs::_PREFS_MIGRATED Prefs::_PREFS_MIGRATED
]; ];
/** @var Prefs|null */
private static $instance; private static $instance;
/** @var array<string, bool|int|string> */
private $cache = []; private $cache = [];
/** @var PDO */ /** @var PDO */
@ -154,10 +157,13 @@ class Prefs {
return self::$instance; return self::$instance;
} }
static function is_valid(string $pref_name) { static function is_valid(string $pref_name): bool {
return isset(self::_DEFAULTS[$pref_name]); return isset(self::_DEFAULTS[$pref_name]);
} }
/**
* @return bool|int|null|string
*/
static function get_default(string $pref_name) { static function get_default(string $pref_name) {
if (self::is_valid($pref_name)) if (self::is_valid($pref_name))
return self::_DEFAULTS[$pref_name][0]; return self::_DEFAULTS[$pref_name][0];
@ -181,10 +187,16 @@ class Prefs {
// //
} }
/**
* @return array<int, array<string, bool|int|null|string>>
*/
static function get_all(int $owner_uid, int $profile_id = null) { static function get_all(int $owner_uid, int $profile_id = null) {
return self::get_instance()->_get_all($owner_uid, $profile_id); return self::get_instance()->_get_all($owner_uid, $profile_id);
} }
/**
* @return array<int, array<string, bool|int|null|string>>
*/
private function _get_all(int $owner_uid, int $profile_id = null) { private function _get_all(int $owner_uid, int $profile_id = null) {
$rv = []; $rv = [];
@ -205,7 +217,7 @@ class Prefs {
return $rv; return $rv;
} }
private function cache_all(int $owner_uid, $profile_id = null) { private function cache_all(int $owner_uid, ?int $profile_id): void {
if (!$profile_id) $profile_id = null; if (!$profile_id) $profile_id = null;
// fill cache with defaults // fill cache with defaults
@ -232,11 +244,17 @@ class Prefs {
} }
} }
static function get(string $pref_name, int $owner_uid, int $profile_id = null) { /**
* @return bool|int|null|string
*/
static function get(string $pref_name, int $owner_uid, ?int $profile_id) {
return self::get_instance()->_get($pref_name, $owner_uid, $profile_id); return self::get_instance()->_get($pref_name, $owner_uid, $profile_id);
} }
private function _get(string $pref_name, int $owner_uid, int $profile_id = null) { /**
* @return bool|int|null|string
*/
private function _get(string $pref_name, int $owner_uid, ?int $profile_id) {
if (isset(self::_DEFAULTS[$pref_name])) { if (isset(self::_DEFAULTS[$pref_name])) {
if (!$profile_id || in_array($pref_name, self::_PROFILE_BLACKLIST)) $profile_id = null; if (!$profile_id || in_array($pref_name, self::_PROFILE_BLACKLIST)) $profile_id = null;
@ -274,12 +292,15 @@ class Prefs {
return null; return null;
} }
private function _is_cached(string $pref_name, int $owner_uid, int $profile_id = null) { private function _is_cached(string $pref_name, int $owner_uid, ?int $profile_id): bool {
$cache_key = sprintf("%d/%d/%s", $owner_uid, $profile_id, $pref_name); $cache_key = sprintf("%d/%d/%s", $owner_uid, $profile_id, $pref_name);
return isset($this->cache[$cache_key]); return isset($this->cache[$cache_key]);
} }
private function _get_cache(string $pref_name, int $owner_uid, int $profile_id = null) { /**
* @return bool|int|null|string
*/
private function _get_cache(string $pref_name, int $owner_uid, ?int $profile_id) {
$cache_key = sprintf("%d/%d/%s", $owner_uid, $profile_id, $pref_name); $cache_key = sprintf("%d/%d/%s", $owner_uid, $profile_id, $pref_name);
if (isset($this->cache[$cache_key])) if (isset($this->cache[$cache_key]))
@ -288,17 +309,23 @@ class Prefs {
return null; return null;
} }
private function _set_cache(string $pref_name, $value, int $owner_uid, int $profile_id = null) { /**
* @param bool|int|string $value
*/
private function _set_cache(string $pref_name, $value, int $owner_uid, ?int $profile_id): void {
$cache_key = sprintf("%d/%d/%s", $owner_uid, $profile_id, $pref_name); $cache_key = sprintf("%d/%d/%s", $owner_uid, $profile_id, $pref_name);
$this->cache[$cache_key] = $value; $this->cache[$cache_key] = $value;
} }
static function set(string $pref_name, $value, int $owner_uid, int $profile_id = null, bool $strip_tags = true) { /**
* @param bool|int|string $value
*/
static function set(string $pref_name, $value, int $owner_uid, ?int $profile_id, bool $strip_tags = true): bool {
return self::get_instance()->_set($pref_name, $value, $owner_uid, $profile_id); return self::get_instance()->_set($pref_name, $value, $owner_uid, $profile_id);
} }
private function _delete(string $pref_name, int $owner_uid, int $profile_id = null) { private function _delete(string $pref_name, int $owner_uid, ?int $profile_id): bool {
$sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs2 $sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs2
WHERE pref_name = :name AND owner_uid = :uid AND WHERE pref_name = :name AND owner_uid = :uid AND
(profile = :profile OR (:profile IS NULL AND profile IS NULL))"); (profile = :profile OR (:profile IS NULL AND profile IS NULL))");
@ -306,7 +333,10 @@ class Prefs {
return $sth->execute(["uid" => $owner_uid, "profile" => $profile_id, "name" => $pref_name ]); return $sth->execute(["uid" => $owner_uid, "profile" => $profile_id, "name" => $pref_name ]);
} }
private function _set(string $pref_name, $value, int $owner_uid, int $profile_id = null, bool $strip_tags = true) { /**
* @param bool|int|string $value
*/
private function _set(string $pref_name, $value, int $owner_uid, ?int $profile_id, bool $strip_tags = true): bool {
if (!$profile_id) $profile_id = null; if (!$profile_id) $profile_id = null;
if ($profile_id && in_array($pref_name, self::_PROFILE_BLACKLIST)) if ($profile_id && in_array($pref_name, self::_PROFILE_BLACKLIST))
@ -359,7 +389,7 @@ class Prefs {
return false; return false;
} }
function migrate(int $owner_uid, int $profile_id = null) { function migrate(int $owner_uid, ?int $profile_id): void {
if (get_schema_version() < 141) if (get_schema_version() < 141)
return; return;
@ -401,7 +431,7 @@ class Prefs {
} }
} }
static function reset(int $owner_uid, int $profile_id = null) { static function reset(int $owner_uid, ?int $profile_id): void {
if (!$profile_id) $profile_id = null; if (!$profile_id) $profile_id = null;
$sth = Db::pdo()->prepare("DELETE FROM ttrss_user_prefs2 $sth = Db::pdo()->prepare("DELETE FROM ttrss_user_prefs2