mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00

The following changes were made: * The IntlDateFormatter constructor now accepts the usual values for its $timezone argument. This includes timezone identifiers, IntlTimeZone objects, DateTimeZone objects and NULL. An empty string is not accepted. An invalid time zone is no longer accepted (it used to use UTC in this case). * When NULL is passed to IntlDateFormatter, the time zone specified in date.timezone is used instead of the ICU default. * The IntlDateFormatter $calendar argument now accepts also an IntlCalendar. In this case, IntlDateFormatter::getCalendar() will return false. * The time zone passed to the IntlDateFormatter is ignored if it is NULL and if the calendar passed is an IntlCalendar object -- in this case, the IntlCalendar time zone will be used instead. Otherwise, the time zone specified in the $timezone argument is used instead. * Added IntlDateFormatter::getCalendarObject(), which always returns the IntlCalendar object that backs the DateFormat, even if a constant was passed to the constructor, i.e., if an IntlCalendar was not passed to the constructor. * Added IntlDateFormatter::setTimeZone(). It accepts the usual values for time zone arguments. If NULL is passed, the time zone of the IntlDateFormatter WILL be overridden with the default time zone, even if an IntlCalendar object was passed to the constructor. * Added IntlDateFormatter::getTimeZone(), which returns the time zone that's associated with the DateFormat. * Depreacated IntlDateFormatter::setTimeZoneId() and made it an alias for IntlDateFormatter::setTimeZone(), as the new ::setTimeZone() also accepts plain identifiers, besides other types. IntlDateFormatter::getTimeZoneId() is not deprecated however. * IntlDateFormatter::setCalendar() with a constant passed should now work correctly. This requires saving the requested locale to the constructor. * Centralized the hacks required to avoid compilation disasters on Windows due to some headers being included inside and outside of extern "C" blocks.
261 lines
8 KiB
C++
261 lines
8 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 5 |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Gustavo Lopes <cataphract@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include "../intl_cppshims.h"
|
|
|
|
#include <unicode/timezone.h>
|
|
#include <unicode/calendar.h>
|
|
#include <unicode/datefmt.h>
|
|
|
|
extern "C" {
|
|
#include "../php_intl.h"
|
|
#include "dateformat_class.h"
|
|
#include "dateformat_attrcpp.h"
|
|
#define USE_TIMEZONE_POINTER 1
|
|
#include "../timezone/timezone_class.h"
|
|
#define USE_CALENDAR_POINTER 1
|
|
#include "../calendar/calendar_class.h"
|
|
}
|
|
|
|
#include "../intl_convertcpp.h"
|
|
#include "dateformat_helpers.h"
|
|
|
|
static inline DateFormat *fetch_datefmt(IntlDateFormatter_object *dfo) {
|
|
return (DateFormat *)dfo->datef_data.udatf;
|
|
}
|
|
|
|
/* {{{ proto string IntlDateFormatter::getTimeZoneId()
|
|
* Get formatter timezone_id. }}} */
|
|
/* {{{ proto string datefmt_get_timezone_id(IntlDateFormatter $mf)
|
|
* Get formatter timezone_id.
|
|
*/
|
|
U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id)
|
|
{
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
|
|
&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
|
|
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_get_timezone_"
|
|
"id: unable to parse input params", 0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
DATE_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
UnicodeString res = UnicodeString();
|
|
fetch_datefmt(dfo)->getTimeZone().getID(res);
|
|
intl_charFromString(res, &Z_STRVAL_P(return_value),
|
|
&Z_STRLEN_P(return_value), &INTL_DATA_ERROR_CODE(dfo));
|
|
INTL_METHOD_CHECK_STATUS(dfo, "Could not convert time zone id to UTF-8");
|
|
|
|
Z_TYPE_P(return_value) = IS_STRING;
|
|
}
|
|
|
|
/* {{{ proto IntlTimeZone IntlDateFormatter::getTimeZone()
|
|
* Get formatter timezone. }}} */
|
|
/* {{{ proto IntlTimeZone datefmt_get_timezone(IntlDateFormatter $mf)
|
|
* Get formatter timezone.
|
|
*/
|
|
U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
|
|
{
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
|
|
&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
|
|
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
|
|
"datefmt_get_timezone: unable to parse input params", 0 TSRMLS_CC );
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
DATE_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
const TimeZone& tz = fetch_datefmt(dfo)->getTimeZone();
|
|
TimeZone *tz_clone = tz.clone();
|
|
if (tz_clone == NULL) {
|
|
intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
|
|
"datefmt_get_timezone: Out of memory when cloning time zone",
|
|
0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
object_init_ex(return_value, TimeZone_ce_ptr);
|
|
timezone_object_construct(tz_clone, return_value, 1 TSRMLS_CC);
|
|
}
|
|
|
|
U_CFUNC PHP_FUNCTION(datefmt_set_timezone_id)
|
|
{
|
|
php_error_docref0(NULL TSRMLS_CC, E_DEPRECATED,
|
|
"Use datefmt_set_timezone() instead, which also accepts a plain "
|
|
"time zone identifier and for which this function is now an "
|
|
"alias");
|
|
PHP_FN(datefmt_set_timezone)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
|
|
}
|
|
|
|
/* {{{ proto boolean IntlDateFormatter::setTimeZone(mixed $timezone)
|
|
* Set formatter's timezone. }}} */
|
|
/* {{{ proto boolean datefmt_set_timezone_id(IntlDateFormatter $mf, $timezone_id)
|
|
* Set formatter timezone_id.
|
|
*/
|
|
U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
|
|
{
|
|
zval **timezone_zv;
|
|
TimeZone *timezone;
|
|
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
if ( zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
|
|
"OZ", &object, IntlDateFormatter_ce_ptr, &timezone_zv) == FAILURE) {
|
|
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_set_timezone: "
|
|
"unable to parse input params", 0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
DATE_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
timezone = timezone_process_timezone_argument(timezone_zv,
|
|
INTL_DATA_ERROR_P(dfo), "datefmt_set_timezone" TSRMLS_CC);
|
|
if (timezone == NULL) {
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
fetch_datefmt(dfo)->adoptTimeZone(timezone);
|
|
}
|
|
|
|
/* {{{ proto int IntlDateFormatter::getCalendar( )
|
|
* Get formatter calendar type. }}} */
|
|
/* {{{ proto int datefmt_get_calendar(IntlDateFormatter $mf)
|
|
* Get formatter calendar type.
|
|
*/
|
|
U_CFUNC PHP_FUNCTION(datefmt_get_calendar)
|
|
{
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
|
|
&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
|
|
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
|
|
"datefmt_get_calendar: unable to parse input params", 0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
DATE_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
if (dfo->calendar == -1) {
|
|
/* an IntlCalendar was provided to the constructor */
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
RETURN_LONG(dfo->calendar);
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ proto IntlCalendar IntlDateFormatter::getCalendarObject()
|
|
* Get formatter calendar. }}} */
|
|
/* {{{ proto IntlCalendar datefmt_get_calendar_object(IntlDateFormatter $mf)
|
|
* Get formatter calendar.
|
|
*/
|
|
U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object)
|
|
{
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
|
|
&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
|
|
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
|
|
"datefmt_get_calendar_object: unable to parse input params",
|
|
0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
DATE_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
const Calendar *cal = fetch_datefmt(dfo)->getCalendar();
|
|
if (cal == NULL) {
|
|
RETURN_NULL();
|
|
}
|
|
|
|
Calendar *cal_clone = cal->clone();
|
|
if (cal_clone == NULL) {
|
|
intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
|
|
"datefmt_get_calendar_object: Out of memory when cloning "
|
|
"calendar", 0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
calendar_object_create(return_value, cal_clone TSRMLS_CC);
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ proto bool IntlDateFormatter::setCalendar(mixed $calendar)
|
|
* Set formatter's calendar. }}} */
|
|
/* {{{ proto bool datefmt_set_calendar(IntlDateFormatter $mf, mixed $calendar)
|
|
* Set formatter's calendar.
|
|
*/
|
|
U_CFUNC PHP_FUNCTION(datefmt_set_calendar)
|
|
{
|
|
zval *calendar_zv;
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz",
|
|
&object, IntlDateFormatter_ce_ptr, &calendar_zv) == FAILURE) {
|
|
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
|
|
"datefmt_set_calendar: unable to parse input params", 0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
DATE_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
Calendar *cal;
|
|
long cal_type;
|
|
bool cal_owned;
|
|
Locale locale = Locale::createFromName(dfo->requested_locale);
|
|
// getting the actual locale from the DateFormat is not enough
|
|
// because we would have lost modifiers such as @calendar. We
|
|
// must store the requested locale on object creation
|
|
|
|
if (datefmt_process_calendar_arg(calendar_zv, locale,
|
|
"datefmt_set_calendar", INTL_DATA_ERROR_P(dfo), cal, cal_type,
|
|
cal_owned TSRMLS_CC) == FAILURE) {
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
if (cal_owned) {
|
|
/* a non IntlCalendar was specified, we want to keep the timezone */
|
|
TimeZone *old_timezone = fetch_datefmt(dfo)->getTimeZone().clone();
|
|
if (old_timezone == NULL) {
|
|
intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
|
|
"datefmt_set_calendar: Out of memory when cloning calendar",
|
|
0 TSRMLS_CC);
|
|
delete cal;
|
|
RETURN_FALSE;
|
|
}
|
|
cal->adoptTimeZone(old_timezone);
|
|
} else {
|
|
cal = cal->clone();
|
|
if (cal == NULL) {
|
|
intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
|
|
"datefmt_set_calendar: Out of memory when cloning calendar",
|
|
0 TSRMLS_CC);
|
|
RETURN_FALSE;
|
|
}
|
|
}
|
|
|
|
fetch_datefmt(dfo)->adoptCalendar(cal);
|
|
|
|
dfo->calendar = cal_type;
|
|
|
|
RETURN_TRUE;
|
|
}
|
|
/* }}} */
|
|
|