Fix deleteCookie() when prefix is defined. Fixes #3433

codeigniter4 · Aug 1, 2020 · bc125f5 · bc125f5
1 parent 906026e
commit bc125f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
@@ -984,12 +984,12 @@ public function deleteCookie(string $name = '', string $domain = '', string $pat
 			$prefix = $this->cookiePrefix;
 		}
 
-		$name = $prefix . $name;
+		$prefixedName = $prefix . $name;
 
 		$cookieHasFlag = false;
 		foreach ($this->cookies as &$cookie)
 		{
-			if ($cookie['name'] === $name)
+			if ($cookie['name'] === $prefixedName)
 			{
 				if (! empty($domain) && $cookie['domain'] !== $domain)
 				{

diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
@@ -199,7 +199,7 @@ public function testCookieDelete()
 		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
 		$response->deleteCookie('bee');
 		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
+		$this->assertEquals($cookie['expires'], '', 'Expires should be an empty string');
 
 		// delete cookie with wrong prefix?
 		$config->cookiePrefix = 'mine';
@@ -210,7 +210,7 @@ public function testCookieDelete()
 		$this->assertFalse($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
 		$response->deleteCookie('bee', '', '', 'mine');
 		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
+		$this->assertEquals($cookie['expires'], '', 'Expires should be an empty string');
 
 		// delete cookie with wrong domain?
 		$config->cookieDomain = '.mine.com';
@@ -221,7 +221,7 @@ public function testCookieDelete()
 		$this->assertFalse($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
 		$response->deleteCookie('bee', '.mine.com', '', '');
 		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
+		$this->assertEquals($cookie['expires'], '', 'Expires should be an empty string');
 
 		// delete cookie with wrong path?
 		$config->cookiePath = '/whoknowswhere';
@@ -232,7 +232,7 @@ public function testCookieDelete()
 		$this->assertFalse($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
 		$response->deleteCookie('bee', '', '/whoknowswhere', '');
 		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie['expires'] <= time(), $cookie['expires'] . ' should be less than ' . time());
+		$this->assertEquals($cookie['expires'], '', 'Expires should be an empty string');
 	}
 
 }