mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-50704 date: Fix invalid timezone mapping for +14

Browse Source 
The value Etc/GMT-14 was added to the list of known timezones,
and Etc/GMT+13 & Etc/GMT+14 were removed as they are not valid.

Tests were added to ensure that legacy user timezones are mapped
to known timezones. Other tests were changed to reflect the changes
with regards to Etc/GMT+13 and +-14.
This commit is contained in:
Frederic Massart 2016-05-09 13:27:25 +08:00
parent 1e72daa899
commit 88474db22f
3 changed files with 80 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/date.php
View File

@ -72,8 +72,12 @@ class core_date {
if (is_numeric($currentvalue)) {
// UTC offset.
$modifier = ($currentvalue > 0) ? '+' : '';
$a = 'UTC' . $modifier . number_format($currentvalue, 1);
if ($currentvalue == 0) {
$a = 'UTC';
} else {
$modifier = ($currentvalue > 0) ? '+' : '';
$a = 'UTC' . $modifier . number_format($currentvalue, 1);
}
$timezones[$currentvalue] = get_string('timezoneinvalid', 'core_admin', $a);
} else {
// Some string we don't recognise.
@ -508,7 +512,7 @@ class core_date {
);
// Legacy GMT fallback.
for ($i = -14; $i <= 13; $i++) {
for ($i = -12; $i <= 14; $i++) {
$off = abs($i);
if ($i < 0) {
$mapto = 'Etc/GMT+' . $off;

74
lib/tests/date_test.php
View File

@ -77,7 +77,7 @@ class core_date_testcase extends advanced_testcase {
$this->assertSame('Pacific/Auckland', core_date::normalise_timezone(-14));
$this->assertSame('Etc/GMT-12', core_date::normalise_timezone(12));
$this->assertSame('Etc/GMT-13', core_date::normalise_timezone(13));
$this->assertSame('Pacific/Auckland', core_date::normalise_timezone(14));
$this->assertSame('Etc/GMT-14', core_date::normalise_timezone(14));
$this->assertSame('Asia/Kabul', core_date::normalise_timezone(4.5));
$this->assertSame('Asia/Kolkata', core_date::normalise_timezone(5.5));
@ -107,7 +107,7 @@ class core_date_testcase extends advanced_testcase {
$this->assertSame('Pacific/Auckland', core_date::normalise_timezone(-14));
$this->assertSame('Etc/GMT-12', core_date::normalise_timezone(12));
$this->assertSame('Etc/GMT-13', core_date::normalise_timezone(13));
$this->assertSame('Pacific/Auckland', core_date::normalise_timezone(14));
$this->assertSame('Etc/GMT-14', core_date::normalise_timezone(14));
$this->setTimezone('Pacific/Auckland', 'Pacific/Auckland');
$tz = new DateTimeZone('Pacific/Auckland');
@ -334,6 +334,76 @@ class core_date_testcase extends advanced_testcase {
$this->assertSame('Etc/GMT-1', date_default_timezone_get());
}
public function legacyUserTimezoneProvider() {
return [
['', 'Australia/Perth'], // Fallback on default timezone.
['-13.0', 'Australia/Perth'], // Fallback on default timezone.
['-12.5', 'Etc/GMT+12'],
['-12.0', 'Etc/GMT+12'],
['-11.5', 'Etc/GMT+11'],
['-11.0', 'Etc/GMT+11'],
['-10.5', 'Etc/GMT+10'],
['-10.0', 'Etc/GMT+10'],
['-9.5', 'Etc/GMT+9'],
['-9.0', 'Etc/GMT+9'],
['-8.5', 'Etc/GMT+8'],
['-8.0', 'Etc/GMT+8'],
['-7.5', 'Etc/GMT+7'],
['-7.0', 'Etc/GMT+7'],
['-6.5', 'Etc/GMT+6'],
['-6.0', 'Etc/GMT+6'],
['-5.5', 'Etc/GMT+5'],
['-5.0', 'Etc/GMT+5'],
['-4.5', 'Etc/GMT+4'],
['-4.0', 'Etc/GMT+4'],
['-3.5', 'Etc/GMT+3'],
['-3.0', 'Etc/GMT+3'],
['-2.5', 'Etc/GMT+2'],
['-2.0', 'Etc/GMT+2'],
['-1.5', 'Etc/GMT+1'],
['-1.0', 'Etc/GMT+1'],
['-0.5', 'Etc/GMT'],
['0', 'Etc/GMT'],
['0.0', 'Etc/GMT'],
['0.5', 'Etc/GMT'],
['1.0', 'Etc/GMT-1'],
['1.5', 'Etc/GMT-1'],
['2.0', 'Etc/GMT-2'],
['2.5', 'Etc/GMT-2'],
['3.0', 'Etc/GMT-3'],
['3.5', 'Etc/GMT-3'],
['4.0', 'Etc/GMT-4'],
['4.5', 'Asia/Kabul'],
['5.0', 'Etc/GMT-5'],
['5.5', 'Asia/Kolkata'],
['6.0', 'Etc/GMT-6'],
['6.5', 'Asia/Rangoon'],
['7.0', 'Etc/GMT-7'],
['7.5', 'Etc/GMT-7'],
['8.0', 'Etc/GMT-8'],
['8.5', 'Etc/GMT-8'],
['9.0', 'Etc/GMT-9'],
['9.5', 'Australia/Darwin'],
['10.0', 'Etc/GMT-10'],
['10.5', 'Etc/GMT-10'],
['11.0', 'Etc/GMT-11'],
['11.5', 'Etc/GMT-11'],
['12.0', 'Etc/GMT-12'],
['12.5', 'Etc/GMT-12'],
['13.0', 'Etc/GMT-13'],
];
}
/**
* @dataProvider legacyUserTimezoneProvider
* @param string $tz The legacy timezone.
* @param string $expected The expected converted timezone.
*/
public function test_get_legacy_user_timezone($tz, $expected) {
$this->setTimezone('Australia/Perth', 'Australia/Perth');
$this->assertEquals($expected, core_date::get_user_timezone($tz));
}
public function test_get_user_timezone() {
global $CFG, $USER;
$this->resetAfterTest();

2
lib/tests/moodlelib_test.php
View File

@ -1582,7 +1582,7 @@ class core_moodlelib_testcase extends advanced_testcase {
'expectedoutput' => '1309485600'
),
array(
'usertimezone' => '14', // Server time.
'usertimezone' => '-14', // Server time.
'year' => '2011',
'month' => '7',
'day' => '1',