bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Remove most calls to date_default_timezone_* calls

Browse source 
- It was wrongly used to set the node-wide ot user-specific timezone
- It is now fully managed from the App object
- Add a static variable to DateTimeFormat maintain the convenient local() method
This commit is contained in:
Hypolite Petovan 2021-10-03 12:38:47 -04:00
commit 6db211568a
11 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Util/DateTimeFormat.php
View file

@ -36,6 +36,13 @@ class DateTimeFormat
const HTTP = 'D, d M Y H:i:s \G\M\T';
const JSON = 'Y-m-d\TH:i:s.v\Z';
static $localTimezone = 'UTC';
public static function setLocalTimeZone(string $timezone)
{
self::$localTimezone = $timezone;
}
/**
* convert() shorthand for UTC.
*
@ -59,7 +66,7 @@ class DateTimeFormat
*/
public static function local($time, $format = self::MYSQL)
{
return self::convert($time, date_default_timezone_get(), 'UTC', $format);
return self::convert($time, self::$localTimezone, 'UTC', $format);
}
/**
@ -160,7 +167,7 @@ class DateTimeFormat
$to_obj = new DateTimeZone('UTC');
}
$d->setTimeZone($to_obj);
$d->setTimezone($to_obj);
return $d->format($format);
}

12
src/Util/Temporal.php
View file

@ -360,23 +360,19 @@ class Temporal
* Returns the age in years, given a date of birth and the timezone of the person
* whose date of birth is provided.
*
* @param string $dob Date of Birth
* @param string $owner_tz (optional) Timezone of the person of interest
* @param string $dob Date of Birth
* @param string $timezone Timezone of the person of interest
*
* @return int Age in years
* @throws \Exception
*/
public static function getAgeByTimezone($dob, $owner_tz = ''): int
public static function getAgeByTimezone(string $dob, string $timezone): int
{
if (!intval($dob)) {
return 0;
}
if (!$owner_tz) {
$owner_tz = date_default_timezone_get();
}
$birthdate = new DateTime($dob . ' 00:00:00', new DateTimeZone($owner_tz));
$birthdate = new DateTime($dob . ' 00:00:00', new DateTimeZone($timezone));
$currentDate = new DateTime('now', new DateTimeZone('UTC'));
$interval = $birthdate->diff($currentDate);