diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index 4747a5ed98d6..51e8c3c1c117 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -2129,7 +2129,7 @@ protected function getSessionTimezone(): ?string // Auto-sync with app timezone if ($this->timezone === true) { $appConfig = config('App'); - $timezone = $appConfig->appTimezone ?? 'UTC'; + $timezone = $appConfig->appTimezone; } else { // Use specific timezone from config $timezone = $this->timezone; diff --git a/system/Log/Logger.php b/system/Log/Logger.php index 485230f44efa..1f2fdea876b8 100644 --- a/system/Log/Logger.php +++ b/system/Log/Logger.php @@ -181,10 +181,10 @@ public function __construct($config, bool $debug = CI_DEBUG) $this->logCache = []; } - $this->logGlobalContext = $config->logGlobalContext ?? $this->logGlobalContext; - $this->logContext = $config->logContext ?? $this->logContext; - $this->logContextTrace = $config->logContextTrace ?? $this->logContextTrace; - $this->logContextUsedKeys = $config->logContextUsedKeys ?? $this->logContextUsedKeys; + $this->logGlobalContext = $config->logGlobalContext ?? $this->logGlobalContext; // @phpstan-ignore nullCoalesce.property + $this->logContext = $config->logContext ?? $this->logContext; // @phpstan-ignore nullCoalesce.property + $this->logContextTrace = $config->logContextTrace ?? $this->logContextTrace; // @phpstan-ignore nullCoalesce.property + $this->logContextUsedKeys = $config->logContextUsedKeys ?? $this->logContextUsedKeys; // @phpstan-ignore nullCoalesce.property } /** diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php index e09bf016468a..438b54b96151 100644 --- a/tests/system/Database/Live/ConnectTest.php +++ b/tests/system/Database/Live/ConnectTest.php @@ -186,7 +186,7 @@ public function testTimezoneAutoSyncWithAppTimezone(): void $timezone = $this->getDatabaseTimezone($db, $driver); $appConfig = config('App'); - $appTimezone = $appConfig->appTimezone ?? 'UTC'; + $appTimezone = $appConfig->appTimezone; $expectedOffset = $this->getPrivateMethodInvoker($db, 'convertTimezoneToOffset')($appTimezone); $this->assertSame($expectedOffset, $timezone);