Skip to content

Commit 9a3a4b5

Browse files
devnexendevnexen
authored
ext/intl: IntlDateFormatter class removing redundant error message info. (#13465)
Also correcting new IntlChar class constants typos.
1 parent b2b5b01 commit 9a3a4b5

18 files changed

+60
-64
lines changed

‎NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ PHP NEWS
6060
aliases for ::ROUND_DOWN and ::ROUND_UP. (Jorg Sowa)
6161
. Added NumberFormatter::ROUND_HALFODD. (Ayesh Karunaratne)
6262
. Added PROPERTY_IDS_UNARY_OPERATOR, PROPERTY_ID_COMPAT_MATH_START and
63-
PROPERTY_ID_COMPT_MATH_CONTINUE constants. (David Carlier)
63+
PROPERTY_ID_COMPAT_MATH_CONTINUE constants. (David Carlier)
6464
. Added IntlDateFormatter::getIanaID/intltz_get_iana_id method/function.
6565
(David Carlier)
6666
. Set to C++17 standard for icu 74 and onwards. (David Carlier)

‎UPGRADING

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,8 @@ PHP 8.4 UPGRADE NOTES
467467
. The IntlDateFormatter class exposes now the new PATTERN constant
468468
reflecting udat api's UDAT_PATTERN.
469469
. The IntlChar class exposes now the new PROPERTY_IDS_UNARY_OPERATOR (new
470-
IDS binary operator), PROPERTY_ID_COMPT_MATH_START,
471-
PROPERTY_ID_COMPT_MATH_CONTINUE (both for mathematical
470+
IDS binary operator), PROPERTY_ID_COMPAT_MATH_START,
471+
PROPERTY_ID_COMPAT_MATH_CONTINUE (both for mathematical
472472
identifier profiling purpose) constants.
473473

474474
- LDAP:

‎ext/intl/tests/timezone_IDforWindowsID_basic2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ foreach ($tzs as $tz => $regions) {
2727
--EXPECT--
2828
** Gnomeregan
2929
bool(false)
30-
Error: intltz_get_windows_id: Unknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
30+
Error: unknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
3131
** India Standard Time
3232
string(13) "Asia/Calcutta"
3333
** Pacific Standard Time

‎ext/intl/tests/timezone_countEquivalentIDs_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ini_set("intl.error_level", E_WARNING);
99
var_dump(IntlTimeZone::countEquivalentIDs("foo\x80"));
1010
?>
1111
--EXPECTF--
12-
Warning: IntlTimeZone::countEquivalentIDs(): intltz_count_equivalent_ids: could not convert time zone id to UTF-16 in %s on line %d
12+
Warning: IntlTimeZone::countEquivalentIDs(): could not convert time zone id to UTF-16 in %s on line %d
1313
bool(false)

‎ext/intl/tests/timezone_createEnumeration_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ini_set("intl.error_level", E_WARNING);
99
var_dump(IntlTimeZone::createEnumeration(array()));
1010
?>
1111
--EXPECTF--
12-
Warning: IntlTimeZone::createEnumeration(): intltz_create_enumeration: invalid argument type in %s on line %d
12+
Warning: IntlTimeZone::createEnumeration(): invalid argument type in %s on line %d
1313
bool(false)

‎ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ini_set("intl.error_level", E_WARNING);
99
var_dump(IntlTimeZone::createTimeZoneIDEnumeration(-1));
1010
?>
1111
--EXPECTF--
12-
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad zone type in %s on line %d
12+
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): bad zone type in %s on line %d
1313
bool(false)

‎ext/intl/tests/timezone_createTimeZone_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ini_set("intl.error_level", E_WARNING);
99
var_dump(IntlTimeZone::createTimeZone("foo\x80"));
1010
?>
1111
--EXPECTF--
12-
Warning: IntlTimeZone::createTimeZone(): intltz_create_time_zone: could not convert time zone id to UTF-16 in %s on line %d
12+
Warning: IntlTimeZone::createTimeZone(): could not convert time zone id to UTF-16 in %s on line %d
1313
NULL

‎ext/intl/tests/timezone_getCanonicalID_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ini_set("intl.error_level", E_WARNING);
99
var_dump(IntlTimeZone::getCanonicalID("foo\x81"));
1010
?>
1111
--EXPECTF--
12-
Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: could not convert time zone id to UTF-16 in %s on line %d
12+
Warning: IntlTimeZone::getCanonicalID(): could not convert time zone id to UTF-16 in %s on line %d
1313
bool(false)

‎ext/intl/tests/timezone_getCanonicalID_variant1_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ var_dump($isSystemId);
2020
string(13) "Europe/Lisbon"
2121
bool(true)
2222

23-
Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: error obtaining canonical ID in %stimezone_getCanonicalID_variant1_2.php on line %d
23+
Warning: IntlTimeZone::getCanonicalID(): error obtaining canonical ID in %stimezone_getCanonicalID_variant1_2.php on line %d
2424
bool(false)
2525
bool(true)

‎ext/intl/tests/timezone_getDisplayName_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump($tz->getDisplayName(false, -1));
1212
var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_PT'));
1313
?>
1414
--EXPECTF--
15-
Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: wrong display type in %s on line %d
15+
Warning: IntlTimeZone::getDisplayName(): wrong display type in %s on line %d
1616
bool(false)
1717

1818
Fatal error: Uncaught TypeError: intltz_get_display_name(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d

‎ext/intl/tests/timezone_getEquivalentID_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ini_set("intl.error_level", E_WARNING);
99
var_dump(IntlTimeZone::getEquivalentID("foo\x80", 0));
1010
?>
1111
--EXPECTF--
12-
Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: could not convert time zone id to UTF-16 in %s on line %d
12+
Warning: IntlTimeZone::getEquivalentID(): could not convert time zone id to UTF-16 in %s on line %d
1313
bool(false)

‎ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var_dump($lsb->getErrorMessage());
2828
int(0)
2929
string(12) "U_ZERO_ERROR"
3030

31-
Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d
31+
Warning: IntlTimeZone::getOffset(): error obtaining offset in %s on line %d
3232
bool(false)
3333
int(1)
34-
string(67) "intltz_get_offset: error obtaining offset: U_ILLEGAL_ARGUMENT_ERROR"
34+
string(48) "error obtaining offset: U_ILLEGAL_ARGUMENT_ERROR"

‎ext/intl/tests/timezone_getOffset_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var_dump($tz->getOffset(INF, true, $a, $a));
1919
intltz_get_offset(null, time()*1000, false, $a, $a);
2020
?>
2121
--EXPECTF--
22-
Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d
22+
Warning: IntlTimeZone::getOffset(): error obtaining offset in %s on line %d
2323
bool(false)
2424

2525
Fatal error: Uncaught TypeError: intltz_get_offset(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d

‎ext/intl/tests/timezone_getRegion_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ var_dump(IntlTimeZone::getRegion("foo\x81"));
1010
var_dump(IntlTimeZone::getRegion("foo"));
1111
?>
1212
--EXPECTF--
13-
Warning: IntlTimeZone::getRegion(): intltz_get_region: could not convert time zone id to UTF-16 in %s on line %d
13+
Warning: IntlTimeZone::getRegion(): could not convert time zone id to UTF-16 in %s on line %d
1414
bool(false)
1515

16-
Warning: IntlTimeZone::getRegion(): intltz_get_region: Error obtaining region in %s on line %d
16+
Warning: IntlTimeZone::getRegion(): error obtaining region in %s on line %d
1717
bool(false)

‎ext/intl/tests/timezone_windowsID_basic2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ string(18) "Cuba Standard Time"
3333
string(21) "Central Standard Time"
3434
string(21) "Pacific Standard Time"
3535
bool(false)
36-
Error: intltz_get_windows_id: Unknown system timezone: U_ILLEGAL_ARGUMENT_ERROR
36+
Error: unknown system timezone: U_ILLEGAL_ARGUMENT_ERROR
3737
string(21) "Morocco Standard Time"
3838
string(23) "Singapore Standard Time"
3939
string(26) "W. Australia Standard Time"

‎ext/intl/timezone/timezone_methods.cpp

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone)
6060
UnicodeString id = UnicodeString();
6161
if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
6262
intl_error_set(NULL, status,
63-
"intltz_create_time_zone: could not convert time zone id to UTF-16", 0);
63+
"could not convert time zone id to UTF-16", 0);
6464
RETURN_NULL();
6565
}
6666

