studio-variable/designtopack
4
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

12
public/kirby/src/Cms/Auth.php
View file

@ -202,7 +202,7 @@ class Auth
* @throws \Kirby\Exception\InvalidArgumentException if the authorization header is invalid
* @throws \Kirby\Exception\PermissionException if basic authentication is not allowed
*/
public function currentUserFromBasicAuth(BasicAuth $auth = null): User|null
public function currentUserFromBasicAuth(BasicAuth|null $auth = null): User|null
{
if ($this->kirby->option('api.basicAuth', false) !== true) {
throw new PermissionException('Basic authentication is not activated');
@ -250,7 +250,7 @@ class Auth
* valid user id in there
*/
public function currentUserFromSession(
Session|array $session = null
Session|array|null $session = null
): User|null {
$session = $this->session($session);
@ -440,7 +440,7 @@ class Auth
* logged in user will be returned
*/
public function status(
Session|array $session = null,
Session|array|null $session = null,
bool $allowImpersonation = true
): Status {
// try to return from cache
@ -723,7 +723,7 @@ class Auth
* @throws \Throwable If an authentication error occurred
*/
public function user(
Session|array $session = null,
Session|array|null $session = null,
bool $allowImpersonation = true
): User|null {
if ($allowImpersonation === true && $this->impersonate !== null) {
@ -887,7 +887,7 @@ class Auth
*/
protected function fail(
Throwable $exception,
Throwable $fallback = null
Throwable|null $fallback = null
): void {
$debug = $this->kirby->option('auth.debug', 'log');
@ -911,7 +911,7 @@ class Auth
/**
* Creates a session object from the passed options
*/
protected function session(Session|array $session = null): Session
protected function session(Session|array|null $session = null): Session
{
// use passed session options or session object if set
if (is_array($session) === true) {