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

@@ -568,7 +568,7 @@ public function setCookie(
         $httponly = null,
         $samesite = null,
     ) {
-        $store = $this->initializeCookieStore();
+        $store = $this->getCookieStore();
 
         if ($name instanceof Cookie) {
             $this->cookieStore = $store->put($name);
@@ -613,19 +613,24 @@ public function setCookie(
     /**
      * Returns the `CookieStore` instance.
      *
+     * Lazily instantiates the `CookieStore` on first call, so that the Cookie and
+     * CookieStore classes are not loaded on requests that do not use cookies.
+     *
      * @return CookieStore
      */
     public function getCookieStore()
     {
-        return $this->initializeCookieStore();
+        $this->cookieStore ??= new CookieStore([]);
+
+        return $this->cookieStore;
     }
 
     /**
      * Checks to see if the Response has a specified cookie or not.
      */
     public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool
     {
-        $store  = $this->initializeCookieStore();
+        $store  = $this->getCookieStore();
         $prefix = $prefix !== '' ? $prefix : Cookie::setDefaults()['prefix']; // to retain BC
 
         return $store->has($name, $prefix, $value);
@@ -641,7 +646,7 @@ public function hasCookie(string $name, ?string $value = null, string $prefix =
      */
     public function getCookie(?string $name = null, string $prefix = '')
     {
-        $store = $this->initializeCookieStore();
+        $store = $this->getCookieStore();
 
         if ((string) $name === '') {
             return $store->display();
@@ -669,7 +674,7 @@ public function deleteCookie(string $name = '', string $domain = '', string $pat
             return $this;
         }
 
-        $store  = $this->initializeCookieStore();
+        $store  = $this->getCookieStore();
         $prefix = $prefix !== '' ? $prefix : Cookie::setDefaults()['prefix']; // to retain BC
 
         $prefixed = $prefix . $name;
@@ -812,21 +817,8 @@ public function download(string $filename = '', $data = '', bool $setMime = fals
 
     public function getCSP(): ContentSecurityPolicy
     {
-        return $this->CSP ??= service('csp');
-    }
-
-    /**
-     * Lazily initializes the cookie store and the Cookie class defaults.
-     * Called by every cookie-related method so cookie machinery is only
-     * loaded when the developer actually interacts with cookies.
-     */
-    private function initializeCookieStore(): CookieStore
-    {
-        if ($this->cookieStore === null) {
-            Cookie::setDefaults(config(CookieConfig::class));
-            $this->cookieStore = new CookieStore([]);
-        }
+        $this->CSP ??= service('csp');
 
-        return $this->cookieStore;
+        return $this->CSP;
     }
 }

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');
+        }
+    }
 }