@@ -84,7 +84,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
8484
tzobj = Z_PHPTIMEZONE_P(zv_timezone);
8585
if (!tzobj->initialized) {
8686
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
87-
"intltz_from_date_time_zone: DateTimeZone object is unconstructed",
87+
"DateTimeZone object is unconstructed",
8888
0);
8989
RETURN_NULL();
9090
}
@@ -151,7 +151,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_enumeration)
151151
if (UNEXPECTED(Z_LVAL_P(arg) < (zend_long)INT32_MIN ||
152152
Z_LVAL_P(arg) > (zend_long)INT32_MAX)) {
153153
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
154-
"intltz_create_enumeration: value is out of range", 0);
154+
"value is out of range", 0);
155155
RETURN_FALSE;
156156
} else {
157157
se = TimeZone::createEnumeration((int32_t) Z_LVAL_P(arg));
@@ -180,15 +180,15 @@ U_CFUNC PHP_FUNCTION(intltz_create_enumeration)
180180
se = TimeZone::createEnumeration(Z_STRVAL_P(arg));
181181
} else {
182182
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
183-
"intltz_create_enumeration: invalid argument type", 0);
183+
"invalid argument type", 0);
184184
RETURN_FALSE;
185185
}
186186

187187
if (se) {
188188
IntlIterator_from_StringEnumeration(se, return_value);
189189
} else {
190190
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
191-
"intltz_create_enumeration: error obtaining enumeration", 0);
191+
"error obtaining enumeration", 0);
192192
RETVAL_FALSE;
193193
}
194194
}
@@ -208,7 +208,7 @@ U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids)
208208
UnicodeString id = UnicodeString();
209209
if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
210210
intl_error_set(NULL, status,
211-
"intltz_count_equivalent_ids: could not convert time zone id to UTF-16", 0);
211+
"could not convert time zone id to UTF-16", 0);
212212
RETURN_FALSE;
213213
}
214214

