Merge pull request #6998 from kenjis/fix-services-session

fix: Config\Session
codeigniter4 · Dec 22, 2022 · 13d8246 · 13d8246
2 parents feb1772 + 503ab4f
commit 13d8246
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/Config/Session.php b/app/Config/Session.php
@@ -3,8 +3,8 @@
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Session\Handlers\BaseHandler;
 use CodeIgniter\Session\Handlers\FileHandler;
-use SessionHandlerInterface;
 
 class Session extends BaseConfig
 {
@@ -19,7 +19,7 @@ class Session extends BaseConfig
      * - `CodeIgniter\Session\Handlers\MemcachedHandler`
      * - `CodeIgniter\Session\Handlers\RedisHandler`
      *
-     * @phpstan-var class-string<SessionHandlerInterface>
+     * @phpstan-var class-string<BaseHandler>
      */
     public string $driver = FileHandler::class;
 

diff --git a/system/Config/Services.php b/system/Config/Services.php
@@ -73,6 +73,7 @@
 use Config\Migrations;
 use Config\Pager as PagerConfig;
 use Config\Services as AppServices;
+use Config\Session as SessionConfig;
 use Config\Toolbar as ToolbarConfig;
 use Config\Validation as ValidationConfig;
 use Config\View as ViewConfig;
@@ -645,10 +646,13 @@ public static function session(?App $config = null, bool $getShared = true)
 
         $logger = AppServices::logger();
 
-        $driverName = $config->sessionDriver;
+        /** @var SessionConfig|null $sessionConfig */
+        $sessionConfig = config('Session');
+
+        $driverName = $sessionConfig->driver ?? $config->sessionDriver;
 
         if ($driverName === DatabaseHandler::class) {
-            $DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
+            $DBGroup = $sessionConfig->DBGroup ?? $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
             $db      = Database::connect($DBGroup);
 
             $driver = $db->getPlatform();