summaryrefslogtreecommitdiff
path: root/ext/intl/tests
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2020-02-25 20:58:33 +0100
committerMáté Kocsis <kocsismate@woohoolabs.com>2020-02-26 15:00:08 +0100
commit960318ed95d17bd30c2896e2f3189ebffb965dce (patch)
tree2890972c266dabe649a44b540869a49e41a3e450 /ext/intl/tests
parentc7094d892639fedffb67c273f8fd44f3ffff86d6 (diff)
downloadphp-git-960318ed95d17bd30c2896e2f3189ebffb965dce.tar.gz
Change argument error message format
Closes GH-5211
Diffstat (limited to 'ext/intl/tests')
-rw-r--r--ext/intl/tests/breakiter___construct_error.phpt2
-rw-r--r--ext/intl/tests/bug48227.phpt4
-rw-r--r--ext/intl/tests/calendar_add_error.phpt2
-rw-r--r--ext/intl/tests/calendar_before_after_error.phpt4
-rw-r--r--ext/intl/tests/calendar_clear_error.phpt2
-rw-r--r--ext/intl/tests/calendar_equals_error.phpt6
-rw-r--r--ext/intl/tests/calendar_fieldDifference_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getDayOfWeekType_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getErrorCode_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getErrorMessage_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getType_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getWeekendTransition_error.phpt2
-rw-r--r--ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt8
-rw-r--r--ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt6
-rw-r--r--ext/intl/tests/calendar_inDaylightTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isEquivalentTo_error.phpt8
-rw-r--r--ext/intl/tests/calendar_isLenient_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isSet_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isWeekend_error.phpt2
-rw-r--r--ext/intl/tests/calendar_roll_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setLenient_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/calendar_set_error.phpt2
-rw-r--r--ext/intl/tests/calendar_toDateTime_error.phpt2
-rw-r--r--ext/intl/tests/formatter_fail.phpt6
-rw-r--r--ext/intl/tests/gregoriancalendar___construct_error.phpt2
-rw-r--r--ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt2
-rw-r--r--ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt2
-rw-r--r--ext/intl/tests/msgfmt_fail2.phpt6
-rw-r--r--ext/intl/tests/timezone_getDSTSavings_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getDisplayName_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getErrorCode_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getErrorMessage_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getID_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getOffset_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getRawOffset_error.phpt2
-rw-r--r--ext/intl/tests/timezone_hasSameRules_error.phpt4
-rw-r--r--ext/intl/tests/timezone_toDateTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/timezone_useDaylightTime_error.phpt2
-rw-r--r--ext/intl/tests/transliterator_create_inverse_error.phpt2
-rw-r--r--ext/intl/tests/transliterator_get_error_code_error.phpt2
-rw-r--r--ext/intl/tests/transliterator_get_error_message_error.phpt2
50 files changed, 67 insertions, 67 deletions
diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt
index 35a145dcec..c8cbdcc6de 100644
--- a/ext/intl/tests/breakiter___construct_error.phpt
+++ b/ext/intl/tests/breakiter___construct_error.phpt
@@ -43,6 +43,6 @@ Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 paramete
Exception: IntlRuleBasedBreakIterator::__construct() expects at most 2 parameters, 3 given in %s on line %d
-Exception: IntlRuleBasedBreakIterator::__construct() expects argument #2 ($areCompiled) to be of type bool, array given in %s on line %d
+Exception: IntlRuleBasedBreakIterator::__construct(): Argument #2 ($areCompiled) must be of type bool, array given in %s on line %d
Exception: IntlRuleBasedBreakIterator::__construct(): rbbi_create_instance: unable to create instance from compiled rules in %s on line %d
diff --git a/ext/intl/tests/bug48227.phpt b/ext/intl/tests/bug48227.phpt
index 28a614da03..9635b70906 100644
--- a/ext/intl/tests/bug48227.phpt
+++ b/ext/intl/tests/bug48227.phpt
@@ -16,7 +16,7 @@ foreach (['', 1, NULL, $x] as $value) {
?>
--EXPECT--
-NumberFormatter::format() expects argument #1 ($value) to be of type number, string given
+NumberFormatter::format(): Argument #1 ($value) must be of type number, string given
string(1) "1"
string(1) "0"
-NumberFormatter::format() expects argument #1 ($value) to be of type number, object given
+NumberFormatter::format(): Argument #1 ($value) must be of type number, object given
diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index e30ed02856..59b9abc053 100644
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_add(1, 2, 3));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_add() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_add(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_add(1, 2, 3)
#1 {main}
diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index a9bbed25e6..8fd6db2a1b 100644
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -65,9 +65,9 @@ error: 0, IntlCalendar::after() expects exactly 1 parameter, 0 given
error: 0, IntlCalendar::before() expects exactly 1 parameter, 0 given
-error: 0, IntlCalendar::after() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, IntlCalendar::after(): Argument #1 ($calendar) must be of type IntlCalendar, int given
-error: 0, IntlCalendar::before() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, IntlCalendar::before(): Argument #1 ($calendar) must be of type IntlCalendar, int given
error: 0, IntlCalendar::after() expects exactly 1 parameter, 2 given
diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt
index c56f9065fc..dd2c1e0e75 100644
--- a/ext/intl/tests/calendar_clear_error.phpt
+++ b/ext/intl/tests/calendar_clear_error.phpt
@@ -23,7 +23,7 @@ bool(false)
Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_clear() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_clear(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_clear(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index 0d4665af60..9da547fe5a 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -47,10 +47,10 @@ try {
--EXPECT--
error: 0, IntlCalendar::equals() expects exactly 1 parameter, 0 given
-error: 0, IntlCalendar::equals() expects argument #1 ($calendar) to be of type IntlCalendar, object given
+error: 0, IntlCalendar::equals(): Argument #1 ($calendar) must be of type IntlCalendar, object given
error: 0, IntlCalendar::equals() expects exactly 1 parameter, 2 given
-error: 0, intlcal_equals() expects argument #2 ($calendar) to be of type IntlCalendar, array given
+error: 0, intlcal_equals(): Argument #2 ($calendar) must be of type IntlCalendar, array given
-error: 0, intlcal_equals() expects argument #1 ($calendarObject) to be of type IntlCalendar, int given
+error: 0, intlcal_equals(): Argument #1 ($calendarObject) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index 872fea825d..bf9ab18c76 100644
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -32,7 +32,7 @@ Warning: IntlCalendar::fieldDifference(): intlcal_field_difference: Call to ICU
bool(false)
intlcal_field_difference() expects exactly 3 parameters, 4 given
-Fatal error: Uncaught TypeError: intlcal_field_difference() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_field_difference(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_field_difference(1, 0, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index 644e580f11..5408f966e2 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -19,7 +19,7 @@ var_dump(intlcal_get_day_of_week_type(1, 1));
Warning: IntlCalendar::getDayOfWeekType(): intlcal_get_day_of_week_type: invalid day of week in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_get_day_of_week_type() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_day_of_week_type(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_day_of_week_type(1, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt
index 4d69bdedfd..5bf65b59c5 100644
--- a/ext/intl/tests/calendar_getErrorCode_error.phpt
+++ b/ext/intl/tests/calendar_getErrorCode_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_error_code(null));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_error_code() expects argument #1 ($calendar) to be of type IntlCalendar, null given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_error_code(): Argument #1 ($calendar) must be of type IntlCalendar, null given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_error_code(NULL)
#1 {main}
diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt
index 68b1ad1d6c..733194fee9 100644
--- a/ext/intl/tests/calendar_getErrorMessage_error.phpt
+++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_error_message(null));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_error_message() expects argument #1 ($calendar) to be of type IntlCalendar, null given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_error_message(): Argument #1 ($calendar) must be of type IntlCalendar, null given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_error_message(NULL)
#1 {main}
diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index 22de5dadcd..fa37edd380 100644
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_first_day_of_week(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_first_day_of_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_first_day_of_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_first_day_of_week(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index 644a7eab1c..9a84ac9719 100644
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_minimal_days_in_first_week(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_minimal_days_in_first_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_minimal_days_in_first_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_minimal_days_in_first_week(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index b49861ba49..3c8082d62b 100644
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_skipped_wall_time_option(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_skipped_wall_time_option() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_skipped_wall_time_option(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_skipped_wall_time_option(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index be9585a821..11bc5631c8 100644
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_time_zone(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_time_zone() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_time_zone(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_time_zone(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index 6c917103cb..6018cd7c92 100644
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_time(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_time() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_time(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index f623bd3e8b..83bf072508 100644
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_type(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_get_type() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_type(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_type(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index b9d7f30299..3be22cfc9c 100644
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -18,7 +18,7 @@ var_dump(intlcal_get_weekend_transition(1, 1));
Warning: IntlCalendar::getWeekendTransition(): intlcal_get_weekend_transition: invalid day of week in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_get_weekend_transition() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_get_weekend_transition(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_weekend_transition(1, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 7392294b96..318738f094 100644
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -71,10 +71,10 @@ bool(false)
Warning: intlcal_get_minimum(): intlcal_get_minimum: invalid field in %s on line %d
bool(false)
-error: 0, intlcal_get_least_maximum() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, intlcal_get_least_maximum(): Argument #1 ($calendar) must be of type IntlCalendar, int given
-error: 0, intlcal_get_maximum() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, intlcal_get_maximum(): Argument #1 ($calendar) must be of type IntlCalendar, int given
-error: 0, intlcal_get_greatest_minimum() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, intlcal_get_greatest_minimum(): Argument #1 ($calendar) must be of type IntlCalendar, int given
-error: 0, intlcal_get_minimum() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, intlcal_get_minimum(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index 5fe75fe17a..207d9e5cdb 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -93,11 +93,11 @@ error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: invalid fiel
bool(false)
error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: invalid field
bool(false)
-error: 0, intlcal_get() expects argument #2 ($field) to be of type int, string given
+error: 0, intlcal_get(): Argument #2 ($field) must be of type int, string given
-error: 0, intlcal_get_actual_maximum() expects argument #2 ($field) to be of type int, string given
+error: 0, intlcal_get_actual_maximum(): Argument #2 ($field) must be of type int, string given
-error: 0, intlcal_get_actual_minimum() expects argument #2 ($field) to be of type int, string given
+error: 0, intlcal_get_actual_minimum(): Argument #2 ($field) must be of type int, string given
error: 0, intlcal_get() expects exactly 2 parameters, 1 given
diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index fb4492cb08..4b6d88aa4c 100644
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_in_daylight_time(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_in_daylight_time() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_in_daylight_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_in_daylight_time(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index 4acb3b6143..a801bba952 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -49,14 +49,14 @@ try {
echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
}
--EXPECT--
-error: 0, IntlCalendar::isEquivalentTo() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($calendar) must be of type IntlCalendar, int given
error: 0, IntlCalendar::isEquivalentTo() expects exactly 1 parameter, 2 given
-error: 0, IntlCalendar::isEquivalentTo() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($calendar) must be of type IntlCalendar, int given
error: 0, intlcal_is_equivalent_to() expects exactly 2 parameters, 1 given
-error: 0, intlcal_is_equivalent_to() expects argument #2 ($calendar) to be of type IntlCalendar, int given
+error: 0, intlcal_is_equivalent_to(): Argument #2 ($calendar) must be of type IntlCalendar, int given
-error: 0, intlcal_is_equivalent_to() expects argument #1 ($calendarObject) to be of type IntlCalendar, int given
+error: 0, intlcal_is_equivalent_to(): Argument #1 ($calendarObject) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index 9e4a573908..dafefcc640 100644
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_is_lenient(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_is_lenient() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_is_lenient(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_is_lenient(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index 905e7c082d..969a5130a5 100644
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -19,7 +19,7 @@ var_dump(intlcal_is_set(1, 2));
Warning: IntlCalendar::isSet(): intlcal_is_set: invalid field in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_is_set() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_is_set(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_is_set(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index 138939d61e..aed66aefda 100644
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_is_weekend(1));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_is_weekend() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_is_weekend(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_is_weekend(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index e37c6d24b2..de110a864c 100644
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -19,7 +19,7 @@ var_dump(intlcal_roll(1, 2, 3));
Warning: IntlCalendar::roll(): intlcal_roll: invalid field in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_roll() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_roll(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_roll(1, 2, 3)
#1 {main}
diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index abaad15708..163e41fe48 100644
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -23,7 +23,7 @@ bool(false)
Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_set_first_day_of_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_set_first_day_of_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_first_day_of_week(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index 7e16004dc2..4dadb15c9f 100644
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_set_lenient(1, false));
--EXPECTF--
-Fatal error: Uncaught TypeError: intlcal_set_lenient() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_set_lenient(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_lenient(1, false)
#1 {main}
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index 1973018628..c1b1a944fb 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -23,7 +23,7 @@ bool(false)
Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_set_minimal_days_in_first_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_set_minimal_days_in_first_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index 795d5d56f9..c89e502e7a 100644
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -23,7 +23,7 @@ bool(false)
Warning: IntlCalendar::setRepeatedWallTimeOption(): intlcal_set_repeated_wall_time_option: invalid option in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_set_repeated_wall_time_option() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_set_repeated_wall_time_option(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_repeated_wall_time_option(1, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index e8204c0d9f..722b876ec3 100644
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -47,4 +47,4 @@ error: 0, IntlCalendar::setTimeZone() expects exactly 1 parameter, 0 given
error: 0, intlcal_set_time_zone() expects exactly 2 parameters, 3 given
-error: 0, intlcal_set_time_zone() expects argument #1 ($calendar) to be of type IntlCalendar, int given
+error: 0, intlcal_set_time_zone(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index 397deb48da..2113353604 100644
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -38,7 +38,7 @@ bool(false)
Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intlcal_set() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_set(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set(1, 2, 3)
#1 {main}
diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index e6ed8faf9c..20f45ef6d2 100644
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -21,7 +21,7 @@ var_dump(intlcal_to_date_time(3));
Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d
string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
-Fatal error: Uncaught TypeError: intlcal_to_date_time() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlcal_to_date_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_to_date_time(3)
#1 {main}
diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt
index 8103f1f1a3..3201c9a82b 100644
--- a/ext/intl/tests/formatter_fail.phpt
+++ b/ext/intl/tests/formatter_fail.phpt
@@ -100,13 +100,13 @@ IntlException: Constructor failed in %s on line %d
'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR'
'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR'
-TypeError: NumberFormatter::__construct() expects argument #1 ($locale) to be of type string, array given in %s on line %d
+TypeError: NumberFormatter::__construct(): Argument #1 ($locale) must be of type string, array given in %s on line %d
'U_ZERO_ERROR'
-TypeError: NumberFormatter::create() expects argument #1 ($locale) to be of type string, array given in %s on line %d
+TypeError: NumberFormatter::create(): Argument #1 ($locale) must be of type string, array given in %s on line %d
'U_ZERO_ERROR'
-TypeError: numfmt_create() expects argument #1 ($locale) to be of type string, array given in %s on line %d
+TypeError: numfmt_create(): Argument #1 ($locale) must be of type string, array given in %s on line %d
'U_ZERO_ERROR'
IntlException: Constructor failed in %s on line %d
diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt
index 83de556587..1f8d90b518 100644
--- a/ext/intl/tests/gregoriancalendar___construct_error.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt
@@ -38,4 +38,4 @@ Too many arguments
Too many arguments
No variant with 4 arguments (excluding trailing NULLs)
No variant with 4 arguments (excluding trailing NULLs)
-IntlGregorianCalendar::__construct() expects argument #6 to be of type int, array given
+IntlGregorianCalendar::__construct(): Argument #6 must be of type int, array given
diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index 2caa055388..3fe4faf464 100644
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -14,7 +14,7 @@ var_dump(intlgregcal_get_gregorian_change(1));
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intlgregcal_get_gregorian_change() expects argument #1 ($calendar) to be of type IntlGregorianCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlgregcal_get_gregorian_change(): Argument #1 ($calendar) must be of type IntlGregorianCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlgregcal_get_gregorian_change(1)
#1 {main}
diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 6223256def..9cee3881f3 100644
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -14,7 +14,7 @@ var_dump(intlgregcal_is_leap_year(1, 2));
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intlgregcal_is_leap_year() expects argument #1 ($calendar) to be of type IntlGregorianCalendar, int given in %s:%d
+Fatal error: Uncaught TypeError: intlgregcal_is_leap_year(): Argument #1 ($calendar) must be of type IntlGregorianCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlgregcal_is_leap_year(1, 2)
#1 {main}
diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt
index c02fcb35c3..b53e70e8ea 100644
--- a/ext/intl/tests/msgfmt_fail2.phpt
+++ b/ext/intl/tests/msgfmt_fail2.phpt
@@ -136,13 +136,13 @@ IntlException: Constructor failed in %s on line %d
'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
-TypeError: MessageFormatter::__construct() expects argument #1 ($locale) to be of type string, array given in %s on line %d
+TypeError: MessageFormatter::__construct(): Argument #1 ($locale) must be of type string, array given in %s on line %d
'U_ZERO_ERROR'
-TypeError: MessageFormatter::create() expects argument #1 ($locale) to be of type string, array given in %s on line %d
+TypeError: MessageFormatter::create(): Argument #1 ($locale) must be of type string, array given in %s on line %d
'U_ZERO_ERROR'
-TypeError: msgfmt_create() expects argument #1 ($locale) to be of type string, array given in %s on line %d
+TypeError: msgfmt_create(): Argument #1 ($locale) must be of type string, array given in %s on line %d
'U_ZERO_ERROR'
IntlException: Constructor failed in %s on line %d
diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt
index e5802d1ef4..fe59f3cae4 100644
--- a/ext/intl/tests/timezone_getDSTSavings_error.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intltz_get_dst_savings(null));
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_dst_savings() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_dst_savings(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_dst_savings(NULL)
#1 {main}
diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 7861f25fe6..0a76fcf1e9 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -16,7 +16,7 @@ var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_P
Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: wrong display type in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intltz_get_display_name() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_display_name(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_display_name(NULL, 1, false, 'pt_PT')
#1 {main}
diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt
index 91d0167b8a..c20e3c666a 100644
--- a/ext/intl/tests/timezone_getErrorCode_error.phpt
+++ b/ext/intl/tests/timezone_getErrorCode_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intltz_get_error_code(null));
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_error_code() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_error_code(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_error_code(NULL)
#1 {main}
diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt
index d492a956ea..9cd26d4f45 100644
--- a/ext/intl/tests/timezone_getErrorMessage_error.phpt
+++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intltz_get_error_message(null));
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_error_message() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_error_message(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_error_message(NULL)
#1 {main}
diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt
index 23c4cd1726..da79d7c1bb 100644
--- a/ext/intl/tests/timezone_getID_error.phpt
+++ b/ext/intl/tests/timezone_getID_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
intltz_get_id(null);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_id() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_id(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_id(NULL)
#1 {main}
diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt
index d9715b4998..639b690595 100644
--- a/ext/intl/tests/timezone_getOffset_error.phpt
+++ b/ext/intl/tests/timezone_getOffset_error.phpt
@@ -23,7 +23,7 @@ intltz_get_offset(null, time()*1000, false, $a, $a);
Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: intltz_get_offset() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_offset(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_offset(NULL, %d, false, NULL, NULL)
#1 {main}
diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt
index 5b495322a1..612fa9b39d 100644
--- a/ext/intl/tests/timezone_getRawOffset_error.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
intltz_get_raw_offset(null);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_raw_offset() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_raw_offset(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_get_raw_offset(NULL)
#1 {main}
diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index 4f99dc6eb5..99d2a2e21d 100644
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -31,7 +31,7 @@ try {
}
--EXPECT--
int(0)
-string(106) "IntlTimeZone::hasSameRules() expects argument #1 ($otherTimeZone) to be of type IntlTimeZone, string given"
+string(101) "IntlTimeZone::hasSameRules(): Argument #1 ($otherTimeZone) must be of type IntlTimeZone, string given"
int(0)
-string(88) "intltz_has_same_rules() expects argument #1 ($tz) to be of type IntlTimeZone, null given"
+string(83) "intltz_has_same_rules(): Argument #1 ($tz) must be of type IntlTimeZone, null given"
diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index fc07b16ad5..530c73e3be 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -21,7 +21,7 @@ var_dump(intltz_to_date_time_zone(1));
Warning: IntlTimeZone::toDateTimeZone(): intltz_to_date_time_zone: DateTimeZone constructor threw exception in %s on line %d
string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
-Fatal error: Uncaught TypeError: intltz_to_date_time_zone() expects argument #1 ($tz) to be of type IntlTimeZone, int given in %s:%d
+Fatal error: Uncaught TypeError: intltz_to_date_time_zone(): Argument #1 ($tz) must be of type IntlTimeZone, int given in %s:%d
Stack trace:
#0 %s(%d): intltz_to_date_time_zone(1)
#1 {main}
diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt
index 283e42ea23..6f702848a9 100644
--- a/ext/intl/tests/timezone_useDaylightTime_error.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
intltz_use_daylight_time(null);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: intltz_use_daylight_time() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_use_daylight_time(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
Stack trace:
#0 %s(%d): intltz_use_daylight_time(NULL)
#1 {main}
diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt
index 3b069cb230..a93554043d 100644
--- a/ext/intl/tests/transliterator_create_inverse_error.phpt
+++ b/ext/intl/tests/transliterator_create_inverse_error.phpt
@@ -10,7 +10,7 @@ ini_set("intl.error_level", E_WARNING);
transliterator_create_inverse("jj");
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: transliterator_create_inverse() expects argument #1 ($orig_trans) to be of type Transliterator, string given in %s:%d
+Fatal error: Uncaught TypeError: transliterator_create_inverse(): Argument #1 ($orig_trans) must be of type Transliterator, string given in %s:%d
Stack trace:
#0 %s(%d): transliterator_create_inverse('jj')
#1 {main}
diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt
index bfd3c1b118..64f9ea5cc2 100644
--- a/ext/intl/tests/transliterator_get_error_code_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_code_error.phpt
@@ -8,7 +8,7 @@ ini_set("intl.error_level", E_WARNING);
echo transliterator_get_error_code(array()), "\n";
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: transliterator_get_error_code() expects argument #1 ($trans) to be of type Transliterator, array given in %s:%d
+Fatal error: Uncaught TypeError: transliterator_get_error_code(): Argument #1 ($trans) must be of type Transliterator, array given in %s:%d
Stack trace:
#0 %s(%d): transliterator_get_error_code(Array)
#1 {main}
diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt
index 543480d55e..9c2e837da3 100644
--- a/ext/intl/tests/transliterator_get_error_message_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_message_error.phpt
@@ -8,7 +8,7 @@ ini_set("intl.error_level", E_WARNING);
echo transliterator_get_error_message(array()), "\n";
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: transliterator_get_error_message() expects argument #1 ($trans) to be of type Transliterator, array given in %s:%d
+Fatal error: Uncaught TypeError: transliterator_get_error_message(): Argument #1 ($trans) must be of type Transliterator, array given in %s:%d
Stack trace:
#0 %s(%d): transliterator_get_error_message(Array)
#1 {main}