fix: Fixed an issue where the samesite option defaulted to a bool…

… when it should have defaulted to the string `Lax`
nystudio107 · Feb 12, 2024 · 9d1e9a8 · 9d1e9a8
1 parent c135ced
commit 9d1e9a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/services/CookiesService.php b/src/services/CookiesService.php
@@ -79,7 +79,7 @@ public function setSecure(
         string $domain = '',
         bool   $secure = false,
         bool   $httpOnly = false,
-        bool   $sameSite = false,
+        string $sameSite = 'Lax',
     ): void
     {
         if (empty($value)) {
@@ -131,8 +131,7 @@ public function getSecure(string $name = ''): string
             }
 
             if (
-                $cookie
-                && !empty($cookie->value)
+                !empty($cookie->value)
                 && $data !== false
             ) {
                 $result = unserialize(base64_decode($data), ['allowed_classes' => false]);

diff --git a/src/twigextensions/CookiesTwigExtension.php b/src/twigextensions/CookiesTwigExtension.php
@@ -51,9 +51,9 @@ public function getFilters(): array
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('setCookie', fn(string $name = "", string $value = "", int $expire = 0, string $path = "/", string $domain = "", bool $secure = false, bool $httpOnly = false, bool $sameSite = false) => $this->setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite)),
+            new TwigFunction('setCookie', fn(string $name = "", string $value = "", int $expire = 0, string $path = "/", string $domain = "", bool $secure = false, bool $httpOnly = false, string $sameSite = 'Lax') => $this->setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite)),
             new TwigFunction('getCookie', fn($name) => $this->getCookie($name)),
-            new TwigFunction('setSecureCookie', fn(string $name = "", string $value = "", int $expire = 0, string $path = "/", string $domain = "", bool $secure = false, bool $httpOnly = false, bool $sameSite = false) => $this->setSecureCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite)),
+            new TwigFunction('setSecureCookie', fn(string $name = "", string $value = "", int $expire = 0, string $path = "/", string $domain = "", bool $secure = false, bool $httpOnly = false, string $sameSite = 'Lax') => $this->setSecureCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite)),
             new TwigFunction('getSecureCookie', fn($name) => $this->getSecureCookie($name)),
         ];
     }
@@ -103,7 +103,7 @@ public function setSecureCookie(
         string $domain = "",
         bool   $secure = false,
         bool   $httpOnly = false,
-        bool   $sameSite = false,
+        string $sameSite = 'Lax',
     ): void
     {
         Cookies::$plugin->cookies->setSecure(

diff --git a/src/variables/CookiesVariable.php b/src/variables/CookiesVariable.php
@@ -66,7 +66,7 @@ public function setSecure(
         string $domain = "",
         bool   $secure = false,
         bool   $httpOnly = false,
-        bool   $sameSite = false,
+        string $sameSite = 'Lax',
     ): void
     {
         Cookies::$plugin->cookies->setSecure(