Merge pull request #201 from halilsafakkilic/master

Added None to the allowed SameSite parameters in toHeader method.
slimphp · Sep 21, 2021 · 3f07ae4 · 3f07ae4
2 parents b7d40be + ad10498
commit 3f07ae4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Cookies.php b/src/Cookies.php
@@ -170,7 +170,7 @@ protected function toHeader(string $name, array $properties): string
             $result .= '; HttpOnly';
         }
 
-        if (isset($properties['samesite']) && in_array(strtolower($properties['samesite']), ['lax', 'strict'], true)) {
+        if (isset($properties['samesite']) && in_array(strtolower($properties['samesite']), ['lax', 'strict', 'none'], true)) {
             // While strtolower is needed for correct comparison, the RFC doesn't care about case
             $result .= '; SameSite=' . $properties['samesite'];
         }

diff --git a/tests/CookiesTest.php b/tests/CookiesTest.php
@@ -275,4 +275,11 @@ public function testParseHeaderException()
 
         Cookies::parseHeader(new stdClass());
     }
+
+    public function testSetSameSiteNoneToHeaders()
+    {
+        $cookies = new Cookies();
+        $cookies->set('foo', ['value' => 'bar', 'samesite' => 'None']);
+        $this->assertEquals('foo=bar; SameSite=None', $cookies->toHeaders()[0]);
+    }
 }