diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-10-13 10:54:44 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-10-13 17:17:25 +0200 |
| commit | 01b8291c76f103bf9c31b19e08b28dd482d28829 (patch) | |
| tree | 2aa357129e3d58d3255271c7aff39217cabb4238 | |
| parent | 581862b51b8a3322a518bdd216e7fcd6f60f4bfc (diff) | |
| download | nextcloud-server-01b8291c76f103bf9c31b19e08b28dd482d28829.tar.gz nextcloud-server-01b8291c76f103bf9c31b19e08b28dd482d28829.zip | |
Type the autentication provider passwords as nullable strings
For historic reasons we couldn't add a nullable type hint before
nullable type hints were supported by our target php versions. This is
now possible.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| -rw-r--r-- | lib/private/Authentication/Token/DefaultTokenProvider.php | 13 | ||||
| -rw-r--r-- | lib/private/Authentication/Token/IProvider.php | 2 | ||||
| -rw-r--r-- | lib/private/Authentication/Token/PublicKeyTokenProvider.php | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php index a60c8b85b08..c10d7f17bc2 100644 --- a/lib/private/Authentication/Token/DefaultTokenProvider.php +++ b/lib/private/Authentication/Token/DefaultTokenProvider.php @@ -71,21 +71,12 @@ class DefaultTokenProvider implements IProvider { } /** - * Create and persist a new token - * - * @param string $token - * @param string $uid - * @param string $loginName - * @param string|null $password - * @param string $name - * @param int $type token type - * @param int $remember whether the session token should be used for remember-me - * @return IToken + * {@inheritDoc} */ public function generateToken(string $token, string $uid, string $loginName, - $password, + ?string $password, string $name, int $type = IToken::TEMPORARY_TOKEN, int $remember = IToken::DO_NOT_REMEMBER): IToken { diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php index b37fc2c8cf4..e604ac715c2 100644 --- a/lib/private/Authentication/Token/IProvider.php +++ b/lib/private/Authentication/Token/IProvider.php @@ -53,7 +53,7 @@ interface IProvider { public function generateToken(string $token, string $uid, string $loginName, - $password, + ?string $password, string $name, int $type = IToken::TEMPORARY_TOKEN, int $remember = IToken::DO_NOT_REMEMBER): IToken; diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php index e8149319904..22c62d82fac 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php +++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php @@ -80,7 +80,7 @@ class PublicKeyTokenProvider implements IProvider { public function generateToken(string $token, string $uid, string $loginName, - $password, + ?string $password, string $name, int $type = IToken::TEMPORARY_TOKEN, int $remember = IToken::DO_NOT_REMEMBER): IToken { |