diff options
| author | wn <4-wn@users.noreply.gitlab.tt-rss.org> | 2025-04-30 16:34:52 +0000 |
|---|---|---|
| committer | wn <4-wn@users.noreply.gitlab.tt-rss.org> | 2025-04-30 16:34:52 +0000 |
| commit | 4ae17d0f1c956bfe392653ab847eb2e3da6f7bfc (patch) | |
| tree | bfecf40fe1a3e7d86d71e367e05d85b4e9e8bf00 /classes | |
| parent | 4cb8a84df46d46bc325b6638defbdc4dc34151ed (diff) | |
| parent | f097c5ed97671f66be71e52c13917c23528ba308 (diff) | |
Merge branch 'feature/phpstan-updates' into 'master'
PHPStan update and addressing findings
See merge request tt-rss/tt-rss!122
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/PluginHost.php | 3 | ||||
| -rw-r--r-- | classes/UrlHelper.php | 1 | ||||
| -rw-r--r-- | classes/UserHelper.php | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/classes/PluginHost.php b/classes/PluginHost.php index 5f1d97f53..ec47e6249 100644 --- a/classes/PluginHost.php +++ b/classes/PluginHost.php @@ -143,9 +143,6 @@ class PluginHost { /** @see Plugin::hook_format_article() */ const HOOK_FORMAT_ARTICLE = "hook_format_article"; - /** @see Plugin::hook_format_article_cdm() */ - const HOOK_FORMAT_ARTICLE_CDM = "hook_format_article_cdm"; - /** @see Plugin::hook_feed_basic_info() */ const HOOK_FEED_BASIC_INFO = "hook_feed_basic_info"; diff --git a/classes/UrlHelper.php b/classes/UrlHelper.php index ad01266ee..d31dcaa3c 100644 --- a/classes/UrlHelper.php +++ b/classes/UrlHelper.php @@ -432,6 +432,7 @@ class UrlHelper { return false; } + // @phpstan-ignore argument.type (prior validation ensures the host value exists) self::$fetch_effective_ip_addr = gethostbyname(parse_url(self::$fetch_effective_url, PHP_URL_HOST)); if (!self::$fetch_effective_ip_addr || str_starts_with(self::$fetch_effective_ip_addr, '127.')) { diff --git a/classes/UserHelper.php b/classes/UserHelper.php index c0540258f..15063c33f 100644 --- a/classes/UserHelper.php +++ b/classes/UserHelper.php @@ -181,10 +181,8 @@ class UserHelper { $_SESSION["last_login_update"] = time(); } - if ($_SESSION["uid"]) { - startup_gettext(); - self::load_user_plugins($_SESSION["uid"]); - } + startup_gettext(); + self::load_user_plugins($_SESSION["uid"]); } } |