X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FRegister.php;h=497d357b6d8b77c3441e6b4428d50aeb8821d18a;hb=7171441238f343d6f0b2c57cc120739f0675491e;hp=f4d409bc328fda3931dda68c961555a79d8626a2;hpb=aa0b485f3dca72c5448076e913fa54d948cd7731;p=friendica.git diff --git a/src/Model/Register.php b/src/Model/Register.php index f4d409bc32..497d357b6d 100644 --- a/src/Model/Register.php +++ b/src/Model/Register.php @@ -1,6 +1,6 @@ [$start, $count]]); } @@ -50,8 +50,7 @@ class Register * * @param int $uid The user id * - * @return array The pending user information - * + * @return array|bool Array on succes, false on failure * @throws \Exception */ public static function getPendingForUser(int $uid) @@ -65,7 +64,7 @@ class Register * @return int * @throws \Exception */ - public static function getPendingCount() + public static function getPendingCount(): int { return DBA::count('pending-view', ['self' => true]); } @@ -74,10 +73,10 @@ class Register * Returns the register record associated with the provided hash * * @param string $hash - * @return array + * @return array|bool Array on succes, false on failure * @throws \Exception */ - public static function getByHash($hash) + public static function getByHash(string $hash) { return DBA::selectFirst('register', [], ['hash' => $hash]); } @@ -89,7 +88,7 @@ class Register * @return boolean * @throws \Exception */ - public static function existsByHash($hash) + public static function existsByHash(string $hash): bool { return DBA::exists('register', ['hash' => $hash]); } @@ -100,7 +99,7 @@ class Register * @return string * @throws \Exception */ - public static function createForInvitation() + public static function createForInvitation(): string { $code = Strings::getRandomName(8) . random_int(1000, 9999); @@ -115,21 +114,27 @@ class Register } /** - * Creates a register record for approval and returns the success of the database insert + * Creates a register record for approval * Checks for the existence of the provided user id * - * @param integer $uid The ID of the user needing approval - * @param string $language The registration language - * @param string $note An additional message from the user - * @return boolean - * @throws \Exception + * @param integer $uid The ID of the user needing approval + * @param string $language The registration language + * @param string $note An additional message from the user + * @return void + * @throws \OutOfBoundsException + * @throws HTTPException\InternalServerErrorException + * @throws HTTPException\NotFoundException */ - public static function createForApproval($uid, $language, $note = '') + public static function createForApproval(int $uid, string $language, string $note = ''): void { $hash = Strings::getRandomHex(); + if (!$uid) { + throw new \OutOfBoundsException("User ID can't be empty"); + } + if (!User::exists($uid)) { - return false; + throw new HTTPException\NotFoundException("User ID doesn't exist"); } $fields = [ @@ -141,7 +146,9 @@ class Register 'note' => $note ]; - return DBA::insert('register', $fields); + if (!DBA::insert('register', $fields)) { + throw new HTTPException\InternalServerErrorException('Unable to insert a `register` record'); + } } /** @@ -151,7 +158,7 @@ class Register * @return boolean * @throws \Exception */ - public static function deleteByHash($hash) + public static function deleteByHash(string $hash): bool { return DBA::delete('register', ['hash' => $hash]); }