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()'.
---
 plugins/share/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/share/init.php')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 359d86802..8da417e52 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -133,7 +133,7 @@ class Share extends Plugin {
 
 			$line["content"] = Sanitizer::sanitize($line["content"],
 				$line['hide_images'],
-				$owner_uid, $line["site_url"], false, $line["id"]);
+				$owner_uid, $line["site_url"], null, $line["id"]);
 
 			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ARTICLE,
 				function ($result) use (&$line) {
-- 
cgit v1.2.3


From 68d7cf44f994b422ede2adc6d182d5efce5cbe64 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 13 Nov 2021 19:49:37 +0300
Subject: phpstan: deal with plugins/share

---
 plugins/share/init.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'plugins/share/init.php')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 8da417e52..4a2a942d7 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -1,14 +1,16 @@
 <?php
 class Share extends Plugin {
+	/** @var PluginHost $host */
 	private $host;
 
+	/** @return array<float|string|null> */
 	function about() {
 		return array(null,
 			"Share article by unique URL",
 			"fox");
 	}
 
-	/* @var PluginHost $host */
+	/** @param PluginHost $host */
 	function init($host) {
 		$this->host = $host;
 
@@ -20,18 +22,22 @@ class Share extends Plugin {
 		return $method == "get";
 	}
 
+	/** @return string */
 	function get_js() {
 		return file_get_contents(__DIR__ . "/share.js");
 	}
 
+	/** @return string */
 	function get_css() {
 		return file_get_contents(__DIR__ . "/share.css");
 	}
 
+	/** @return string */
 	function get_prefs_js() {
 		return file_get_contents(__DIR__ . "/share_prefs.js");
 	}
 
+	/** @return void */
 	function unshare() {
 		$id = $_REQUEST['id'];
 
@@ -42,6 +48,9 @@ class Share extends Plugin {
 		print __("Article unshared");
 	}
 
+	/** @param int $id
+	 *
+	 * @return void */
 	function hook_prefs_tab_section($id) {
 		if ($id == "prefFeedsPublishedGenerated") {
 			?>
@@ -56,6 +65,7 @@ class Share extends Plugin {
 		}
 	}
 
+	/** @return void */
 	function clearArticleKeys() {
 		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = '' WHERE
 			owner_uid = ?");
@@ -64,6 +74,7 @@ class Share extends Plugin {
 		print __("Shared URLs cleared.");
 	}
 
+	/** @return void */
 	function newkey() {
 		$id = $_REQUEST['id'];
 		$uuid = uniqid_short();
@@ -75,6 +86,10 @@ class Share extends Plugin {
 		print json_encode(["link" => $uuid]);
 	}
 
+	/**
+	 * @param array<string,mixed> $line
+	 *
+	 * @return string */
 	function hook_article_button($line) {
 		$icon_class = !empty($line['uuid']) ? "is-shared" : "";
 
@@ -83,6 +98,7 @@ class Share extends Plugin {
 			title='".__('Share by URL')."'>link</i>";
 	}
 
+	/** @return void */
 	function get() {
 		$uuid = clean($_REQUEST["key"] ?? "");
 
@@ -107,7 +123,7 @@ class Share extends Plugin {
 		print "Article not found.";
 	}
 
-	private function format_article($id, $owner_uid) {
+	private function format_article(int $id, int $owner_uid) : void {
 
 		$pdo = Db::pdo();
 
@@ -231,6 +247,7 @@ class Share extends Plugin {
 		}
 	}
 
+	/** @return void */
 	function shareDialog() {
 		$id = (int)clean($_REQUEST['id'] ?? 0);
 
@@ -276,6 +293,7 @@ class Share extends Plugin {
 		<?php
 	}
 
+	/** @return int */
 	function api_version() {
 		return 2;
 	}
-- 
cgit v1.2.3


From 03d069226886a6955cc71c6b25ddc92b9b7d47b2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 13 Nov 2021 19:52:47 +0300
Subject: no need to duplicate annotations

---
 plugins/share/init.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'plugins/share/init.php')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 4a2a942d7..4dbc389fd 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -3,14 +3,12 @@ class Share extends Plugin {
 	/** @var PluginHost $host */
 	private $host;
 
-	/** @return array<float|string|null> */
 	function about() {
 		return array(null,
 			"Share article by unique URL",
 			"fox");
 	}
 
-	/** @param PluginHost $host */
 	function init($host) {
 		$this->host = $host;
 
@@ -22,17 +20,14 @@ class Share extends Plugin {
 		return $method == "get";
 	}
 
-	/** @return string */
 	function get_js() {
 		return file_get_contents(__DIR__ . "/share.js");
 	}
 
-	/** @return string */
 	function get_css() {
 		return file_get_contents(__DIR__ . "/share.css");
 	}
 
-	/** @return string */
 	function get_prefs_js() {
 		return file_get_contents(__DIR__ . "/share_prefs.js");
 	}
-- 
cgit v1.2.3


From fe5ada72504705f9304c3f0bba049a20998fe650 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 13 Nov 2021 20:07:13 +0300
Subject: set some annotations on Plugin hook methods

---
 plugins/share/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/share/init.php')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 4dbc389fd..b900de5c0 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -43,8 +43,8 @@ class Share extends Plugin {
 		print __("Article unshared");
 	}
 
-	/** @param int $id
-	 *
+	/**
+	 * @param string $id
 	 * @return void */
 	function hook_prefs_tab_section($id) {
 		if ($id == "prefFeedsPublishedGenerated") {
-- 
cgit v1.2.3


From 242cf916eff84325c4ab30fdc4dc24292ab6127f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 14 Nov 2021 21:20:59 +0300
Subject: deal with phpstan warnings in plugins/note, nsfw, and share

---
 plugins/share/init.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'plugins/share/init.php')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index b900de5c0..0b14c673b 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -194,10 +194,7 @@ class Share extends Plugin {
 								strip_tags($content_decoded)
 							)
 						), 500, "...")) ?>">
-
-					<?php if ($og_image) { ?>
-						<meta property='og:image' content="<?= htmlspecialchars($og_image) ?>">
-					<?php } ?>
+					<meta property='og:image' content="<?= htmlspecialchars($og_image) ?>">
 				</head>
 
 				<body class='flat ttrss_utility ttrss_zoom css_loading'>
-- 
cgit v1.2.3