mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
b87cff66b8
php-src/ext/intl
History
Dmitry Stogov f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
..
breakiterator Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
calendar Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
collator Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
common Add support for non-scalar Iterator keys in foreach 2013-03-12 17:27:31 +01:00
converter Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
dateformat fix argument type & remove warning 2013-10-20 22:59:07 -07:00
doc Merge branch 'pull-request/341' 2013-06-10 14:30:59 -07:00
formatter fix const warnings in intl methods 2013-10-20 22:32:20 -07:00
grapheme Merge branch 'PHP-5.4' into PHP-5.5 2013-08-14 20:43:25 -07:00
idn - Updated UPGRADING, protos and attribution in ext/intl/idn/idn.c 2011-11-24 22:45:50 +00:00
locale Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
msgformat fix const warnings in intl methods 2013-10-20 22:32:20 -07:00
normalizer Merge branch '5.3' into 5.4 2012-07-30 10:31:10 +02:00
resourcebundle Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
spoofchecker Fixed defective cloning in ext/intl classes 2012-08-26 23:42:13 +02:00
tests test fixes for ICU 53.1 2014-04-14 15:34:32 +02:00
timezone Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
transliterator Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
config.m4 Add UConverter class (ICU's UConverter API) 2013-01-29 19:05:14 +01:00
config.w32 added appropriate exception handling flag to ext\intl 2014-01-17 11:03:40 +01:00
CREDITS Remove executable bit from files 2012-07-30 10:25:17 +02:00
ERROR.CONVENTIONS Merge branch 'pull-request/341' 2013-06-10 14:30:59 -07:00
intl_common.h Remove executable bit from files 2012-07-30 10:25:17 +02:00
intl_convert.c Merge branch '5.3' into 5.4 2012-07-30 10:31:10 +02:00
intl_convert.h Remove executable bit from files 2012-07-30 10:25:17 +02:00
intl_convertcpp.cpp DateFormat plays nice with Calendar, TimeZone 2012-06-04 00:01:48 +02:00
intl_convertcpp.h Initial checkin of calendar/timezone code. 2012-04-01 23:28:00 +01:00
intl_cppshims.h Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file" 2013-08-20 10:55:10 -07:00
intl_data.h Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 2013-08-22 08:58:35 -07:00
intl_error.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
intl_error.h Merge branch '5.4' 2012-07-30 11:04:48 +02:00
php_intl.c intl: add intlcal_set_minimal_days_in_first_week() 2013-07-03 05:06:32 +01:00
php_intl.h Merge branch '5.4' 2012-07-30 11:04:48 +02:00
TODO Remove executable bit from files 2012-07-30 10:25:17 +02:00