diff options
Diffstat (limited to 'dev-lang/php/files')
5 files changed, 0 insertions, 714 deletions
diff --git a/dev-lang/php/files/libressl-compatibility.patch b/dev-lang/php/files/libressl-compatibility.patch deleted file mode 100644 index 3b9c39dcc599..000000000000 --- a/dev-lang/php/files/libressl-compatibility.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/ext/openssl/openssl.c 2018-04-04 14:26:34.583000000 +0000 -+++ b/ext/openssl/openssl.c 2018-04-04 14:20:16.907000000 +0000 -@@ -73,7 +73,7 @@ - #ifdef HAVE_OPENSSL_MD2_H - #define OPENSSL_ALGO_MD2 4 - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define OPENSSL_ALGO_DSS1 5 - #endif - #define OPENSSL_ALGO_SHA224 6 -@@ -560,7 +560,7 @@ - #endif - - /* {{{ OpenSSL compatibility functions and macros */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa - #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh - #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa -@@ -677,7 +677,7 @@ - return M_ASN1_STRING_data(asn1); - } - --#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - static int X509_get_signature_nid(const X509 *x) - { -@@ -1324,7 +1324,7 @@ - mdtype = (EVP_MD *) EVP_md2(); - break; - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - case OPENSSL_ALGO_DSS1: - mdtype = (EVP_MD *) EVP_dss1(); - break; -@@ -1450,7 +1450,7 @@ - #ifdef HAVE_OPENSSL_MD2_H - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT); - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); - #endif - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT); -@@ -3620,7 +3620,7 @@ - RETURN_FALSE; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* Due to changes in OpenSSL 1.1 related to locking when decoding CSR, - * the pub key is not changed after assigning. It means if we pass - * a private key, it will be returned including the private part. -@@ -3631,7 +3631,7 @@ - /* Retrieve the public key from the CSR */ - tpubkey = X509_REQ_get_pubkey(csr); - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* We need to free the CSR as it was duplicated */ - X509_REQ_free(csr); - #endif diff --git a/dev-lang/php/files/mbstring-oniguruma-6.8.patch b/dev-lang/php/files/mbstring-oniguruma-6.8.patch deleted file mode 100644 index c238f88007c5..000000000000 --- a/dev-lang/php/files/mbstring-oniguruma-6.8.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4072b2787074ee8e247a6639585b49e10c5a55fe Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" <cmbecker69@gmx.de> -Date: Tue, 20 Mar 2018 16:35:39 +0100 -Subject: [PATCH] Fix #76113: mbstring does not build with Oniguruma 6.8.1 - -As of Oniguruma 6.8.1, the regex structure has been moved from the -public `oniguruma.h` to the private `regint.h`. Thus, it is no longer -possible to directly access the struct's members, and actually, there -is no need to, since there are respective accessor functions available -at least of 2.3.1. ---- - ext/mbstring/php_mbregex.c | 2 +- - 1 file changed, 1 insertions(+), 1 deletion(-) - -diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c -index a5a6cd0..7a70c63 100644 ---- a/ext/mbstring/php_mbregex.c -+++ b/ext/mbstring/php_mbregex.c -@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl - OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN]; - - rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen); -- if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) { -+ if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) { - if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) { - onig_error_code_to_str(err_str, err_code, &err_info); - php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str); --- -2.1.4 - diff --git a/dev-lang/php/files/php-7.0.33-intl-detect-icu-via-pkg-config.patch b/dev-lang/php/files/php-7.0.33-intl-detect-icu-via-pkg-config.patch deleted file mode 100644 index d23ec91fc83f..000000000000 --- a/dev-lang/php/files/php-7.0.33-intl-detect-icu-via-pkg-config.patch +++ /dev/null @@ -1,159 +0,0 @@ -Based on the following upstream commits: - -https://github.com/php/php-src/commit/9a8e7b571896f39f83cb000fdb7c466b6d328d52 -https://github.com/php/php-src/pull/3701 -https://github.com/php/php-src/commit/2bd299f7318492fd7e5cafffa562d76ba60e69d4 - ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2205,49 +2205,16 @@ dnl - dnl Common setup macro for ICU - dnl - AC_DEFUN([PHP_SETUP_ICU],[ -- PHP_ARG_WITH(icu-dir,, -- [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) -+ PKG_CHECK_MODULES([ICU], [icu-io >= 50.1]) - -- if test "$PHP_ICU_DIR" = "no"; then -- PHP_ICU_DIR=DEFAULT -- fi -- -- if test "$PHP_ICU_DIR" = "DEFAULT"; then -- dnl Try to find icu-config -- AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) -- else -- ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" -- fi -- -- AC_MSG_CHECKING([for location of ICU headers and libraries]) -- -- dnl Trust icu-config to know better what the install prefix is.. -- icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` -- if test "$?" != "0" || test -z "$icu_install_prefix"; then -- AC_MSG_RESULT([not found]) -- AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) -- else -- AC_MSG_RESULT([$icu_install_prefix]) -- -- dnl Check ICU version -- AC_MSG_CHECKING([for ICU 4.0 or greater]) -- icu_version_full=`$ICU_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $icu_version_full -- IFS=$ac_IFS -- icu_version=`expr [$]1 \* 1000 + [$]2` -- AC_MSG_RESULT([found $icu_version_full]) -+ PHP_EVAL_INCLINE($ICU_CFLAGS) -+ PHP_EVAL_LIBLINE($ICU_LIBS, $1) - -- if test "$icu_version" -lt "4000"; then -- AC_MSG_ERROR([ICU version 4.0 or later is required]) -- fi -+ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" -+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" - -- ICU_VERSION=$icu_version -- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` -- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` -- PHP_EVAL_INCLINE($ICU_INCS) -- PHP_EVAL_LIBLINE($ICU_LIBS, $1) -+ if test "$PKG_CONFIG icu-io --atleast-version=60"; then -+ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" - fi - ]) - ---- a/ext/intl/config.m4 -+++ b/ext/intl/config.m4 -@@ -9,18 +9,10 @@ if test "$PHP_INTL" != "no"; then - PHP_SETUP_ICU(INTL_SHARED_LIBADD) - PHP_SUBST(INTL_SHARED_LIBADD) - PHP_REQUIRE_CXX() -- if test "$icu_version" -ge "4002"; then -- icu_spoof_src=" spoofchecker/spoofchecker_class.c \ -- spoofchecker/spoofchecker.c\ -- spoofchecker/spoofchecker_create.c\ -- spoofchecker/spoofchecker_main.c" -- else -- icu_spoof_src="" -- fi -+ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" - PHP_NEW_EXTENSION(intl, php_intl.c \ - intl_error.c \ - intl_convert.c \ -- intl_convertcpp.cpp \ - collator/collator.c \ - collator/collator_class.c \ - collator/collator_sort.c \ -@@ -32,8 +24,6 @@ if test "$PHP_INTL" != "no"; then - collator/collator_is_numeric.c \ - collator/collator_error.c \ - common/common_error.c \ -- common/common_enum.cpp \ -- common/common_date.cpp \ - converter/converter.c \ - formatter/formatter.c \ - formatter/formatter_main.c \ -@@ -53,17 +43,12 @@ if test "$PHP_INTL" != "no"; then - dateformat/dateformat_attr.c \ - dateformat/dateformat_data.c \ - dateformat/dateformat_format.c \ -- dateformat/dateformat_format_object.cpp \ - dateformat/dateformat_parse.c \ -- dateformat/dateformat_create.cpp \ -- dateformat/dateformat_attrcpp.cpp \ -- dateformat/dateformat_helpers.cpp \ - msgformat/msgformat.c \ - msgformat/msgformat_attr.c \ - msgformat/msgformat_class.c \ - msgformat/msgformat_data.c \ - msgformat/msgformat_format.c \ -- msgformat/msgformat_helpers.cpp \ - msgformat/msgformat_parse.c \ - grapheme/grapheme_string.c \ - grapheme/grapheme_util.c \ -@@ -73,6 +58,21 @@ if test "$PHP_INTL" != "no"; then - transliterator/transliterator.c \ - transliterator/transliterator_class.c \ - transliterator/transliterator_methods.c \ -+ uchar/uchar.c \ -+ idn/idn.c \ -+ spoofchecker/spoofchecker_class.c \ -+ spoofchecker/spoofchecker.c\ -+ spoofchecker/spoofchecker_create.c\ -+ spoofchecker/spoofchecker_main.c, $ext_shared,,$INTL_COMMON_FLAGS,cxx) -+ -+ PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \ -+ common/common_enum.cpp \ -+ common/common_date.cpp \ -+ dateformat/dateformat_format_object.cpp \ -+ dateformat/dateformat_create.cpp \ -+ dateformat/dateformat_attrcpp.cpp \ -+ dateformat/dateformat_helpers.cpp \ -+ msgformat/msgformat_helpers.cpp \ - timezone/timezone_class.cpp \ - timezone/timezone_methods.cpp \ - calendar/calendar_class.cpp \ -@@ -83,10 +83,15 @@ if test "$PHP_INTL" != "no"; then - breakiterator/breakiterator_methods.cpp \ - breakiterator/rulebasedbreakiterator_methods.cpp \ - breakiterator/codepointiterator_internal.cpp \ -- breakiterator/codepointiterator_methods.cpp \ -- uchar/uchar.c \ -- idn/idn.c \ -- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx) -+ breakiterator/codepointiterator_methods.cpp" -+ -+ PHP_INTL_CPP_FLAGS="$ICU_CXXFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" -+ if test "$ext_shared" = "no"; then -+ PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS) -+ else -+ PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes) -+ fi -+ - PHP_ADD_BUILD_DIR($ext_builddir/collator) - PHP_ADD_BUILD_DIR($ext_builddir/converter) - PHP_ADD_BUILD_DIR($ext_builddir/common) --- -2.19.2 - diff --git a/dev-lang/php/files/php-7.0.33-intl-icu-memory-corruption.patch b/dev-lang/php/files/php-7.0.33-intl-icu-memory-corruption.patch deleted file mode 100644 index e6e7f5917c5b..000000000000 --- a/dev-lang/php/files/php-7.0.33-intl-icu-memory-corruption.patch +++ /dev/null @@ -1,91 +0,0 @@ -Based on the following upstream commits: - -https://github.com/php/php-src/commit/45a05f38410d4a67c8c83c09906e2cfb42fc6e4c -https://github.com/php/php-src/commit/534684d1042978f3c21caf9b665a7aca27f3f325 - ---- a/ext/intl/msgformat/msgformat_helpers.cpp -+++ b/ext/intl/msgformat/msgformat_helpers.cpp -@@ -27,6 +27,7 @@ - #include <unicode/timezone.h> - #include <unicode/datefmt.h> - #include <unicode/calendar.h> -+#include <unicode/strenum.h> - - #include <vector> - -@@ -45,6 +46,7 @@ extern "C" { - - #if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 48 - #define HAS_MESSAGE_PATTERN 1 -+#define HAS_MISALLOCATE_MEMORY_BUG 1 - #endif - - U_NAMESPACE_BEGIN -@@ -345,6 +347,26 @@ static void umsg_set_timezone(MessageFormatter_object *mfo, - return; /* already done */ - } - -+#ifdef HAS_MISALLOCATE_MEMORY_BUG -+ /* There is a bug in ICU which prevents MessageFormatter::getFormats() -+ to handle more than 10 formats correctly. The enumerator could be -+ used to walk through the present formatters using getFormat(), which -+ however seems to provide just a readonly access. This workaround -+ prevents crash when there are > 10 formats but doesn't set any error. -+ As a result, only DateFormatters with > 10 subformats are affected. -+ This workaround should be ifdef'd out, when the bug has been fixed -+ in ICU. */ -+ icu::StringEnumeration* fnames = mf->getFormatNames(err.code); -+ if (!fnames || U_FAILURE(err.code)) { -+ return; -+ } -+ count = fnames->count(err.code); -+ delete fnames; -+ if (count > 10) { -+ return; -+ } -+#endif -+ - formats = mf->getFormats(count); - - if (formats == NULL) { ---- /dev/null -+++ b/ext/intl/tests/bug74484_MessageFormatter.phpt -@@ -0,0 +1,35 @@ -+--TEST-- -+Bug #74484 MessageFormatter::formatMessage memory corruption with 11+ named placeholder -+--SKIPIF-- -+<?php -+if (!extension_loaded('intl')) -+ die('skip intl extension not enabled'); -+if (version_compare(INTL_ICU_VERSION, '4.8') < 0) -+ die('skip for ICU 4.8+'); -+?> -+--FILE-- -+<?php -+$text = "{a} {b} {c} {d} {e} {f} {g} {h} {i} {j} {k} {l}"; -+ -+$vars = array( -+ 'a' => 1, -+ 'b' => 2, -+ 'c' => 3, -+ 'd' => 4, -+ 'e' => 5, -+ 'f' => 6, -+ 'g' => 7, -+ 'h' => 8, -+ 'i' => 9, -+ 'j' => 10, -+ 'k' => 11, -+ 'l' => 12 -+); -+ -+var_dump(MessageFormatter::formatMessage('en_US', $text, $vars)); -+ -+?> -+==DONE== -+--EXPECT-- -+string(26) "1 2 3 4 5 6 7 8 9 10 11 12" -+==DONE== --- -2.19.2 - diff --git a/dev-lang/php/files/php-7.0.33-intl-use-icu-namespace.patch b/dev-lang/php/files/php-7.0.33-intl-use-icu-namespace.patch deleted file mode 100644 index 4b25abe20550..000000000000 --- a/dev-lang/php/files/php-7.0.33-intl-use-icu-namespace.patch +++ /dev/null @@ -1,369 +0,0 @@ -Based on the following upstream commits: - -https://github.com/php/php-src/commit/8d35a423838eb462cd39ee535c5d003073cc5f22 -https://github.com/php/php-src/commit/d8200e48857aeaf09f7127751efc5632ef7660a7 -https://github.com/php/php-src/commit/9a8e7b571896f39f83cb000fdb7c466b6d328d52 - ---- a/ext/intl/breakiterator/breakiterator_class.cpp -+++ b/ext/intl/breakiterator/breakiterator_class.cpp -@@ -38,6 +38,7 @@ extern "C" { - } - - using PHP::CodePointBreakIterator; -+using icu::RuleBasedBreakIterator; - - /* {{{ Global variables */ - zend_class_entry *BreakIterator_ce_ptr; ---- a/ext/intl/breakiterator/breakiterator_class.h -+++ b/ext/intl/breakiterator/breakiterator_class.h -@@ -26,6 +26,8 @@ - - #ifndef USE_BREAKITERATOR_POINTER - typedef void BreakIterator; -+#else -+using icu::BreakIterator; - #endif - - typedef struct { ---- a/ext/intl/breakiterator/breakiterator_methods.cpp -+++ b/ext/intl/breakiterator/breakiterator_methods.cpp -@@ -32,6 +32,8 @@ extern "C" { - } - - using PHP::CodePointBreakIterator; -+using icu::BreakIterator; -+using icu::Locale; - - U_CFUNC PHP_METHOD(BreakIterator, __construct) - { ---- a/ext/intl/breakiterator/codepointiterator_internal.cpp -+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp -@@ -33,6 +33,8 @@ typedef union { - - using namespace PHP; - -+using icu::UCharCharacterIterator; -+ - UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator); - - CodePointBreakIterator::CodePointBreakIterator() ---- a/ext/intl/breakiterator/codepointiterator_internal.h -+++ b/ext/intl/breakiterator/codepointiterator_internal.h -@@ -18,8 +18,11 @@ - #define CODEPOINTITERATOR_INTERNAL_H - - #include <unicode/brkiter.h> -+#include <unicode/unistr.h> - --using U_ICU_NAMESPACE::BreakIterator; -+using icu::BreakIterator; -+using icu::CharacterIterator; -+using icu::UnicodeString; - - namespace PHP { - ---- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp -+++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp -@@ -26,6 +26,9 @@ extern "C" { - #include "../intl_convertcpp.h" - #include "../intl_common.h" - -+using icu::RuleBasedBreakIterator; -+using icu::Locale; -+ - static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) { - return (RuleBasedBreakIterator*)bio->biter; - } ---- a/ext/intl/calendar/calendar_class.cpp -+++ b/ext/intl/calendar/calendar_class.cpp -@@ -34,6 +34,9 @@ extern "C" { - #include <assert.h> - } - -+using icu::GregorianCalendar; -+using icu::Locale; -+ - /* {{{ Global variables */ - zend_class_entry *Calendar_ce_ptr; - zend_class_entry *GregorianCalendar_ce_ptr; ---- a/ext/intl/calendar/calendar_class.h -+++ b/ext/intl/calendar/calendar_class.h -@@ -26,6 +26,8 @@ - - #ifndef USE_CALENDAR_POINTER - typedef void Calendar; -+#else -+using icu::Calendar; - #endif - - typedef struct { ---- a/ext/intl/calendar/calendar_methods.cpp -+++ b/ext/intl/calendar/calendar_methods.cpp -@@ -40,6 +40,8 @@ extern "C" { - } - #include "../common/common_enum.h" - -+using icu::Locale; -+ - U_CFUNC PHP_METHOD(IntlCalendar, __construct) - { - zend_throw_exception( NULL, ---- a/ext/intl/calendar/gregoriancalendar_methods.cpp -+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp -@@ -23,6 +23,8 @@ - #include <unicode/locid.h> - #include <unicode/calendar.h> - #include <unicode/gregocal.h> -+#include <unicode/ustring.h> -+ - extern "C" { - #include "../php_intl.h" - #include "../intl_common.h" -@@ -34,6 +36,11 @@ extern "C" { - #include "zend_exceptions.h" - } - -+using icu::GregorianCalendar; -+using icu::Locale; -+using icu::UnicodeString; -+using icu::StringPiece; -+ - static inline GregorianCalendar *fetch_greg(Calendar_object *co) { - return (GregorianCalendar*)co->ucal; - } ---- a/ext/intl/common/common_date.cpp -+++ b/ext/intl/common/common_date.cpp -@@ -25,6 +25,9 @@ extern "C" { - #include <ext/date/php_date.h> - } - -+using icu::TimeZone; -+using icu::UnicodeString; -+ - #ifndef INFINITY - #define INFINITY (DBL_MAX+DBL_MAX) - #endif ---- a/ext/intl/common/common_date.h -+++ b/ext/intl/common/common_date.h -@@ -28,6 +28,8 @@ U_CDECL_END - - #include <unicode/timezone.h> - -+using icu::TimeZone; -+ - U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func); - U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz, - intl_error *err, const char *func); ---- a/ext/intl/common/common_enum.h -+++ b/ext/intl/common/common_enum.h -@@ -75,6 +75,7 @@ U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter); - U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter); - - #ifdef __cplusplus -+using icu::StringEnumeration; - U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object); - #endif - ---- a/ext/intl/converter/converter.c -+++ b/ext/intl/converter/converter.c -@@ -18,6 +18,8 @@ - #include "zend_exceptions.h" - - #include <unicode/utypes.h> -+#include <unicode/utf8.h> -+#include <unicode/utf16.h> - #include <unicode/ucnv.h> - #include <unicode/ustring.h> - ---- a/ext/intl/dateformat/dateformat_format_object.cpp -+++ b/ext/intl/dateformat/dateformat_format_object.cpp -@@ -33,6 +33,12 @@ extern "C" { - #include "../common/common_date.h" - } - -+using icu::Locale; -+using icu::DateFormat; -+using icu::GregorianCalendar; -+using icu::StringPiece; -+using icu::SimpleDateFormat; -+ - static const DateFormat::EStyle valid_styles[] = { - DateFormat::kNone, - DateFormat::kFull, ---- a/ext/intl/dateformat/dateformat_helpers.cpp -+++ b/ext/intl/dateformat/dateformat_helpers.cpp -@@ -28,6 +28,8 @@ extern "C" { - #include "../calendar/calendar_class.h" - } - -+using icu::GregorianCalendar; -+ - int datefmt_process_calendar_arg(zval* calendar_zv, - Locale const& locale, - const char *func_name, ---- a/ext/intl/dateformat/dateformat_helpers.h -+++ b/ext/intl/dateformat/dateformat_helpers.h -@@ -22,11 +22,16 @@ - #endif - - #include <unicode/calendar.h> -+#include <unicode/datefmt.h> - - extern "C" { - #include "../php_intl.h" - } - -+using icu::Locale; -+using icu::Calendar; -+using icu::DateFormat; -+ - int datefmt_process_calendar_arg(zval* calendar_zv, - Locale const& locale, - const char *func_name, ---- a/ext/intl/grapheme/grapheme_string.c -+++ b/ext/intl/grapheme/grapheme_string.c -@@ -24,6 +24,7 @@ - #include "grapheme_util.h" - - #include <unicode/utypes.h> -+#include <unicode/utf8.h> - #include <unicode/ucol.h> - #include <unicode/ustring.h> - #include <unicode/ubrk.h> -@@ -831,10 +832,10 @@ PHP_FUNCTION(grapheme_extract) - pstr = str + start; - - /* just in case pstr points in the middle of a character, move forward to the start of the next char */ -- if ( !UTF8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) { -- char *str_end = str + str_len; -+ if ( !U8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) { -+ unsigned char *str_end = str + str_len; - -- while ( !UTF8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) { -+ while ( !U8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) { - pstr++; - if ( pstr >= str_end ) { - intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, ---- a/ext/intl/intl_convertcpp.h -+++ b/ext/intl/intl_convertcpp.h -@@ -26,6 +26,8 @@ - #include <unicode/unistr.h> - #include <zend_types.h> - -+using icu::UnicodeString; -+ - int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status); - - zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status); ---- a/ext/intl/msgformat/msgformat_helpers.cpp -+++ b/ext/intl/msgformat/msgformat_helpers.cpp -@@ -76,6 +76,16 @@ MessageFormatAdapter::getMessagePattern(MessageFormat* m) { - #endif - U_NAMESPACE_END - -+using icu::Formattable; -+using icu::Format; -+using icu::DateFormat; -+using icu::MessageFormat; -+#ifdef HAS_MESSAGE_PATTERN -+using icu::MessagePattern; -+#endif -+using icu::MessageFormatAdapter; -+using icu::FieldPosition; -+ - U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt) - { - int32_t fmt_count = 0; -@@ -227,15 +237,16 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, - UnicodeString typeString = mp.getSubstring(type_part); - /* This is all based on the rules in the docs for MessageFormat - * @see http://icu-project.org/apiref/icu4c/classMessageFormat.html */ -- if (typeString == "number") { -+#define ASCII_LITERAL(s) UNICODE_STRING(s, sizeof(s)-1) -+ if (typeString == ASCII_LITERAL("number")) { - MessagePattern::Part style_part = mp.getPart(i + 1); /* Not advancing i */ - if (style_part.getType() == UMSGPAT_PART_TYPE_ARG_STYLE) { - UnicodeString styleString = mp.getSubstring(style_part); -- if (styleString == "integer") { -+ if (styleString == ASCII_LITERAL("integer")) { - type = Formattable::kInt64; -- } else if (styleString == "currency") { -+ } else if (styleString == ASCII_LITERAL("currency")) { - type = Formattable::kDouble; -- } else if (styleString == "percent") { -+ } else if (styleString == ASCII_LITERAL("percent")) { - type = Formattable::kDouble; - } else { /* some style invalid/unknown to us */ - type = Formattable::kDouble; -@@ -243,12 +254,13 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, - } else { // if missing style, part, make it a double - type = Formattable::kDouble; - } -- } else if ((typeString == "date") || (typeString == "time")) { -+ } else if ((typeString == ASCII_LITERAL("date")) || (typeString == ASCII_LITERAL("time"))) { - type = Formattable::kDate; -- } else if ((typeString == "spellout") || (typeString == "ordinal") -- || (typeString == "duration")) { -+ } else if ((typeString == ASCII_LITERAL("spellout")) || (typeString == ASCII_LITERAL("ordinal")) -+ || (typeString == ASCII_LITERAL("duration"))) { - type = Formattable::kDouble; - } -+#undef ASCII_LITERAL - } else { - /* If there's no UMSGPAT_PART_TYPE_ARG_TYPE right after a - * UMSGPAT_ARG_TYPE_SIMPLE argument, then the pattern ---- a/ext/intl/normalizer/normalizer_normalize.c -+++ b/ext/intl/normalizer/normalizer_normalize.c -@@ -24,6 +24,7 @@ - #include "normalizer_class.h" - #include "normalizer_normalize.h" - #include "intl_convert.h" -+#include <unicode/utf8.h> - - /* {{{ proto string Normalizer::normalize( string $input [, string $form = FORM_C] ) - * Normalize a string. }}} */ ---- a/ext/intl/timezone/timezone_class.cpp -+++ b/ext/intl/timezone/timezone_class.cpp -@@ -37,6 +37,8 @@ extern "C" { - #include <ext/date/php_date.h> - } - -+using icu::Calendar; -+ - /* {{{ Global variables */ - U_CDECL_BEGIN - zend_class_entry *TimeZone_ce_ptr = NULL; ---- a/ext/intl/timezone/timezone_class.h -+++ b/ext/intl/timezone/timezone_class.h -@@ -29,6 +29,8 @@ - - #ifndef USE_TIMEZONE_POINTER - typedef void TimeZone; -+#else -+using icu::TimeZone; - #endif - - typedef struct { ---- a/ext/intl/timezone/timezone_methods.cpp -+++ b/ext/intl/timezone/timezone_methods.cpp -@@ -23,6 +23,7 @@ - #include <unicode/locid.h> - #include <unicode/timezone.h> - #include <unicode/ustring.h> -+#include <unicode/calendar.h> - #include "intl_convertcpp.h" - - #include "../common/common_date.h" -@@ -37,6 +38,9 @@ extern "C" { - } - #include "common/common_enum.h" - -+using icu::Locale; -+using icu::Calendar; -+ - U_CFUNC PHP_METHOD(IntlTimeZone, __construct) - { - zend_throw_exception( NULL, --- -2.19.2 - |