mirror of
https://github.com/php/php-src.git
synced 2024-09-23 19:07:26 +00:00
eb346ef0f4
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.
119 lines
4.4 KiB
C
Executable File
119 lines
4.4 KiB
C
Executable File
/*
|
|
+----------------------------------------------------------------------+
|
|
| 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: Kirti Velankar <kirtig@yahoo-inc.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <unicode/udat.h>
|
|
|
|
#include "php_intl.h"
|
|
#include "dateformat_class.h"
|
|
#include "dateformat.h"
|
|
|
|
/* {{{ dateformat_register_constants
|
|
* Register constants common for the both (OO and procedural)
|
|
* APIs.
|
|
*/
|
|
void dateformat_register_constants( INIT_FUNC_ARGS )
|
|
{
|
|
if( IntlDateFormatter_ce_ptr == NULL) {
|
|
zend_error(E_ERROR, "DateFormat class not defined");
|
|
return;
|
|
}
|
|
|
|
#define DATEFORMATTER_EXPOSE_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_CS)
|
|
#define DATEFORMATTER_EXPOSE_CLASS_CONST(x) zend_declare_class_constant_long( IntlDateFormatter_ce_ptr, ZEND_STRS( #x ) - 1, UDAT_##x TSRMLS_CC );
|
|
#define DATEFORMATTER_EXPOSE_CUSTOM_CLASS_CONST(name, value) zend_declare_class_constant_long( IntlDateFormatter_ce_ptr, ZEND_STRS( name ) - 1, value TSRMLS_CC );
|
|
|
|
#define DATEFORMATTER_EXPOSE_UCAL_CLASS_CONST(x) zend_declare_class_constant_long( IntlDateFormatter_ce_ptr, ZEND_STRS( #x ) - 1, UCAL_##x TSRMLS_CC );
|
|
|
|
/* UDateFormatStyle constants */
|
|
DATEFORMATTER_EXPOSE_CLASS_CONST( FULL );
|
|
DATEFORMATTER_EXPOSE_CLASS_CONST( LONG );
|
|
DATEFORMATTER_EXPOSE_CLASS_CONST( MEDIUM );
|
|
DATEFORMATTER_EXPOSE_CLASS_CONST( SHORT );
|
|
DATEFORMATTER_EXPOSE_CLASS_CONST( NONE );
|
|
|
|
/*
|
|
DATEFORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "GREGORIAN", DATEF_GREGORIAN );
|
|
DATEFORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "CUSTOMARY", DATEF_CUSTOMARY );
|
|
DATEFORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "BUDDHIST", DATEF_BUDDHIST );
|
|
DATEFORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "JAPANESE_IMPERIAL", DATEF_JAPANESE_IMPERIAL );
|
|
*/
|
|
|
|
DATEFORMATTER_EXPOSE_UCAL_CLASS_CONST( GREGORIAN );
|
|
DATEFORMATTER_EXPOSE_UCAL_CLASS_CONST( TRADITIONAL );
|
|
|
|
#undef DATEFORMATTER_EXPOSE_UCAL_CLASS_CONST
|
|
#undef DATEFORMATTER_EXPOSE_CUSTOM_CLASS_CONST
|
|
#undef DATEFORMATTER_EXPOSE_CLASS_CONST
|
|
#undef DATEFORMATTER_EXPOSE_CONST
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ proto int IntlDateFormatter::getErrorCode()
|
|
* Get formatter's last error code. }}} */
|
|
/* {{{ proto int datefmt_get_error_code( IntlDateFormatter $nf )
|
|
* Get formatter's last error code.
|
|
*/
|
|
PHP_FUNCTION( datefmt_get_error_code )
|
|
{
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
/* Parse parameters. */
|
|
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_error_code: unable to parse input params", 0 TSRMLS_CC );
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
dfo = (IntlDateFormatter_object *) zend_object_store_get_object( object TSRMLS_CC );
|
|
|
|
/* Return formatter's last error code. */
|
|
RETURN_LONG( INTL_DATA_ERROR_CODE(dfo) );
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ proto string IntlDateFormatter::getErrorMessage( )
|
|
* Get text description for formatter's last error code. }}} */
|
|
/* {{{ proto string datefmt_get_error_message( IntlDateFormatter $coll )
|
|
* Get text description for formatter's last error code.
|
|
*/
|
|
PHP_FUNCTION( datefmt_get_error_message )
|
|
{
|
|
char* message = NULL;
|
|
DATE_FORMAT_METHOD_INIT_VARS;
|
|
|
|
/* Parse parameters. */
|
|
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_error_message: unable to parse input params", 0 TSRMLS_CC );
|
|
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
dfo = (IntlDateFormatter_object *) zend_object_store_get_object( object TSRMLS_CC );
|
|
|
|
/* Return last error message. */
|
|
message = intl_error_get_message( INTL_DATA_ERROR_P(dfo) TSRMLS_CC );
|
|
RETURN_STRING( message, 0);
|
|
}
|
|
/* }}} */
|