Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions lib/timezonedata/extrazones.php
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,9 @@
'PST' => 'America/Los_Angeles',
'Gulf Standard Time' => 'Asia/Dubai',
'Western/Central Europe' => 'Europe/Prague',
'Alberta Standard Time' => 'America/Edmonton',
'Mountain Time (Alberta)' => 'America/Edmonton',
'Manitoba Standard Time' => 'America/Winnipeg',
'British Columbia Standard Time' => 'America/Vancouver',
'Pacific Time (British Columbia)' => 'America/Vancouver',
];
20 changes: 20 additions & 0 deletions tests/VObject/TimeZoneUtilTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,26 @@ public function testMicrosoftMap(): void
self::assertEquals($ex->getName(), $tz->getName());
}

#[DataProvider('canadaPermanentTimeZoneProvider')]
public function testCanadaPermanentTimeZones(string $origin, string $expected): void
{
$tz = TimeZoneUtil::getTimeZone($origin, null, true);
self::assertSame($expected, $tz->getName());
}

public static function canadaPermanentTimeZoneProvider(): iterable
{
yield 'Alberta Standard Time' => ['Alberta Standard Time', 'America/Edmonton'];
yield 'Alberta Standard Time 1' => ['Alberta Standard Time 1', 'America/Edmonton'];
yield 'Mountain Time (Alberta)' => ['Mountain Time (Alberta)', 'America/Edmonton'];
yield '(UTC-06:00) Mountain Time (Alberta)' => ['(UTC-06:00) Mountain Time (Alberta)', 'America/Edmonton'];
yield 'Manitoba Standard Time' => ['Manitoba Standard Time', 'America/Winnipeg'];
yield 'Manitoba Standard Time 1' => ['Manitoba Standard Time 1', 'America/Winnipeg'];
yield 'British Columbia Standard Time' => ['British Columbia Standard Time', 'America/Vancouver'];
yield 'Pacific Time (British Columbia)' => ['Pacific Time (British Columbia)', 'America/Vancouver'];
yield '(UTC-07:00) Pacific Time (British Columbia)' => ['(UTC-07:00) Pacific Time (British Columbia)', 'America/Vancouver'];
}

#[DataProvider('unSupportTimezoneProvider')]
public function testPHPUnSupportTimeZone(string $origin, string $expected): void
{
Expand Down
Loading