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

Upgrade to 3.2.0

Browse Source
This commit is contained in:
Bastian Allgeier
2019-06-25 09:56:08 +02:00
parent 9e18cf635d
commit 9c89153d35
296 changed files with 14408 additions and 2504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,9 +15,9 @@ use Kirby\Toolkit\Str;
*
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link http://getkirby.com
* @copyright Bastian Allgeier
* @license MIT
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @license https://opensource.org/licenses/MIT
*/
class Sessions
{
@@ -30,7 +30,7 @@ class Sessions
/**
* Creates a new Sessions instance
*
* @param 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`
@@ -105,9 +105,9 @@ class Sessions
* Defaults to `1800` (half an hour)
* - `renewable`: Should it be possible to extend the expiry date?
* Defaults to `true`
* @return Session
* @return Kirby\Session\Session
*/
public function create(array $options = []): Session
public function create(array $options = [])
{
// fall back to default mode
if (!isset($options['mode'])) {
@@ -122,9 +122,9 @@ class Sessions
*
* @param string $token Session token, either including or without the key
* @param string $mode Optional transmission mode override
* @return Session
* @return Kirby\Session\Session
*/
public function get(string $token, string $mode = null): Session
public function get(string $token, string $mode = null)
{
if (isset($this->cache[$token])) {
return $this->cache[$token];
@@ -139,7 +139,7 @@ class Sessions
* - In `header` mode: Gets the session from the `Authorization` request header
* - In `manual` mode: Fails and throws an Exception
*
* @return 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 +183,7 @@ class Sessions
* - Tries to get the session from the cookie
* - Otherwise returns null
*
* @return 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,9 +211,9 @@ class Sessions
* Getter for the session store instance
* Used internally
*
* @return SessionStore
* @return Kirby\Session\SessionStore
*/
public function store(): SessionStore
public function store()
{
return $this->store;
}