diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-04-17 08:30:21 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-04-17 08:30:21 +0200 |
| commit | f3760f138dcbaf7a2190336a0378cf1b2190c9f5 (patch) | |
| tree | 6fac8fbf9efd7aa74a8e3970ab70ccf85287b2cd /app/Controllers/subscriptionController.php | |
| parent | 41fa4e746df8c2e2399ed753b4994ca85cb21358 (diff) | |
Complete PHPStan Level 6 (#5305)
* Complete PHPStan Level 6
Fix https://github.com/FreshRSS/FreshRSS/issues/4112
And initiate PHPStan Level 7
* PHPStan Level 6 for tests
* Use phpstan/phpstan-phpunit
* Update to PHPStan version 1.10
* Fix mixed bug
* Fix mixed return bug
* Fix paginator bug
* Fix FreshRSS_UserConfiguration
* A couple more Minz_Configuration bug fixes
* A few trivial PHPStan Level 7 fixes
* A few more simple PHPStan Level 7
* More files passing PHPStan Level 7
Add interface to replace removed class from https://github.com/FreshRSS/FreshRSS/pull/5251
* A few more PHPStan Level 7 preparations
* A few last details
Diffstat (limited to 'app/Controllers/subscriptionController.php')
| -rw-r--r-- | app/Controllers/subscriptionController.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index e0a8d4ff4..d96cb02e1 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -19,7 +19,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { $catDAO->checkDefault(); $feedDAO->updateTTL(); - $this->view->categories = $catDAO->listSortedCategories(false, true); + $this->view->categories = $catDAO->listSortedCategories(false, true) ?: []; $this->view->default_category = $catDAO->getDefault(); $signalError = false; @@ -90,7 +90,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { */ public function feedAction(): void { if (Minz_Request::paramBoolean('ajax')) { - $this->view->_layout(false); + $this->view->_layout(null); } else { FreshRSS_View::appendScript(Minz_Url::display('/scripts/feed.js?' . @filemtime(PUBLIC_PATH . '/scripts/feed.js'))); } @@ -200,7 +200,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { ]); } - $feed->_filtersAction('read', preg_split('/[\n\r]+/', Minz_Request::paramString('filteractions_read'))); + $feed->_filtersAction('read', preg_split('/[\n\r]+/', Minz_Request::paramString('filteractions_read')) ?: []); $feed->_kind(Minz_Request::paramInt('feed_kind') ?: FreshRSS_Feed::KIND_RSS); if ($feed->kind() === FreshRSS_Feed::KIND_HTML_XPATH || $feed->kind() === FreshRSS_Feed::KIND_XML_XPATH) { @@ -235,8 +235,8 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { 'name' => Minz_Request::paramString('name'), 'kind' => $feed->kind(), 'description' => sanitizeHTML(Minz_Request::paramString('description', true)), - 'website' => checkUrl(Minz_Request::paramString('website')), - 'url' => checkUrl(Minz_Request::paramString('url')), + 'website' => checkUrl(Minz_Request::paramString('website')) ?: '', + 'url' => checkUrl(Minz_Request::paramString('url')) ?: '', 'category' => Minz_Request::paramInt('category'), 'pathEntries' => Minz_Request::paramString('path_entries'), 'priority' => Minz_Request::paramTernary('priority') === null ? FreshRSS_Feed::PRIORITY_MAIN_STREAM : Minz_Request::paramInt('priority'), @@ -283,7 +283,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { } public function categoryAction(): void { - $this->view->_layout(false); + $this->view->_layout(null); $categoryDAO = FreshRSS_Factory::createCategoryDao(); |