Added IntlTimeZone::fromDateTimeZone() and ::toDateTimeZone.

IntlTimeZone::fromDateTimeZone(DateTimeZone $dtz) converts from an
ext/date TimeZone to an IntlTimeZone. The conversion is done by feeding
the time zone name (essentially what would be given by
DateTimeZone::getName()) to ICU's TimeZone::createTimeZone except if it's
an offset time zone. In that case, the offset is read from the ext/date
time zone object structure and an appopriate id (of the form
GMT<+|-><HH:MM>) is given to ICU's TimeZone::createTimeZone. Not all
ext/date time zones are recognized for ICU. For instance, WEST is not.
Note that these kind of abbreviations, as far as I can tell, can only be
created via ext/date DateTime, not directly through DateTimeZone's
constructor.

For IntlTimeZone::toDateTimeZone(), the behavior is symmetrical.
We instantiate a DateTimeZone and then call its constructor if we don't
have an offset time zone, otherwise we mess with its structure. If the
timezone is not valid for ext/date, then we allow the exception of
DateTimeZone constructor to propagate.

1 files changed, 57 insertions, 0 deletions

diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index eaa6b46e39..e596cc5174 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -28,6 +28,9 @@ extern "C" {
 #include "intl_convert.h"
 #include "../locale/locale.h"
 #include <zend_exceptions.h>
+/* avoid redefinition of int8_t, already defined in unicode/pwin32.h */
+#define _MSC_STDINT_H_ 1
+#include <ext/date/php_date.h>
 }
 #include "common/common_enum.h"
 
@@ -57,6 +60,37 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone)
 	timezone_object_construct(tz, return_value, 1 TSRMLS_CC);
 }
 
+U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
+{
+	zval				*zv_timezone;
+	TimeZone			*tz;
+	php_timezone_obj	*tzobj;
+	intl_error_reset(NULL TSRMLS_CC);
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
+			&zv_timezone, php_date_get_timezone_ce()) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"intltz_from_date_time_zone: bad arguments", 0 TSRMLS_CC);
+		RETURN_NULL();
+	}
+
+	tzobj = (php_timezone_obj *)zend_objects_get_address(zv_timezone TSRMLS_CC);
+	if (!tzobj->initialized) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"intltz_from_date_time_zone: DateTimeZone object is unconstructed",
+			0 TSRMLS_CC);
+		RETURN_NULL();
+	}
+
+	tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+		"intltz_from_date_time_zone" TSRMLS_CC);
+	if (tz == NULL) {
+		RETURN_NULL();
+	}
+
+	timezone_object_construct(tz, return_value, 1 TSRMLS_CC);
+}
+
 U_CFUNC PHP_FUNCTION(intltz_create_default)
 {
 	intl_error_reset(NULL TSRMLS_CC);
@@ -549,6 +583,29 @@ U_CFUNC PHP_FUNCTION(intltz_get_dst_savings)
 	RETURN_LONG((long)to->utimezone->getDSTSavings());
 }
 
+U_CFUNC PHP_FUNCTION(intltz_to_date_time_zone)
+{
+	TIMEZONE_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+			"O", &object, TimeZone_ce_ptr) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"intltz_to_date_time_zone: bad arguments", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	TIMEZONE_METHOD_FETCH_OBJECT;
+
+	zval *ret = timezone_convert_to_datetimezone(to->utimezone,
+		&TIMEZONE_ERROR(to), "intltz_to_date_time_zone" TSRMLS_CC);
+
+	if (ret) {
+		RETURN_ZVAL(ret, 1, 1);
+	} else {
+		RETURN_FALSE;
+	}
+}
+
 U_CFUNC PHP_FUNCTION(intltz_get_error_code)
 {
 	TIMEZONE_METHOD_INIT_VARS