From 03495c11ed69f6311e9c7596cc53c5b15ce82bf6 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Thu, 11 Nov 2021 19:59:25 +0000
Subject: Address PHPStan warnings in 'classes/sanitizer.php'.

This also includes some minor tweaks to things that call 'Sanitizer::sanitize()'.
---
 classes/feeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index cd2633ffb..20aa9c05d 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -271,7 +271,7 @@ class Feeds extends Handler_Protected {
 				$this->_mark_timestamp("   pre-sanitize");
 
 				$line["content"] = Sanitizer::sanitize($line["content"],
-					$line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
+					$line['hide_images'], null, $line["site_url"], $highlight_words, $line["id"]);
 
 				$this->_mark_timestamp("   sanitize");
 
-- 
cgit v1.2.3-54-g00ecf


From f704d25ab15c5ffd988403d36b90fe76fb72916e Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Thu, 11 Nov 2021 20:12:47 +0000
Subject: Address PHPStan warnings in 'classes/timehelper.php'.

---
 classes/feeds.php      | 2 +-
 classes/timehelper.php | 8 ++++----
 include/functions.php  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index 20aa9c05d..529a8e403 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -299,7 +299,7 @@ class Feeds extends Handler_Protected {
 				$this->_mark_timestamp("   enclosures");
 
 				$line["updated_long"] = TimeHelper::make_local_datetime($line["updated"],true);
-				$line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, false, false, true);
+				$line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, null, false, true);
 
 				$line['imported'] = T_sprintf("Imported at %s",
 					TimeHelper::make_local_datetime($line["date_entered"], false));
