From 95277fd099987f8173287c9565494633157a0ac8 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Thu, 11 Nov 2021 22:28:13 +0000
Subject: Address PHPStan warnings in 'classes/labels.php'.

---
 classes/labels.php | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'classes/labels.php')

diff --git a/classes/labels.php b/classes/labels.php
index 570f24f4f..b9c480f82 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -1,15 +1,15 @@
 <?php
 class Labels
 {
-	static function label_to_feed_id($label) {
+	static function label_to_feed_id(int $label): int {
 		return LABEL_BASE_INDEX - 1 - abs($label);
 	}
 
-	static function feed_to_label_id($feed) {
+	static function feed_to_label_id(int $feed): int {
 		return LABEL_BASE_INDEX - 1 + abs($feed);
 	}
 
-	static function find_id($label, $owner_uid) {
+	static function find_id(string $label, int $owner_uid): int {
 		$pdo = Db::pdo();
 
 		$sth = $pdo->prepare("SELECT id FROM ttrss_labels2 WHERE LOWER(caption) = LOWER(?)
@@ -23,7 +23,7 @@ class Labels
 		}
 	}
 
-	static function find_caption($label, $owner_uid) {
+	static function find_caption(int $label, int $owner_uid): string {
 		$pdo = Db::pdo();
 
 		$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 WHERE id = ?
@@ -37,18 +37,24 @@ class Labels
 		}
 	}
 
-	static function get_as_hash($owner_uid) {
+	/**
+	 * @return array<int, array<string, string>>
+	 */
+	static function get_as_hash(int $owner_uid): array {
 		$rv = [];
 		$labels = Labels::get_all($owner_uid);
 
 		foreach ($labels as $i => $label) {
-			$rv[$label["id"]] = $labels[$i];
+			$rv[(int)$label["id"]] = $labels[$i];
 		}
 
 		return $rv;
 	}
 
-	static function get_all($owner_uid)	{
+	/**
+	 * @return array<int, array<string, string>> An array of label detail arrays
+	 */
+	static function get_all(int $owner_uid)	{
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -64,7 +70,12 @@ class Labels
 		return $rv;
 	}
 
-	static function update_cache($owner_uid, $id, $labels = false, $force = false) {
+	/**
+	 * @param array<int, array<int|string, mixed>>|null $labels
+	 *
+	 * @see Article::_get_labels()
+	 */
+	static function update_cache(int $owner_uid, int $id, ?array $labels = null, bool $force = false): void {
 		$pdo = Db::pdo();
 
 		if ($force)
@@ -81,7 +92,7 @@ class Labels
 
 	}
 
-	static function clear_cache($id)	{
+	static function clear_cache(int $id): void	{
 
 		$pdo = Db::pdo();
 
@@ -91,7 +102,7 @@ class Labels
 
 	}
 
-	static function remove_article($id, $label, $owner_uid) {
+	static function remove_article(int $id, string $label, int $owner_uid): void {
 
 		$label_id = self::find_id($label, $owner_uid);
 
@@ -109,7 +120,7 @@ class Labels
 		self::clear_cache($id);
 	}
 
-	static function add_article($id, $label, $owner_uid)	{
+	static function add_article(int $id, string $label, int $owner_uid): void {
 
 		$label_id = self::find_id($label, $owner_uid);
 
@@ -138,7 +149,7 @@ class Labels
 
 	}
 
-	static function remove($id, $owner_uid) {
+	static function remove(int $id, int $owner_uid): void {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$pdo = Db::pdo();
@@ -182,7 +193,10 @@ class Labels
 		if (!$tr_in_progress) $pdo->commit();
 	}
 
-	static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false)	{
+	/**
+	 * @return false|int false if the check for an existing label failed, otherwise the number of rows inserted (1 on success)
+	 */
+	static function create(string $caption, ?string $fg_color = '', ?string $bg_color = '', ?int $owner_uid = null)	{
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-- 
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/labels.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 9db5e402a0283deaae7d06496f410e9ab8deb1b4 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Fri, 12 Nov 2021 05:42:55 +0000
Subject: Address PHPStan warnings in 'classes/rpc.php'.

Also a couple minor fixes in 'classes/article.php' and 'classes/labels.php'.
---
 classes/article.php |  2 +-
 classes/labels.php  |  2 +-
 classes/rpc.php     | 76 ++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 51 insertions(+), 29 deletions(-)

(limited to 'classes/labels.php')

diff --git a/classes/article.php b/classes/article.php
index 4af36d1c0..b4f28dc28 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -483,7 +483,7 @@ class Article extends Handler_Protected {
 
 	/**
 	 * @param array<int, int> $ids
-	 * @param Article::CATCHUP_MODE_* $cmode
+	 * @param int $cmode Article::CATCHUP_MODE_*
 	 */
 	static function _catchup_by_id($ids, int $cmode, ?int $owner_uid = null): void {
 
diff --git a/classes/labels.php b/classes/labels.php
index d78f92139..5a17d665e 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -71,7 +71,7 @@ class Labels
 	}
 
 	/**
-	 * @param array<int, array<int, array<int, int|string>> $labels
+	 * @param array<int, array<int, array<int, int|string>>> $labels
 	 *
 	 * @see Article::_get_labels()
 	 */
diff --git a/classes/rpc.php b/classes/rpc.php
index 60119a605..75d008b8b 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -7,7 +7,10 @@ class RPC extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}*/
 
-	private function _translations_as_array() {
+	/**
+	 * @return array<string, string>
+	 */
+	private function _translations_as_array(): array {
 
 		global $text_domains;
 
@@ -37,7 +40,7 @@ class RPC extends Handler_Protected {
 	}
 
 
-	function togglepref() {
+	function togglepref(): void {
 		$key = clean($_REQUEST["key"]);
 		set_pref($key, !get_pref($key));
 		$value = get_pref($key);
@@ -45,7 +48,7 @@ class RPC extends Handler_Protected {
 		print json_encode(array("param" =>$key, "value" => $value));
 	}
 
-	function setpref() {
+	function setpref(): void {
 		// set_pref escapes input, so no need to double escape it here
 		$key = clean($_REQUEST['key']);
 		$value = $_REQUEST['value'];
@@ -55,7 +58,7 @@ class RPC extends Handler_Protected {
 		print json_encode(array("param" =>$key, "value" => $value));
 	}
 
-	function mark() {
+	function mark(): void {
 		$mark = clean($_REQUEST["mark"]);
 		$id = clean($_REQUEST["id"]);
 
@@ -68,7 +71,7 @@ class RPC extends Handler_Protected {
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	function delete() {
+	function delete(): void {
 		$ids = explode(",", clean($_REQUEST["ids"]));
 		$ids_qmarks = arr_qmarks($ids);
 
@@ -81,7 +84,7 @@ class RPC extends Handler_Protected {
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	function publ() {
+	function publ(): void {
 		$pub = clean($_REQUEST["pub"]);
 		$id = clean($_REQUEST["id"]);
 
@@ -94,7 +97,7 @@ class RPC extends Handler_Protected {
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	function getRuntimeInfo() {
+	function getRuntimeInfo(): void {
 		$reply = [
 			'runtime-info' => $this->_make_runtime_info()
 		];
@@ -102,7 +105,7 @@ class RPC extends Handler_Protected {
 		print json_encode($reply);
 	}
 
-	function getAllCounters() {
+	function getAllCounters(): void {
 		@$seq = (int) $_REQUEST['seq'];
 
 		$feed_id_count = (int)$_REQUEST["feed_id_count"];
@@ -133,7 +136,7 @@ class RPC extends Handler_Protected {
 	}
 
 	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
-	function catchupSelected() {
+	function catchupSelected(): void {
 		$ids = array_map("intval", clean($_REQUEST["ids"] ?? []));
 		$cmode = (int)clean($_REQUEST["cmode"]);
 
@@ -145,7 +148,7 @@ class RPC extends Handler_Protected {
 			"feeds" => Article::_feeds_of($ids)]);
 	}
 
-	function markSelected() {
+	function markSelected(): void {
 		$ids = array_map("intval", clean($_REQUEST["ids"] ?? []));
 		$cmode = (int)clean($_REQUEST["cmode"]);
 
@@ -157,7 +160,7 @@ class RPC extends Handler_Protected {
 			"feeds" => Article::_feeds_of($ids)]);
 	}
 
-	function publishSelected() {
+	function publishSelected(): void {
 		$ids = array_map("intval", clean($_REQUEST["ids"] ?? []));
 		$cmode = (int)clean($_REQUEST["cmode"]);
 
@@ -169,7 +172,7 @@ class RPC extends Handler_Protected {
 			"feeds" => Article::_feeds_of($ids)]);
 	}
 
-	function sanityCheck() {
+	function sanityCheck(): void {
 		$_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
 		$_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
@@ -220,7 +223,7 @@ class RPC extends Handler_Protected {
 		print "</ul>";
 	}*/
 
-	function catchupFeed() {
+	function catchupFeed(): void {
 		$feed_id = clean($_REQUEST['feed_id']);
 		$is_cat = clean($_REQUEST['is_cat']) == "true";
 		$mode = clean($_REQUEST['mode'] ?? '');
@@ -235,7 +238,7 @@ class RPC extends Handler_Protected {
 		//print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	function setWidescreen() {
+	function setWidescreen(): void {
 		$wide = (int) clean($_REQUEST["wide"]);
 
 		set_pref(Prefs::WIDESCREEN_MODE, $wide);
@@ -243,7 +246,7 @@ class RPC extends Handler_Protected {
 		print json_encode(["wide" => $wide]);
 	}
 
-	static function updaterandomfeed_real() {
+	static function updaterandomfeed_real(): void {
 
 		$default_interval = (int) Prefs::get_default(Prefs::DEFAULT_UPDATE_INTERVAL);
 
@@ -336,11 +339,14 @@ class RPC extends Handler_Protected {
 
 	}
 
-	function updaterandomfeed() {
+	function updaterandomfeed(): void {
 		self::updaterandomfeed_real();
 	}
 
-	private function markArticlesById($ids, $cmode) {
+	/**
+	 * @param array<int, int> $ids
+	 */
+	private function markArticlesById(array $ids, int $cmode): void {
 
 		$ids_qmarks = arr_qmarks($ids);
 
@@ -361,7 +367,10 @@ class RPC extends Handler_Protected {
 		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
 	}
 
-	private function publishArticlesById($ids, $cmode) {
+	/**
+	 * @param array<int, int> $ids
+	 */
+	private function publishArticlesById(array $ids, int $cmode): void {
 
 		$ids_qmarks = arr_qmarks($ids);
 
@@ -382,7 +391,7 @@ class RPC extends Handler_Protected {
 		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
 	}
 
-	function log() {
+	function log(): void {
 		$msg = clean($_REQUEST['msg'] ?? "");
 		$file = basename(clean($_REQUEST['file'] ?? ""));
 		$line = (int) clean($_REQUEST['line'] ?? 0);
@@ -396,7 +405,7 @@ class RPC extends Handler_Protected {
 		}
 	}
 
-	function checkforupdates() {
+	function checkforupdates(): void {
 		$rv = ["changeset" => [], "plugins" => []];
 
 		$version = Config::get_version(false);
@@ -425,7 +434,10 @@ class RPC extends Handler_Protected {
 		print json_encode($rv);
 	}
 
-	private function _make_init_params() {
+	/**
+	 * @return array<string, mixed>
+	 */
+	private function _make_init_params(): array {
 		$params = array();
 
 		foreach ([Prefs::ON_CATCHUP_SHOW_NEXT_FEED, Prefs::HIDE_READ_FEEDS,
@@ -481,7 +493,7 @@ class RPC extends Handler_Protected {
 		return $params;
 	}
 
-	private function image_to_base64($filename) {
+	private function image_to_base64(string $filename): string {
 		if (file_exists($filename)) {
 			$ext = pathinfo($filename, PATHINFO_EXTENSION);
 
@@ -493,7 +505,10 @@ class RPC extends Handler_Protected {
 		}
 	}
 
-	static function _make_runtime_info() {
+	/**
+	 * @return array<string, mixed>
+	 */
+	static function _make_runtime_info(): array {
 		$data = array();
 
 		$pdo = Db::pdo();
@@ -562,7 +577,10 @@ class RPC extends Handler_Protected {
 		return $data;
 	}
 
-	static function get_hotkeys_info() {
+	/**
+	 * @return array<string, array<string, string>>
+	 */
+	static function get_hotkeys_info(): array {
 		$hotkeys = array(
 			__("Navigation") => array(
 				"next_feed" => __("Open next feed"),
@@ -642,8 +660,12 @@ class RPC extends Handler_Protected {
 		return $hotkeys;
 	}
 
-	// {3} - 3 panel mode only
-	// {C} - combined mode only
+	/**
+	 * {3} - 3 panel mode only
+	 * {C} - combined mode only
+	 *
+	 * @return array{0: array<int, string>, 1: array<string, string>} $prefixes, $hotkeys
+	 */
 	static function get_hotkeys_map() {
 		$hotkeys = array(
 			"k" => "next_feed",
@@ -728,7 +750,7 @@ class RPC extends Handler_Protected {
 		return array($prefixes, $hotkeys);
 	}
 
-	function hotkeyHelp() {
+	function hotkeyHelp(): void {
 		$info = self::get_hotkeys_info();
 		$imap = self::get_hotkeys_map();
 		$omap = array();
-- 
cgit v1.2.3-54-g00ecf


From b37a03fb31cf1c394e36ccf082bb5d3359f3a1fb Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Sat, 13 Nov 2021 14:41:22 +0000
Subject: Fix the type of Labels::update_cache()

---
 classes/article.php | 2 ++
 classes/labels.php  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'classes/labels.php')

diff --git a/classes/article.php b/classes/article.php
index b4f28dc28..b720971b9 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -553,6 +553,8 @@ class Article extends Handler_Protected {
 		}
 
 		if (count($rv) > 0)
+			// PHPStan has issues with the shape of $rv for some reason (array vs non-empty-array).
+			// @phpstan-ignore-next-line
 			Labels::update_cache($owner_uid, $id, $rv);
 		else
 			Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
diff --git a/classes/labels.php b/classes/labels.php
index 5a17d665e..026e6621f 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -71,7 +71,8 @@ class Labels
 	}
 
 	/**
-	 * @param array<int, array<int, array<int, int|string>>> $labels
+	 * @param array{'no-labels': 1}|array<int, array<int, array{0: int, 1: string, 2: string, 3: string}>> $labels
+	 * [label_id, caption, fg_color, bg_color]
 	 *
 	 * @see Article::_get_labels()
 	 */
-- 
cgit v1.2.3-54-g00ecf