Skip to content

Commit 9a3a4b5

Browse files
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

0 commit comments

Comments
 (0)