interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.4.3

Browse Source
This commit is contained in:
Bastian Allgeier
2020-09-15 10:25:09 +02:00
parent 54b9ba3047
commit d8e797dd9b
108 changed files with 1750 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kirby/src/Cms/User.php
View File

@@ -82,7 +82,7 @@ class User extends ModelWithContent
public static $models = [];
/**
* @var string
* @var \Kirby\Cms\Field
*/
protected $name;
@@ -176,7 +176,7 @@ class User extends ModelWithContent
/**
* Returns the UserBlueprint object
*
* @return \Kirby\Cms\UserBlueprint
* @return \Kirby\Cms\Blueprint
*/
public function blueprint()
{
@@ -200,7 +200,7 @@ class User extends ModelWithContent
*
* @internal
* @param array $data
* @param string $languageCode Not used so far
* @param string $languageCode|null Not used so far
* @return array
*/
public function contentFileData(array $data, string $languageCode = null): array
@@ -400,10 +400,8 @@ class User extends ModelWithContent
* Logs the user in
*
* @param string $password
* @param \Kirby\Session\Session|array $session Session options or session object to set the user in
* @param \Kirby\Session\Session|array|null $session Session options or session object to set the user in
* @return bool
*
* @throws \Kirby\Exception\PermissionException If the password is not valid
*/
public function login(string $password, $session = null): bool
{
@@ -416,7 +414,7 @@ class User extends ModelWithContent
/**
* Logs the user in without checking the password
*
* @param \Kirby\Session\Session|array $session Session options or session object to set the user in
* @param \Kirby\Session\Session|array|null $session Session options or session object to set the user in
* @return void
*/
public function loginPasswordless($session = null): void
@@ -437,7 +435,7 @@ class User extends ModelWithContent
/**
* Logs the user out
*
* @param \Kirby\Session\Session|array $session Session options or session object to unset the user in
* @param \Kirby\Session\Session|array|null $session Session options or session object to unset the user in
* @return void
*/
public function logout($session = null): void
@@ -757,7 +755,7 @@ class User extends ModelWithContent
/**
* Sets the user email
*
* @param string $email
* @param string $email|null
* @return self
*/
protected function setEmail(string $email = null)
@@ -771,7 +769,7 @@ class User extends ModelWithContent
/**
* Sets the user id
*
* @param string $id
* @param string $id|null
* @return self
*/
protected function setId(string $id = null)
@@ -783,7 +781,7 @@ class User extends ModelWithContent
/**
* Sets the user language
*
* @param string $language
* @param string $language|null
* @return self
*/
protected function setLanguage(string $language = null)
@@ -795,7 +793,7 @@ class User extends ModelWithContent
/**
* Sets the user name
*
* @param string $name
* @param string $name|null
* @return self
*/
protected function setName(string $name = null)
@@ -807,7 +805,7 @@ class User extends ModelWithContent
/**
* Sets the user's password hash
*
* @param string $password
* @param string $password|null
* @return self
*/
protected function setPassword(string $password = null)
@@ -819,7 +817,7 @@ class User extends ModelWithContent
/**
* Sets the user role
*
* @param string $role
* @param string $role|null
* @return self
*/
protected function setRole(string $role = null)
@@ -907,12 +905,12 @@ class User extends ModelWithContent
/**
* Compares the given password with the stored one
*
* @param string $password
* @param string $password|null
* @return bool
*
* @throws \Kirby\Exception\NotFoundException If the user has no password
* @throws \Kirby\Exception\InvalidArgumentException If the entered password is not valid
* @throws \Kirby\Exception\InvalidArgumentException If the entered password does not match the user password
* or does not match the user password
*/
public function validatePassword(string $password = null): bool
{