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 --- app/Controllers/extensionController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/Controllers/extensionController.php') diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php index 0158b2f76..9cfc6ff68 100644 --- a/app/Controllers/extensionController.php +++ b/app/Controllers/extensionController.php @@ -54,7 +54,7 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController { // fetch the list as an array /** @var array $list*/ $list = json_decode($json, true); - if (empty($list)) { + if (empty($list) || !is_array($list)) { Minz_Log::warning('Failed to convert extension file list'); return []; } @@ -136,9 +136,9 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController { $conf = null; if ($type === 'system') { - $conf = FreshRSS_Context::$system_conf; + $conf = FreshRSS_Context::systemConf(); } elseif ($type === 'user') { - $conf = FreshRSS_Context::$user_conf; + $conf = FreshRSS_Context::userConf(); } $res = $ext->install(); @@ -198,9 +198,9 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController { $conf = null; if ($type === 'system') { - $conf = FreshRSS_Context::$system_conf; + $conf = FreshRSS_Context::systemConf(); } elseif ($type === 'user') { - $conf = FreshRSS_Context::$user_conf; + $conf = FreshRSS_Context::userConf(); } $res = $ext->uninstall(); -- cgit v1.2.3