Skip to content

Commit 30f5a50

Browse files
committed
fix: use Config\Session in Services
1 parent feb1772 commit 30f5a50

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

system/Config/Services.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
use Config\Migrations;
7474
use Config\Pager as PagerConfig;
7575
use Config\Services as AppServices;
76+
use Config\Session as SessionConfig;
7677
use Config\Toolbar as ToolbarConfig;
7778
use Config\Validation as ValidationConfig;
7879
use Config\View as ViewConfig;
@@ -645,10 +646,13 @@ public static function session(?App $config = null, bool $getShared = true)
645646

646647
$logger = AppServices::logger();
647648

648-
$driverName = $config->sessionDriver;
649+
/** @var SessionConfig|null $sessionConfig */
650+
$sessionConfig = config('Session');
651+
652+
$driverName = $sessionConfig->driver ?? $config->sessionDriver;
649653

650654
if ($driverName === DatabaseHandler::class) {
651-
$DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
655+
$DBGroup = $sessionConfig->DBGroup ?? $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
652656
$db = Database::connect($DBGroup);
653657

654658
$driver = $db->getPlatform();

0 commit comments

Comments
 (0)