aboutsummaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-12-27 12:12:49 +0100
committerGravatar GitHub <noreply@github.com> 2024-12-27 12:12:49 +0100
commitb1d24fbdb7d1cc948c946295035dad6df550fb7e (patch)
tree7b4365a04097a779659474fbb9281a9661512522 /app/views
parent897e4a3f4a273d50c28157edb67612b2d7fa2e6f (diff)
PHPStan 2.0 (#7131)
* PHPStan 2.0 fix https://github.com/FreshRSS/FreshRSS/issues/6989 https://github.com/phpstan/phpstan/releases/tag/2.0.0 https://github.com/phpstan/phpstan/blob/2.0.x/UPGRADING.md * More * More * Done * fix i18n CLI * Restore a PHPStan Next test For work towards PHPStan Level 10 * 4 more on Level 10 * fix getTagsForEntry * API at Level 10 * More Level 10 * Finish Minz at Level 10 * Finish CLI at Level 10 * Finish Controllers at Level 10 * More Level 10 * More * Pass bleedingEdge * Clean PHPStan options and add TODOs * Level 10 for main config * More * Consitency array vs. list * Sanitize themes get_infos * Simplify TagDAO->getTagsForEntries() * Finish reportAnyTypeWideningInVarTag * Prepare checkBenevolentUnionTypes and checkImplicitMixed * Fixes * Refix * Another fix * Casing of __METHOD__ constant
Diffstat (limited to 'app/views')
-rw-r--r--app/views/entry/bookmark.phtml2
-rw-r--r--app/views/helpers/category/update.phtml2
-rw-r--r--app/views/helpers/export/opml.phtml6
-rw-r--r--app/views/helpers/feed/update.phtml2
-rw-r--r--app/views/helpers/logs_pagination.phtml2
-rw-r--r--app/views/index/global.phtml2
-rw-r--r--app/views/index/logs.phtml6
-rw-r--r--app/views/stats/index.phtml2
8 files changed, 13 insertions, 11 deletions
diff --git a/app/views/entry/bookmark.phtml b/app/views/entry/bookmark.phtml
index 81647352c..a124df673 100644
--- a/app/views/entry/bookmark.phtml
+++ b/app/views/entry/bookmark.phtml
@@ -7,7 +7,7 @@ header('Content-Type: application/json; charset=UTF-8');
$url = [
'c' => Minz_Request::controllerName(),
'a' => Minz_Request::actionName(),
- 'params' => $_GET,
+ 'params' => array_filter($_GET, 'is_string', ARRAY_FILTER_USE_KEY),
];
$url['params']['is_favorite'] = (Minz_Request::paramTernary('is_favorite') ?? true) ? '0' : '1';
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index 8d97a6eec..5b81b6737 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -116,7 +116,7 @@
<legend><?= _t('sub.category.archiving') ?></legend>
<?php
$archiving = $this->category->attributeArray('archiving');
- /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */
+ /** @var array{default?:bool,keep_period?:string,keep_max?:int,keep_min?:int,keep_favourites?:bool,keep_labels?:bool,keep_unreads?:bool}|null $archiving */
if (empty($archiving)) {
$archiving = [ 'default' => true ];
} else {
diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml
index c37d8c7c4..37e728470 100644
--- a/app/views/helpers/export/opml.phtml
+++ b/app/views/helpers/export/opml.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
/**
* @param array<FreshRSS_Feed> $feeds
- * @return array<array<string,string|bool|int>>
+ * @return list<array<string,string|bool|int>>
*/
function feedsToOutlines(array $feeds, bool $excludeMutedFeeds = false): array {
$outlines = [];
@@ -112,7 +112,9 @@ function feedsToOutlines(array $feeds, bool $excludeMutedFeeds = false): array {
if (!empty($curl_params[CURLOPT_HTTPHEADER]) && is_array($curl_params[CURLOPT_HTTPHEADER])) {
$headers = '';
foreach ($curl_params[CURLOPT_HTTPHEADER] as $header) {
- $headers .= $header . "\n";
+ if (is_string($header)) {
+ $headers .= $header . "\n";
+ }
}
$headers = trim($headers);
$outline['frss:CURLOPT_HTTPHEADER'] = $headers;
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 6275d5486..7dd71a0da 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -305,7 +305,7 @@
</div>
<?php
$archiving = $this->feed->attributeArray('archiving');
- /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */
+ /** @var array{default?:bool,keep_period?:string,keep_max?:int,keep_min?:int,keep_favourites?:bool,keep_labels?:bool,keep_unreads?:bool}|null $archiving */
if (empty($archiving)) {
$archiving = [ 'default' => true ];
} else {
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
index 77e3f3c82..b3c56253b 100644
--- a/app/views/helpers/logs_pagination.phtml
+++ b/app/views/helpers/logs_pagination.phtml
@@ -3,7 +3,7 @@
/** @var FreshRSS_View $this */
$c = Minz_Request::controllerName();
$a = Minz_Request::actionName();
- $params = $_GET;
+ $params = array_filter($_GET, 'is_string', ARRAY_FILTER_USE_KEY);
?>
<?php if ($this->nbPage > 1) { ?>
<nav class="nav-pagination nav-list">
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 72916f1a0..527c0b9c4 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -39,7 +39,7 @@
<main id="stream" class="global<?= $class ?>">
<h1 class="title_hidden"><?= _t('conf.reading.view.global') ?></h1>
<?php
- $params = $_GET;
+ $params = array_filter($_GET, 'is_string', ARRAY_FILTER_USE_KEY);
unset($params['c']);
unset($params['a']);
$url_base = [
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index ec8bf3881..60b593344 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -11,14 +11,14 @@
<h1><?= _t('index.log') ?></h1>
<?php
- /** @var array<FreshRSS_Log> $items */
+ /** @var list<FreshRSS_Log> $items */
$items = $this->logsPaginator->items();
?>
<?php if (!empty($items)) { ?>
<form method="post" action="<?= _url('index', 'logs') ?>">
<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
-
+
<div id="loglist-wrapper" class="table-wrapper scrollbar-thin">
<table id="loglist">
<thead>
@@ -46,7 +46,7 @@
</table>
</div>
<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
-
+
<div class="form-group form-actions">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<input type="hidden" name="clearLogs" />
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 3a5db2fb8..31e6e51f9 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -102,7 +102,7 @@
* Generate a color palette.
*
* @param int $count The number of colors to generate.
- * @return array<int, string> An array of HSL color strings.
+ * @return array<int,string> An array of HSL color strings.
*/
function generateColorPalette(int $count): array {
$colors = [];