From 9f734c90506a6e5916589d7c8f39c45ff40f6273 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 22 Oct 2021 13:49:08 +0300
Subject: [PATCH] minor phpstan tweaks

---
 classes/api.php                               |  2 +-
 classes/feeditem/common.php                   |  1 +
 classes/handler/public.php                    |  4 ++++
 phpstan.neon                                  |  1 -
 .../vendor/composer/InstalledVersions.php     | 19 +++++++++----------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/classes/api.php b/classes/api.php
index 5f825e551..033aa8654 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -307,6 +307,7 @@ class API extends Handler {
 		$article_ids = 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')
@@ -369,7 +370,6 @@ class API extends Handler {
 			}
 
 			$this->_wrap(self::STATUS_OK, $articles);
-		// @phpstan-ignore-next-line
 		} else {
 			$this->_wrap(self::STATUS_ERR, ['error' => self::E_INCORRECT_USAGE]);
 		}
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 18afeaa94..b4774941f 100755
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -190,6 +190,7 @@ abstract class FeedItem_Common extends FeedItem {
 		}, $tmp);
 
 		// remove empty values
+		// @phpstan-ignore-next-line
 		$tmp = array_filter($tmp, 'strlen');
 
 		asort($tmp);
diff --git a/classes/handler/public.php b/classes/handler/public.php
index b9619971b..14474d0bb 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -53,6 +53,10 @@ class Handler_Public extends Handler {
 
 			if ($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);
+
+				return false;
 			}
 
 		} else {
diff --git a/phpstan.neon b/phpstan.neon
index 818f99577..7fe02b07e 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,7 +1,6 @@
 parameters:
    level: 5
    ignoreErrors:
-#      - '#Constant.*not found#'
       - '#Constant.*\b(SUBSTRING_FOR_DATE|SCHEMA_VERSION|SELF_USER_AGENT|LABEL_BASE_INDEX|PLUGIN_FEED_BASE_INDEX)\b.*not found#'
       - '#Comparison operation ">" between int<1, max> and 0 is always true.#'
       - '#Access to an undefined property DOMNode::\$tagName.#'
diff --git a/plugins/af_readability/vendor/composer/InstalledVersions.php b/plugins/af_readability/vendor/composer/InstalledVersions.php
index 420d2ea9c..eb57e7a7e 100644
--- a/plugins/af_readability/vendor/composer/InstalledVersions.php
+++ b/plugins/af_readability/vendor/composer/InstalledVersions.php
@@ -23,41 +23,41 @@ use Composer\Semver\VersionParser;
 class InstalledVersions
 {
     private static $installed = array (
-  'root' => 
+  'root' =>
   array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
-    'aliases' => 
+    'aliases' =>
     array (
     ),
     'reference' => 'a73e3bec45c5523910c711cf882976b71781ac9e',
     'name' => '__root__',
   ),
-  'versions' => 
+  'versions' =>
   array (
-    '__root__' => 
+    '__root__' =>
     array (
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
-      'aliases' => 
+      'aliases' =>
       array (
       ),
       'reference' => 'a73e3bec45c5523910c711cf882976b71781ac9e',
     ),
-    'fivefilters/readability.php' => 
+    'fivefilters/readability.php' =>
     array (
       'pretty_version' => 'v2.1.0',
       'version' => '2.1.0.0',
-      'aliases' => 
+      'aliases' =>
       array (
       ),
       'reference' => '7617a912b6c527909168f5d41d263792f171c42a',
     ),
-    'psr/log' => 
+    'psr/log' =>
     array (
       'pretty_version' => '1.1.4',
       'version' => '1.1.4.0',
-      'aliases' => 
+      'aliases' =>
       array (
       ),
       'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
@@ -285,7 +285,6 @@ class InstalledVersions
         $installed = array();
 
         if (self::$canGetVendors) {
-            // @phpstan-ignore-next-line
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];