Session informations stored in log files #2048

Author: Fasse

src/Session/Entity/Session.php

@@ -530,20 +530,16 @@ public static function setCookie(
             $secure = HTTPS;
         }
 
-        $gLogger->info('Set Cookie!', array('name' => $name, 'value' => $value, 'expire' => $expire, 'path' => $path, 'domain' => $domain, 'secure' => $secure, 'httpOnly' => $httpOnly, 'sameSite' => 'lax'));
-
-        if (PHP_VERSION_ID < 70300) {
-            return setcookie($name, $value, $expire, $path . ';samesite=lax', $domain, $secure, $httpOnly);
-        } else {
-            return setcookie($name, $value, array(
-                'expires' => $expire,
-                'path' => $path,
-                'domain' => $domain,
-                'secure' => $secure,
-                'httponly' => $httpOnly,
-                'samesite' => 'lax'
-            ));
-        }
+        $gLogger->info('Set Cookie!', array('name' => $name, 'expire' => $expire, 'path' => $path, 'domain' => $domain, 'secure' => $secure, 'httpOnly' => $httpOnly, 'sameSite' => 'lax'));
+
+        return setcookie($name, $value, array(
+            'expires' => $expire,
+            'path' => $path,
+            'domain' => $domain,
+            'secure' => $secure,
+            'httponly' => $httpOnly,
+            'samesite' => 'lax'
+        ));
     }
 
     /**
@@ -594,27 +590,23 @@ public static function start(string $cookiePrefix, int $limit = 0, string $path
             $secure = HTTPS;
         }
 
-        if (PHP_VERSION_ID < 70300) {
-            session_set_cookie_params($limit, $path . ';samesite=lax', $domain, $secure, $httpOnly);
-        } else {
-            session_set_cookie_params(array(
-                'lifetime' => $limit,
-                'path' => $path,
-                'domain' => $domain,
-                'secure' => $secure,
-                'httponly' => $httpOnly,
-                'samesite' => 'lax'
-            ));
-        }
+        session_set_cookie_params(array(
+            'lifetime' => $limit,
+            'path' => $path,
+            'domain' => $domain,
+            'secure' => $secure,
+            'httponly' => $httpOnly,
+            'samesite' => 'lax'
+        ));
 
         if (session_status() === PHP_SESSION_ACTIVE) {
-            $gLogger->notice('Session is already started!', array('sessionId' => session_id()));
+            $gLogger->notice('Session is already started!');
         }
 
         // Start session
         session_start();
 
-        $gLogger->info('Session Started!', array('name' => $sessionName, 'limit' => $limit, 'path' => $path, 'domain' => $domain, 'secure' => $secure, 'httpOnly' => $httpOnly, 'sameSite' => 'lax', 'sessionId' => session_id()));
+        $gLogger->info('Session Started!', array('name' => $sessionName, 'limit' => $limit, 'path' => $path, 'domain' => $domain, 'secure' => $secure, 'httpOnly' => $httpOnly, 'sameSite' => 'lax'));
     }
 
     /**