@@ -236,14 +236,14 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
236236
if (zoneType != UCAL_ZONE_TYPE_ANY && zoneType != UCAL_ZONE_TYPE_CANONICAL
237237
&& zoneType != UCAL_ZONE_TYPE_CANONICAL_LOCATION) {
238238
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
239-
"intltz_create_time_zone_id_enumeration: bad zone type", 0);
239+
"bad zone type", 0);
240240
RETURN_FALSE;
241241
}
242242

243243
if (!arg3isnull) {
244244
if (UNEXPECTED(offset_arg < (zend_long)INT32_MIN || offset_arg > (zend_long)INT32_MAX)) {
245245
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
246-
"intltz_create_time_zone_id_enumeration: offset out of bounds", 0);
246+
"offset out of bounds", 0);
247247
RETURN_FALSE;
248248
}
249249
offset = (int32_t)offset_arg;
@@ -254,8 +254,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
254254
UErrorCode uec = UErrorCode();
255255
se = TimeZone::createTimeZoneIDEnumeration((USystemTimeZoneType)zoneType,
256256
region, offsetp, uec);
257-
INTL_CHECK_STATUS(uec, "intltz_create_time_zone_id_enumeration: "
258-
"Error obtaining time zone id enumeration")
257+
INTL_CHECK_STATUS(uec, "error obtaining time zone id enumeration")
259258

260259
IntlIterator_from_StringEnumeration(se, return_value);
261260
}
@@ -276,18 +275,18 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
276275
UnicodeString id;
277276
if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
278277
intl_error_set(NULL, status,
279-
"intltz_get_canonical_id: could not convert time zone id to UTF-16", 0);
278+
"could not convert time zone id to UTF-16", 0);
280279
RETURN_FALSE;
281280
}
282281

283282
UnicodeString result;
284283
UBool isSystemID;
285284
TimeZone::getCanonicalID(id, result, isSystemID, status);
286-
INTL_CHECK_STATUS(status, "intltz_get_canonical_id: error obtaining canonical ID");
285+
INTL_CHECK_STATUS(status, "error obtaining canonical ID");
287286

288287
zend_string *u8str =intl_convert_utf16_to_utf8(result.getBuffer(), result.length(), &status);
289288
INTL_CHECK_STATUS(status,
290-
"intltz_get_canonical_id: could not convert time zone id to UTF-16");
289+
"could not convert time zone id to UTF-16");
291290
RETVAL_NEW_STR(u8str);
292291

