Skip to content

[feat] Dynamic timezone handling in Utils class #2291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

[feat] Dynamic timezone handling in Utils class #2291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/Support/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,26 @@

class Utils
{
/**
* Get the timezone from Carbon.
*
* @return string
*/
protected static function getTimezone()
{
$tz = Carbon::now()->getTimezone()->getName();

return in_array($tz, timezone_identifiers_list()) ? $tz : 'UTC';
}

/**
* Get the Carbon instance for the current time.
*
* @return \Carbon\Carbon
*/
public static function now()
{
return Carbon::now('UTC');
return Carbon::now(static::getTimezone());
}

/**
Expand All @@ -33,7 +45,7 @@ public static function now()
*/
public static function timestamp($timestamp)
{
return Carbon::createFromTimestampUTC($timestamp)->timezone('UTC');
return Carbon::createFromTimestampUTC($timestamp)->timezone(static::getTimezone());
}

/**
Expand Down