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
---
 cli/_cli.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'cli/_cli.php')

diff --git a/cli/_cli.php b/cli/_cli.php
index eb2152082..91fa8de36 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -35,11 +35,12 @@ function cliInitUser(string $username): string {
 		fail('FreshRSS error: user not found: ' . $username . "\n");
 	}
 
-	if (!FreshRSS_Context::initUser($username)) {
+	FreshRSS_Context::initUser($username);
+	if (!FreshRSS_Context::hasUserConf()) {
 		fail('FreshRSS error: invalid configuration for user: ' . $username . "\n");
 	}
 
-	$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
+	$ext_list = FreshRSS_Context::userConf()->extensions_enabled;
 	Minz_ExtensionManager::enableByList($ext_list, 'user');
 
 	return $username;
@@ -80,10 +81,10 @@ function performRequirementCheck(string $databaseType): void {
  */
 function getLongOptions(array $options, string $regex): array {
 	$longOptions = array_filter($options, static function (string $a) use ($regex) {
-		return preg_match($regex, $a);
+		return preg_match($regex, $a) === 1;
 	});
 	return array_map(static function (string $a) use ($regex) {
-		return preg_replace($regex, '', $a);
+		return preg_replace($regex, '', $a) ?? '';
 	}, $longOptions);
 }
 
-- 
cgit v1.2.3