From 01632b11c7ef5e831fb3984f53b847218e5e70b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Mon, 12 Sep 2022 03:45:19 +0200 Subject: [PATCH] Changed: - added missing type-hints --- .../TwoFactor/Model/AppSpecificPassword.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Security/TwoFactor/Model/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php index 5c9cd5eadf..affabb3464 100644 --- a/src/Security/TwoFactor/Model/AppSpecificPassword.php +++ b/src/Security/TwoFactor/Model/AppSpecificPassword.php @@ -32,12 +32,12 @@ use PragmaRX\Random\Random; */ class AppSpecificPassword { - public static function countForUser($uid) + public static function countForUser(int $uid) { return DBA::count('2fa_app_specific_password', ['uid' => $uid]); } - public static function checkDuplicateForUser($uid, $description) + public static function checkDuplicateForUser(int $uid, string $description): bool { return DBA::exists('2fa_app_specific_password', ['uid' => $uid, 'description' => $description]); } @@ -50,7 +50,7 @@ class AppSpecificPassword * @return bool * @throws \Exception */ - public static function authenticateUser($uid, $plaintextPassword) + public static function authenticateUser(int $uid, string $plaintextPassword): bool { $appSpecificPasswords = self::getListForUser($uid); @@ -79,7 +79,7 @@ class AppSpecificPassword * @return array * @throws \Exception */ - public static function getListForUser($uid) + public static function getListForUser(int $uid): array { $appSpecificPasswordsStmt = DBA::select('2fa_app_specific_password', ['id', 'description', 'hashed_password', 'last_used'], ['uid' => $uid]); @@ -102,7 +102,7 @@ class AppSpecificPassword * @return array The new app-specific password data structure with the plaintext password added * @throws \Exception */ - public static function generateForUser(int $uid, $description) + public static function generateForUser(int $uid, string $description): array { $Random = (new Random())->size(40); @@ -111,10 +111,10 @@ class AppSpecificPassword $generated = DateTimeFormat::utcNow(); $fields = [ - 'uid' => $uid, - 'description' => $description, + 'uid' => $uid, + 'description' => $description, 'hashed_password' => User::hashPassword($plaintextPassword), - 'generated' => $generated, + 'generated' => $generated, ]; DBA::insert('2fa_app_specific_password', $fields); @@ -125,7 +125,7 @@ class AppSpecificPassword return $fields; } - private static function update($appSpecificPasswordId, $fields) + private static function update(int $appSpecificPasswordId, array $fields) { return DBA::update('2fa_app_specific_password', $fields, ['id' => $appSpecificPasswordId]); }