diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-07-22 04:22:48 +0200 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-07-22 04:22:48 +0200 |
| commit | 99e48d3a5751b486fdc49a3409edd509faa3b27c (patch) | |
| tree | 911f0481885ad0039d09b9d69fd5c6138776ae13 /ext/intl/php_intl.c | |
| parent | 11a5afec22e62af1555ceedc41460b96f8c06ed5 (diff) | |
| parent | 2498c90c71980168b5b9ac2fa006340b9460b1f2 (diff) | |
| download | php-git-99e48d3a5751b486fdc49a3409edd509faa3b27c.tar.gz | |
Merge branch 'datefmt_tz_cal_interop'
* datefmt_tz_cal_interop:
Readded accidentally removed line
Added IntlDateFormatter::formatObject(). Refactor
Refactored internal_get_timestamp()
Unified zval -> UDate conversions
Diffstat (limited to 'ext/intl/php_intl.c')
| -rwxr-xr-x | ext/intl/php_intl.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 19896a7108..d7ed9dc6e5 100755 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -62,6 +62,7 @@ #include "dateformat/dateformat_attr.h" #include "dateformat/dateformat_attrcpp.h" #include "dateformat/dateformat_format.h" +#include "dateformat/dateformat_format_object.h" #include "dateformat/dateformat_parse.h" #include "dateformat/dateformat_data.h" @@ -350,6 +351,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_format, 0, 0, 0) ZEND_ARG_INFO(0, array) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_format_object, 0, 0, 1) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, locale) +ZEND_END_ARG_INFO() + + ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_create, 0, 0, 3) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, date_type) @@ -706,6 +714,7 @@ zend_function_entry intl_functions[] = { PHP_FE( datefmt_is_lenient, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_set_lenient, arginfo_msgfmt_get_locale ) PHP_FE( datefmt_format, arginfo_datefmt_format ) + PHP_FE( datefmt_format_object, arginfo_datefmt_format_object ) PHP_FE( datefmt_parse, datefmt_parse_args ) PHP_FE( datefmt_localtime , datefmt_parse_args ) PHP_FE( datefmt_get_error_code, arginfo_msgfmt_get_error_code ) |