diff --git a/classes/timehelper.php b/classes/timehelper.php
index 4317f343f..e66f82f90 100644
--- a/classes/timehelper.php
+++ b/classes/timehelper.php
@@ -1,7 +1,7 @@
 <?php
 class TimeHelper {
 
-	static function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
+	static function smart_date_time(int $timestamp, int $tz_offset = 0, int $owner_uid = null, bool $eta_min = false): string {
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
 		if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
@@ -21,8 +21,8 @@ class TimeHelper {
 		}
 	}
 
-	static function make_local_datetime($timestamp, $long, $owner_uid = false,
-					$no_smart_dt = false, $eta_min = false) {
+	static function make_local_datetime(string $timestamp, bool $long, int $owner_uid = null,
+					bool $no_smart_dt = false, bool $eta_min = false): string {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 		if (!$timestamp) $timestamp = '1970-01-01 0:00';
@@ -67,7 +67,7 @@ class TimeHelper {
 		}
 	}
 
-	static function convert_timestamp($timestamp, $source_tz, $dest_tz) {
+	static function convert_timestamp(int $timestamp, string $source_tz, string $dest_tz): int {
 
 		try {
 			$source_tz = new DateTimeZone($source_tz);
diff --git a/include/functions.php b/include/functions.php
index 238cbe7f5..8b112e3fb 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -213,12 +213,12 @@
 	}
 
 	/** function is @deprecated by TimeHelper::smart_date_time() */
-	function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
+	function smart_date_time(int $timestamp, int $tz_offset = 0, int $owner_uid = null, bool $eta_min = false): string {
 		return TimeHelper::smart_date_time($timestamp, $tz_offset, $owner_uid, $eta_min);
 	}
 
 	/** function is @deprecated by TimeHelper::make_local_datetime() */
-	function make_local_datetime($timestamp, $long, $owner_uid = false, $no_smart_dt = false, $eta_min = false) {
+	function make_local_datetime(string $timestamp, bool $long, int $owner_uid = null, bool $no_smart_dt = false, bool $eta_min = false): string {
 		return TimeHelper::make_local_datetime($timestamp, $long, $owner_uid, $no_smart_dt, $eta_min);
 	}
 
-- 
cgit v1.2.3-54-g00ecf


From 57bf56f7945b639d0e39f4c7ad9da161a4a18888 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Fri, 12 Nov 2021 01:50:40 +0000
Subject: Address PHPStan warnings in 'classes/article.php'.

Also related changes in some other classes.
---
 classes/article.php | 92 ++++++++++++++++++++++++++++++++++++-----------------
 classes/digest.php  |  2 +-
 classes/feeds.php   |  4 +--
 classes/labels.php  |  4 +--
 classes/rpc.php     |  8 ++---
 5 files changed, 71 insertions(+), 39 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/article.php b/classes/article.php
index 04855ac9d..4af36d1c0 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -4,7 +4,11 @@ class Article extends Handler_Protected {
 	const ARTICLE_KIND_VIDEO = 2;
 	const ARTICLE_KIND_YOUTUBE = 3;
 
-	function redirect() {
+	const CATCHUP_MODE_MARK_AS_READ = 0;
+	const CATCHUP_MODE_MARK_AS_UNREAD = 1;
+	const CATCHUP_MODE_TOGGLE = 2;
+
+	function redirect(): void {
 		$article = ORM::for_table('ttrss_entries')
 			->table_alias('e')
 			->join('ttrss_user_entries', [ 'ref_id', '=', 'e.id'], 'ue')
@@ -24,8 +28,7 @@ class Article extends Handler_Protected {
 		print "Article not found or has an empty URL.";
 	}
 
-	static function _create_published_article($title, $url, $content, $labels_str,
-			$owner_uid) {
+	static function _create_published_article(string $title, string $url, string $content, string $labels_str, int $owner_uid): bool {
 
 		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
 
@@ -158,14 +161,14 @@ class Article extends Handler_Protected {
 		return $rc;
 	}
 
-	function printArticleTags() {
+	function printArticleTags(): void {
 		$id = (int) clean($_REQUEST['id'] ?? 0);
 
 		print json_encode(["id" => $id,
 			"tags" => self::_get_tags($id)]);
 	}
 
-	function setScore() {
+	function setScore(): void {
 		$ids = array_map("intval", clean($_REQUEST['ids'] ?? []));
 		$score = (int)clean($_REQUEST['score']);
 
@@ -179,7 +182,7 @@ class Article extends Handler_Protected {
 		print json_encode(["id" => $ids, "score" => $score]);
 	}
 
-	function setArticleTags() {
+	function setArticleTags(): void {
 
 		$id = clean($_REQUEST["id"]);
 
@@ -254,18 +257,18 @@ class Article extends Handler_Protected {
 		print "</ul>";
 	}*/
 
-	function assigntolabel() {
-		return $this->_label_ops(true);
+	function assigntolabel(): void {
+		$this->_label_ops(true);
 	}
 
-	function removefromlabel() {
-		return $this->_label_ops(false);
+	function removefromlabel(): void {
+		$this->_label_ops(false);
 	}
 
-	private function _label_ops($assign) {
+	private function _label_ops(bool $assign): void {
 		$reply = array();
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
+		$ids = array_map("intval", explode(",", clean($_REQUEST["ids"] ?? [])));
 		$label_id = clean($_REQUEST["lid"]);
 
 		$label = Labels::find_caption($label_id, $_SESSION["uid"]);
@@ -289,11 +292,10 @@ class Article extends Handler_Protected {
 		print json_encode($reply);
 	}
 
-	static function _format_enclosures($id,
-										$always_display_enclosures,
-									   $article_content,
-										$hide_images = false) {
-
+	/**
+	 * @return array{'formatted': string, 'entries': array<int, array<string, mixed>>}
+	 */
+	static function _format_enclosures(int $id, bool $always_display_enclosures, string $article_content, bool $hide_images = false): array {
 		$enclosures = self::_get_enclosures($id);
 		$enclosures_formatted = "";
 
@@ -366,7 +368,10 @@ class Article extends Handler_Protected {
 		return $rv;
 	}
 
-	static function _get_tags($id, $owner_uid = 0, $tag_cache = false) {
+	/**
+	 * @return array<int, string>
+	 */
+	static function _get_tags(int $id, int $owner_uid = 0, ?string $tag_cache = null): array {
 
 		$a_id = $id;
 
@@ -383,12 +388,14 @@ class Article extends Handler_Protected {
 
 		/* check cache first */
 
-		if ($tag_cache === false) {
+		if (!$tag_cache) {
 			$csth = $pdo->prepare("SELECT tag_cache FROM ttrss_user_entries
 				WHERE ref_id = ? AND owner_uid = ?");
 			$csth->execute([$id, $owner_uid]);
 
-			if ($row = $csth->fetch()) $tag_cache = $row["tag_cache"];
+			if ($row = $csth->fetch()) {
+				$tag_cache = $row["tag_cache"];
+			}
 		}
 
 		if ($tag_cache) {
@@ -416,7 +423,7 @@ class Article extends Handler_Protected {
 		return $tags;
 	}
 
-	function getmetadatabyid() {
+	function getmetadatabyid(): void {
 		$article = ORM::for_table('ttrss_entries')
 			->join('ttrss_user_entries', ['ref_id', '=', 'id'], 'ue')
 			->where('ue.owner_uid', $_SESSION['uid'])
@@ -429,7 +436,10 @@ class Article extends Handler_Protected {
 		}
 	}
 
-	static function _get_enclosures($id) {
+	/**
+	 * @return array<int, array<string, mixed>>
+	 */
+	static function _get_enclosures(int $id): array {
 		$encs = ORM::for_table('ttrss_enclosures')
 			->where('post_id', $id)
 			->find_many();
@@ -452,7 +462,7 @@ class Article extends Handler_Protected {
 
 	}
 
-	static function _purge_orphans() {
+	static function _purge_orphans(): void {
 
         // purge orphaned posts in main content table
 
@@ -471,7 +481,11 @@ class Article extends Handler_Protected {
         }
     }
 
-	static function _catchup_by_id($ids, $cmode, $owner_uid = false) {
+	/**
+	 * @param array<int, int> $ids
+	 * @param Article::CATCHUP_MODE_* $cmode
+	 */
+	static function _catchup_by_id($ids, int $cmode, ?int $owner_uid = null): void {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -479,11 +493,11 @@ class Article extends Handler_Protected {
 
 		$ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 1) {
+		if ($cmode == Article::CATCHUP_MODE_MARK_AS_UNREAD) {
 			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = true
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 2) {
+		} else if ($cmode == Article::CATCHUP_MODE_TOGGLE) {
 			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = NOT unread,last_read = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
@@ -496,7 +510,10 @@ class Article extends Handler_Protected {
 		$sth->execute(array_merge($ids, [$owner_uid]));
 	}
 
-	static function _get_labels($id, $owner_uid = false) {
+	/**
+	 * @return array<int, array<int, int|string>>
+	 */
+	static function _get_labels(int $id, ?int $owner_uid = null): array {
 		$rv = array();
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
@@ -543,6 +560,12 @@ class Article extends Handler_Protected {
 		return $rv;
 	}
 
+	/**
+	 * @param array<int, array<string, mixed>> $enclosures
+	 * @param array<string, mixed> $headline
+	 *
+	 * @return array<int, Article::ARTICLE_KIND_*|string>
+	 */
 	static function _get_image(array $enclosures, string $content, string $site_url, array $headline) {
 
 		$article_image = "";
@@ -603,14 +626,14 @@ class Article extends Handler_Protected {
 				}
 
 			if ($article_image) {
-				$article_image = rewrite_relative_url($site_url, $article_image);
+				$article_image = UrlHelper::rewrite_relative($site_url, $article_image);
 
 				if (!$article_kind && (count($enclosures) > 1 || (isset($elems) && $elems->length > 1)))
 					$article_kind = Article::ARTICLE_KIND_ALBUM;
 			}
 
 			if ($article_stream)
-				$article_stream = rewrite_relative_url($site_url, $article_stream);
+				$article_stream = UrlHelper::rewrite_relative($site_url, $article_stream);
 		}
 
 		$cache = new DiskCache("images");
@@ -624,7 +647,12 @@ class Article extends Handler_Protected {
 		return [$article_image, $article_stream, $article_kind];
 	}
 
-	// only cached, returns label ids (not label feed ids)
+	/**
+	 * only cached, returns label ids (not label feed ids)
+	 *
+	 * @param array<int, int> $article_ids
+	 * @return array<int, int>
+	 */
 	static function _labels_of(array $article_ids) {
 		if (count($article_ids) == 0)
 			return [];
@@ -651,6 +679,10 @@ class Article extends Handler_Protected {
 		return array_unique($rv);
 	}
 
+	/**
+	 * @param array<int, int> $article_ids
+	 * @return array<int, int>
+	 */
 	static function _feeds_of(array $article_ids) {
 		if (count($article_ids) == 0)
 			return [];
diff --git a/classes/digest.php b/classes/digest.php
index 7adf9b449..15203166b 100644
--- a/classes/digest.php
+++ b/classes/digest.php
@@ -62,7 +62,7 @@ class Digest
 
 						if ($rc && $do_catchup) {
 							Debug::log("Marking affected articles as read...");
-							Article::_catchup_by_id($affected_ids, 0, $line["id"]);
+							Article::_catchup_by_id($affected_ids, Article::CATCHUP_MODE_MARK_AS_READ, $line["id"]);
 						}
 					} else {
 						Debug::log("No headlines");
diff --git a/classes/feeds.php b/classes/feeds.php
index 529a8e403..c9f47463f 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -289,9 +289,9 @@ class Feeds extends Handler_Protected {
 
 				if ($line["num_enclosures"] > 0) {
 					$line["enclosures"] = Article::_format_enclosures($id,
-						$line["always_display_enclosures"],
+						sql_bool_to_bool($line["always_display_enclosures"]),
 						$line["content"],
-						$line["hide_images"]);
+						sql_bool_to_bool($line["hide_images"]));
 				} else {
 					$line["enclosures"] = [ 'formatted' => '', 'entries' => [] ];
 				}
diff --git a/classes/labels.php b/classes/labels.php
index b9c480f82..d78f92139 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -71,11 +71,11 @@ class Labels
 	}
 
 	/**
-	 * @param array<int, array<int|string, mixed>>|null $labels
+	 * @param array<int, array<int, array<int, int|string>> $labels
 	 *
 	 * @see Article::_get_labels()
 	 */
-	static function update_cache(int $owner_uid, int $id, ?array $labels = null, bool $force = false): void {
+	static function update_cache(int $owner_uid, int $id, array $labels, bool $force = false): void {
 		$pdo = Db::pdo();
 
 		if ($force)
diff --git a/classes/rpc.php b/classes/rpc.php
index 0432ed2d3..6d56f039e 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -344,11 +344,11 @@ class RPC extends Handler_Protected {
 
 		$ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
+		if ($cmode == Article::CATCHUP_MODE_MARK_AS_READ) {
 			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = false, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
+		} else if ($cmode == Article::CATCHUP_MODE_MARK_AS_UNREAD) {
 			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = true, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
@@ -365,11 +365,11 @@ class RPC extends Handler_Protected {
 
 		$ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
+		if ($cmode == Article::CATCHUP_MODE_MARK_AS_READ) {
 			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = false, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
+		} else if ($cmode == Article::CATCHUP_MODE_MARK_AS_UNREAD) {
 			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = true, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-- 
cgit v1.2.3-54-g00ecf


From 5606e38bff619c388c9621dde30f0d54127a21f4 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Fri, 12 Nov 2021 02:01:31 +0000
Subject: Update signature of handler 'csrf_ignore' to include types.

---
 classes/feeds.php         | 2 +-
 classes/handler.php       | 2 +-
 classes/ihandler.php      | 2 +-
 classes/opml.php          | 2 +-
 classes/pluginhandler.php | 2 +-
 classes/pref/feeds.php    | 2 +-
 classes/pref/filters.php  | 2 +-
 classes/pref/labels.php   | 2 +-
 classes/pref/prefs.php    | 2 +-
 classes/pref/system.php   | 2 +-
 classes/pref/users.php    | 2 +-
 classes/rpc.php           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index c9f47463f..951675adb 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -8,7 +8,7 @@ class Feeds extends Handler_Protected {
 	 private $viewfeed_timestamp;
 	 private $viewfeed_timestamp_last;
 
-    function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/handler.php b/classes/handler.php
index 09557c284..4c79628db 100644
--- a/classes/handler.php
+++ b/classes/handler.php
@@ -8,7 +8,7 @@ class Handler implements IHandler {
 		$this->args = $args;
 	}
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		return false;
 	}
 
diff --git a/classes/ihandler.php b/classes/ihandler.php
index 01c9e3109..8345839c0 100644
--- a/classes/ihandler.php
+++ b/classes/ihandler.php
@@ -1,6 +1,6 @@
 <?php
 interface IHandler {
-	function csrf_ignore($method);
+	function csrf_ignore(string $method): bool;
 	function before($method);
 	function after();
 }
diff --git a/classes/opml.php b/classes/opml.php
index e0dbebcda..f60918061 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -1,7 +1,7 @@
 <?php
 class OPML extends Handler_Protected {
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("export", "import");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index 75b823822..9b3772ddc 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -1,6 +1,6 @@
 <?php
 class PluginHandler extends Handler_Protected {
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		return true;
 	}
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ac0874259..ce1a53bef 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -5,7 +5,7 @@ class Pref_Feeds extends Handler_Protected {
 	const E_ICON_UPLOAD_FAILED = 'E_ICON_UPLOAD_FAILED';
 	const E_ICON_UPLOAD_SUCCESS = 'E_ICON_UPLOAD_SUCCESS';
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index", "getfeedtree", "savefeedorder");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index c4017e4ec..8bc32939d 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -1,7 +1,7 @@
 <?php
 class Pref_Filters extends Handler_Protected {
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index", "getfiltertree", "savefilterorder");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 0eb88ea36..81b85481b 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -1,7 +1,7 @@
 <?php
 class Pref_Labels extends Handler_Protected {
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index", "getlabeltree");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index c45d6d6ea..3a39bf981 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -17,7 +17,7 @@ class Pref_Prefs extends Handler_Protected {
 	const PI_ERR_PLUGIN_NOT_FOUND = "PI_ERR_PLUGIN_NOT_FOUND";
 	const PI_ERR_NO_WORKDIR = "PI_ERR_NO_WORKDIR";
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index", "updateself", "otpqrcode");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 8bebcc7ce..356adee0c 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -4,7 +4,7 @@ class Pref_System extends Handler_Administrative {
 
 	private $log_page_limit = 15;
 
-	function csrf_ignore($method) {
+	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pref/users.php b/classes/pref/users.php
index aeba296b2..3c952b11b 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -1,6 +1,6 @@
 <?php
 class Pref_Users extends Handler_Administrative {
-		function csrf_ignore($method) {
+		function csrf_ignore(string $method): bool {
 			return $method == "index";
 		}
 
diff --git a/classes/rpc.php b/classes/rpc.php
index 6d56f039e..4024aae2e 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -1,7 +1,7 @@
 <?php
 class RPC extends Handler_Protected {
 
-	/*function csrf_ignore($method) {
+	/*function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("completelabels");
 
 		return array_search($method, $csrf_ignored) !== false;
-- 
cgit v1.2.3-54-g00ecf


From 763515de794b4affaf2babcc73008fcf88875c97 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Fri, 12 Nov 2021 04:48:06 +0000
Subject: Address PHPStan warnings in 'classes/feeds.php'.

Also some minor related tweaks in other classes.
---
 classes/api.php   |   4 +-
 classes/debug.php |  15 ++-
 classes/feeds.php | 286 +++++++++++++++++++++++++++++++++---------------------
 classes/rpc.php   |   2 +-
 4 files changed, 187 insertions(+), 120 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/api.php b/classes/api.php
index 7d6ac174c..1835d487c 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -409,8 +409,8 @@ class API extends Handler {
 
 	function catchupFeed() {
 		$feed_id = clean($_REQUEST["feed_id"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-		@$mode = clean($_REQUEST["mode"]);
+		$is_cat = clean($_REQUEST["is_cat"]) == "true";
+		$mode = clean($_REQUEST['mode'] ?? "");
 
 		if (!in_array($mode, ["all", "1day", "1week", "2week"]))
 			$mode = "all";
diff --git a/classes/debug.php b/classes/debug.php
index f7c23cf1c..eca7b31db 100644
--- a/classes/debug.php
+++ b/classes/debug.php
@@ -5,6 +5,13 @@ class Debug {
     const LOG_VERBOSE = 1;
     const LOG_EXTENDED = 2;
 
+	const ALL_LOG_LEVELS = [
+		Debug::LOG_DISABLED,
+		Debug::LOG_NORMAL,
+		Debug::LOG_VERBOSE,
+		Debug::LOG_EXTENDED,
+	];
+
 	/** @deprecated */
 	public static int $LOG_DISABLED = self::LOG_DISABLED;
 
@@ -43,21 +50,21 @@ class Debug {
     }
 
 	/**
-	 * @param Debug::LOG_* $level
+	 * @param int $level Debug::LOG_*
 	 */
-    public static function set_loglevel($level): void {
+    public static function set_loglevel(int $level): void {
         self::$loglevel = $level;
     }
 
 	/**
-	 * @return Debug::LOG_*
+	 * @return int Debug::LOG_*
 	 */
     public static function get_loglevel(): int {
         return self::$loglevel;
     }
 
 	/**
-	 * @param Debug::LOG_* $level
+	 * @param int $level Debug::LOG_*
 	 */
     public static function log(string $message, int $level = Debug::LOG_NORMAL): bool {
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 951675adb..24511c396 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -5,8 +5,11 @@ class Feeds extends Handler_Protected {
 	const NEVER_GROUP_FEEDS = [ -6, 0 ];
 	const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
 
-	 private $viewfeed_timestamp;
-	 private $viewfeed_timestamp_last;
+	/** @var int|float int on 64-bit, float on 32-bit */
+	private $viewfeed_timestamp;
+
+	/** @var int|float int on 64-bit, float on 32-bit */
+	private $viewfeed_timestamp_last;
 
 	function csrf_ignore(string $method): bool {
 		$csrf_ignored = array("index");
@@ -14,9 +17,12 @@ class Feeds extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	private function _format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
-					$offset, $override_order = false, $include_children = false, $check_first_id = false,
-					$skip_first_id_check = false, $order_by = false) {
+	/**
+	 * @return array{0: array<int, int>, 1: int, 2: int, 3: bool, 4: array<string, mixed>} $topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply
+	 */
+	private function _format_headlines_list(int $feed, string $method, string $view_mode, int $limit, bool $cat_view,
+					int $offset, string $override_order, bool $include_children, bool $check_first_id,
+					bool $skip_first_id_check, string $order_by): array {
 
 		$disable_cache = false;
 
@@ -80,6 +86,8 @@ class Feeds extends Handler_Protected {
 					"include_children" => $include_children,
 					"order_by" => $order_by);
 
+				// Implemented by a plugin, so ignore the undefined 'get_headlines' method.
+				// @phpstan-ignore-next-line
 				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed),
 					$options);
 			}
@@ -433,7 +441,7 @@ class Feeds extends Handler_Protected {
 		return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply);
 	}
 
-	function catchupAll() {
+	function catchupAll(): void {
 		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 						last_read = NOW(), unread = false WHERE unread = true AND owner_uid = ?");
 		$sth->execute([$_SESSION['uid']]);
@@ -441,7 +449,7 @@ class Feeds extends Handler_Protected {
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	function view() {
+	function view(): void {
 		$reply = array();
 
 		$feed = $_REQUEST["feed"];
@@ -450,7 +458,7 @@ class Feeds extends Handler_Protected {
 		$limit = 30;
 		$cat_view = $_REQUEST["cat"] == "true";
 		$next_unread_feed = $_REQUEST["nuf"] ?? 0;
-		$offset = $_REQUEST["skip"] ?? 0;
+		$offset = (int) ($_REQUEST["skip"] ?? 0);
 		$order_by = $_REQUEST["order_by"] ?? "";
 		$check_first_id = $_REQUEST["fid"] ?? 0;
 
@@ -538,7 +546,10 @@ class Feeds extends Handler_Protected {
 		print json_encode($reply);
 	}
 
-	private function _generate_dashboard_feed() {
+	/**
+	 * @return array<string, array<string, mixed>>
+	 */
+	private function _generate_dashboard_feed(): array {
 		$reply = array();
 
 		$reply['headlines']['id'] = -5;
@@ -580,7 +591,10 @@ class Feeds extends Handler_Protected {
 		return $reply;
 	}
 
-	private function _generate_error_feed($error) {
+	/**
+	 * @return array<string, mixed>
+	 */
+	private function _generate_error_feed(string $error): array {
 		$reply = array();
 
 		$reply['headlines']['id'] = -7;
@@ -596,13 +610,13 @@ class Feeds extends Handler_Protected {
 		return $reply;
 	}
 
-	function subscribeToFeed() {
+	function subscribeToFeed(): void {
 		print json_encode([
 			"cat_select" => \Controls\select_feeds_cats("cat")
 		]);
 	}
 
-	function search() {
+	function search(): void {
 		print json_encode([
 			"show_language" => Config::get(Config::DB_TYPE) == "pgsql",
 			"show_syntax_help" => count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0,
@@ -611,7 +625,7 @@ class Feeds extends Handler_Protected {
 		]);
 	}
 
-	function opensite() {
+	function opensite(): void {
 		$feed = ORM::for_table('ttrss_feeds')
 			->find_one((int)$_REQUEST['feed_id']);
 
@@ -628,10 +642,14 @@ class Feeds extends Handler_Protected {
 		print "Feed not found or has an empty site URL.";
 	}
 
-	function updatedebugger() {
+	function updatedebugger(): void {
 		header("Content-type: text/html");
 
-		$xdebug = isset($_REQUEST["xdebug"]) ? (int)$_REQUEST["xdebug"] : 1;
+		$xdebug = isset($_REQUEST["xdebug"]) ? (int)$_REQUEST["xdebug"] : Debug::LOG_VERBOSE;
+
+		if (!in_array($xdebug, Debug::ALL_LOG_LEVELS)) {
+			$xdebug = Debug::LOG_VERBOSE;
+		}
 
 		Debug::set_enabled(true);
 		Debug::set_loglevel($xdebug);
@@ -644,9 +662,9 @@ class Feeds extends Handler_Protected {
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if (!$sth->fetch()) {
-		    print "Access denied.";
-		    return;
-        }
+			print "Access denied.";
+			return;
+		}
 		?>
 		<!DOCTYPE html>
 		<html>
@@ -731,7 +749,10 @@ class Feeds extends Handler_Protected {
 
 	}
 
-	static function _catchup($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
+	/**
+	 * @param array<int, string> $search
+	 */
+	static function _catchup(string $feed_id_or_tag_name, bool $cat_view, ?int $owner_uid = null, string $mode = 'all', ?array $search = null): void {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
@@ -785,14 +806,16 @@ class Feeds extends Handler_Protected {
 				$date_qpart = "true";
 		}
 
-		if (is_numeric($feed)) {
+		if (is_numeric($feed_id_or_tag_name)) {
+			$feed_id = (int) $feed_id_or_tag_name;
+
 			if ($cat_view) {
 
-				if ($feed >= 0) {
+				if ($feed_id >= 0) {
 
-					if ($feed > 0) {
-						$children = self::_get_child_cats($feed, $owner_uid);
-						array_push($children, $feed);
+					if ($feed_id > 0) {
+						$children = self::_get_child_cats($feed_id, $owner_uid);
+						array_push($children, $feed_id);
 						$children = array_map("intval", $children);
 
 						$children = join(",", $children);
@@ -810,7 +833,7 @@ class Feeds extends Handler_Protected {
 										(SELECT id FROM ttrss_feeds WHERE $cat_qpart) AND $date_qpart AND $search_qpart) as tmp)");
 					$sth->execute([$owner_uid]);
 
-				} else if ($feed == -2) {
+				} else if ($feed_id == -2) {
 
 					$sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
@@ -819,18 +842,18 @@ class Feeds extends Handler_Protected {
 					$sth->execute([$owner_uid]);
 				}
 
-			} else if ($feed > 0) {
+			} else if ($feed_id > 0) {
 
 				$sth = $pdo->prepare("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
 						(SELECT id FROM
 							(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 								AND owner_uid = ? AND unread = true AND feed_id = ? AND $date_qpart AND $search_qpart) as tmp)");
-				$sth->execute([$owner_uid, $feed]);
+				$sth->execute([$owner_uid, $feed_id]);
 
-			} else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
+			} else if ($feed_id < 0 && $feed_id > LABEL_BASE_INDEX) { // special, like starred
 
-				if ($feed == -1) {
+				if ($feed_id == -1) {
 					$sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
@@ -839,7 +862,7 @@ class Feeds extends Handler_Protected {
 					$sth->execute([$owner_uid]);
 				}
 
-				if ($feed == -2) {
+				if ($feed_id == -2) {
 					$sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
@@ -848,7 +871,7 @@ class Feeds extends Handler_Protected {
 					$sth->execute([$owner_uid]);
 				}
 
-				if ($feed == -3) {
+				if ($feed_id == -3) {
 
 					$intl = (int) get_pref(Prefs::FRESH_ARTICLE_MAX_AGE);
 
@@ -867,7 +890,7 @@ class Feeds extends Handler_Protected {
 					$sth->execute([$owner_uid]);
 				}
 
-				if ($feed == -4) {
+				if ($feed_id == -4) {
 					$sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
@@ -875,10 +898,9 @@ class Feeds extends Handler_Protected {
 									AND owner_uid = ? AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
 					$sth->execute([$owner_uid]);
 				}
+			} else if ($feed_id < LABEL_BASE_INDEX) { // label
 
-			} else if ($feed < LABEL_BASE_INDEX) { // label
-
-				$label_id = Labels::feed_to_label_id($feed);
+				$label_id = Labels::feed_to_label_id($feed_id);
 
 				$sth = $pdo->prepare("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
@@ -887,23 +909,21 @@ class Feeds extends Handler_Protected {
 								AND label_id = ? AND ref_id = article_id
 								AND owner_uid = ? AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
 				$sth->execute([$label_id, $owner_uid]);
-
 			}
-
 		} else { // tag
+			$tag_name = $feed_id_or_tag_name;
+
 			$sth = $pdo->prepare("UPDATE ttrss_user_entries
 				SET unread = false, last_read = NOW() WHERE ref_id IN
 					(SELECT id FROM
 						(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
 							AND post_int_id = int_id AND tag_name = ?
 							AND ttrss_user_entries.owner_uid = ? AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
-			$sth->execute([$feed, $owner_uid]);
-
+			$sth->execute([$tag_name, $owner_uid]);
 		}
 	}
 
-	static function _get_counters($feed, $is_cat = false, $unread_only = false,
-							 $owner_uid = false) {
+	static function _get_counters(int $feed, bool $is_cat = false, bool $unread_only = false, ?int $owner_uid = null): int {
 
 		$n_feed = (int) $feed;
 		$need_entries = false;
@@ -1002,7 +1022,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	function add() {
+	function add(): void {
 		$feed = clean($_REQUEST['feed']);
 		$cat = clean($_REQUEST['cat'] ?? '');
 		$need_auth = isset($_REQUEST['need_auth']);
@@ -1015,7 +1035,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	/**
-	 * @return array (code => Status code, message => error message if available)
+	 * @return array<string, mixed> (code => Status code, message => error message if available)
 	 *
 	 *                 0 - OK, Feed already exists
 	 *                 1 - OK, Feed added
@@ -1029,8 +1049,7 @@ class Feeds extends Handler_Protected {
 	 *                 7 - Error while creating feed database entry.
 	 *                 8 - Permission denied (ACCESS_LEVEL_READONLY).
 	 */
-	static function _subscribe($url, $cat_id = 0,
-							   $auth_login = '', $auth_pass = '') : array {
+	static function _subscribe(string $url, int $cat_id = 0, string $auth_login = '', string $auth_pass = ''): array {
 
 		$user = ORM::for_table("ttrss_users")->find_one($_SESSION['uid']);
 
@@ -1109,15 +1128,18 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function _get_icon_file($feed_id) {
+	static function _get_icon_file(int $feed_id): string {
 		return Config::get(Config::ICONS_DIR) . "/$feed_id.ico";
 	}
 
-	static function _has_icon($id) {
+	static function _has_icon(int $id): bool {
 		return is_file(Config::get(Config::ICONS_DIR) . "/$id.ico") && filesize(Config::get(Config::ICONS_DIR) . "/$id.ico") > 0;
 	}
 
-	static function _get_icon($id) {
+	/**
+	 * @return false|string false if the icon ID was unrecognized, otherwise, the icon identifier string
+	 */
+	static function _get_icon(int $id) {
 		switch ($id) {
 			case 0:
 				return "archive";
@@ -1137,7 +1159,7 @@ class Feeds extends Handler_Protected {
 				} else {
 					$icon = self::_get_icon_file($id);
 
-                    if ($icon && file_exists($icon)) {
+					if ($icon && file_exists($icon)) {
 						return Config::get(Config::ICONS_URL) . "/" . basename($icon) . "?" . filemtime($icon);
 					}
 				}
@@ -1147,6 +1169,9 @@ class Feeds extends Handler_Protected {
 		return false;
 	}
 
+	/**
+	 * @return false|int false if the feed couldn't be found by URL+owner, otherwise the feed ID
+	 */
 	static function _find_by_url(string $feed_url, int $owner_uid) {
 		$feed = ORM::for_table('ttrss_feeds')
 			->where('owner_uid', $owner_uid)
@@ -1160,7 +1185,11 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	/** $owner_uid defaults to $_SESSION['uid] */
+	/**
+	 * $owner_uid defaults to $_SESSION['uid']
+	 *
+	 * @return false|int false if the category/feed couldn't be found by title, otherwise its ID
+	 */
 	static function _find_by_title(string $title, bool $cat = false, int $owner_uid = 0) {
 
 		$res = false;
@@ -1184,8 +1213,8 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function _get_title($id, bool $cat = false) {
-	    $pdo = Db::pdo();
+	static function _get_title(int $id, bool $cat = false): string {
+		$pdo = Db::pdo();
 
 		if ($cat) {
 			return self::_get_cat_title($id);
@@ -1197,7 +1226,7 @@ class Feeds extends Handler_Protected {
 			return __("Fresh articles");
 		} else if ($id == -4) {
 			return __("All articles");
-		} else if ($id === 0 || $id === "0") {
+		} else if ($id === 0) {
 			return __("Archived articles");
 		} else if ($id == -6) {
 			return __("Recently read");
@@ -1226,12 +1255,12 @@ class Feeds extends Handler_Protected {
 			}
 
 		} else {
-			return $id;
+			return "$id";
 		}
 	}
 
 	// only real cats
-	static function _get_cat_marked(int $cat, int $owner_uid = 0) {
+	static function _get_cat_marked(int $cat, int $owner_uid = 0): int {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1245,16 +1274,17 @@ class Feeds extends Handler_Protected {
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
 					AND owner_uid = :uid)
 				AND owner_uid = :uid");
+
 			$sth->execute(["cat" => $cat ? $cat : null, "uid" => $owner_uid]);
-			$row = $sth->fetch();
 
-			return $row["marked"];
-		} else {
-			return 0;
+			if ($row = $sth->fetch()) {
+				return (int) $row["marked"];
+			}
 		}
+		return 0;
 	}
 
-	static function _get_cat_unread(int $cat, int $owner_uid = 0) {
+	static function _get_cat_unread(int $cat, int $owner_uid = 0): int {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1265,14 +1295,15 @@ class Feeds extends Handler_Protected {
 			$sth = $pdo->prepare("SELECT SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS unread
 				FROM ttrss_user_entries
 				WHERE feed_id IN (SELECT id FROM ttrss_feeds
-                    WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
+					WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
 					AND owner_uid = :uid)
 				AND owner_uid = :uid");
-			$sth->execute(["cat" => $cat ? $cat : null, "uid" => $owner_uid]);
-			$row = $sth->fetch();
 
-			return $row["unread"];
+			$sth->execute(["cat" => $cat ? $cat : null, "uid" => $owner_uid]);
 
+			if ($row = $sth->fetch()) {
+				return (int) $row["unread"];
+			}
 		} else if ($cat == -1) {
 			return 0;
 		} else if ($cat == -2) {
@@ -1280,15 +1311,19 @@ class Feeds extends Handler_Protected {
 			$sth = $pdo->prepare("SELECT COUNT(DISTINCT article_id) AS unread
 				FROM ttrss_user_entries ue, ttrss_user_labels2 l
 				WHERE article_id = ref_id AND unread IS true AND ue.owner_uid = :uid");
+
 			$sth->execute(["uid" => $owner_uid]);
-            $row = $sth->fetch();
 
-			return $row["unread"];
+			if ($row = $sth->fetch()) {
+				return (int) $row["unread"];
+			}
 		}
+
+		return 0;
 	}
 
 	// only accepts real cats (>= 0)
-	static function _get_cat_children_unread(int $cat, int $owner_uid = 0) {
+	static function _get_cat_children_unread(int $cat, int $owner_uid = 0): int {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$pdo = Db::pdo();
@@ -1307,7 +1342,7 @@ class Feeds extends Handler_Protected {
 		return $unread;
 	}
 
-	static function _get_global_unread(int $user_id = 0) {
+	static function _get_global_unread(int $user_id = 0): int {
 
 		if (!$user_id) $user_id = $_SESSION["uid"];
 
@@ -1323,7 +1358,7 @@ class Feeds extends Handler_Protected {
 		return $row["count"];
 	}
 
-	static function _get_cat_title(int $cat_id) {
+	static function _get_cat_title(int $cat_id): string {
 		switch ($cat_id) {
 			case 0:
 				return __("Uncategorized");
@@ -1343,7 +1378,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	private static function _get_label_unread($label_id, int $owner_uid = 0) {
+	private static function _get_label_unread(int $label_id, ?int $owner_uid = null): int {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$pdo = Db::pdo();
@@ -1360,7 +1395,11 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function _get_headlines($params) {
+	/**
+	 * @param array<string, mixed> $params
+	 * @return array<int, mixed> $result, $feed_title, $feed_site_url, $last_error, $last_updated, $highlight_words, $first_id, $is_vfeed, $query_error_override
+	 */
+	static function _get_headlines($params): array {
 
 		$pdo = Db::pdo();
 
@@ -1577,7 +1616,7 @@ class Feeds extends Handler_Protected {
 		} else if ($feed <= LABEL_BASE_INDEX) { // labels
 			$label_id = Labels::feed_to_label_id($feed);
 
-			$query_strategy_part = "label_id = ".$pdo->quote($label_id)." AND
+			$query_strategy_part = "label_id = $label_id AND
 					ttrss_labels2.id = ttrss_user_labels2.label_id AND
 					ttrss_user_labels2.article_id = ref_id";
 
@@ -1857,7 +1896,10 @@ class Feeds extends Handler_Protected {
 
 	}
 
-	static function _get_parent_cats(int $cat, int $owner_uid) {
+	/**
+	 * @return array<int, int>
+	 */
+	static function _get_parent_cats(int $cat, int $owner_uid): array {
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -1874,7 +1916,10 @@ class Feeds extends Handler_Protected {
 		return $rv;
 	}
 
-	static function _get_child_cats(int $cat, int $owner_uid) {
+	/**
+	 * @return array<int, int>
+	 */
+	static function _get_child_cats(int $cat, int $owner_uid): array {
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -1891,7 +1936,11 @@ class Feeds extends Handler_Protected {
 		return $rv;
 	}
 
-	static function _cats_of(array $feeds, int $owner_uid, bool $with_parents = false) {
+	/**
+	 * @param array<int, int> $feeds
+	 * @return array<int, int>
+	 */
+	static function _cats_of(array $feeds, int $owner_uid, bool $with_parents = false): array {
 		if (count($feeds) == 0)
 			return [];
 
@@ -1930,24 +1979,27 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-    private function _color_of($name) {
-        $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
-            "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
-            "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
+	private function _color_of(string $name): string {
+		$colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
+			"#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
+			"#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
 
-        $sum = 0;
+		$sum = 0;
 
-        for ($i = 0; $i < strlen($name); $i++) {
-            $sum += ord($name[$i]);
-        }
+		for ($i = 0; $i < strlen($name); $i++) {
+			$sum += ord($name[$i]);
+		}
 
-        $sum %= count($colormap);
+		$sum %= count($colormap);
 
-        return $colormap[$sum];
+		return $colormap[$sum];
 	}
 
-	private static function _get_feeds_from_html($url, $content) {
-		$url     = UrlHelper::validate($url);
+	/**
+	 * @return array<string, string> array of feed URL -> feed title
+	 */
+	private static function _get_feeds_from_html(string $url, string $content): array {
+		$url = UrlHelper::validate($url);
 		$baseUrl = substr($url, 0, strrpos($url, '/') + 1);
 
 		$feedUrls = [];
@@ -1964,9 +2016,7 @@ class Feeds extends Handler_Protected {
 					if ($title == '') {
 						$title = $entry->getAttribute('type');
 					}
-					$feedUrl = rewrite_relative_url(
-						$baseUrl, $entry->getAttribute('href')
-					);
+					$feedUrl = UrlHelper::rewrite_relative($baseUrl, $entry->getAttribute('href'));
 					$feedUrls[$feedUrl] = $title;
 				}
 			}
@@ -1974,11 +2024,11 @@ class Feeds extends Handler_Protected {
 		return $feedUrls;
 	}
 
-	static function _is_html($content) {
+	static function _is_html(string $content): bool {
 		return preg_match("/<html|DOCTYPE html/i", substr($content, 0, 8192)) !== 0;
 	}
 
-	static function _remove_cat(int $id, int $owner_uid) {
+	static function _remove_cat(int $id, int $owner_uid): void {
 		$cat = ORM::for_table('ttrss_feed_categories')
 			->where('owner_uid', $owner_uid)
 			->find_one($id);
@@ -1987,7 +2037,7 @@ class Feeds extends Handler_Protected {
 			$cat->delete();
 	}
 
-	static function _add_cat(string $title, int $owner_uid, int $parent_cat = null, int $order_id = 0) {
+	static function _add_cat(string $title, int $owner_uid, int $parent_cat = null, int $order_id = 0): bool {
 
 		$cat = ORM::for_table('ttrss_feed_categories')
 			->where('owner_uid', $owner_uid)
@@ -2011,13 +2061,13 @@ class Feeds extends Handler_Protected {
 		return false;
 	}
 
-	static function _clear_access_keys(int $owner_uid) {
+	static function _clear_access_keys(int $owner_uid): void {
 		$key = ORM::for_table('ttrss_access_keys')
 			->where('owner_uid', $owner_uid)
 			->delete_many();
 	}
 
-	static function _update_access_key(string $feed_id, bool $is_cat, int $owner_uid) {
+	static function _update_access_key(int $feed_id, bool $is_cat, int $owner_uid): ?string {
 		$key = ORM::for_table('ttrss_access_keys')
 			->where('owner_uid', $owner_uid)
 			->where('feed_id', $feed_id)
@@ -2027,7 +2077,7 @@ class Feeds extends Handler_Protected {
 		return self::_get_access_key($feed_id, $is_cat, $owner_uid);
 	}
 
-	static function _get_access_key(string $feed_id, bool $is_cat, int $owner_uid) {
+	static function _get_access_key(int $feed_id, bool $is_cat, int $owner_uid): ?string {
 		$key = ORM::for_table('ttrss_access_keys')
 			->where('owner_uid', $owner_uid)
 			->where('feed_id', $feed_id)
@@ -2036,21 +2086,23 @@ class Feeds extends Handler_Protected {
 
 		if ($key) {
 			return $key->access_key;
-		} else {
-			$key = ORM::for_table('ttrss_access_keys')->create();
+		}
 
-			$key->owner_uid = $owner_uid;
-			$key->feed_id = $feed_id;
-			$key->is_cat = $is_cat;
-			$key->access_key = uniqid_short();
+		$key = ORM::for_table('ttrss_access_keys')->create();
 
-			if ($key->save()) {
-				return $key->access_key;
-			}
+		$key->owner_uid = $owner_uid;
+		$key->feed_id = $feed_id;
+		$key->is_cat = $is_cat;
+		$key->access_key = uniqid_short();
+
+		if ($key->save()) {
+			return $key->access_key;
 		}
+
+		return null;
 	}
 
-	static function _purge(int $feed_id, int $purge_interval) {
+	static function _purge(int $feed_id, int $purge_interval): ?int {
 
 		if (!$purge_interval) $purge_interval = self::_get_purge_interval($feed_id);
 
@@ -2079,7 +2131,7 @@ class Feeds extends Handler_Protected {
 
 			if ($purge_interval <= 0) {
 				Debug::log("purge_feed: purging disabled for this feed, nothing to do.", Debug::$LOG_VERBOSE);
-				return;
+				return null;
 			}
 
 			if (!$purge_unread)
@@ -2120,7 +2172,7 @@ class Feeds extends Handler_Protected {
 		return $rows_deleted;
 	}
 
-	private static function _get_purge_interval(int $feed_id) {
+	private static function _get_purge_interval(int $feed_id): int {
 		$feed = ORM::for_table('ttrss_feeds')->find_one($feed_id);
 
 		if ($feed) {
@@ -2133,7 +2185,10 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	private static function _search_to_sql($search, $search_language, $owner_uid) {
+	/**
+	 * @return array{0: string, 1: array<int, string>} [$search_query_part, $search_words]
+	 */
+	private static function _search_to_sql(string $search, string $search_language, int $owner_uid): array {
 		$keywords = str_getcsv(preg_replace('/(-?\w+)\:"(\w+)/', '"${1}:${2}', trim($search)), ' ');
 		$query_keywords = array();
 		$search_words = array();
@@ -2226,7 +2281,7 @@ class Feeds extends Handler_Protected {
 							array_push($query_keywords, "($not
 								(ttrss_entries.id IN (
 									SELECT article_id FROM ttrss_user_labels2 WHERE
-										label_id = ".$pdo->quote($label_id).")))");
+										label_id = $label_id)))");
 						} else {
 							array_push($query_keywords, "(false)");
 						}
@@ -2300,7 +2355,10 @@ class Feeds extends Handler_Protected {
 		return array($search_query_part, $search_words);
 	}
 
-	static function _order_to_override_query($order) {
+	/**
+	 * @return array{0: string, 1: bool}
+	 */
+	static function _order_to_override_query(string $order): array {
 		$query = "";
 		$skip_first_id = false;
 
@@ -2310,7 +2368,9 @@ class Feeds extends Handler_Protected {
 			},
 			$order);
 
-		if ($query)	return [$query, $skip_first_id];
+		if (is_string($query) && $query !== "") {
+			return [$query, $skip_first_id];
+		}
 
 		switch ($order) {
 			case "title":
@@ -2328,7 +2388,7 @@ class Feeds extends Handler_Protected {
 		return [$query, $skip_first_id];
 	}
 
-	private function _mark_timestamp($label) {
+	private function _mark_timestamp(string $label): void {
 
 		if (empty($_REQUEST['timestamps']))
 			return;
diff --git a/classes/rpc.php b/classes/rpc.php
index 4024aae2e..60119a605 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -227,7 +227,7 @@ class RPC extends Handler_Protected {
 		$search_query = clean($_REQUEST['search_query']);
 		$search_lang = clean($_REQUEST['search_lang']);
 
-		Feeds::_catchup($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
+		Feeds::_catchup($feed_id, $is_cat, null, $mode, [$search_query, $search_lang]);
 
 		// return counters here synchronously so that frontend can figure out next unread feed properly
 		print json_encode(['counters' => Counters::get_all()]);
-- 
cgit v1.2.3-54-g00ecf


From 25775bb4075e70aa4fad4620d077d4a0e59bb139 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Sat, 13 Nov 2021 04:14:18 +0000
Subject: Fix type of 'check_first_id' in Feeds '_format_headlines_list'.

---
 classes/feeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index 24511c396..22906cb54 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -21,7 +21,7 @@ class Feeds extends Handler_Protected {
 	 * @return array{0: array<int, int>, 1: int, 2: int, 3: bool, 4: array<string, mixed>} $topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply
 	 */
 	private function _format_headlines_list(int $feed, string $method, string $view_mode, int $limit, bool $cat_view,
-					int $offset, string $override_order, bool $include_children, bool $check_first_id,
+					int $offset, string $override_order, bool $include_children, ?int $check_first_id = null,
 					bool $skip_first_id_check, string $order_by): array {
 
 		$disable_cache = false;
-- 
cgit v1.2.3-54-g00ecf


From 1ec003ce352f5bf1418986d7b96c35e75231ffde Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Sat, 13 Nov 2021 14:05:43 +0000
Subject: Typing IHandler methods, typing Handler_Public, fix type of $feed_id
 (might be tag).

---
 classes/api.php                    |  2 +-
 classes/feeds.php                  | 14 +++++++++++--
 classes/handler.php                | 13 ++++++++++---
 classes/handler/administrative.php |  2 +-
 classes/handler/protected.php      |  2 +-
 classes/handler/public.php         | 40 +++++++++++++++++++++-----------------
 classes/ihandler.php               |  4 ++--
 7 files changed, 49 insertions(+), 28 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/api.php b/classes/api.php
index 1835d487c..125741c73 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -27,7 +27,7 @@ class API extends Handler {
 				]);
 	}
 
-	function before($method) {
+	function before(string $method): bool {
 		if (parent::before($method)) {
 			header("Content-Type: text/json");
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 22906cb54..0c75215c8 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -2067,7 +2067,12 @@ class Feeds extends Handler_Protected {
 			->delete_many();
 	}
 
-	static function _update_access_key(int $feed_id, bool $is_cat, int $owner_uid): ?string {
+	/**
+	 * @param string $feed_id may be a feed ID or tag
+	 *
+	 * @see Handler_Public#generate_syndicated_feed()
+	 */
+	static function _update_access_key(string $feed_id, bool $is_cat, int $owner_uid): ?string {
 		$key = ORM::for_table('ttrss_access_keys')
 			->where('owner_uid', $owner_uid)
 			->where('feed_id', $feed_id)
@@ -2077,7 +2082,12 @@ class Feeds extends Handler_Protected {
 		return self::_get_access_key($feed_id, $is_cat, $owner_uid);
 	}
 
-	static function _get_access_key(int $feed_id, bool $is_cat, int $owner_uid): ?string {
+	/**
+	 * @param string $feed_id may be a feed ID or tag
+	 *
+	 * @see Handler_Public#generate_syndicated_feed()
+	 */
+	static function _get_access_key(string $feed_id, bool $is_cat, int $owner_uid): ?string {
 		$key = ORM::for_table('ttrss_access_keys')
 			->where('owner_uid', $owner_uid)
 			->where('feed_id', $feed_id)
diff --git a/classes/handler.php b/classes/handler.php
index 4c79628db..3ee42cedb 100644
--- a/classes/handler.php
+++ b/classes/handler.php
@@ -1,9 +1,16 @@
 <?php
 class Handler implements IHandler {
+	// TODO: class properties can be switched to PHP typing if/when the minimum PHP_VERSION is raised to 7.4.0+
+	/** @var PDO */
 	protected $pdo;
+
+	/** @var array<int|string, mixed> */
 	protected $args;
 
-	function __construct($args) {
+	/**
+	 * @param array<int|string, mixed> $args
+	 */
+	function __construct(array $args) {
 		$this->pdo = Db::pdo();
 		$this->args = $args;
 	}
@@ -12,11 +19,11 @@ class Handler implements IHandler {
 		return false;
 	}
 
-	function before($method) {
+	function before(string $method): bool {
 		return true;
 	}
 
-	function after() {
+	function after(): bool {
 		return true;
 	}
 
diff --git a/classes/handler/administrative.php b/classes/handler/administrative.php
index f2f5b36ba..533cb3630 100644
--- a/classes/handler/administrative.php
+++ b/classes/handler/administrative.php
@@ -1,6 +1,6 @@
 <?php
 class Handler_Administrative extends Handler_Protected {
-   function before($method) {
+   function before(string $method): bool {
       if (parent::before($method)) {
          if (($_SESSION["access_level"] ?? 0) >= UserHelper::ACCESS_LEVEL_ADMIN) {
             return true;
diff --git a/classes/handler/protected.php b/classes/handler/protected.php
index 8e9e5ca1d..a15fc0956 100644
--- a/classes/handler/protected.php
+++ b/classes/handler/protected.php
@@ -1,7 +1,7 @@
 <?php
 class Handler_Protected extends Handler {
 
-	function before($method) {
+	function before(string $method): bool {
 		return parent::before($method) && !empty($_SESSION['uid']);
 	}
 }
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 9a9f7b892..e28bb5fd2 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -1,10 +1,12 @@
 <?php
 class Handler_Public extends Handler {
 
-	// $feed may be a tag
+	/**
+	 * @param string $feed may be a feed ID or tag
+	 */
 	private function generate_syndicated_feed(int $owner_uid, string $feed, bool $is_cat,
 		int $limit, int $offset, string $search, string $view_mode = "",
-		string $format = 'atom', string $order = "", string $orig_guid = "", string $start_ts = "") {
+		string $format = 'atom', string $order = "", string $orig_guid = "", string $start_ts = ""): void {
 
 		$note_style = 	"background-color : #fff7d5;
 			border-width : 1px; ".
@@ -52,11 +54,13 @@ class Handler_Public extends Handler {
 				PluginHost::feed_to_pfeed_id((int)$feed));
 
 			if ($handler) {
+				// 'get_headlines' is implemented by the plugin.
+				// @phpstan-ignore-next-line
 				$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;
+				return;
 			}
 
 		} else {
@@ -247,7 +251,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	function getUnread() {
+	function getUnread(): void {
 		$login = clean($_REQUEST["login"]);
 		$fresh = clean($_REQUEST["fresh"]) == "1";
 
@@ -265,7 +269,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	function getProfiles() {
+	function getProfiles(): void {
 		$login = clean($_REQUEST["login"]);
 		$rv = [];
 
@@ -288,7 +292,7 @@ class Handler_Public extends Handler {
 		print json_encode($rv);
 	}
 
-	function logout() {
+	function logout(): void {
 		if (validate_csrf($_POST["csrf_token"])) {
 			UserHelper::logout();
 			header("Location: index.php");
@@ -298,7 +302,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	function rss() {
+	function rss(): void {
 		$feed = clean($_REQUEST["id"]);
 		$key = clean($_REQUEST["key"]);
 		$is_cat = clean($_REQUEST["is_cat"] ?? false);
@@ -333,21 +337,21 @@ class Handler_Public extends Handler {
 		header('HTTP/1.1 403 Forbidden');
 	}
 
-	function updateTask() {
+	function updateTask(): void {
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK);
 	}
 
-	function housekeepingTask() {
+	function housekeepingTask(): void {
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING);
 	}
 
-	function globalUpdateFeeds() {
+	function globalUpdateFeeds(): void {
 		RPC::updaterandomfeed_real();
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK);
 	}
 
-	function login() {
+	function login(): void {
 		if (!Config::get(Config::SINGLE_USER_MODE)) {
 
 			$login = clean($_POST["login"]);
@@ -403,12 +407,12 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	function index() {
+	function index(): void {
 		header("Content-Type: text/plain");
 		print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 	}
 
-	function forgotpass() {
+	function forgotpass(): void {
 		startup_gettext();
 		session_start();
 
@@ -587,7 +591,7 @@ class Handler_Public extends Handler {
 		print "</html>";
 	}
 
-	function dbupdate() {
+	function dbupdate(): void {
 		startup_gettext();
 
 		if (!Config::get(Config::SINGLE_USER_MODE) && ($_SESSION["access_level"] ?? 0) < 10) {
@@ -730,7 +734,7 @@ class Handler_Public extends Handler {
 		<?php
 	}
 
-	function cached() {
+	function cached(): void {
 		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
 
 		// we do not allow files with extensions at the moment
@@ -746,7 +750,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	private function _make_article_tag_uri($id, $timestamp) {
+	private function _make_article_tag_uri(int $id, string $timestamp): string {
 
 		$timestamp = date("Y-m-d", strtotime($timestamp));
 
@@ -756,7 +760,7 @@ class Handler_Public extends Handler {
 	// this should be used very carefully because this endpoint is exposed to unauthenticated users
 	// plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
 	// in general, don't do anything user-related in here and do not modify $_SESSION
-	public function pluginhandler() {
+	public function pluginhandler(): void {
 		$host = new PluginHost();
 
 		$plugin_name = basename(clean($_REQUEST["plugin"]));
@@ -788,7 +792,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	static function _render_login_form(string $return_to = "") {
+	static function _render_login_form(string $return_to = ""): void {
 		header('Cache-Control: public');
 
 		if ($return_to)
diff --git a/classes/ihandler.php b/classes/ihandler.php
index 8345839c0..215143370 100644
--- a/classes/ihandler.php
+++ b/classes/ihandler.php
@@ -1,6 +1,6 @@
 <?php
 interface IHandler {
 	function csrf_ignore(string $method): bool;
-	function before($method);
-	function after();
+	function before(string $method): bool;
+	function after(): bool;
 }
-- 
cgit v1.2.3-54-g00ecf