From 9b0baf9b32a7f1c299c4bb2127dc192a7daa1ac9 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Sat, 23 Nov 2024 19:18:52 +0000
Subject: Use match expressions in some places.

---
 classes/UserHelper.php | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

(limited to 'classes/UserHelper.php')

diff --git a/classes/UserHelper.php b/classes/UserHelper.php
index 21c2ab4d5..de0b5a6ed 100644
--- a/classes/UserHelper.php
+++ b/classes/UserHelper.php
@@ -383,30 +383,18 @@ class UserHelper {
 	 * @return false|string False if the password couldn't be hashed, otherwise the hash string.
 	 */
 	static function hash_password(string $pass, string $salt, string $algo = self::HASH_ALGOS[0]): false|string {
-		$pass_hash = "";
-
-		switch ($algo) {
-			case self::HASH_ALGO_SHA1:
-				$pass_hash = sha1($pass);
-				break;
-			case self::HASH_ALGO_SHA1X:
-				$pass_hash = sha1("$salt:$pass");
-				break;
-			case self::HASH_ALGO_MODE2:
-			case self::HASH_ALGO_SSHA256:
-				$pass_hash = hash('sha256', $salt . $pass);
-				break;
-			case self::HASH_ALGO_SSHA512:
-				$pass_hash = hash('sha512', $salt . $pass);
-				break;
-			default:
-				user_error("hash_password: unknown hash algo: $algo", E_USER_ERROR);
-		}
-
-		if ($pass_hash)
-			return "$algo:$pass_hash";
-		else
-			return false;
+		$pass_hash = match ($algo) {
+			self::HASH_ALGO_SHA1 => sha1($pass),
+			self::HASH_ALGO_SHA1X => sha1("$salt:$pass"),
+			self::HASH_ALGO_MODE2, self::HASH_ALGO_SSHA256 => hash('sha256', $salt . $pass),
+			self::HASH_ALGO_SSHA512 => hash('sha512', $salt . $pass),
+			default => null,
+		};
+
+		if ($pass_hash === null)
+			user_error("hash_password: unknown hash algo: $algo", E_USER_ERROR);
+
+		return $pass_hash ? "$algo:$pass_hash" : false;
 	}
 
 	/**
-- 
cgit v1.2.3-54-g00ecf