From 57e9237406c696e23311f2bd6ab22344371cfbc7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Jun 2022 10:12:40 +0900
Subject: [PATCH] fix: get_cookie() does not take Config\Cookie::$prefix

---
 system/Helpers/cookie_helper.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index 51a746c5395b..d7e8af570ca1 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -10,6 +10,7 @@
  */
 
 use Config\App;
+use Config\Cookie;
 use Config\Services;
 
 //=============================================================================
@@ -63,7 +64,13 @@ function set_cookie(
      */
     function get_cookie($index, bool $xssClean = false)
     {
-        $prefix  = isset($_COOKIE[$index]) ? '' : config(App::class)->cookiePrefix;
+        /** @var Cookie|null $cookie */
+        $cookie = config('Cookie');
+
+        // @TODO Remove Config\App fallback when deprecated `App` members are removed.
+        $cookiePrefix = $cookie instanceof Cookie ? $cookie->prefix : config(App::class)->cookiePrefix;
+
+        $prefix  = isset($_COOKIE[$index]) ? '' : $cookiePrefix;
         $request = Services::request();
         $filter  = $xssClean ? FILTER_SANITIZE_FULL_SPECIAL_CHARS : FILTER_DEFAULT;