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

Update Composer packages

Browse source
This commit is contained in:
Paul Nicoué 2022-12-19 14:56:05 +01:00
parent 0320235f6c
commit a8b68fb61b
378 changed files with 28466 additions and 28852 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,12 +139,12 @@ class Session
if ($this->tokenExpiry !== null) {
if (is_string($this->tokenKey)) {
return $this->tokenExpiry . '.' . $this->tokenId . '.' . $this->tokenKey;
} else {
return $this->tokenExpiry . '.' . $this->tokenId;
}
} else {
return null;
return $this->tokenExpiry . '.' . $this->tokenId;
}
return null;
}
/**
@ -611,12 +611,15 @@ class Session
// now make sure that we have a valid timestamp
if (is_int($time)) {
return $time;
} else {
throw new InvalidArgumentException([
'data' => ['method' => 'Session::timeToTimestamp', 'argument' => '$time'],
'translate' => false
]);
}
throw new InvalidArgumentException([
'data' => [
'method' => 'Session::timeToTimestamp',
'argument' => '$time'
],
'translate' => false
]);
}
/**
@ -727,7 +730,7 @@ class Session
$this->renewable = $data['renewable'];
// reload data into existing object to avoid breaking memory references
if (is_a($this->data, 'Kirby\Session\SessionData')) {
if ($this->data instanceof SessionData) {
$this->data()->reload($data['data']);
} else {
$this->data = new SessionData($this, $data['data']);