studio-variable/designtopack
3
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

update kirby

Browse source
This commit is contained in:
isUnknown 2025-02-07 17:11:37 +01:00
parent 652262ac94
commit 9c662bcbba
165 changed files with 1757 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/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']);