From a80a5f48a16e7d232168a7aaa68e9a1804235ce1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
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/apiController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/Controllers/apiController.php')

diff --git a/app/Controllers/apiController.php b/app/Controllers/apiController.php
index 7568f9831..2d9fad535 100644
--- a/app/Controllers/apiController.php
+++ b/app/Controllers/apiController.php
@@ -13,18 +13,20 @@ class FreshRSS_api_Controller extends FreshRSS_ActionController {
 	 */
 	public static function updatePassword(string $apiPasswordPlain) {
 		$username = Minz_User::name();
-		$userConfig = FreshRSS_Context::$user_conf;
+		if ($username == null) {
+			return _t('feedback.api.password.failed');
+		}
 
 		$apiPasswordHash = FreshRSS_password_Util::hash($apiPasswordPlain);
-		$userConfig->apiPasswordHash = $apiPasswordHash;
+		FreshRSS_Context::userConf()->apiPasswordHash = $apiPasswordHash;
 
 		$feverKey = FreshRSS_fever_Util::updateKey($username, $apiPasswordPlain);
 		if (!$feverKey) {
 			return _t('feedback.api.password.failed');
 		}
 
-		$userConfig->feverKey = $feverKey;
-		if ($userConfig->save()) {
+		FreshRSS_Context::userConf()->feverKey = $feverKey;
+		if (FreshRSS_Context::userConf()->save()) {
 			return false;
 		} else {
 			return _t('feedback.api.password.failed');
-- 
cgit v1.2.3