From 06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 Nov 2023 14:47:55 +0100
Subject: Add function param/return types, fix a lot more phpstorm complaints

---
 inc/session.inc.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'inc/session.inc.php')

diff --git a/inc/session.inc.php b/inc/session.inc.php
index 1c20c8a6..622eb320 100644
--- a/inc/session.inc.php
+++ b/inc/session.inc.php
@@ -10,7 +10,7 @@ class Session
 	private static $userId = 0;
 	private static $updateSessionDateline = false;
 	
-	private static function generateSessionId(string $salt)
+	private static function generateSessionId(string $salt): void
 	{
 		if (self::$sid !== false)
 			ErrorHandler::traceError('Error: Asked to generate session id when already set.');
@@ -27,7 +27,7 @@ class Session
 		);
 	}
 
-	public static function create(string $salt, int $userId, bool $fixedAddress)
+	public static function create(string $salt, int $userId, bool $fixedAddress): void
 	{
 		self::generateSessionId($salt);
 		self::$data = [];
@@ -71,7 +71,7 @@ class Session
 	 * @param mixed $value data to store for key, false = delete
 	 * @param int|false $validMinutes validity in minutes, or false = forever
 	 */
-	public static function set(string $key, $value, $validMinutes = 60)
+	public static function set(string $key, $value, $validMinutes = 60): void
 	{
 		if (self::$data === false)
 			ErrorHandler::traceError('Tried to set session data with no active session');
@@ -96,7 +96,7 @@ class Session
 		return true;
 	}
 	
-	public static function delete()
+	public static function delete(): void
 	{
 		if (self::$sid === false)
 			return;
@@ -112,7 +112,7 @@ class Session
 	 * a security measure if the user suspects that a session left open on
 	 * another device could be/is being abused.
 	 */
-	public static function deleteAllButCurrent()
+	public static function deleteAllButCurrent(): void
 	{
 		if (self::$sid === false)
 			return;
@@ -120,7 +120,7 @@ class Session
 			['sid' => self::$sid, 'uid' => self::$userId]);
 	}
 
-	public static function deleteCookie()
+	public static function deleteCookie(): void
 	{
 		Util::clearCookie('sid');
 	}
@@ -155,7 +155,7 @@ class Session
 		return true;
 	}
 
-	private static function setupSessionAccounting(bool $cookie)
+	private static function setupSessionAccounting(bool $cookie): void
 	{
 		if ($cookie) {
 			self::$updateSessionDateline = true;
@@ -169,7 +169,7 @@ class Session
 		});
 	}
 
-	private static function saveOnShutdown()
+	private static function saveOnShutdown(): void
 	{
 		$now = time();
 		$args = ['lastip' => $_SERVER['REMOTE_ADDR']];
@@ -182,7 +182,7 @@ class Session
 		self::saveData($args);
 	}
 
-	public static function saveExtraData()
+	public static function saveExtraData(): void
 	{
 		if (!self::$dataChanged)
 			return;
@@ -190,7 +190,7 @@ class Session
 		self::$dataChanged = false;
 	}
 
-	private static function saveData(array $args)
+	private static function saveData(array $args): void
 	{
 		$query = "UPDATE session SET " . implode(', ', array_map(function ($key) {
 				return "$key = :$key";
-- 
cgit v1.2.3-55-g7522