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/layout/aside_configure.phtml |  6 +++---
 app/layout/aside_feed.phtml      | 16 ++++++++--------
 app/layout/header.phtml          | 14 +++++++-------
 app/layout/layout.phtml          | 14 +++++++-------
 app/layout/nav_menu.phtml        | 21 ++++++++++++---------
 app/layout/simple.phtml          |  8 ++++----
 6 files changed, 41 insertions(+), 38 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index b59293f21..729b61f5c 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -48,7 +48,7 @@
 					<a href="<?= _url('index', 'logs') ?>"><?= _t('gen.menu.logs') ?></a>
 				</li>
 				<?php } ?>
-				<?= Minz_ExtensionManager::callHook('menu_configuration_entry') ?>
+				<?= Minz_ExtensionManager::callHookString('menu_configuration_entry') ?>
 			</ul>
 		</li>
 
@@ -68,7 +68,7 @@
 				<li class="item<?= Minz_Request::controllerName() === 'update' && Minz_Request::actionName() === 'checkInstall' ? ' active' : '' ?>">
 					<a href="<?= _url('update', 'checkInstall') ?>"><?= _t('gen.menu.check_install') ?></a>
 				</li>
-				<?php if (!FreshRSS_Context::$system_conf->disable_update) { ?>
+				<?php if (!FreshRSS_Context::systemConf()->disable_update) { ?>
 				<li class="item<?= Minz_Request::controllerName() === 'update' && Minz_Request::actionName() === 'index' ? ' active' : '' ?>">
 					<a href="<?= _url('update', 'index') ?>"><?= _t('gen.menu.update') ?></a>
 				</li>
@@ -76,7 +76,7 @@
 				<li class="item<?= Minz_Request::actionName() === 'logs' ? ' active' : '' ?>">
 					<a href="<?= _url('index', 'logs') ?>"><?= _t('gen.menu.logs') ?></a>
 				</li>
-				<?= Minz_ExtensionManager::callHook('menu_admin_entry') ?>
+				<?= Minz_ExtensionManager::callHookString('menu_admin_entry') ?>
 			</ul>
 		</li>
 		<?php } ?>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 1d491ad79..29b110647 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -3,7 +3,7 @@
 	/** @var FreshRSS_View $this */
 	$actual_view = Minz_Request::actionName();
 	$class = '';
-	if (FreshRSS_Context::$user_conf->hide_read_feeds &&
+	if (FreshRSS_Context::userConf()->hide_read_feeds &&
 			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
 			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
 		$class = ' state_unread';
@@ -54,7 +54,7 @@
 
 		<?php
 			$t_active = FreshRSS_Context::isCurrentGet('T');
-			$t_show = ($t_active && in_array(FreshRSS_Context::$user_conf->display_categories, ['active', 'remember'], true)) || FreshRSS_Context::$user_conf->display_categories === 'all';
+			$t_show = ($t_active && in_array(FreshRSS_Context::userConf()->display_categories, ['active', 'remember'], true)) || FreshRSS_Context::userConf()->display_categories === 'all';
 		?>
 		<li id="tags" class="tree-folder category tags<?= $t_active ? ' active' : '' ?>" data-unread="<?= format_number($this->nbUnreadTags) ?>">
 			<div class="tree-folder-title">
@@ -85,11 +85,11 @@
 
 			foreach ($this->categories as $cat):
 				$feeds = $cat->feeds();
-				$position = $cat->attributes('position');
+				$position = $cat->attributeInt('position');
 				if (!empty($feeds)) {
 					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
-					$c_show = ($c_active && in_array(FreshRSS_Context::$user_conf->display_categories, ['active', 'remember'], true))
-						|| FreshRSS_Context::$user_conf->display_categories === 'all';
+					$c_show = ($c_active && in_array(FreshRSS_Context::userConf()->display_categories, ['active', 'remember'], true))
+						|| FreshRSS_Context::userConf()->display_categories === 'all';
 		?>
 		<li id="c_<?= $cat->id() ?>" class="tree-folder category<?= $c_active ? ' active' : '' ?>"<?=
 			null === $position ? '' : " data-position='$position'" ?> data-unread="<?= $cat->nbNotRead() ?>">
@@ -124,11 +124,11 @@
 ?>
 <li id="f_<?= $feed->id() ?>" class="item feed<?= $f_active_class, $mute_class, $error_class, $empty_class ?>" title="<?= $error_title, $empty_title ?>"
 		data-unread="<?= $feed->nbNotRead() ?>" data-priority="<?= $feed->priority() ?>"><?php
-		if ($f_active || $nbFeedsTotal < FreshRSS_Context::$user_conf->simplify_over_n_feeds):
+		if ($f_active || $nbFeedsTotal < FreshRSS_Context::userConf()->simplify_over_n_feeds):
 	?><div class="dropdown no-mobile">
 		<div class="dropdown-target"></div><a class="dropdown-toggle" data-fweb="<?= $feed->website() ?>"><?= _i('configure') ?></a><?php /* feed_config_template */ ?>
 	</div><?php
-			if (FreshRSS_Context::$user_conf->show_favicons) { ?><img class="favicon test" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php }
+			if (FreshRSS_Context::userConf()->show_favicons) { ?><img class="favicon test" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php }
 		endif;
 	?><a class="item-title" data-unread="<?= format_number($feed->nbNotRead()) ?>" href="<?=
 		_url('index', $actual_view, 'get', 'f_' . $feed->id()) . $state_filter_manual ?>"><?= $feed->name() ?></a></li>
@@ -179,7 +179,7 @@
 		<li class="item"><a class="configure open-slider" href="<?= $url ?>"><?= _t('gen.action.manage') ?></a></li>
 		<li class="item"><a href="<?= _url('feed', 'actualize', 'id', '------') ?>"><?= _t('gen.action.actualize') ?></a></li>
 		<li class="item">
-			<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
+			<?php $confirm = FreshRSS_Context::userConf()->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
 			<button class="read_all as-link <?= $confirm ?>"
 				form="mark-read-aside"
 				formaction="<?= _url('entry', 'read', 'get', 'f_------') ?>"
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index e5722abb6..18e67fd2d 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -4,18 +4,18 @@
 <header class="header">
 	<div class="item title">
 		<a href="<?= _url('index', 'index') ?>">
-			<?php if (FreshRSS_Context::$system_conf->logo_html == '') { ?>
+			<?php if (FreshRSS_Context::systemConf()->logo_html == '') { ?>
 				<img class="logo" src="<?= _i('FreshRSS-logo', FreshRSS_Themes::ICON_URL) ?>" alt="FreshRSS" loading="lazy" />
 			<?php
 				} else {
-					echo FreshRSS_Context::$system_conf->logo_html;
+					echo FreshRSS_Context::systemConf()->logo_html;
 				}
 			?>
 		</a>
 	</div>
 
 	<div class="item search">
-		<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
+		<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::systemConf()->allow_anonymous) { ?>
 		<form action="<?= _url('index', 'index') ?>" method="get">
 			<div class="stick">
 				<input type="search" name="search" id="search"
@@ -81,7 +81,7 @@
 						<li class="item"><a href="<?= _url('configure', 'shortcut') ?>"><?= _t('gen.menu.shortcuts') ?></a></li>
 						<li class="item"><a href="<?= _url('configure', 'queries') ?>"><?= _t('gen.menu.queries') ?></a></li>
 						<li class="item"><a href="<?= _url('extension', 'index') ?>"><?= _t('gen.menu.extensions') ?></a></li>
-						<?= Minz_ExtensionManager::callHook('menu_configuration_entry') ?>
+						<?= Minz_ExtensionManager::callHookString('menu_configuration_entry') ?>
 					</ul>
 				</li>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
@@ -94,10 +94,10 @@
 						<li class="item"><a href="<?= _url('user', 'manage') ?>"><?= _t('gen.menu.user_management') ?></a></li>
 						<li class="item"><a href="<?= _url('auth', 'index') ?>"><?= _t('gen.menu.authentication') ?></a></li>
 						<li class="item"><a href="<?= _url('update', 'checkInstall') ?>"><?= _t('gen.menu.check_install') ?></a></li>
-						<?php if (!FreshRSS_Context::$system_conf->disable_update) { ?>
+						<?php if (!FreshRSS_Context::systemConf()->disable_update) { ?>
 						<li class="item"><a href="<?= _url('update', 'index') ?>"><?= _t('gen.menu.update') ?></a></li>
 						<?php } ?>
-						<?= Minz_ExtensionManager::callHook('menu_admin_entry') ?>
+						<?= Minz_ExtensionManager::callHookString('menu_admin_entry') ?>
 					</ul>
 				</li>
 				<?php } ?>
@@ -111,7 +111,7 @@
 								<a href="<?= _url('index', 'tos') ?>"><?= _t('index.tos.title')?></a>
 							</li>
 						<?php } ?>
-						<?= Minz_ExtensionManager::callHook('menu_other_entry') ?>
+						<?= Minz_ExtensionManager::callHookString('menu_other_entry') ?>
 					</ul>
 				</li>
 			</ul>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 49cf85a02..adbd52327 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -4,13 +4,13 @@
 	FreshRSS::preLayout();
 ?>
 <!DOCTYPE html>
-<html lang="<?= FreshRSS_Context::$user_conf->language ?>" xml:lang="<?= FreshRSS_Context::$user_conf->language ?>"<?php
+<html lang="<?= FreshRSS_Context::userConf()->language ?>" xml:lang="<?= FreshRSS_Context::userConf()->language ?>"<?php
 $class = '';
 if (_t('gen.dir') === 'rtl') {
 	echo ' dir="rtl"';
 	$class = 'rtl ';
 }
-?> class="<?= $class ?><?= (FreshRSS_Context::$user_conf->darkMode === 'no') ? '' : 'darkMode_' . FreshRSS_Context::$user_conf->darkMode ?>">
+?> class="<?= $class ?><?= (FreshRSS_Context::userConf()->darkMode === 'no') ? '' : 'darkMode_' . FreshRSS_Context::userConf()->darkMode ?>">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
@@ -26,10 +26,10 @@ if (_t('gen.dir') === 'rtl') {
 		<link rel="apple-touch-icon" href="<?= Minz_Url::display('/themes/icons/apple-touch-icon.png') ?>" />
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
-		<meta name="apple-mobile-web-app-title" content="<?= FreshRSS_Context::$system_conf->title ?>">
+		<meta name="apple-mobile-web-app-title" content="<?= FreshRSS_Context::systemConf()->title ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
 		<meta name="theme-color" content="#FFF" />
-<?php if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
+<?php if (!FreshRSS_Context::systemConf()->allow_referrer) { ?>
 		<meta name="referrer" content="never" />
 <?php } ?>
 		<?= FreshRSS_View::headTitle() ?>
@@ -39,8 +39,8 @@ if (_t('gen.dir') === 'rtl') {
 		$url_rss = $url_base;
 		$url_rss['a'] = 'rss';
 		unset($url_rss['params']['rid']);
-		if (FreshRSS_Context::$user_conf->since_hours_posts_per_rss) {
-			$url_rss['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
+		if (FreshRSS_Context::userConf()->since_hours_posts_per_rss) {
+			$url_rss['params']['hours'] = FreshRSS_Context::userConf()->since_hours_posts_per_rss;
 		}
 ?>
 		<link rel="alternate" type="application/rss+xml" title="<?= $this->rss_title ?>" href="<?= Minz_Url::display($url_rss) ?>" />
@@ -50,7 +50,7 @@ if (_t('gen.dir') === 'rtl') {
 		unset($opml_rss['params']['rid']);
 ?>
 		<link rel="outline" type="text/x-opml" title="OPML" href="<?= Minz_Url::display($opml_rss) ?>" />
-<?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
+<?php } if (FreshRSS_Context::systemConf()->allow_robots) { ?>
 		<meta name="description" content="<?= htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8') ?>" />
 <?php } else { ?>
 		<meta name="robots" content="noindex,nofollow" />
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 72838094f..3d0027f17 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -84,7 +84,7 @@
 					<a href="<?= _url('configure', 'queries') ?>"><?= _i('configure') ?></a>
 				</li>
 
-				<?php foreach (FreshRSS_Context::$user_conf->queries as $raw_query): ?>
+				<?php foreach (FreshRSS_Context::userConf()->queries as $raw_query): ?>
 					<li class="item query">
 						<?php if (!empty($raw_query['url'])): ?>
 							<a href="<?= $raw_query['url'] ?>"><?= $raw_query['name'] ?? $raw_query['url'] ?></a>
@@ -97,7 +97,7 @@
 
 				<?php
 					$classSeparator = '';
-					if (count(FreshRSS_Context::$user_conf->queries) > 0) {
+					if (count(FreshRSS_Context::userConf()->queries) > 0) {
 						$classSeparator = ' separator';
 					}
 
@@ -140,7 +140,7 @@
 
 	<div class="group stick" id="nav_menu_read_all">
 		<form id="mark-read-menu" method="post">
-		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
+		<?php $confirm = FreshRSS_Context::userConf()->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
 		<button class="read_all btn <?= $confirm ?>"
 			form="mark-read-menu"
 			formaction="<?= Minz_Url::display($mark_read_url) ?>"
@@ -196,6 +196,9 @@
 		<?php
 		$readingModes = FreshRSS_ReadingMode::getReadingModes();
 		$readingModes = Minz_ExtensionManager::callHook('nav_reading_modes', $readingModes);
+		if (!is_iterable($readingModes)) {
+			$readingModes = FreshRSS_ReadingMode::getReadingModes();
+		}
 
 		/** @var FreshRSS_ReadingMode $mode */
 		foreach ($readingModes as $mode) {
@@ -210,12 +213,12 @@
 
 		<?php
 			$url_output['a'] = 'rss';
-			if (FreshRSS_Context::$user_conf->token) {
+			if (FreshRSS_Context::userConf()->token) {
 				$url_output['params']['user'] = Minz_User::name();
-				$url_output['params']['token'] = FreshRSS_Context::$user_conf->token;
+				$url_output['params']['token'] = FreshRSS_Context::userConf()->token;
 			}
-			if (FreshRSS_Context::$user_conf->since_hours_posts_per_rss) {
-				$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
+			if (FreshRSS_Context::userConf()->since_hours_posts_per_rss) {
+				$url_output['params']['hours'] = FreshRSS_Context::userConf()->since_hours_posts_per_rss;
 			}
 		?>
 		<a class="view-rss btn" target="_blank" rel="noreferrer" title="<?= _t('index.menu.rss_view') ?>" href="<?= Minz_Url::display($url_output) ?>">
@@ -223,7 +226,7 @@
 		</a>
 	</div>
 
-	<?php $nav_menu_hooks = Minz_ExtensionManager::callHook('nav_menu'); ?>
+	<?php $nav_menu_hooks = Minz_ExtensionManager::callHookString('nav_menu'); ?>
 	<?php if ($nav_menu_hooks != '') { ?>
 	<div class="group" id="nav_menu_hooks">
 		<?= $nav_menu_hooks ?>
@@ -249,7 +252,7 @@
 		</a>
 	</div>
 
-	<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous_refresh) { ?>
+	<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::systemConf()->allow_anonymous_refresh) { ?>
 		<div class="group">
 			<a id="actualize" class="btn" href="<?= _url('feed', 'actualize') ?>" title="<?= _t('gen.action.actualize') ?>"><?= _i('refresh') ?></a>
 		</div>
diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml
index b9f74cf59..f2e6bbd25 100644
--- a/app/layout/simple.phtml
+++ b/app/layout/simple.phtml
@@ -4,7 +4,7 @@
 	FreshRSS::preLayout();
 ?>
 <!DOCTYPE html>
-<html lang="<?= FreshRSS_Context::$user_conf->language ?>" xml:lang="<?= FreshRSS_Context::$user_conf->language ?>">
+<html lang="<?= FreshRSS_Context::userConf()->language ?>" xml:lang="<?= FreshRSS_Context::userConf()->language ?>">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="initial-scale=1.0" />
@@ -18,7 +18,7 @@
 		<link rel="apple-touch-icon" href="<?= Minz_Url::display('/themes/icons/apple-touch-icon.png') ?>" />
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="black" />
-		<meta name="apple-mobile-web-app-title" content="<?= FreshRSS_Context::$system_conf->title ?>">
+		<meta name="apple-mobile-web-app-title" content="<?= FreshRSS_Context::systemConf()->title ?>">
 		<meta name="msapplication-TileColor" content="#FFF" />
 		<meta name="referrer" content="never" />
 		<meta name="robots" content="noindex,nofollow" />
@@ -31,11 +31,11 @@
 	<div class="header">
 		<div class="item title">
 			<a href="<?= _url('index', 'index') ?>">
-				<?php if (FreshRSS_Context::$system_conf->logo_html == '') { ?>
+				<?php if (FreshRSS_Context::systemConf()->logo_html == '') { ?>
 					<img class="logo" src="<?= _i('FreshRSS-logo', FreshRSS_Themes::ICON_URL) ?>" alt="FreshRSS" loading="lazy" />
 				<?php
 					} else {
-						echo FreshRSS_Context::$system_conf->logo_html;
+						echo FreshRSS_Context::systemConf()->logo_html;
 					}
 				?>
 			</a>
-- 
cgit v1.2.3