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/feedController.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/feedController.php')
| -rw-r--r-- | app/Controllers/feedController.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 39a1c7289..15bf0128b 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -262,7 +262,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { FreshRSS_View::prependTitle(_t('sub.feed.title_add') . ' ยท '); $catDAO = FreshRSS_Factory::createCategoryDao(); - $this->view->categories = $catDAO->listCategories(false); + $this->view->categories = $catDAO->listCategories(false) ?: []; $this->view->feed = new FreshRSS_Feed($url); try { // We try to get more information about the feed. @@ -316,7 +316,8 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { /** * @return array{0:int,1:FreshRSS_Feed|false,2:int} */ - public static function actualizeFeed(int $feed_id, string $feed_url, bool $force, ?SimplePie $simplePiePush = null, bool $noCommit = false, int $maxFeeds = 10) { + public static function actualizeFeed(int $feed_id, string $feed_url, bool $force, ?SimplePie $simplePiePush = null, + bool $noCommit = false, int $maxFeeds = 10): array { @set_time_limit(300); $feedDAO = FreshRSS_Factory::createFeedDao(); @@ -666,7 +667,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { // are several updated feeds. Minz_Request::setGoodNotification(_t('feedback.sub.feed.actualizeds')); // No layout in ajax request. - $this->view->_layout(false); + $this->view->_layout(null); } else { // Redirect to the main page with correct notification. if ($updated_feeds === 1) { @@ -903,7 +904,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $this->view->selectorSuccess = false; $this->view->htmlContent = ''; - $this->view->_layout(false); + $this->view->_layout(null); $this->_csp([ 'default-src' => "'self'", |