From 85432ab2b95f78b26bdf4b4a06071c8491ed1c8d Mon Sep 17 00:00:00 2001 From: Much Yusron Arif <3467343+yusronarif@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:43:27 +0700 Subject: [PATCH 1/2] update carbonFormat --- helpers.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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}" : ''; From a2bb0d63c5991963a25cabce643da1b20205016f Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sat, 2 Mar 2024 09:44:14 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- tests/TestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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']);