php-icu64.patch

   1 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.cpp php-5.6.40/ext/intl/breakiterator/breakiterator_class.cpp
   2 --- php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.cpp       2019-01-09 10:54:13.000000000 +0100
   3 +++ php-5.6.40/ext/intl/breakiterator/breakiterator_class.cpp   2021-08-23 23:20:40.309048531 +0200
   4 @@ -38,6 +38,7 @@ extern "C" {
   5  }
   6
   7  using PHP::CodePointBreakIterator;
   8 +using icu::RuleBasedBreakIterator;
   9
  10  /* {{{ Global variables */
  11  zend_class_entry *BreakIterator_ce_ptr;
  12 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.h php-5.6.40/ext/intl/breakiterator/breakiterator_class.h
  13 --- php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.h 2019-01-09 10:54:13.000000000 +0100
  14 +++ php-5.6.40/ext/intl/breakiterator/breakiterator_class.h     2021-08-23 23:20:40.309048531 +0200
  15 @@ -26,6 +26,8 @@
  16
  17  #ifndef USE_BREAKITERATOR_POINTER
  18  typedef void BreakIterator;
  19 +#else
  20 +using icu::BreakIterator;
  21  #endif
  22
  23  typedef struct {
  24 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/breakiterator_methods.cpp php-5.6.40/ext/intl/breakiterator/breakiterator_methods.cpp
  25 --- php-5.6.40.org/ext/intl/breakiterator/breakiterator_methods.cpp     2019-01-09 10:54:13.000000000 +0100
  26 +++ php-5.6.40/ext/intl/breakiterator/breakiterator_methods.cpp 2021-08-23 23:20:40.309048531 +0200
  27 @@ -32,6 +32,8 @@ extern "C" {
  28  }
  29
  30  using PHP::CodePointBreakIterator;
  31 +using icu::BreakIterator;
  32 +using icu::Locale;
  33
  34  U_CFUNC PHP_METHOD(BreakIterator, __construct)
  35  {
  36 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.cpp php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.cpp
  37 --- php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.cpp        2019-01-09 10:54:13.000000000 +0100
  38 +++ php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.cpp    2021-08-23 23:20:40.309048531 +0200
  39 @@ -30,6 +30,7 @@ typedef union {
  40  #define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
  41
  42  using namespace PHP;
  43 +using icu::UCharCharacterIterator;
  44
  45  UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
  46
  47 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.h php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.h
  48 --- php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.h  2019-01-09 10:54:13.000000000 +0100
  49 +++ php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.h      2021-08-23 23:20:40.312381861 +0200
  50 @@ -18,8 +18,11 @@
  51  #define CODEPOINTITERATOR_INTERNAL_H
  52
  53  #include <unicode/brkiter.h>
  54 +#include <unicode/unistr.h>
  55
  56 -using U_ICU_NAMESPACE::BreakIterator;
  57 +using icu::BreakIterator;
  58 +using icu::CharacterIterator;
  59 +using icu::UnicodeString;
  60
  61  namespace PHP {
  62
  63 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp php-5.6.40/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
  64 --- php-5.6.40.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp    2019-01-09 10:54:13.000000000 +0100
  65 +++ php-5.6.40/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp        2021-08-23 23:20:40.312381861 +0200
  66 @@ -25,6 +25,9 @@ extern "C" {
  67
  68  #include "../intl_convertcpp.h"
  69
  70 +using icu::RuleBasedBreakIterator;
  71 +using icu::Locale;
  72 +
  73  static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
  74         return (RuleBasedBreakIterator*)bio->biter;
  75  }
  76 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/calendar_class.cpp php-5.6.40/ext/intl/calendar/calendar_class.cpp
  77 --- php-5.6.40.org/ext/intl/calendar/calendar_class.cpp 2019-01-09 10:54:13.000000000 +0100
  78 +++ php-5.6.40/ext/intl/calendar/calendar_class.cpp     2021-08-23 23:20:40.312381861 +0200
  79 @@ -34,6 +34,9 @@ extern "C" {
  80  #include <assert.h>
  81  }
  82
  83 +using icu::GregorianCalendar;
  84 +using icu::Locale;
  85 +
  86  /* {{{ Global variables */
  87  zend_class_entry *Calendar_ce_ptr;
  88  zend_class_entry *GregorianCalendar_ce_ptr;
  89 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/calendar_class.h php-5.6.40/ext/intl/calendar/calendar_class.h
  90 --- php-5.6.40.org/ext/intl/calendar/calendar_class.h   2019-01-09 10:54:13.000000000 +0100
  91 +++ php-5.6.40/ext/intl/calendar/calendar_class.h       2021-08-23 23:20:40.312381861 +0200
  92 @@ -26,6 +26,8 @@
  93
  94  #ifndef USE_CALENDAR_POINTER
  95  typedef void Calendar;
  96 +#else
  97 +using icu::Calendar;
  98  #endif
  99
 100  typedef struct {
 101 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/calendar_methods.cpp php-5.6.40/ext/intl/calendar/calendar_methods.cpp
 102 --- php-5.6.40.org/ext/intl/calendar/calendar_methods.cpp       2019-01-09 10:54:13.000000000 +0100
 103 +++ php-5.6.40/ext/intl/calendar/calendar_methods.cpp   2021-08-23 23:20:40.312381861 +0200
 104 @@ -40,6 +40,8 @@ extern "C" {
 105  }
 106  #include "../common/common_enum.h"
 107
 108 +using icu::Locale;
 109 +
 110  U_CFUNC PHP_METHOD(IntlCalendar, __construct)
 111  {
 112         zend_throw_exception( NULL,
 113 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/gregoriancalendar_methods.cpp php-5.6.40/ext/intl/calendar/gregoriancalendar_methods.cpp
 114 --- php-5.6.40.org/ext/intl/calendar/gregoriancalendar_methods.cpp      2019-01-09 10:54:13.000000000 +0100
 115 +++ php-5.6.40/ext/intl/calendar/gregoriancalendar_methods.cpp  2021-08-23 23:20:40.312381861 +0200
 116 @@ -32,6 +32,11 @@ extern "C" {
 117  #include <ext/date/php_date.h>
 118  }
 119
 120 +using icu::GregorianCalendar;
 121 +using icu::Locale;
 122 +using icu::UnicodeString;
 123 +using icu::StringPiece;
 124 +
 125  static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
 126         return (GregorianCalendar*)co->ucal;
 127  }
 128 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/common/common_date.cpp php-5.6.40/ext/intl/common/common_date.cpp
 129 --- php-5.6.40.org/ext/intl/common/common_date.cpp      2019-01-09 10:54:13.000000000 +0100
 130 +++ php-5.6.40/ext/intl/common/common_date.cpp  2021-08-23 23:20:40.312381861 +0200
 131 @@ -17,6 +17,8 @@
 132  #include "../intl_cppshims.h"
 133
 134  #include <unicode/calendar.h>
 135 +using icu::TimeZone;
 136 +using icu::UnicodeString;
 137
 138  extern "C" {
 139  #include "../php_intl.h"
 140 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/common/common_date.h php-5.6.40/ext/intl/common/common_date.h
 141 --- php-5.6.40.org/ext/intl/common/common_date.h        2019-01-09 10:54:13.000000000 +0100
 142 +++ php-5.6.40/ext/intl/common/common_date.h    2021-08-23 23:20:40.312381861 +0200
 143 @@ -27,6 +27,7 @@ U_CDECL_END
 144  #ifdef __cplusplus
 145
 146  #include <unicode/timezone.h>
 147 +using icu::TimeZone;
 148
 149  U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC);
 150  U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
 151 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/common/common_enum.h php-5.6.40/ext/intl/common/common_enum.h
 152 --- php-5.6.40.org/ext/intl/common/common_enum.h        2019-01-09 10:54:13.000000000 +0100
 153 +++ php-5.6.40/ext/intl/common/common_enum.h    2021-08-23 23:20:40.312381861 +0200
 154 @@ -69,6 +69,7 @@ U_CFUNC void zoi_with_current_get_curren
 155  U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRMLS_DC);
 156
 157  #ifdef __cplusplus
 158 +using icu::StringEnumeration;
 159  U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object TSRMLS_DC);
 160  #endif
 161
 162 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/dateformat/dateformat_format_object.cpp php-5.6.40/ext/intl/dateformat/dateformat_format_object.cpp
 163 --- php-5.6.40.org/ext/intl/dateformat/dateformat_format_object.cpp     2019-01-09 10:54:13.000000000 +0100
 164 +++ php-5.6.40/ext/intl/dateformat/dateformat_format_object.cpp 2021-08-23 23:20:40.312381861 +0200
 165 @@ -33,6 +33,12 @@ extern "C" {
 166  #include "../common/common_date.h"
 167  }
 168
 169 +using icu::Locale;
 170 +using icu::DateFormat;
 171 +using icu::GregorianCalendar;
 172 +using icu::StringPiece;
 173 +using icu::SimpleDateFormat;
 174 +
 175  static const DateFormat::EStyle valid_styles[] = {
 176                 DateFormat::kNone,
 177                 DateFormat::kFull,
 178 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.cpp php-5.6.40/ext/intl/dateformat/dateformat_helpers.cpp
 179 --- php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.cpp   2019-01-09 10:54:13.000000000 +0100
 180 +++ php-5.6.40/ext/intl/dateformat/dateformat_helpers.cpp       2021-08-23 23:20:40.312381861 +0200
 181 @@ -28,6 +28,8 @@ extern "C" {
 182  #include "../calendar/calendar_class.h"
 183  }
 184
 185 +using icu::GregorianCalendar;
 186 +
 187  int datefmt_process_calendar_arg(zval* calendar_zv,
 188                                                                  Locale const& locale,
 189                                                                  const char *func_name,
 190 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.h php-5.6.40/ext/intl/dateformat/dateformat_helpers.h
 191 --- php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.h     2019-01-09 10:54:13.000000000 +0100
 192 +++ php-5.6.40/ext/intl/dateformat/dateformat_helpers.h 2021-08-23 23:20:40.312381861 +0200
 193 @@ -23,10 +23,17 @@
 194
 195  #include <unicode/calendar.h>
 196
 197 +#include <unicode/datefmt.h>
 198 +
 199  extern "C" {
 200  #include "../php_intl.h"
 201  }
 202
 203 +using icu::Locale;
 204 +using icu::Calendar;
 205 +
 206 +using icu::DateFormat;
 207 +
 208  int datefmt_process_calendar_arg(zval* calendar_zv,
 209                                                                  Locale const& locale,
 210                                                                  const char *func_name,
 211 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/intl_convertcpp.h php-5.6.40/ext/intl/intl_convertcpp.h
 212 --- php-5.6.40.org/ext/intl/intl_convertcpp.h   2019-01-09 10:54:13.000000000 +0100
 213 +++ php-5.6.40/ext/intl/intl_convertcpp.h       2021-08-23 23:20:40.312381861 +0200
 214 @@ -24,6 +24,7 @@
 215  #endif
 216
 217  #include <unicode/unistr.h>
 218 +using icu::UnicodeString;
 219
 220  int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCode *status);
 221
 222 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/msgformat/msgformat_helpers.cpp php-5.6.40/ext/intl/msgformat/msgformat_helpers.cpp
 223 --- php-5.6.40.org/ext/intl/msgformat/msgformat_helpers.cpp     2019-01-09 10:54:13.000000000 +0100
 224 +++ php-5.6.40/ext/intl/msgformat/msgformat_helpers.cpp 2021-08-23 23:20:40.312381861 +0200
 225 @@ -27,6 +27,7 @@
 226  #include <unicode/timezone.h>
 227  #include <unicode/datefmt.h>
 228  #include <unicode/calendar.h>
 229 +#include <unicode/strenum.h>
 230
 231  #include <vector>
 232
 233 @@ -76,6 +77,16 @@ MessageFormatAdapter::getMessagePattern(
 234  #endif
 235  U_NAMESPACE_END
 236
 237 +using icu::Formattable;
 238 +using icu::Format;
 239 +using icu::DateFormat;
 240 +using icu::MessageFormat;
 241 +#ifdef HAS_MESSAGE_PATTERN
 242 +using icu::MessagePattern;
 243 +#endif
 244 +using icu::MessageFormatAdapter;
 245 +using icu::FieldPosition;
 246 +
 247  U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
 248  {
 249         int32_t fmt_count = 0;
 250 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/timezone/timezone_class.cpp php-5.6.40/ext/intl/timezone/timezone_class.cpp
 251 --- php-5.6.40.org/ext/intl/timezone/timezone_class.cpp 2019-01-09 10:54:13.000000000 +0100
 252 +++ php-5.6.40/ext/intl/timezone/timezone_class.cpp     2021-08-23 23:20:40.312381861 +0200
 253 @@ -37,6 +37,8 @@ extern "C" {
 254  #include <ext/date/php_date.h>
 255  }
 256
 257 +using icu::Calendar;
 258 +
 259  /* {{{ Global variables */
 260  U_CDECL_BEGIN
 261  zend_class_entry *TimeZone_ce_ptr = NULL;
 262 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/timezone/timezone_class.h php-5.6.40/ext/intl/timezone/timezone_class.h
 263 --- php-5.6.40.org/ext/intl/timezone/timezone_class.h   2019-01-09 10:54:13.000000000 +0100
 264 +++ php-5.6.40/ext/intl/timezone/timezone_class.h       2021-08-23 23:20:40.312381861 +0200
 265 @@ -29,6 +29,8 @@
 266
 267  #ifndef USE_TIMEZONE_POINTER
 268  typedef void TimeZone;
 269 +#else
 270 +using icu::TimeZone;
 271  #endif
 272
 273  typedef struct {
 274 diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/timezone/timezone_methods.cpp php-5.6.40/ext/intl/timezone/timezone_methods.cpp
 275 --- php-5.6.40.org/ext/intl/timezone/timezone_methods.cpp       2019-01-09 10:54:13.000000000 +0100
 276 +++ php-5.6.40/ext/intl/timezone/timezone_methods.cpp   2021-08-23 23:20:40.312381861 +0200
 277 @@ -23,6 +23,7 @@
 278  #include <unicode/locid.h>
 279  #include <unicode/timezone.h>
 280  #include <unicode/ustring.h>
 281 +#include <unicode/calendar.h>
 282  #include "intl_convertcpp.h"
 283
 284  #include "../common/common_date.h"
 285 @@ -37,6 +38,9 @@ extern "C" {
 286  }
 287  #include "common/common_enum.h"
 288
 289 +using icu::Locale;
 290 +using icu::Calendar;
 291 +
 292  U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
 293  {
 294         zend_throw_exception( NULL,