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

Upgrade to 4.6.0

Browse Source
This commit is contained in:
Bastian Allgeier
2025-01-30 12:15:44 +01:00
parent d71db84033
commit daf499e2e4
179 changed files with 1848 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,7 +239,7 @@ class User extends ModelWithContent
*/
public static function hashPassword(
#[SensitiveParameter]
string $password = null
string|null $password = null
): string|null {
if ($password !== null) {
$password = password_hash($password, PASSWORD_DEFAULT);
@@ -279,7 +279,7 @@ class User extends ModelWithContent
/**
* Compares the current object with the given user object
*/
public function is(User $user = null): bool
public function is(User|null $user = null): bool
{
if ($user === null) {
return false;
@@ -625,7 +625,7 @@ class User extends ModelWithContent
*
* @return $this
*/
protected function setBlueprint(array $blueprint = null): static
protected function setBlueprint(array|null $blueprint = null): static
{
if ($blueprint !== null) {
$blueprint['model'] = $this;
@@ -683,7 +683,7 @@ class User extends ModelWithContent
* (`null` to keep the original token)
*/
public function toString(
string $template = null,
string|null $template = null,
array $data = [],
string|null $fallback = '',
string $handler = 'template'
@@ -711,7 +711,7 @@ class User extends ModelWithContent
*/
public function validatePassword(
#[SensitiveParameter]
string $password = null
string|null $password = null
): bool {
if (empty($this->password()) === true) {
throw new NotFoundException(['key' => 'user.password.undefined']);