diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-06-03 23:08:19 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-06-03 23:08:19 +0100 |
| commit | 6efc877826d327186dbf8055a10856363bc94aa2 (patch) | |
| tree | 4a198a2473e58a2d054ff302b678c9fb3abef8c7 /ext/intl/php_intl.c | |
| parent | 9434f5e41fd321e9e8a893451c6fabb3c658fa27 (diff) | |
| parent | 758f0686d41cd39176f5055c50f0b094580cbbf0 (diff) | |
| download | php-git-6efc877826d327186dbf8055a10856363bc94aa2.tar.gz | |
Merge branch 'datefmt_tz_cal_interop'
* datefmt_tz_cal_interop:
Added and fixed tests given eb346ef
DateFormat plays nice with Calendar, TimeZone
Added private constructor to IntlTimeZone.
Fixed write in constant memory.
Diffstat (limited to 'ext/intl/php_intl.c')
| -rwxr-xr-x | ext/intl/php_intl.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index db8e00392c..59272db712 100755 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -41,6 +41,8 @@ #include "formatter/formatter_main.h" #include "formatter/formatter_parse.h" +#include "grapheme/grapheme.h" + #include "msgformat/msgformat.h" #include "msgformat/msgformat_class.h" #include "msgformat/msgformat_attr.h" @@ -58,6 +60,7 @@ #include "dateformat/dateformat.h" #include "dateformat/dateformat_class.h" #include "dateformat/dateformat_attr.h" +#include "dateformat/dateformat_attrcpp.h" #include "dateformat/dateformat_format.h" #include "dateformat/dateformat_parse.h" #include "dateformat/dateformat_data.h" @@ -321,6 +324,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_set_pattern, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_set_timezone, 0, 0, 2) + ZEND_ARG_INFO(0, mf) + ZEND_ARG_INFO(0, timezone) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_set_calendar, 0, 0, 2) ZEND_ARG_INFO(0, mf) ZEND_ARG_INFO(0, calendar) @@ -675,10 +683,13 @@ zend_function_entry intl_functions[] = { PHP_FE( datefmt_get_datetype, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_get_timetype, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_get_calendar, arginfo_msgfmt_get_locale ) + PHP_FE( datefmt_get_calendar_object, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_set_calendar, arginfo_datefmt_set_calendar ) PHP_FE( datefmt_get_locale, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_get_timezone_id, arginfo_msgfmt_get_locale ) - PHP_FE( datefmt_set_timezone_id, arginfo_msgfmt_get_locale ) + PHP_FE( datefmt_set_timezone_id, arginfo_datefmt_set_timezone ) + PHP_FE( datefmt_get_timezone, arginfo_msgfmt_get_locale ) + PHP_FE( datefmt_set_timezone, arginfo_datefmt_set_timezone ) PHP_FE( datefmt_get_pattern, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_set_pattern, arginfo_datefmt_set_pattern ) PHP_FE( datefmt_is_lenient, arginfo_msgfmt_get_locale ) |