diff options
| author | 2022-01-04 13:59:09 +0100 | |
|---|---|---|
| committer | 2022-01-04 13:59:09 +0100 | |
| commit | 1335a0e3cf11a0d4248e9eaaf748b89e6df741ef (patch) | |
| tree | ed6a8d17cef0581e5b0402dc8dfedd42fabfe9c7 /app/views | |
| parent | 0988b0c2be911133f883313bc3a858670192cc69 (diff) | |
PHPStan level 5 (#4110)
* Fix most PHPDocs errors
Contributes to https://github.com/FreshRSS/FreshRSS/issues/4103
https://phpstan.org/writing-php-code/phpdoc-types
* Avoid func_get_args
Use variadic syntax instead https://php.net/manual/functions.arguments#functions.variable-arg-list
And avoid dynamic functions names when possible to more easily identify calls and unused functions.
Contributes to https://github.com/FreshRSS/FreshRSS/issues/4103
* PHPStan level 3
* PHPStand level 4
* Update default to PHPStan level 4
* Towards level 5
* Fix level 4 regression
* Towards level 5
* Pass PHPStan level 5
* Towards level 6
* Remove erronenous regression from changelog
https://github.com/FreshRSS/FreshRSS/pull/4116
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/queries.phtml | 4 | ||||
| -rw-r--r-- | app/views/helpers/index/normal/entry_bottom.phtml | 1 | ||||
| -rwxr-xr-x | app/views/helpers/pagination.phtml | 6 | ||||
| -rwxr-xr-x | app/views/index/rss.phtml | 2 | ||||
| -rw-r--r-- | app/views/subscription/index.phtml | 2 | ||||
| -rw-r--r-- | app/views/user/profile.phtml | 3 |
6 files changed, 9 insertions, 9 deletions
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml index 3f15f299b..3e4b3684b 100644 --- a/app/views/configure/queries.phtml +++ b/app/views/configure/queries.phtml @@ -16,7 +16,7 @@ <div class="form-group" id="query-group-<?= $key ?>" draggable="true"> <div class="box"> <div class="box-title"> - <a class="configure open-slider" href="<?= _url('configure', 'query', 'id', $key) ?>"><?= _i('configure') ?></a><?= $query->getName() ?> + <a class="configure open-slider" href="<?= _url('configure', 'query', 'id', '' . $key) ?>"><?= _i('configure') ?></a><?= $query->getName() ?> <input type="hidden" id="queries_<?= $key ?>_name" name="queries[<?= $key ?>][name]" value="<?= $query->getName() ?>"/> <input type="hidden" id="queries_<?= $key ?>_url" name="queries[<?= $key ?>][url]" value="<?= $query->getUrl() ?>"/> <input type="hidden" id="queries_<?= $key ?>_search" name="queries[<?= $key ?>][search]" value="<?= urlencode($query->getSearch()) ?>"/> @@ -66,7 +66,7 @@ </a> <div id="slider"<?= $class ?>> <?php - if (isset($this->query)) { + if ($this->query != null) { $this->renderHelper('configure/query'); } ?> diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml index 07e68ed92..5f105c6c9 100644 --- a/app/views/helpers/index/normal/entry_bottom.phtml +++ b/app/views/helpers/index/normal/entry_bottom.phtml @@ -35,6 +35,7 @@ ?></li><?php } } + // @phpstan-ignore-next-line if ($bottomline_labels) { ?><li class="item"> <div class="dropdown dynamictags"> diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index 9b249762c..eed4f5dc2 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -20,7 +20,7 @@ <?php $hasAccess = FreshRSS_Auth::hasAccess(); -if ($url_mark_read && $hasAccess) { ?> +if ($hasAccess) { ?> <form id="mark-read-pagination" method="post"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <?php } else { ?> @@ -32,7 +32,7 @@ if ($url_mark_read && $hasAccess) { ?> <a id="load_more" href="<?= Minz_Url::display($url_next) ?>"> <?= _t('gen.pagination.load_more') ?> </a> - <?php } elseif ($url_mark_read && $hasAccess) { ?> + <?php } elseif ($hasAccess) { ?> <button id="bigMarkAsRead" class="as-link <?= FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : '' ?>" form="mark-read-pagination" @@ -49,7 +49,7 @@ if ($url_mark_read && $hasAccess) { ?> <?php } ?> </li> </ul> -<?php if ($url_mark_read && $hasAccess) { ?> +<?php if ($hasAccess) { ?> </form> <?php } else {?> </div> diff --git a/app/views/index/rss.phtml b/app/views/index/rss.phtml index f0772cc86..eedb31fa4 100755 --- a/app/views/index/rss.phtml +++ b/app/views/index/rss.phtml @@ -3,7 +3,7 @@ <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <channel> <title><?= $this->rss_title ?></title> - <link><?= Minz_Url::display(null, 'html', true) ?></link> + <link><?= Minz_Url::display('', 'html', true) ?></link> <description><?= _t('index.feed.rss_of', $this->rss_title) ?></description> <pubDate><?= date('D, d M Y H:i:s O') ?></pubDate> <lastBuildDate><?= gmdate('D, d M Y H:i:s') ?> GMT</lastBuildDate> diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index e16d6ad95..92b1c7ec9 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -22,7 +22,7 @@ <?php if (!$this->onlyFeedsWithError && $this->signalError){ ?> <div> - <a class="btn" href="<?= _url('subscription', 'index', 'error', 1) ?>"><?= _i('look') ?> <?= _t('sub.feed.show.error') ?></a> + <a class="btn" href="<?= _url('subscription', 'index', 'error', '1') ?>"><?= _i('look') ?> <?= _t('sub.feed.show.error') ?></a> </div> <?php } ?> diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index 99ebcb326..5acb241ed 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -57,8 +57,7 @@ <label class="group-name" for="token"><?= _t('admin.auth.token') ?></label> <?php $token = FreshRSS_Context::$user_conf->token; ?> <div class="group-controls"> - <input type="text" id="token" name="token" value="<?= $token ?>" placeholder="<?= _t('gen.short.blank_to_disable') ?>"<?php - echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?= $token ?>"/> + <input type="text" id="token" name="token" value="<?= $token ?>" placeholder="<?= _t('gen.short.blank_to_disable') ?>" data-leave-validation="<?= $token ?>"/> <p class="help"><?= _i('help') ?> <?= _t('admin.auth.token_help') ?></p> <kbd><?= Minz_Url::display(array('a' => 'rss', 'params' => array('user' => Minz_Session::param('currentUser'), 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true) ?></kbd> |
