From 67a00a799cb5893f27c9a93dabf7e2e0d73e8a80 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 23 Dec 2020 11:40:32 +0200
Subject: [PATCH] Return value fixes for Session class

---
 system/src/Grav/Framework/Session/Session.php | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/system/src/Grav/Framework/Session/Session.php b/system/src/Grav/Framework/Session/Session.php
index 778966fb4..d1550fda4 100644
--- a/system/src/Grav/Framework/Session/Session.php
+++ b/system/src/Grav/Framework/Session/Session.php
@@ -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();