Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return value fixes for Session class

Browse Source
This commit is contained in:
Matias Griese 2020-12-23 11:40:32 +02:00
parent 589c9e4445
commit 67a00a799c
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
system/src/Grav/Framework/Session/Session.php
View File

@ -82,7 +82,7 @@ class Session implements SessionInterface
*/
public function getId()
{
return session_id();
return session_id() ?: null;
}
/**
@ -100,7 +100,7 @@ class Session implements SessionInterface
*/
public function getName()
{
return session_name();
return session_name() ?: null;
}
/**
@ -312,22 +312,25 @@ class Session implements SessionInterface
*/
public function invalidate()
{
$params = session_get_cookie_params();
$name = $this->getName();
if (null !== $name) {
$params = session_get_cookie_params();
$cookie_options = array (
'expires' => time() - 42000,
'path' => $params['path'],
'domain' => $params['domain'],
'secure' => $params['secure'],
'httponly' => $params['httponly'],
'samesite' => $params['samesite']
);
$cookie_options = array (
'expires' => time() - 42000,
'path' => $params['path'],
'domain' => $params['domain'],
'secure' => $params['secure'],
'httponly' => $params['httponly'],
'samesite' => $params['samesite']
);
setcookie(
session_name(),
'',
$cookie_options
);
setcookie(
session_name(),
'',
$cookie_options
);
}
if ($this->isSessionStarted()) {
session_unset();