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/timehelper.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'classes/timehelper.php')

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);
-- 
cgit v1.2.3


From 728a71150a6e63dafeae311e591c5b43ce4e317e Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Thu, 11 Nov 2021 21:33:12 +0000
Subject: Fix 'TimeHelper::make_local_datetime()' (null is allowed).

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

(limited to 'classes/timehelper.php')

diff --git a/classes/timehelper.php b/classes/timehelper.php
index e66f82f90..453ee0cee 100644
--- a/classes/timehelper.php
+++ b/classes/timehelper.php
@@ -21,7 +21,7 @@ class TimeHelper {
 		}
 	}
 
-	static function make_local_datetime(string $timestamp, bool $long, int $owner_uid = null,
+	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'];
-- 
cgit v1.2.3