From 4cc3374f9f6cdd6ea05d4d16942d0165d8b2ed90 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Wed, 10 Nov 2021 21:38:25 +0000
Subject: Initial go at PHPStan rule level 6.

---
 update_daemon2.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'update_daemon2.php')

diff --git a/update_daemon2.php b/update_daemon2.php
index 8931813ff..46f7450a6 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -37,7 +37,7 @@
 	/**
 	 * @SuppressWarnings(unused)
 	 */
-	function reap_children() {
+	function reap_children(): int {
 		global $children;
 		global $ctimes;
 
@@ -64,7 +64,7 @@
 		return count($tmp);
 	}
 
-	function check_ctimes() {
+	function check_ctimes(): void {
 		global $ctimes;
 
 		foreach (array_keys($ctimes) as $pid) {
@@ -80,7 +80,7 @@
 	/**
 	* @SuppressWarnings(unused)
  	*/
-	function sigchld_handler($signal) {
+	function sigchld_handler(int $signo, mixed $siginfo): void {
 		$running_jobs = reap_children();
 
 		Debug::log("Received SIGCHLD, $running_jobs active tasks left.");
@@ -88,7 +88,7 @@
 		pcntl_waitpid(-1, $status, WNOHANG);
 	}
 
-	function shutdown($caller_pid) {
+	function shutdown(int $caller_pid): void {
 		if ($caller_pid == posix_getpid()) {
 			if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.lock")) {
 				Debug::log("Removing lockfile (master)...");
@@ -97,7 +97,7 @@
 		}
 	}
 
-	function task_shutdown() {
+	function task_shutdown(): void {
 		$pid = posix_getpid();
 
 		if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon-$pid.lock")) {
@@ -106,13 +106,13 @@
 		}
 	}
 
-	function sigint_handler() {
+	function sigint_handler(): void {
 		Debug::log("[MASTER] SIG_INT received, shutting down master process.");
 		shutdown(posix_getpid());
 		die;
 	}
 
-	function task_sigint_handler() {
+	function task_sigint_handler(): void {
 		Debug::log("[TASK] SIG_INT received, shutting down task.");
 		task_shutdown();
 		die;
-- 
cgit v1.2.3-54-g00ecf


From bf53dfa51559fd094338f23acd0f4ec312bfd215 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Wed, 10 Nov 2021 21:53:28 +0000
Subject: Don't use 'mixed' directly (PHP 8+).

---
 update_daemon2.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'update_daemon2.php')

diff --git a/update_daemon2.php b/update_daemon2.php
index 46f7450a6..06a31225e 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -79,8 +79,9 @@
 
 	/**
 	* @SuppressWarnings(unused)
+	* @param mixed $siginfo
  	*/
-	function sigchld_handler(int $signo, mixed $siginfo): void {
+	function sigchld_handler(int $signo, $siginfo): void {
 		$running_jobs = reap_children();
 
 		Debug::log("Received SIGCHLD, $running_jobs active tasks left.");
-- 
cgit v1.2.3-54-g00ecf


From 0f324b77df21631b183c98d67dbb08750be9d2e1 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Thu, 11 Nov 2021 12:11:30 +0000
Subject: Address PHPStan warning and tweak 'tasks'+'interval' handling in
 'update_daemon2.php'.

This ensures both are of the expected type (int) and meet a reasonable minimum.
---
 update_daemon2.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'update_daemon2.php')

diff --git a/update_daemon2.php b/update_daemon2.php
index 06a31225e..eea790c8b 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -130,7 +130,7 @@
 
 	$options = getopt("", $longopts);
 
-	if (isset($options["help"]) ) {
+	if ($options === false || isset($options["help"]) ) {
 		print "Tiny Tiny RSS update daemon.\n\n";
 		print "Options:\n";
 		print "  --log FILE           - log messages to FILE\n";
@@ -161,21 +161,28 @@
 
 	if (isset($options["tasks"])) {
 		Debug::log("Set to spawn " . $options["tasks"] . " children.");
-		$max_jobs = $options["tasks"];
+		$max_jobs = (int) $options["tasks"];
 	} else {
 		$max_jobs = Config::get(Config::DAEMON_MAX_JOBS);
 	}
 
+	if ($max_jobs < 1) {
+		$max_jobs = 1;
+		Debug::log("Enforced minimum task count of $max_jobs.");
+	}
+
 	if (isset($options["interval"])) {
 		Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
-		$spawn_interval = $options["interval"];
+		$spawn_interval = (int) $options["interval"];
 	} else {
 		$spawn_interval = Config::get(Config::DAEMON_SLEEP_INTERVAL);
 	}
 
 	// let's enforce a minimum spawn interval as to not forkbomb the host
-	$spawn_interval = max(60, $spawn_interval);
-	Debug::log("Spawn interval: $spawn_interval sec");
+	if ($spawn_interval < 60) {
+		$spawn_interval = 60;
+		Debug::log("Enforced minimum task spawn interval of $spawn_interval seconds.");
+	}
 
 	if (file_is_locked("update_daemon.lock")) {
 		die("error: Can't create lockfile. ".
-- 
cgit v1.2.3-54-g00ecf