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

Upgrade to 3.2.5

Browse Source
This commit is contained in:
Bastian Allgeier
2019-09-24 11:00:59 +02:00
parent ff9b5b1861
commit 447a9dd266
234 changed files with 1990 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kirby/src/Session/Sessions.php
View File

@@ -2,13 +2,13 @@
namespace Kirby\Session;
use Throwable;
use Kirby\Exception\Exception;
use Kirby\Exception\InvalidArgumentException;
use Kirby\Exception\LogicException;
use Kirby\Http\Cookie;
use Kirby\Http\Request;
use Kirby\Toolkit\Str;
use Throwable;
/**
* Sessions - Base class for all session fiddling
@@ -30,7 +30,7 @@ class Sessions
/**
* Creates a new Sessions instance
*
* @param Kirby\Session\SessionStore|string $store SessionStore object or a path to the storage directory (uses the FileSessionStore)
* @param \Kirby\Session\SessionStore|string $store SessionStore object or a path to the storage directory (uses the FileSessionStore)
* @param array $options Optional additional options:
* - `mode`: Default token transmission mode (cookie, header or manual)
* Defaults to `cookie`
@@ -38,7 +38,6 @@ class Sessions
* Defaults to `kirby_session`
* - `gcInterval`: How often should the garbage collector be run?
* Integer or `false` for never; defaults to `100`
*
*/
public function __construct($store, array $options = [])
{
@@ -105,7 +104,7 @@ class Sessions
* Defaults to `1800` (half an hour)
* - `renewable`: Should it be possible to extend the expiry date?
* Defaults to `true`
* @return Kirby\Session\Session
* @return \Kirby\Session\Session
*/
public function create(array $options = [])
{
@@ -122,7 +121,7 @@ class Sessions
*
* @param string $token Session token, either including or without the key
* @param string $mode Optional transmission mode override
* @return Kirby\Session\Session
* @return \Kirby\Session\Session
*/
public function get(string $token, string $mode = null)
{
@@ -139,7 +138,7 @@ class Sessions
* - In `header` mode: Gets the session from the `Authorization` request header
* - In `manual` mode: Fails and throws an Exception
*
* @return Kirby\Session\Session|null Either the current session or null in case there isn't one
* @return \Kirby\Session\Session|null Either the current session or null in case there isn't one
*/
public function current()
{
@@ -183,7 +182,7 @@ class Sessions
* - Tries to get the session from the cookie
* - Otherwise returns null
*
* @return Kirby\Session\Session|null Either the current session or null in case there isn't one
* @return \Kirby\Session\Session|null Either the current session or null in case there isn't one
*/
public function currentDetected()
{
@@ -211,7 +210,7 @@ class Sessions
* Getter for the session store instance
* Used internally
*
* @return Kirby\Session\SessionStore
* @return \Kirby\Session\SessionStore
*/
public function store()
{
@@ -247,7 +246,7 @@ class Sessions
* session or a session with a regenerated token
*
* @internal
* @param Kirby\Session\Session $session Session instance to push to the cache
* @param \Kirby\Session\Session $session Session instance to push to the cache
*/
public function updateCache(Session $session)
{