Upgrade to 3.2.0

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

View File

@@ -7,9 +7,9 @@ namespace Kirby\Session;
*
* @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 AutoSession
{
@@ -21,7 +21,7 @@ class AutoSession
/**
* Creates a new AutoSession 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:
* - `durationNormal`: Duration of normal sessions in seconds
* Defaults to 2 hours
@@ -66,9 +66,9 @@ class AutoSession
* Defaults to `cookie`
* - `long`: Whether the session is a long "remember me" session or a normal session
* Defaults to `false`
* @return Session
* @return Kirby\Session\Session
*/
public function get(array $options = []): Session
public function get(array $options = [])
{
// merge options with defaults
$options = array_merge([
@@ -149,9 +149,9 @@ class AutoSession
* 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 createManually(array $options = []): Session
public function createManually(array $options = [])
{
// only ever allow manual transmission mode
// to prevent overwriting our "auto" session