mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-19 05:44:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

PHPStan level 5 (#4110)

Browse Source 
* 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
This commit is contained in:
Alexandre Alapetite
2022-01-04 13:59:09 +01:00
committed by GitHub
parent 0988b0c2be
commit 1335a0e3cf
73 changed files with 403 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Controllers/feedController.php
View File

@@ -3,7 +3,7 @@
/**
* Controller to handle every feed actions.
*/
class FreshRSS_feed_Controller extends Minz_ActionController {
class FreshRSS_feed_Controller extends FreshRSS_ActionController {
/**
* This action is called before every other action in that class. It is
* the common boiler plate for every action. It is triggered by the
@@ -46,10 +46,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$url = trim($url);
/** @var string $url */
/** @var string|null $url */
$url = Minz_ExtensionManager::callHook('check_url_before_add', $url);
if (null === $url) {
throw new FreshRSS_FeedNotAdded_Exception($url, $title);
throw new FreshRSS_FeedNotAdded_Exception($url);
}
$cat = null;
@@ -77,10 +77,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
throw new FreshRSS_AlreadySubscribed_Exception($url, $feed->name());
}
/** @var FreshRSS_Feed $feed */
/** @var FreshRSS_Feed|null $feed */
$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
if ($feed === null) {
throw new FreshRSS_FeedNotAdded_Exception($url, $feed->name());
throw new FreshRSS_FeedNotAdded_Exception($url);
}
$values = array(
@@ -97,7 +97,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$id = $feedDAO->addFeed($values);
if (!$id) {
// There was an error in database... we cannot say what here.
throw new FreshRSS_FeedNotAdded_Exception($url, $feed->name());
throw new FreshRSS_FeedNotAdded_Exception($url);
}
$feed->_id($id);
@@ -186,7 +186,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$attributes['timeout'] = $timeout > 0 ? $timeout : null;
try {
$feed = self::addFeed($url, '', $cat, null, $http_auth, $attributes);
$feed = self::addFeed($url, '', $cat, '', $http_auth, $attributes);
} catch (FreshRSS_BadUrl_Exception $e) {
// Given url was not a valid url!
Minz_Log::warning($e->getMessage());
@@ -202,7 +202,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
} catch (FreshRSS_AlreadySubscribed_Exception $e) {
return Minz_Request::bad(_t('feedback.sub.feed.already_subscribed', $e->feedName()), $url_redirect);
} catch (FreshRSS_FeedNotAdded_Exception $e) {
return Minz_Request::bad(_t('feedback.sub.feed.not_added', $e->feedName()), $url_redirect);
return Minz_Request::bad(_t('feedback.sub.feed.not_added', $e->url()), $url_redirect);
}
// Entries are in DB, we redirect to feed configuration page.
@@ -296,7 +296,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$updated_feeds = 0;
$nb_new_articles = 0;
foreach ($feeds as $feed) {
/** @var FreshRSS_Feed $feed */
/** @var FreshRSS_Feed|null $feed */
$feed = Minz_ExtensionManager::callHook('feed_before_actualize', $feed);
if (null === $feed) {
continue;
@@ -874,14 +874,4 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$this->view->fatalError = _t('feedback.sub.feed.selector_preview.http_error');
}
}
/**
* This method update TTL values for feeds if needed.
* It changes the old default value (-2) to the new default value (0).
* It changes the old disabled value (-1) to the default disabled value.
*/
private function updateTTL() {
$feedDAO = FreshRSS_Factory::createFeedDao();
$feedDAO->updateTTL();
}
}