host/xiaowang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Kirby and Composer dependencies

Browse source
This commit is contained in:
Paul Nicoué 2022-03-22 15:39:39 +01:00
parent f5d3ea5e84
commit ec74d78ba9
382 changed files with 25077 additions and 4955 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kirby/src/Session/AutoSession.php
View file

@ -8,7 +8,7 @@ namespace Kirby\Session;
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class AutoSession

2
kirby/src/Session/FileSessionStore.php
View file

@ -13,7 +13,7 @@ use Kirby\Toolkit\Str;
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class FileSessionStore extends SessionStore

6
kirby/src/Session/Session.php
View file

@ -16,7 +16,7 @@ use Throwable;
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class Session
@ -560,7 +560,7 @@ class Session
$parts = explode('.', $token);
// only continue if the token has exactly the right amount of parts
$expectedParts = ($withoutKey === true)? 2 : 3;
$expectedParts = ($withoutKey === true) ? 2 : 3;
if (count($parts) !== $expectedParts) {
throw new InvalidArgumentException([
'data' => ['method' => 'Session::parseToken', 'argument' => '$token'],
@ -570,7 +570,7 @@ class Session
$tokenExpiry = (int)$parts[0];
$tokenId = $parts[1];
$tokenKey = ($withoutKey === true)? null : $parts[2];
$tokenKey = ($withoutKey === true) ? null : $parts[2];
// verify that all parts were parsed correctly using reassembly
$expectedToken = $tokenExpiry . '.' . $tokenId;

2
kirby/src/Session/SessionData.php
View file

@ -13,7 +13,7 @@ use Kirby\Exception\LogicException;
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class SessionData

2
kirby/src/Session/SessionStore.php
View file

@ -6,7 +6,7 @@ namespace Kirby\Session;
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
abstract class SessionStore

4
kirby/src/Session/Sessions.php
View file

@ -16,7 +16,7 @@ use Throwable;
* @package Kirby Session
* @author Lukas Bestle <lukas@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class Sessions
@ -190,7 +190,7 @@ class Sessions
// token was found, try to get the session
try {
$mode = (is_string($tokenFromHeader))? 'header' : 'cookie';
$mode = (is_string($tokenFromHeader)) ? 'header' : 'cookie';
return $this->get($token, $mode);
} catch (Throwable $e) {
return null;