From b2051f99346c1801d81845d7a345b9785a92bf95 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 18 Nov 2024 23:59:02 +0900
Subject: [PATCH] Remove condition for PHP < 7.3

---
 common/framework/Cookie.php  | 19 +------------------
 common/framework/Session.php | 12 +-----------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/common/framework/Cookie.php b/common/framework/Cookie.php
index 997b39410..2374be6c8 100644
--- a/common/framework/Cookie.php
+++ b/common/framework/Cookie.php
@@ -79,24 +79,7 @@ class Cookie
 			$options['samesite'] = config('cookie.samesite') ?? 'Lax';
 		}
 
-		// PHP 7.3+ supports the samesite attribute natively. PHP 7.2 requires a hack.
-		if (\PHP_VERSION_ID >= 70300)
-		{
-			$result = setcookie($name, $value, $options);
-		}
-		else
-		{
-			$expires = $options['expires'];
-			$path = $options['path'] ?? '/';
-			$domain = $options['domain'] ?? null;
-			$secure = $options['secure'] ?? false;
-			$httponly = $options['httponly'] ?? false;
-			if (!empty($options['samesite']))
-			{
-				$path = ($path ?: '/') . '; SameSite=' . $options['samesite'];
-			}
-			$result = setcookie($name, $value, $expires, $path, $domain, $secure, $httponly);
-		}
+		$result = setcookie($name, $value, $options);
 
 		// Make the cookie immediately available server-side.
 		if ($result && $options['expires'] >= 0)
diff --git a/common/framework/Session.php b/common/framework/Session.php
index c1e92a067..e88de76d3 100644
--- a/common/framework/Session.php
+++ b/common/framework/Session.php
@@ -79,17 +79,7 @@ class Session
 		ini_set('session.use_cookies', 1);
 		ini_set('session.use_only_cookies', 1);
 		ini_set('session.use_strict_mode', 1);
-		if ($samesite)
-		{
-			if (PHP_VERSION_ID >= 70300)
-			{
-				ini_set('session.cookie_samesite', $samesite);
-			}
-			else
-			{
-				$path = ($path ?: '/') . '; SameSite=' . $samesite;
-			}
-		}
+		ini_set('session.cookie_samesite', $samesite ? 1 : 0);
 		session_set_cookie_params($lifetime, $path, $domain, $secure, $httponly);
 		session_name($session_name = Config::get('session.name') ?: session_name());