mirror of
https://github.com/php/php-src.git
synced 2024-12-18 14:30:35 +08: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.
84 lines
2.6 KiB
C
Executable File
84 lines
2.6 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: Vadim Savchuk <vsavchuk@productengine.com> |
|
|
| Dmitry Lakhtyuk <dlakhtyuk@productengine.com> |
|
|
| Stanislav Malyshev <stas@zend.com> |
|
|
| Kirti Velankar <kirtig@yahoo-inc.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef PHP_INTL_H
|
|
#define PHP_INTL_H
|
|
|
|
#include <php.h>
|
|
|
|
/* Even if we're included from C++, don't introduce C++ definitions
|
|
* because we were included with extern "C". The effect would be that
|
|
* when the headers defined any method, they would do so with C linkage */
|
|
#undef U_SHOW_CPLUSPLUS_API
|
|
#define U_SHOW_CPLUSPLUS_API 0
|
|
#include "collator/collator_sort.h"
|
|
#include <unicode/ubrk.h>
|
|
#include "intl_error.h"
|
|
|
|
extern zend_module_entry intl_module_entry;
|
|
#define phpext_intl_ptr &intl_module_entry
|
|
|
|
#ifdef PHP_WIN32
|
|
#define PHP_INTL_API __declspec(dllexport)
|
|
#else
|
|
#define PHP_INTL_API
|
|
#endif
|
|
|
|
#ifdef ZTS
|
|
#include "TSRM.h"
|
|
#endif
|
|
|
|
ZEND_BEGIN_MODULE_GLOBALS(intl)
|
|
zval* current_collator;
|
|
char* default_locale;
|
|
collator_compare_func_t compare_func;
|
|
UBreakIterator* grapheme_iterator;
|
|
intl_error g_error;
|
|
long error_level;
|
|
zend_bool use_exceptions;
|
|
ZEND_END_MODULE_GLOBALS(intl)
|
|
|
|
/* Macro to access request-wide global variables. */
|
|
#ifdef ZTS
|
|
#define INTL_G(v) TSRMG(intl_globals_id, zend_intl_globals *, v)
|
|
#else
|
|
#define INTL_G(v) (intl_globals.v)
|
|
#endif
|
|
|
|
ZEND_EXTERN_MODULE_GLOBALS(intl)
|
|
|
|
PHP_MINIT_FUNCTION(intl);
|
|
PHP_MSHUTDOWN_FUNCTION(intl);
|
|
PHP_RINIT_FUNCTION(intl);
|
|
PHP_RSHUTDOWN_FUNCTION(intl);
|
|
PHP_MINFO_FUNCTION(intl);
|
|
|
|
#define PHP_INTL_VERSION "1.1.0"
|
|
|
|
#endif /* PHP_INTL_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* End:
|
|
* vim600: noet sw=4 ts=4 fdm=marker
|
|
* vim<600: noet sw=4 ts=4
|
|
*/
|