Merge pull request #4371 from kenjis/fix-cookieSameSite

Fix Undefined property: Config\App::$cookieSameSite
codeigniter4 · Mar 2, 2021 · 906d251 · 906d251
2 parents b951050 + 31ccc2f
commit 906d251
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
@@ -165,6 +165,8 @@ public function __construct($config)
 		$this->cookieHTTPOnly = $config->cookieHTTPOnly;
 		$this->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
 
+		$config->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
+
 		if (! in_array(strtolower($config->cookieSameSite ?: Cookie::SAMESITE_LAX), Cookie::ALLOWED_SAMESITE_VALUES, true))
 		{
 			throw CookieException::forInvalidSameSite($config->cookieSameSite);

diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
@@ -257,6 +257,22 @@ public function testCookieBlankSetSameSite()
 		$this->assertSame('', $allCookies['bar;;/']->getSameSite());
 	}
 
+	public function testCookieWithoutSameSite()
+	{
+		$config = new App();
+		unset($config->cookieSameSite);
+		$response = new Response($config);
+		$response->setCookie([
+			'name'  => 'bar',
+			'value' => 'foo',
+		]);
+
+		$allCookies = $response->getCookies();
+		$this->assertCount(1, $allCookies);
+		$this->assertInstanceOf(Cookie::class, $allCookies['bar;;/']);
+		$this->assertSame('Lax', $allCookies['bar;;/']->getSameSite());
+	}
+
 	public function testCookieStrictSameSite()
 	{
 		$config   = new App();