address review

Author: paulbalandan

system/HTTP/Response.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 
 /**
@@ -142,6 +143,8 @@ class Response extends Message implements ResponseInterface
      */
     public function __construct()
     {
+        Cookie::setDefaults(config('Cookie'));
+
         $this->noCache()->setContentType('text/html');
     }
 

system/HTTP/ResponseTrait.php

@@ -822,10 +822,7 @@ public function getCSP(): ContentSecurityPolicy
      */
     private function initializeCookieStore(): CookieStore
     {
-        if ($this->cookieStore === null) {
-            Cookie::setDefaults(config(CookieConfig::class));
-            $this->cookieStore = new CookieStore([]);
-        }
+        $this->cookieStore ??= new CookieStore([]);
 
         return $this->cookieStore;
     }

tests/system/HTTP/ResponseTest.php

@@ -15,6 +15,7 @@
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
+use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\Cookie\CookieStore;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Superglobals;
@@ -753,4 +754,29 @@ public function testGetCookiesReturnsEmptyArrayWhenCookieStoreNotInitialized():
             'getCookies() must not instantiate the store when no cookies have been set.',
         );
     }
+
+    public function testGetCookieStillUsesSetCookieDefaultsWhenStoreNotInitialized(): void
+    {
+        $oldDefaults = Cookie::setDefaults();
+
+        config('Cookie')->prefix = 'test_';
+
+        try {
+            $response = new Response();
+
+            $this->assertNull($this->getPrivateProperty($response, 'cookieStore'));
+
+            $response->setCookie('foo', 'bar');
+
+            $this->assertInstanceOf(CookieStore::class, $this->getPrivateProperty($response, 'cookieStore'));
+            $this->assertTrue($response->hasCookie('foo'));
+
+            $cookie = $response->getCookie('foo');
+            $this->assertSame('test_', $cookie->getPrefix());
+            $this->assertSame('test_foo', $cookie->getPrefixedName());
+        } finally {
+            Cookie::setDefaults($oldDefaults);
+            Factories::reset('config');
+        }
+    }
 }