From a80a5f48a16e7d232168a7aaa68e9a1804235ce1 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 18 Dec 2023 17:59:16 +0100 Subject: Pass PHPStan level 8 (#5946) * Pass PHPStan level 8 And prepare for PHPStan level 9 https://phpstan.org/user-guide/rule-levels * Revert wrong replace in comment * Fix PHPStan level 8 * Update PHPStan and other dev dependencies * Remove obsolete comment * noVariableVariables and towards bleedingEdge https://github.com/phpstan/phpstan-strict-rules https://phpstan.org/blog/what-is-bleeding-edge * More bleedingEdge * A bit more PHPStan level 9 * More PHPStan level 9 * Prepare for booleansInConditions Ignore int and null * Revert wrong line * More fixes * Fix keep_max_n_unread * Stricter attribute functions * Stricter callHooks and more PHPStan level 9 * More typing * A tiny more --- cli/user-info.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cli/user-info.php') diff --git a/cli/user-info.php b/cli/user-info.php index f24f81078..fbf60482a 100755 --- a/cli/user-info.php +++ b/cli/user-info.php @@ -19,8 +19,10 @@ if (!validateOptions($argv, $params)) { if (empty($options['user'])) { $users = listUsers(); } elseif (is_array($options['user'])) { + /** @var array $users */ $users = $options['user']; } else { + /** @var array $users */ $users = array($options['user']); } @@ -67,10 +69,10 @@ foreach ($users as $username) { $feedList = $feedDAO->listFeedsIds(); $data = array( - 'default' => $username === FreshRSS_Context::$system_conf->default_user ? '*' : '', + 'default' => $username === FreshRSS_Context::systemConf()->default_user ? '*' : '', 'user' => $username, - 'admin' => FreshRSS_Context::$user_conf->is_admin ? '*' : '', - 'enabled' => FreshRSS_Context::$user_conf->enabled ? '*' : '', + 'admin' => FreshRSS_Context::userConf()->is_admin ? '*' : '', + 'enabled' => FreshRSS_Context::userConf()->enabled ? '*' : '', 'last_user_activity' => FreshRSS_UserDAO::mtime($username), 'database_size' => $databaseDAO->size(), 'categories' => $catDAO->count(), @@ -79,8 +81,8 @@ foreach ($users as $username) { 'unreads' => (int)$nbEntries['unread'], 'favourites' => (int)$nbFavorites['all'], 'tags' => $tagDAO->count(), - 'lang' => FreshRSS_Context::$user_conf->language, - 'mail_login' => FreshRSS_Context::$user_conf->mail_login, + 'lang' => FreshRSS_Context::userConf()->language, + 'mail_login' => FreshRSS_Context::userConf()->mail_login, ); if (isset($options['h'])) { //Human format $data['last_user_activity'] = date('c', $data['last_user_activity']); -- cgit v1.2.3