From 1335a0e3cf11a0d4248e9eaaf748b89e6df741ef Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 4 Jan 2022 13:59:09 +0100 Subject: 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 --- p/api/fever.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'p/api/fever.php') diff --git a/p/api/fever.php b/p/api/fever.php index 684e851a6..6a7f10668 100644 --- a/p/api/fever.php +++ b/p/api/fever.php @@ -30,6 +30,9 @@ Minz_Session::init('FreshRSS', true); // $ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576); +/** + * @return string + */ function debugInfo() { if (function_exists('getallheaders')) { $ALL_HEADERS = getallheaders(); @@ -503,18 +506,12 @@ class FeverAPI if (isset($_REQUEST['max_id'])) { // use the max_id argument to request the previous $item_limit items - $max_id = '' . $_REQUEST['max_id']; - if (!ctype_digit($max_id)) { - $max_id = null; - } + $max_id = ctype_digit('' . $_REQUEST['max_id']) ? intval($_REQUEST['max_id']) : null; } elseif (isset($_REQUEST['with_ids'])) { $entry_ids = explode(',', $_REQUEST['with_ids']); } elseif (isset($_REQUEST['since_id'])) { // use the since_id argument to request the next $item_limit items - $since_id = '' . $_REQUEST['since_id']; - if (!ctype_digit($since_id)) { - $since_id = null; - } + $since_id = ctype_digit('' . $_REQUEST['since_id']) ? intval($_REQUEST['since_id']) : null; } $items = array(); -- cgit v1.2.3