From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 9 Nov 2020 13:45:33 +0000 (+0100)
Subject: Add proper return types to CryptoUtil
X-Git-Tag: 5.4.0_Alpha_1~616
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b0c216a7b31ad0da84fe18dbf103dae96322568;p=GitHub%2FWoltLab%2FWCF.git

Add proper return types to CryptoUtil
---

diff --git a/wcfsetup/install/files/lib/util/CryptoUtil.class.php b/wcfsetup/install/files/lib/util/CryptoUtil.class.php
index 120bd37223..2c826d00a7 100644
--- a/wcfsetup/install/files/lib/util/CryptoUtil.class.php
+++ b/wcfsetup/install/files/lib/util/CryptoUtil.class.php
@@ -19,10 +19,9 @@ final class CryptoUtil {
 	 * Signs the given value with the signature secret.
 	 * 
 	 * @param	string		$value
-	 * @return	string
 	 * @throws	CryptoException
 	 */
-	public static function getSignature($value) {
+	public static function getSignature($value): string {
 		if (mb_strlen(SIGNATURE_SECRET, '8bit') < 15) throw new CryptoException('SIGNATURE_SECRET is too short, aborting.');
 		
 		return hash_hmac('sha256', $value, SIGNATURE_SECRET);
@@ -32,9 +31,8 @@ final class CryptoUtil {
 	 * Creates a signed (signature + encoded value) string.
 	 * 
 	 * @param	string	$value
-	 * @return	string
 	 */
-	public static function createSignedString($value) {
+	public static function createSignedString($value): string {
 		return self::getSignature($value).'-'.Base64::encode($value);
 	}
 
@@ -43,9 +41,8 @@ final class CryptoUtil {
 	 * (i.e. consists of a valid signature + encoded value)
 	 * 
 	 * @param	string	$string
-	 * @return	boolean
 	 */
-	public static function validateSignedString($string) {
+	public static function validateSignedString($string): bool {
 		$parts = explode('-', $string, 2);
 		if (count($parts) !== 2) return false;
 		list($signature, $value) = $parts;
@@ -67,10 +64,9 @@ final class CryptoUtil {
 	 * - Returns null if the string is not properly signed.
 	 * 
 	 * @param	string		$string
-	 * @return	null|string
 	 * @see		\wcf\util\CryptoUtil::validateSignedString()
 	 */
-	public static function getValueFromSignedString($string) {
+	public static function getValueFromSignedString($string): ?string {
 		if (!self::validateSignedString($string)) return null;
 		
 		$parts = explode('-', $string, 2);