diff --git a/helpers.php b/helpers.php index 1e4e372..02053b1 100644 --- a/helpers.php +++ b/helpers.php @@ -361,7 +361,7 @@ function carbonFormat( '900', // +9:00 '0900', 'asiajayapura' => 'WIT', - default => ($showTz ? $timezone : ''), + default => $timezone, }; if (is_null($datetime)) { @@ -377,7 +377,7 @@ function carbonFormat( } $datetime->timezone($timezone); - $timezoneLabel = $timezoneSuffix + $timezoneLabel = $showTz && $timezoneSuffix ? " {$timezoneSuffix}" : ''; diff --git a/tests/TestCase.php b/tests/TestCase.php index d24236c..3bea636 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -68,9 +68,9 @@ protected function getEnvironmentSetUp($app) { $app['config']->set('database.default', 'sqlite'); $app['config']->set('database.connections.sqlite', [ - 'driver' => 'sqlite', + 'driver' => 'sqlite', 'database' => ':memory:', - 'prefix' => '', + 'prefix' => '', ]); $app['config']->set('view.paths', [__DIR__.'/resources/views']);