From 33d0eccbb5661e07a6c4fc688c9526f04e02f9fb Mon Sep 17 00:00:00 2001 From: Daniel Kurowski Date: Wed, 19 Oct 2022 15:10:08 +0200 Subject: [PATCH] UserStorage: support int in setExpiration() --- src/Bridges/SecurityHttp/CookieStorage.php | 7 +++++-- src/Bridges/SecurityHttp/SessionStorage.php | 5 ++++- src/Security/UserStorage.php | 3 ++- tests/Security/MockUserStorage.php | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/Bridges/SecurityHttp/CookieStorage.php b/src/Bridges/SecurityHttp/CookieStorage.php index 0ee6e8a2..8b36db07 100644 --- a/src/Bridges/SecurityHttp/CookieStorage.php +++ b/src/Bridges/SecurityHttp/CookieStorage.php @@ -41,7 +41,7 @@ final class CookieStorage implements Nette\Security\UserStorage /** @var string */ private $cookieSameSite = 'Lax'; - /** @var ?string */ + /** @var string|int|null */ private $cookieExpiration; @@ -97,7 +97,10 @@ public function getState(): array } - public function setExpiration(?string $expire, bool $clearIdentity): void + /** + * @param string|int|null $expire + */ + public function setExpiration($expire, bool $clearIdentity): void { $this->cookieExpiration = $expire; } diff --git a/src/Bridges/SecurityHttp/SessionStorage.php b/src/Bridges/SecurityHttp/SessionStorage.php index 87f77efa..eba0c490 100644 --- a/src/Bridges/SecurityHttp/SessionStorage.php +++ b/src/Bridges/SecurityHttp/SessionStorage.php @@ -82,7 +82,10 @@ public function getState(): array } - public function setExpiration(?string $time, bool $clearIdentity = false): void + /** + * @param string|int|null $time + */ + public function setExpiration($time, bool $clearIdentity = false): void { $this->expireTime = $time ? (int) Nette\Utils\DateTime::from($time)->format('U') : null; $this->expireIdentity = $clearIdentity; diff --git a/src/Security/UserStorage.php b/src/Security/UserStorage.php index 7abedac4..868c395a 100644 --- a/src/Security/UserStorage.php +++ b/src/Security/UserStorage.php @@ -38,6 +38,7 @@ function getState(): array; /** * Enables log out from the persistent storage after inactivity (like '20 minutes'). + * @param string|int|null $expire */ - function setExpiration(?string $expire, bool $clearIdentity): void; + function setExpiration($expire, bool $clearIdentity): void; } diff --git a/tests/Security/MockUserStorage.php b/tests/Security/MockUserStorage.php index a162ee01..94c134cc 100644 --- a/tests/Security/MockUserStorage.php +++ b/tests/Security/MockUserStorage.php @@ -29,7 +29,10 @@ public function getState(): array } - public function setExpiration(?string $expire, bool $clearIdentity): void + /** + * @param string|int|null $expire + */ + public function setExpiration($expire, bool $clearIdentity): void { } }