293292
if (is_systemid) { /* by-ref argument passed */
@@ -313,12 +312,12 @@ U_CFUNC PHP_FUNCTION(intltz_get_region)
313312
UnicodeString id;
314313
if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
315314
intl_error_set(NULL, status,
316-
"intltz_get_region: could not convert time zone id to UTF-16", 0);
315+
"could not convert time zone id to UTF-16", 0);
317316
RETURN_FALSE;
318317
}
319318

320319
int32_t region_len = TimeZone::getRegion(id, outbuf, sizeof(outbuf), status);
321-
INTL_CHECK_STATUS(status, "intltz_get_region: Error obtaining region");
320+
INTL_CHECK_STATUS(status, "error obtaining region");
322321

323322
RETURN_STRINGL(outbuf, region_len);
324323
}
@@ -333,8 +332,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version)
333332

334333
UErrorCode status = UErrorCode();
335334
const char *res = TimeZone::getTZDataVersion(status);
336-
INTL_CHECK_STATUS(status, "intltz_get_tz_data_version: "
337-
"Error obtaining time zone data version");
335+
INTL_CHECK_STATUS(status, "error obtaining time zone data version");
338336

339337
RETURN_STRING(res);
340338
}
@@ -358,16 +356,15 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
358356
UnicodeString id;
359357
if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
360358
intl_error_set(NULL, status,
361-
"intltz_get_equivalent_id: could not convert time zone id to UTF-16", 0);
359+
"could not convert time zone id to UTF-16", 0);
362360
RETURN_FALSE;
363361
}
364362

365363
const UnicodeString result = TimeZone::getEquivalentID(id, (int32_t)index);
366364
zend_string *u8str;
367365

368366
u8str = intl_convert_utf16_to_utf8(result.getBuffer(), result.length(), &status);
369-
INTL_CHECK_STATUS(status, "intltz_get_equivalent_id: "
370-
"could not convert resulting time zone id to UTF-16");
367+
INTL_CHECK_STATUS(status, "could not convert resulting time zone id to UTF-16");
371368
RETVAL_NEW_STR(u8str);
372369
}
373370

@@ -420,7 +417,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_id)
420417

421418
u8str = intl_convert_utf16_to_utf8(
422419
id_us.getBuffer(), id_us.length(), TIMEZONE_ERROR_CODE_P(to));
423-
INTL_METHOD_CHECK_STATUS(to, "intltz_get_id: Could not convert id to UTF-8");
420+
INTL_METHOD_CHECK_STATUS(to, "could not convert id to UTF-8");
424421

425422
RETVAL_NEW_STR(u8str);
426423
}
@@ -460,7 +457,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_offset)
460457
to->utimezone->getOffset((UDate) date, (UBool) local, rawOffset, dstOffset,
461458
TIMEZONE_ERROR_CODE(to));
462459

463-
INTL_METHOD_CHECK_STATUS(to, "intltz_get_offset: error obtaining offset");
460+
INTL_METHOD_CHECK_STATUS(to, "error obtaining offset");
464461

465462
zval_ptr_dtor(rawOffsetArg);
466463
ZVAL_LONG(rawOffsetArg, rawOffset);
@@ -499,7 +496,7 @@ U_CFUNC PHP_FUNCTION(intltz_has_same_rules)
499496
other_to = Z_INTL_TIMEZONE_P(other_object);
500497
if (other_to->utimezone == NULL) {
501498
intl_errors_set(&to->err, U_ILLEGAL_ARGUMENT_ERROR,
502-
"intltz_has_same_rules: The second IntlTimeZone is unconstructed", 0);
499+
"The second IntlTimeZone is unconstructed", 0);
503500
RETURN_FALSE;
504501
}
505502

@@ -534,7 +531,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
534531
}
535532
if (!found) {
536533
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
537-
"intltz_get_display_name: wrong display type", 0);
534+
"wrong display type", 0);
538535
RETURN_FALSE;
539536
}
540537

@@ -549,8 +546,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
549546
Locale::createFromName(locale_str), result);
550547

