mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-02-25 11:06:22 -05:00
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
This commit is contained in:
committed by
GitHub
parent
6bb45a8726
commit
a80a5f48a1
@@ -21,10 +21,10 @@ class FreshRSS_javascript_Controller extends FreshRSS_ActionController {
|
||||
Minz_Session::_param('actualize_feeds', false);
|
||||
|
||||
$catDAO = FreshRSS_Factory::createCategoryDao();
|
||||
$this->view->categories = $catDAO->listCategoriesOrderUpdate(FreshRSS_Context::$user_conf->dynamic_opml_ttl_default);
|
||||
$this->view->categories = $catDAO->listCategoriesOrderUpdate(FreshRSS_Context::userConf()->dynamic_opml_ttl_default);
|
||||
|
||||
$feedDAO = FreshRSS_Factory::createFeedDao();
|
||||
$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
|
||||
$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::userConf()->ttl_default);
|
||||
}
|
||||
|
||||
public function nbUnreadsPerFeedAction(): void {
|
||||
@@ -48,10 +48,11 @@ class FreshRSS_javascript_Controller extends FreshRSS_ActionController {
|
||||
header('Pragma: no-cache');
|
||||
|
||||
$user = $_GET['user'] ?? '';
|
||||
if (FreshRSS_Context::initUser($user)) {
|
||||
FreshRSS_Context::initUser($user);
|
||||
if (!FreshRSS_Context::hasUserConf()) {
|
||||
try {
|
||||
$salt = FreshRSS_Context::$system_conf->salt;
|
||||
$s = FreshRSS_Context::$user_conf->passwordHash;
|
||||
$salt = FreshRSS_Context::systemConf()->salt;
|
||||
$s = FreshRSS_Context::userConf()->passwordHash;
|
||||
if (strlen($s) >= 60) {
|
||||
//CRYPT_BLOWFISH Salt: "$2a$", a two digit cost parameter, "$", and 22 characters from the alphabet "./0-9A-Za-z".
|
||||
$this->view->salt1 = substr($s, 0, 29);
|
||||
|
||||
Reference in New Issue
Block a user