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>

diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php
index a60c8b85b08078993afad168a86b01619c004dd7..c10d7f17bc2af1c51bf28b7a5b64785917fb3554 100644 (file)
--- 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 b37fc2c8cf4d0566cd5928bc680f34336eafbed2..e604ac715c24cfc9e7b5a2d8a41fad8a18381268 100644 (file)
--- 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 e81493199049649f6b7420f3bbf2bfab63b0ba50..22c62d82fac059ed708320274974fee07375b21f 100644 (file)
--- 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 {