551548
zend_string *u8str = intl_convert_utf16_to_utf8(result.getBuffer(), result.length(), TIMEZONE_ERROR_CODE_P(to));
552-
INTL_METHOD_CHECK_STATUS(to, "intltz_get_display_name: "
553-
"could not convert resulting time zone id to UTF-16");
549+
INTL_METHOD_CHECK_STATUS(to, "could not convert resulting time zone id to UTF-16");
554550

555551
RETVAL_NEW_STR(u8str);
556552
}
@@ -646,7 +642,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_windows_id)
646642
error = U_ZERO_ERROR;
647643
if (intl_stringFromChar(uID, id->val, id->len, &error) == FAILURE) {
648644
intl_error_set(NULL, error,
649-
"intltz_get_windows_id: could not convert time zone id to UTF-16", 0);
645+
"could not convert time zone id to UTF-16", 0);
650646
RETURN_FALSE;
651647
}
652648

@@ -655,13 +651,13 @@ U_CFUNC PHP_FUNCTION(intltz_get_windows_id)
655651
INTL_CHECK_STATUS(error, "intltz_get_windows_id: Unable to get timezone from windows ID");
656652
if (uWinID.length() == 0) {
657653
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
658-
"intltz_get_windows_id: Unknown system timezone", 0);
654+
"unknown system timezone", 0);
659655
RETURN_FALSE;
660656
}
661657

662658
error = U_ZERO_ERROR;
663659
winID = intl_convert_utf16_to_utf8(uWinID.getBuffer(), uWinID.length(), &error);
664-
INTL_CHECK_STATUS(error, "intltz_get_windows_id: could not convert time zone id to UTF-8");
660+
INTL_CHECK_STATUS(error, "could not convert time zone id to UTF-8");
665661
RETURN_STR(winID);
666662
}
667663
/* }}} */
@@ -682,22 +678,22 @@ U_CFUNC PHP_FUNCTION(intltz_get_id_for_windows_id)
682678
error = U_ZERO_ERROR;
683679
if (intl_stringFromChar(uWinID, winID->val, winID->len, &error) == FAILURE) {
684680
intl_error_set(NULL, error,
685-
"intltz_get_id_for_windows_id: could not convert time zone id to UTF-16", 0);
681+
"could not convert time zone id to UTF-16", 0);
686682
RETURN_FALSE;
687683
}
688684

689685
error = U_ZERO_ERROR;
690686
TimeZone::getIDForWindowsID(uWinID, region ? region->val : NULL, uID, error);
691-
INTL_CHECK_STATUS(error, "intltz_get_id_for_windows_id: Unable to get windows ID for timezone");
687+
INTL_CHECK_STATUS(error, "unable to get windows ID for timezone");
692688
if (uID.length() == 0) {
693689
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
694-
"intltz_get_windows_id: Unknown windows timezone", 0);
690+
"unknown windows timezone", 0);
695691
RETURN_FALSE;
696692
}
697693

698694
error = U_ZERO_ERROR;
699695
id = intl_convert_utf16_to_utf8(uID.getBuffer(), uID.length(), &error);
700-
INTL_CHECK_STATUS(error, "intltz_get_id_for_windows_id: could not convert time zone id to UTF-8");
696+
INTL_CHECK_STATUS(error, "could not convert time zone id to UTF-8");
701697
RETURN_STR(id);
702698
}
703699
/* }}} */

‎ext/intl/uchar/uchar.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class IntlChar
5959
/** @cvalue UCHAR_IDS_UNARY_OPERATOR */
6060
public const int PROPERTY_IDS_UNARY_OPERATOR = UNKNOWN;
6161
/** @cvalue UCHAR_ID_COMPAT_MATH_START */
62-
public const int PROPERTY_ID_COMPT_MATH_START = UNKNOWN;
62+
public const int PROPERTY_ID_COMPAT_MATH_START = UNKNOWN;
6363
/** @cvalue UCHAR_ID_COMPAT_MATH_CONTINUE */
64-
public const int PROPERTY_ID_COMPT_MATH_CONTINUE = UNKNOWN;
64+
public const int PROPERTY_ID_COMPAT_MATH_CONTINUE = UNKNOWN;
6565
#endif
6666
/** @cvalue UCHAR_JOIN_CONTROL */
6767
public const int PROPERTY_JOIN_CONTROL = UNKNOWN;

0 commit comments

Comments
 (0)