Initial checkin of calendar/timezone code.

1 files changed, 252 insertions, 0 deletions

diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 514750f733..54b1e76073 100755
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -68,6 +68,13 @@
 #include "transliterator/transliterator_class.h"
 #include "transliterator/transliterator_methods.h"
 
+#include "timezone/timezone_class.h"
+#include "timezone/timezone_methods.h"
+
+#include "calendar/calendar_class.h"
+#include "calendar/calendar_methods.h"
+#include "calendar/gregoriancalendar_methods.h"
+
 #include "idn/idn.h"
 
 #if U_ICU_VERSION_MAJOR_NUM > 3 && U_ICU_VERSION_MINOR_NUM >=2
@@ -79,6 +86,7 @@
 
 #include "msgformat/msgformat.h"
 #include "common/common_error.h"
+#include "common/common_enum.h"
 
 #include <unicode/uloc.h>
 #include <ext/standard/info.h>
@@ -402,6 +410,176 @@ ZEND_BEGIN_ARG_INFO_EX( arginfo_transliterator_error, 0, 0, 1 )
 	ZEND_ARG_OBJ_INFO( 0, trans, Transliterator, 0 )
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_idarg_static, 0, 0, 1 )
+	ZEND_ARG_INFO( 0, zoneId )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_create_enumeration, 0, 0, 0 )
+	ZEND_ARG_INFO( 0, countryOrRawOffset )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_count_equivalent_ids, 0, 0, 1 )
+	ZEND_ARG_INFO( 0, zoneId )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_create_time_zone_id_enumeration, 0, 0, 1 )
+	ZEND_ARG_INFO( 0, zoneType )
+	ZEND_ARG_INFO( 0, region )
+	ZEND_ARG_INFO( 0, rawOffset )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_get_canonical_id, 0, 0, 1 )
+	ZEND_ARG_INFO( 0, zoneId )
+	ZEND_ARG_INFO( 1, isSystemID )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_get_equivalent_id, 0, 0, 2 )
+	ZEND_ARG_INFO( 0, zoneId )
+	ZEND_ARG_INFO( 0, index )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_get_offset, 0, 0, 5 )
+	ZEND_ARG_OBJ_INFO( 0, timeZone, IntlTimeZone, 0 )
+	ZEND_ARG_INFO( 0, date )
+	ZEND_ARG_INFO( 0, local )
+	ZEND_ARG_INFO( 1, rawOffset )
+	ZEND_ARG_INFO( 1, dstOffset )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_has_same_rules, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, timeZone, IntlTimeZone, 0 )
+	ZEND_ARG_OBJ_INFO( 0, otherTimeZone, IntlTimeZone, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_get_display_name, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, timeZone, IntlTimeZone, 0 )
+	ZEND_ARG_INFO( 0, isDaylight )
+	ZEND_ARG_INFO( 0, style )
+	ZEND_ARG_INFO( 0, locale )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_only_tz, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, timeZone, IntlTimeZone, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_void, 0, 0, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_create_instance, 0, 0, 0 )
+	ZEND_ARG_INFO( 0, timeZone )
+	ZEND_ARG_INFO( 0, locale )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_only_cal, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_void, 0, 0, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_field, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, field )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_dow, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, dayOfWeek )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_other_cal, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_OBJ_INFO( 0, otherCalendar, IntlCalendar, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_date, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, date )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_date_optional, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, date )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_get_keyword_values_for_locale, 0, 0, 3)
+	ZEND_ARG_INFO( 0, key )
+	ZEND_ARG_INFO( 0, locale )
+	ZEND_ARG_INFO( 0, commonlyUsed )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_add, 0, 0, 3 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, field )
+	ZEND_ARG_INFO( 0, amount )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_set_time_zone, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_OBJ_INFO( 0, timeZone, IntlTimeZone, 1 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_set, 0, 0, 3 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, fieldOrYear )
+	ZEND_ARG_INFO( 0, valueOrMonth )
+	ZEND_ARG_INFO( 0, dayOfMonth )
+	ZEND_ARG_INFO( 0, hour )
+	ZEND_ARG_INFO( 0, minute )
+	ZEND_ARG_INFO( 0, second )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_roll, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, field )
+	ZEND_ARG_INFO( 0, amountOrUpOrDown )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_clear, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, field )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_field_difference, 0, 0, 3 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, when )
+	ZEND_ARG_INFO( 0, field )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_get_locale, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, localeType )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_set_lenient, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+	ZEND_ARG_INFO( 0, isLenient )
+ZEND_END_ARG_INFO()
+
+/* Gregorian Calendar */
+ZEND_BEGIN_ARG_INFO_EX( ainfo_gregcal_create_instance, 0, 0, 0 )
+	ZEND_ARG_INFO(0, timeZoneOrYear)
+	ZEND_ARG_INFO(0, localeOrMonth)
+	ZEND_ARG_INFO(0, dayOfMonth)
+	ZEND_ARG_INFO(0, hour)
+	ZEND_ARG_INFO(0, minute)
+	ZEND_ARG_INFO(0, second)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_gregcal_is_leap_year, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlGregorianCalendar, 0 )
+	ZEND_ARG_INFO( 0, year )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_gregcal_only_gregcal, 0, 0, 1 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlGregorianCalendar, 0 )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX( ainfo_gregcal_set_gregorian_change, 0, 0, 2 )
+	ZEND_ARG_OBJ_INFO( 0, calendar, IntlGregorianCalendar, 0 )
+	ZEND_ARG_INFO( 0, date )
+ZEND_END_ARG_INFO()
+
 /* }}} */
 
 /* {{{ intl_functions
@@ -530,6 +708,71 @@ zend_function_entry intl_functions[] = {
 	PHP_FE( transliterator_get_error_code, arginfo_transliterator_error )
 	PHP_FE( transliterator_get_error_message, arginfo_transliterator_error )
 
+	/* TimeZone functions */
+	PHP_FE( intltz_create_time_zone, arginfo_tz_idarg_static )
+	PHP_FE( intltz_create_default, arginfo_tz_void )
+	PHP_FE( intltz_get_id, arginfo_tz_only_tz )
+	PHP_FE( intltz_get_gmt, arginfo_tz_void )
+	PHP_FE( intltz_create_enumeration, arginfo_tz_create_enumeration )
+	PHP_FE( intltz_count_equivalent_ids, arginfo_tz_idarg_static )
+	PHP_FE( intltz_create_time_zone_id_enumeration, arginfo_tz_create_time_zone_id_enumeration )
+	PHP_FE( intltz_get_canonical_id, arginfo_tz_get_canonical_id )
+	PHP_FE( intltz_get_region, arginfo_tz_idarg_static )
+	PHP_FE( intltz_get_tz_data_version, arginfo_tz_void )
+	PHP_FE( intltz_get_equivalent_id, arginfo_tz_get_equivalent_id )
+	PHP_FE( intltz_use_daylight_time, arginfo_tz_only_tz )
+	PHP_FE( intltz_get_offset, arginfo_tz_get_offset )
+	PHP_FE( intltz_get_raw_offset, arginfo_tz_only_tz )
+	PHP_FE( intltz_has_same_rules, arginfo_tz_has_same_rules )
+	PHP_FE( intltz_get_display_name, arginfo_tz_get_display_name )
+	PHP_FE( intltz_get_dst_savings, arginfo_tz_only_tz )
+	PHP_FE( intltz_get_error_code, arginfo_tz_only_tz )
+	PHP_FE( intltz_get_error_message, arginfo_tz_only_tz )
+
+	PHP_FE( intlcal_create_instance, ainfo_cal_create_instance )
+	PHP_FE( intlcal_get_keyword_values_for_locale, ainfo_cal_get_keyword_values_for_locale )
+	PHP_FE( intlcal_get_now, ainfo_cal_void )
+	PHP_FE( intlcal_get_available_locales, ainfo_cal_void )
+	PHP_FE( intlcal_get, ainfo_cal_field )
+	PHP_FE( intlcal_get_time, ainfo_cal_only_cal )
+	PHP_FE( intlcal_set_time, ainfo_cal_date )
+	PHP_FE( intlcal_add, ainfo_cal_add )
+	PHP_FE( intlcal_set_time_zone, ainfo_cal_set_time_zone )
+	PHP_FE( intlcal_after, ainfo_cal_other_cal )
+	PHP_FE( intlcal_before, ainfo_cal_other_cal )
+	PHP_FE( intlcal_set, ainfo_cal_set )
+	PHP_FE( intlcal_roll, ainfo_cal_roll )
+	PHP_FE( intlcal_clear, ainfo_cal_clear )
+	PHP_FE( intlcal_field_difference, ainfo_cal_field_difference )
+	PHP_FE( intlcal_get_actual_maximum, ainfo_cal_field )
+	PHP_FE( intlcal_get_actual_minimum, ainfo_cal_field )
+	PHP_FE( intlcal_get_day_of_week_type, ainfo_cal_dow )
+	PHP_FE( intlcal_get_first_day_of_week, ainfo_cal_only_cal )
+	PHP_FE( intlcal_get_greatest_minimum, ainfo_cal_field )
+	PHP_FE( intlcal_get_least_maximum, ainfo_cal_field )
+	PHP_FE( intlcal_get_locale, ainfo_cal_get_locale )
+	PHP_FE( intlcal_get_maximum, ainfo_cal_field )
+	PHP_FE( intlcal_get_minimal_days_in_first_week, ainfo_cal_only_cal )
+	PHP_FE( intlcal_get_minimum, ainfo_cal_field )
+	PHP_FE( intlcal_get_time_zone, ainfo_cal_only_cal )
+	PHP_FE( intlcal_get_type, ainfo_cal_only_cal )
+	PHP_FE( intlcal_get_weekend_transition, ainfo_cal_dow )
+	PHP_FE( intlcal_in_daylight_time, ainfo_cal_only_cal )
+	PHP_FE( intlcal_is_equivalent_to, ainfo_cal_other_cal )
+	PHP_FE( intlcal_is_lenient, ainfo_cal_only_cal )
+	PHP_FE( intlcal_is_set, ainfo_cal_field )
+	PHP_FE( intlcal_is_weekend, ainfo_cal_date_optional )
+	PHP_FE( intlcal_set_first_day_of_week, ainfo_cal_dow )
+	PHP_FE( intlcal_set_lenient, ainfo_cal_set_lenient )
+	PHP_FE( intlcal_equals, ainfo_cal_other_cal )
+	PHP_FE( intlcal_get_error_code, ainfo_cal_only_cal )
+	PHP_FE( intlcal_get_error_message, ainfo_cal_only_cal )
+
+	PHP_FE( intlgregcal_create_instance, ainfo_gregcal_create_instance )
+	PHP_FE( intlgregcal_set_gregorian_change, ainfo_gregcal_set_gregorian_change )
+	PHP_FE( intlgregcal_get_gregorian_change, ainfo_gregcal_only_gregcal )
+	PHP_FE( intlgregcal_is_leap_year, ainfo_gregcal_is_leap_year )
+
 	/* common functions */
 	PHP_FE( intl_get_error_code, intl_0_args )
 	PHP_FE( intl_get_error_message, intl_0_args )
@@ -640,6 +883,12 @@ PHP_MINIT_FUNCTION( intl )
 	/* Register Transliterator constants */
 	transliterator_register_constants( INIT_FUNC_ARGS_PASSTHRU );
 
+	/* Register 'IntlTimeZone' PHP class */
+	timezone_register_IntlTimeZone_class( TSRMLS_C );
+
+	/* Register 'IntlCalendar' PHP class */
+	calendar_register_IntlCalendar_class( TSRMLS_C );
+
 	/* Expose ICU error codes to PHP scripts. */
 	intl_expose_icu_error_codes( INIT_FUNC_ARGS_PASSTHRU );
 
@@ -657,6 +906,9 @@ PHP_MINIT_FUNCTION( intl )
 	/* Register 'IntlException' PHP class */
 	intl_register_IntlException_class( TSRMLS_C );
 
+	/* Register 'IntlIterator' PHP class */
+	intl_register_IntlIterator_class( TSRMLS_C );
+
 	/* Global error handling. */
 	intl_error_init( NULL TSRMLS_CC );