Remove some PHPStan ignores and make others rule-specific.

9 files changed, 8 insertions, 16 deletions

diff --git a/classes/API.php b/classes/API.php
index d6d622c52..d44a7eaea 100644
--- a/classes/API.php
+++ b/classes/API.php
@@ -300,10 +300,9 @@ class API extends Handler {
 	}
 
 	function getArticle(): bool {
-		$article_ids = explode(',', clean($_REQUEST['article_id'] ?? ''));
+		$article_ids = array_filter(explode(',', clean($_REQUEST['article_id'] ?? '')));
 		$sanitize_content = self::_param_to_bool($_REQUEST['sanitize'] ?? true);
 
-		// @phpstan-ignore-next-line
 		if (count($article_ids)) {
 			$entries = ORM::for_table('ttrss_entries')
 				->table_alias('e')
diff --git a/classes/Debug.php b/classes/Debug.php
index 1cda12539..ba39b4d44 100644
--- a/classes/Debug.php
+++ b/classes/Debug.php
@@ -77,7 +77,7 @@ class Debug {
 	 */
 	public static function map_loglevel(int $level) : int {
 		if (in_array($level, self::ALL_LOG_LEVELS)) {
-			/** @phpstan-ignore-next-line */
+			/** @phpstan-ignore return.type (yes it is a Debug::LOG_* value) */
 			return $level;
 		} else {
 			user_error("Passed invalid debug log level: $level", E_USER_WARNING);
diff --git a/classes/FeedItem_Atom.php b/classes/FeedItem_Atom.php
index f6c96f959..b5eaca181 100644
--- a/classes/FeedItem_Atom.php
+++ b/classes/FeedItem_Atom.php
@@ -43,7 +43,6 @@ class FeedItem_Atom extends FeedItem_Common {
 		$links = $this->elem->getElementsByTagName("link");
 
 		foreach ($links as $link) {
-			/** @phpstan-ignore-next-line */
 			if ($link->hasAttribute("href") &&
 				(!$link->hasAttribute("rel")
 					|| $link->getAttribute("rel") == "alternate"
@@ -181,7 +180,6 @@ class FeedItem_Atom extends FeedItem_Common {
 		$encs = [];
 
 		foreach ($links as $link) {
-			/** @phpstan-ignore-next-line */
 			if ($link->hasAttribute("href") && $link->hasAttribute("rel")) {
 				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
diff --git a/classes/Feeds.php b/classes/Feeds.php
index 38c098724..22f34f719 100644
--- a/classes/Feeds.php
+++ b/classes/Feeds.php
@@ -1067,7 +1067,7 @@ class Feeds extends Handler_Protected {
 		if (!$url) return ["code" => 2];
 
 		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_PRE_SUBSCRIBE,
-			/** @phpstan-ignore-next-line */
+			/** @phpstan-ignore closure.unusedUse, closure.unusedUse, closure.unusedUse */
 			function ($result) use (&$url, &$auth_login, &$auth_pass) {
 				// arguments are updated inside the hook (if needed)
 			},
diff --git a/classes/Handler_Public.php b/classes/Handler_Public.php
index 208c8e40a..be4254783 100644
--- a/classes/Handler_Public.php
+++ b/classes/Handler_Public.php
@@ -53,9 +53,8 @@ class Handler_Public extends Handler {
 			$handler = $tmppluginhost->get_feed_handler(
 				PluginHost::feed_to_pfeed_id((int)$feed));
 
-			if ($handler) {
-				// 'get_headlines' is implemented by the plugin.
-				// @phpstan-ignore-next-line
+			if ($handler && implements_interface($handler, 'IVirtualFeed')) {
+				/** @var Plugin&IVirtualFeed $handler */
 				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id((int)$feed), $params);
 			} else {
 				user_error("Failed to find handler for plugin feed ID: $feed", E_USER_ERROR);
diff --git a/classes/PluginHost.php b/classes/PluginHost.php
index 88eb5d2a4..b54e48d4f 100644
--- a/classes/PluginHost.php
+++ b/classes/PluginHost.php
@@ -386,8 +386,7 @@ class PluginHost {
 	 * @param PluginHost::HOOK_* $type
 	 */
 	function del_hook(string $type, Plugin $sender): void {
-		/** @phpstan-ignore function.alreadyNarrowedType ($type might not exist) */
-		if (is_array($this->hooks[$type])) {
+		if (array_key_exists($type, $this->hooks)) {
 			foreach (array_keys($this->hooks[$type]) as $prio) {
 				$key = array_search($sender, $this->hooks[$type][$prio]);
 
diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index 6e609b76c..87237342a 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -115,9 +115,6 @@ class Pref_Filters extends Handler_Protected {
 		$glue = $filter['match_any_rule'] ? " OR " :  " AND ";
 		$scope_qpart = join($glue, $scope_qparts);
 
-		/** @phpstan-ignore-next-line */
-		if (!$scope_qpart) $scope_qpart = "true";
-
 		$rv = array();
 
 		//while ($found < $limit && $offset < $limit * 1000 && time() - $started < ini_get("max_execution_time") * 0.7) {
diff --git a/classes/UserHelper.php b/classes/UserHelper.php
index 6c294a9a8..27e022624 100644
--- a/classes/UserHelper.php
+++ b/classes/UserHelper.php
@@ -50,7 +50,7 @@ class UserHelper {
 	 */
 	public static function map_access_level(int $level) : int {
 		if (in_array($level, self::ACCESS_LEVELS)) {
-			/** @phpstan-ignore-next-line */
+			/** @phpstan-ignore return.type (yes it is a UserHelper::ACCESS_LEVEL_* value) */
 			return $level;
 		} else {
 			user_error("Passed invalid user access level: $level", E_USER_WARNING);
diff --git a/update.php b/update.php
index c8fe69fdb..c7f274419 100755
--- a/update.php
+++ b/update.php
@@ -215,7 +215,7 @@
 	}
 
 	if (isset($options["daemon"])) {
-		// @phpstan-ignore-next-line
+		// @phpstan-ignore while.alwaysTrue (single process daemon will always run)
 		while (true) {
 			$quiet = (isset($options["quiet"])) ? "--quiet" : "";
 			$log = isset($options['log']) ? '--log '.$options['log'] : '';