Add support for Windows timezone

Fix #69
2024-11-28 05:24:10 +01:00 · 2019-09-01 13:08:55 +01:00 · 2019-09-01 13:08:55 +01:00 · e3d5f8c629
commit e3d5f8c629
parent 77bb693fdd
5 changed files with 241 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,11 @@

 ## [Unreleased]

+### Added
+
+- Persian (Farsi) translation [#72](https://github.com/rlanvin/php-rrule/pull/72)
+- Support for Windows timezone [#69](https://github.com/rlanvin/php-rrule/issues/69)
+
 ## [2.1.0] - 2019-05-30

 ### Fixed
--- a/bin/import_windows_timezones.php
+++ b/bin/import_windows_timezones.php
@ -0,0 +1,48 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Inspired from https://github.com/sabre-io/vobject/blob/master/bin/fetch_windows_zones.php
+ */
+
+$input = 'https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml';
+$output = __DIR__.'/../src/tzdata/windows.php';
+
+$xml = simplexml_load_file($input);
+if ($xml === false) {
+	fprintf(STDERR, "Something went wrong");
+	exit(1);
+}
+$map = [];
+
+// mapZone can contains multiple mapping, so we take only where territory="001"
+foreach ($xml->xpath('//mapZone[@territory=001]') as $zone) {
+	$from = (string) $zone['other'];
+	$to = (string) $zone['type'];
+
+	// then there can also be multiple timezone, so we take the first one
+	$to = explode(" ",$to)[0];
+
+	$map[$from] = $to;
+}
+ksort($map);
+
+$export = var_export($map,true);
+$script = basename(__FILE__);
+$date = gmdate('c');
+
+file_put_contents($output, <<<EOF
+<?php
+
+/**
+ * This file is automatically generated by {$script}.
+ *
+ * Generated at: {$date}
+ * Source used: {$input}
+ */
+
+return {$export};
+EOF
+);
+
+echo "Success\n";
--- a/src/RfcParser.php
+++ b/src/RfcParser.php
@ -22,6 +22,8 @@ namespace RRule;
 */
 class RfcParser
 {
+	static $tzdata = null;
+
 	/**
 	 * High level "line".
 	 * Explode a line into property name, property parameters and property value
@ -128,7 +130,7 @@ class RfcParser
 							);
 						}
 						$dtstart_type = 'tzid';
-						$tmp = new \DateTimeZone($property['params']['TZID']);
+						$tmp = self::parseTimeZone($property['params']['TZID']);
 					}
 					elseif (strpos($property['value'], 'T') !== false) {
 						if (strpos($property['value'], 'Z') === false) {
@ -306,4 +308,21 @@ class RfcParser
 		return $dates;
 	}

+	/**
+	 * Create a new DateTimeZone object, converting non-standard timezone.
+	 *
+	 * @see https://github.com/rlanvin/php-rrule/issues/69
+	 */
+	static public function parseTimeZone($tzid)
+	{
+		if (self::$tzdata === null) {
+			self::$tzdata = require __DIR__.'/tzdata/windows.php';
+		}
+
+		if (isset(self::$tzdata[$tzid])) {
+			return new \DateTimeZone(self::$tzdata[$tzid]);
+		}
+
+		return new \DateTimeZone($tzid);
+	}
 }
--- a/src/tzdata/windows.php
+++ b/src/tzdata/windows.php
@ -0,0 +1,148 @@
+<?php
+
+/**
+ * This file is automatically generated by import_windows_timezones.php.
+ *
+ * Generated at: 2019-09-01T11:35:25+00:00
+ * Source used: https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml
+ */
+
+return array (
+  'AUS Central Standard Time' => 'Australia/Darwin',
+  'AUS Eastern Standard Time' => 'Australia/Sydney',
+  'Afghanistan Standard Time' => 'Asia/Kabul',
+  'Alaskan Standard Time' => 'America/Anchorage',
+  'Aleutian Standard Time' => 'America/Adak',
+  'Altai Standard Time' => 'Asia/Barnaul',
+  'Arab Standard Time' => 'Asia/Riyadh',
+  'Arabian Standard Time' => 'Asia/Dubai',
+  'Arabic Standard Time' => 'Asia/Baghdad',
+  'Argentina Standard Time' => 'America/Buenos_Aires',
+  'Astrakhan Standard Time' => 'Europe/Astrakhan',
+  'Atlantic Standard Time' => 'America/Halifax',
+  'Aus Central W. Standard Time' => 'Australia/Eucla',
+  'Azerbaijan Standard Time' => 'Asia/Baku',
+  'Azores Standard Time' => 'Atlantic/Azores',
+  'Bahia Standard Time' => 'America/Bahia',
+  'Bangladesh Standard Time' => 'Asia/Dhaka',
+  'Belarus Standard Time' => 'Europe/Minsk',
+  'Bougainville Standard Time' => 'Pacific/Bougainville',
+  'Canada Central Standard Time' => 'America/Regina',
+  'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
+  'Caucasus Standard Time' => 'Asia/Yerevan',
+  'Cen. Australia Standard Time' => 'Australia/Adelaide',
+  'Central America Standard Time' => 'America/Guatemala',
+  'Central Asia Standard Time' => 'Asia/Almaty',
+  'Central Brazilian Standard Time' => 'America/Cuiaba',
+  'Central Europe Standard Time' => 'Europe/Budapest',
+  'Central European Standard Time' => 'Europe/Warsaw',
+  'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
+  'Central Standard Time' => 'America/Chicago',
+  'Central Standard Time (Mexico)' => 'America/Mexico_City',
+  'Chatham Islands Standard Time' => 'Pacific/Chatham',
+  'China Standard Time' => 'Asia/Shanghai',
+  'Cuba Standard Time' => 'America/Havana',
+  'Dateline Standard Time' => 'Etc/GMT+12',
+  'E. Africa Standard Time' => 'Africa/Nairobi',
+  'E. Australia Standard Time' => 'Australia/Brisbane',
+  'E. Europe Standard Time' => 'Europe/Chisinau',
+  'E. South America Standard Time' => 'America/Sao_Paulo',
+  'Easter Island Standard Time' => 'Pacific/Easter',
+  'Eastern Standard Time' => 'America/New_York',
+  'Eastern Standard Time (Mexico)' => 'America/Cancun',
+  'Egypt Standard Time' => 'Africa/Cairo',
+  'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
+  'FLE Standard Time' => 'Europe/Kiev',
+  'Fiji Standard Time' => 'Pacific/Fiji',
+  'GMT Standard Time' => 'Europe/London',
+  'GTB Standard Time' => 'Europe/Bucharest',
+  'Georgian Standard Time' => 'Asia/Tbilisi',
+  'Greenland Standard Time' => 'America/Godthab',
+  'Greenwich Standard Time' => 'Atlantic/Reykjavik',
+  'Haiti Standard Time' => 'America/Port-au-Prince',
+  'Hawaiian Standard Time' => 'Pacific/Honolulu',
+  'India Standard Time' => 'Asia/Calcutta',
+  'Iran Standard Time' => 'Asia/Tehran',
+  'Israel Standard Time' => 'Asia/Jerusalem',
+  'Jordan Standard Time' => 'Asia/Amman',
+  'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
+  'Korea Standard Time' => 'Asia/Seoul',
+  'Libya Standard Time' => 'Africa/Tripoli',
+  'Line Islands Standard Time' => 'Pacific/Kiritimati',
+  'Lord Howe Standard Time' => 'Australia/Lord_Howe',
+  'Magadan Standard Time' => 'Asia/Magadan',
+  'Magallanes Standard Time' => 'America/Punta_Arenas',
+  'Marquesas Standard Time' => 'Pacific/Marquesas',
+  'Mauritius Standard Time' => 'Indian/Mauritius',
+  'Middle East Standard Time' => 'Asia/Beirut',
+  'Montevideo Standard Time' => 'America/Montevideo',
+  'Morocco Standard Time' => 'Africa/Casablanca',
+  'Mountain Standard Time' => 'America/Denver',
+  'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
+  'Myanmar Standard Time' => 'Asia/Rangoon',
+  'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
+  'Namibia Standard Time' => 'Africa/Windhoek',
+  'Nepal Standard Time' => 'Asia/Katmandu',
+  'New Zealand Standard Time' => 'Pacific/Auckland',
+  'Newfoundland Standard Time' => 'America/St_Johns',
+  'Norfolk Standard Time' => 'Pacific/Norfolk',
+  'North Asia East Standard Time' => 'Asia/Irkutsk',
+  'North Asia Standard Time' => 'Asia/Krasnoyarsk',
+  'North Korea Standard Time' => 'Asia/Pyongyang',
+  'Omsk Standard Time' => 'Asia/Omsk',
+  'Pacific SA Standard Time' => 'America/Santiago',
+  'Pacific Standard Time' => 'America/Los_Angeles',
+  'Pacific Standard Time (Mexico)' => 'America/Tijuana',
+  'Pakistan Standard Time' => 'Asia/Karachi',
+  'Paraguay Standard Time' => 'America/Asuncion',
+  'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
+  'Romance Standard Time' => 'Europe/Paris',
+  'Russia Time Zone 10' => 'Asia/Srednekolymsk',
+  'Russia Time Zone 11' => 'Asia/Kamchatka',
+  'Russia Time Zone 3' => 'Europe/Samara',
+  'Russian Standard Time' => 'Europe/Moscow',
+  'SA Eastern Standard Time' => 'America/Cayenne',
+  'SA Pacific Standard Time' => 'America/Bogota',
+  'SA Western Standard Time' => 'America/La_Paz',
+  'SE Asia Standard Time' => 'Asia/Bangkok',
+  'Saint Pierre Standard Time' => 'America/Miquelon',
+  'Sakhalin Standard Time' => 'Asia/Sakhalin',
+  'Samoa Standard Time' => 'Pacific/Apia',
+  'Sao Tome Standard Time' => 'Africa/Sao_Tome',
+  'Saratov Standard Time' => 'Europe/Saratov',
+  'Singapore Standard Time' => 'Asia/Singapore',
+  'South Africa Standard Time' => 'Africa/Johannesburg',
+  'Sri Lanka Standard Time' => 'Asia/Colombo',
+  'Sudan Standard Time' => 'Africa/Khartoum',
+  'Syria Standard Time' => 'Asia/Damascus',
+  'Taipei Standard Time' => 'Asia/Taipei',
+  'Tasmania Standard Time' => 'Australia/Hobart',
+  'Tocantins Standard Time' => 'America/Araguaina',
+  'Tokyo Standard Time' => 'Asia/Tokyo',
+  'Tomsk Standard Time' => 'Asia/Tomsk',
+  'Tonga Standard Time' => 'Pacific/Tongatapu',
+  'Transbaikal Standard Time' => 'Asia/Chita',
+  'Turkey Standard Time' => 'Europe/Istanbul',
+  'Turks And Caicos Standard Time' => 'America/Grand_Turk',
+  'US Eastern Standard Time' => 'America/Indianapolis',
+  'US Mountain Standard Time' => 'America/Phoenix',
+  'UTC' => 'Etc/GMT',
+  'UTC+12' => 'Etc/GMT-12',
+  'UTC+13' => 'Etc/GMT-13',
+  'UTC-02' => 'Etc/GMT+2',
+  'UTC-08' => 'Etc/GMT+8',
+  'UTC-09' => 'Etc/GMT+9',
+  'UTC-11' => 'Etc/GMT+11',
+  'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
+  'Venezuela Standard Time' => 'America/Caracas',
+  'Vladivostok Standard Time' => 'Asia/Vladivostok',
+  'Volgograd Standard Time' => 'Europe/Volgograd',
+  'W. Australia Standard Time' => 'Australia/Perth',
+  'W. Central Africa Standard Time' => 'Africa/Lagos',
+  'W. Europe Standard Time' => 'Europe/Berlin',
+  'W. Mongolia Standard Time' => 'Asia/Hovd',
+  'West Asia Standard Time' => 'Asia/Tashkent',
+  'West Bank Standard Time' => 'Asia/Hebron',
+  'West Pacific Standard Time' => 'Pacific/Port_Moresby',
+  'Yakutsk Standard Time' => 'Asia/Yakutsk',
+);
--- a/tests/RRuleTest.php
+++ b/tests/RRuleTest.php
@ -2044,6 +2044,17 @@ class RRuleTest extends TestCase
 			array("FREQ=YEARLY;UNTIL=20170202T090000Z",
 				null
 			),
+
+			// non-standard timezones
+			'Windows timezone' => [
+				'DTSTART;TZID=W. Europe Standard Time:19970901T090000
+			RRULE:FREQ=DAILY;COUNT=3',
+				[
+					date_create('1997-09-01 09:00:00', new DateTimeZone('Europe/Berlin')),
+					date_create('1997-09-02 09:00:00', new DateTimeZone('Europe/Berlin')),
+					date_create('1997-09-03 09:00:00', new DateTimeZone('Europe/Berlin')),
+				]
+			],
 		);
 	}

@ -2213,18 +2224,16 @@ class RRuleTest extends TestCase

 	public function testUnsupportedTimezoneConvertedToUtc()
 	{
-		if (version_compare(PHP_VERSION, '5.5', '>=')) {
-			$date = new DateTime('2016-07-08 12:00:00', new DateTimeZone('+06:00'));
-			$rrule = new RRule(array(
-				"freq" => "WEEKLY",
-				"dtstart" => $date,
-				"interval" => 1
-			));
+		$date = new DateTime('2016-07-08 12:00:00', new DateTimeZone('+06:00'));
+		$rrule = new RRule(array(
+			"freq" => "WEEKLY",
+			"dtstart" => $date,
+			"interval" => 1
+		));

-			$str = $rrule->rfcString();
-			$this->assertTrue(strpos($str, '20160708T060000Z')!== false);
-			$new_rrule = new RRule($str);
-		}
+		$str = $rrule->rfcString();
+		$this->assertTrue(strpos($str, '20160708T060000Z')!== false);
+		$new_rrule = new RRule($str);
 	}

 	public function rfcStringsWithoutTimezone()