diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index dd823d627ce41..acb436652742f 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -241,7 +241,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *e
 }
 /* }}} */
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...) /* {{{ */
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_entry *error_ce, uint32_t arg_num, const char *format, va_list va) /* {{{ */
 {
 	const char *space;
 	const char *class_name;
@@ -254,20 +254,45 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error(zend_class_entry *erro
 	class_name = get_active_class_name(&space);
 	arg_name = get_active_function_arg_name(arg_num);
 
-	va_list va;
-	va_start(va, format);
 	zend_vspprintf(&message, 0, format, va);
-	va_end(va);
-
 	zend_throw_error(error_ce, "%s%s%s(): Argument #%d%s%s%s %s",
-		class_name, space, get_active_function_name(),
-		arg_num, arg_name ? " ($" : "", arg_name ? arg_name : "", arg_name ? ")" : "",
-		message
+		class_name, space, get_active_function_name(), arg_num,
+		arg_name ? " ($" : "", arg_name ? arg_name : "", arg_name ? ")" : "", message
     );
 	efree(message);
 }
 /* }}} */
 
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...) /* {{{ */
+{
+	va_list va;
+
+	va_start(va, format);
+	zend_argument_error_variadic(error_ce, arg_num, format, va);
+	va_end(va);
+}
+/* }}} */
+
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_type_error(uint32_t arg_num, const char *format, ...) /* {{{ */
+{
+	va_list va;
+
+	va_start(va, format);
+	zend_argument_error_variadic(zend_ce_type_error, arg_num, format, va);
+	va_end(va);
+}
+/* }}} */
+
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num, const char *format, ...) /* {{{ */
+{
+	va_list va;
+
+	va_start(va, format);
+	zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va);
+	va_end(va);
+}
+/* }}} */
+
 ZEND_API int ZEND_FASTCALL zend_parse_arg_class(zval *arg, zend_class_entry **pce, int num, int check_null) /* {{{ */
 {
 	zend_class_entry *ce_base = *pce;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index f64f346951732..fe5694940c1d2 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1154,10 +1154,8 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, z
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, const char *name, zval *arg);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *error);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
-#define zend_argument_type_error(arg_num, ...) \
-	zend_argument_error(zend_ce_type_error, arg_num, __VA_ARGS__)
-#define zend_argument_value_error(arg_num, ...) \
-	zend_argument_error(zend_ce_value_error, arg_num, __VA_ARGS__)
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_type_error(uint32_t arg_num, const char *format, ...);
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num, const char *format, ...);
 
 #define ZPP_ERROR_OK             0
 #define ZPP_ERROR_FAILURE        1
diff --git a/ext/standard/array.c b/ext/standard/array.c
index fcef9b07c6ac0..6178be61f2821 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1191,13 +1191,13 @@ PHP_FUNCTION(min)
 		zval *result;
 
 		if (Z_TYPE(args[0]) != IS_ARRAY) {
-			zend_type_error("When only one parameter is given, it must be an array");
+			zend_argument_type_error(1, "must be of type array, %s given", zend_zval_type_name(&args[0]));
 			RETURN_THROWS();
 		} else {
 			if ((result = zend_hash_minmax(Z_ARRVAL(args[0]), php_array_data_compare, 0)) != NULL) {
 				ZVAL_COPY_DEREF(return_value, result);
 			} else {
-				zend_value_error("Array must contain at least one element");
+				zend_argument_value_error(1, "must contain at least one element");
 				RETURN_THROWS();
 			}
 		}
@@ -1238,13 +1238,13 @@ PHP_FUNCTION(max)
 		zval *result;
 
 		if (Z_TYPE(args[0]) != IS_ARRAY) {
-			zend_type_error("When only one parameter is given, it must be an array");
+			zend_argument_type_error(1, "must be of type array, %s given", zend_zval_type_name(&args[0]));
 			RETURN_THROWS();
 		} else {
 			if ((result = zend_hash_minmax(Z_ARRVAL(args[0]), php_array_data_compare, 1)) != NULL) {
 				ZVAL_COPY_DEREF(return_value, result);
 			} else {
-				zend_value_error("Array must contain at least one element");
+				zend_argument_value_error(1, "must contain at least one element");
 				RETURN_THROWS();
 			}
 		}
@@ -3718,7 +3718,7 @@ static zend_always_inline void php_array_replace_wrapper(INTERNAL_FUNCTION_PARAM
 		zval *arg = args + i;
 
 		if (Z_TYPE_P(arg) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(arg));
 			RETURN_THROWS();
 		}
 	}
@@ -3762,7 +3762,7 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
 		zval *arg = args + i;
 
 		if (Z_TYPE_P(arg) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(arg));
 			RETURN_THROWS();
 		}
 		count += zend_hash_num_elements(Z_ARRVAL_P(arg));
@@ -4654,7 +4654,7 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
 
 	for (i = 0; i < argc; i++) {
 		if (Z_TYPE(args[i]) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 			RETURN_THROWS();
 		}
 	}
@@ -4819,7 +4819,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 
 	for (i = 0; i < arr_argc; i++) {
 		if (Z_TYPE(args[i]) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 			arr_argc = i; /* only free up to i - 1 */
 			goto out;
 		}
@@ -5061,7 +5061,7 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty
 
 	for (i = 0; i < argc; i++) {
 		if (Z_TYPE(args[i]) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 			RETURN_THROWS();
 		}
 	}
@@ -5226,7 +5226,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 
 	for (i = 0; i < arr_argc; i++) {
 		if (Z_TYPE(args[i]) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 			arr_argc = i; /* only free up to i - 1 */
 			goto out;
 		}
@@ -5405,7 +5405,7 @@ PHP_FUNCTION(array_diff)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (Z_TYPE(args[0]) != IS_ARRAY) {
-		zend_type_error("Expected parameter 1 to be an array, %s given", zend_zval_type_name(&args[0]));
+		zend_argument_type_error(1, "must be of type array, %s given", zend_zval_type_name(&args[0]));
 		RETURN_THROWS();
 	}
 
@@ -5413,7 +5413,7 @@ PHP_FUNCTION(array_diff)
 	if (num == 0) {
 		for (i = 1; i < argc; i++) {
 			if (Z_TYPE(args[i]) != IS_ARRAY) {
-				zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+				zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 				RETURN_THROWS();
 			}
 		}
@@ -5430,7 +5430,7 @@ PHP_FUNCTION(array_diff)
 		if (!value) {
 			for (i = 1; i < argc; i++) {
 				if (Z_TYPE(args[i]) != IS_ARRAY) {
-					zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+					zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 					RETURN_THROWS();
 				}
 			}
@@ -5441,7 +5441,7 @@ PHP_FUNCTION(array_diff)
 
 		for (i = 1; i < argc; i++) {
 			if (Z_TYPE(args[i]) != IS_ARRAY) {
-				zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+				zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 				RETURN_THROWS();
 			}
 			if (!found) {
@@ -5471,7 +5471,7 @@ PHP_FUNCTION(array_diff)
 	num = 0;
 	for (i = 1; i < argc; i++) {
 		if (Z_TYPE(args[i]) != IS_ARRAY) {
-			zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i]));
+			zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
 			RETURN_THROWS();
 		}
 		num += zend_hash_num_elements(Z_ARRVAL(args[i]));
@@ -5656,7 +5656,7 @@ PHP_FUNCTION(array_multisort)
 						sort_order = Z_LVAL_P(arg) == PHP_SORT_DESC ? PHP_SORT_DESC : PHP_SORT_ASC;
 						parse_state[MULTISORT_ORDER] = 0;
 					} else {
-						zend_type_error("Argument #%d is expected to be an array or sorting flag that has not already been specified", i + 1);
+						zend_argument_type_error(i + 1, "must be an array or a sort flag that has not already been specified");
 						MULTISORT_ABORT;
 					}
 					break;
@@ -5672,19 +5672,19 @@ PHP_FUNCTION(array_multisort)
 						sort_type = (int)Z_LVAL_P(arg);
 						parse_state[MULTISORT_TYPE] = 0;
 					} else {
-						zend_type_error("Argument #%d is expected to be an array or sorting flag that has not already been specified", i + 1);
+						zend_argument_type_error(i + 1, "must be an array or a sort flag that has not already been specified");
 						MULTISORT_ABORT;
 					}
 					break;
 
 				default:
-					zend_type_error("Argument #%d is an unknown sort flag", i + 1);
+					zend_argument_value_error(i + 1, "must be a valid sort flag");
 					MULTISORT_ABORT;
 					break;
 
 			}
 		} else {
-			zend_type_error("Argument #%d is expected to be an array or a sort flag", i + 1);
+			zend_argument_type_error(i + 1, "must be an array or a sort flag");
 			MULTISORT_ABORT;
 		}
 	}
@@ -6120,7 +6120,7 @@ PHP_FUNCTION(array_map)
 		int ret;
 
 		if (Z_TYPE(arrays[0]) != IS_ARRAY) {
-			zend_type_error("Expected parameter 2 to be an array, %s given", zend_zval_type_name(&arrays[0]));
+			zend_argument_type_error(2, "must be of type array, %s given", zend_zval_type_name(&arrays[0]));
 			RETURN_THROWS();
 		}
 		maxlen = zend_hash_num_elements(Z_ARRVAL(arrays[0]));
@@ -6161,7 +6161,7 @@ PHP_FUNCTION(array_map)
 
 		for (i = 0; i < n_arrays; i++) {
 			if (Z_TYPE(arrays[i]) != IS_ARRAY) {
-				zend_type_error("Expected parameter %d to be an array, %s given", i + 2, zend_zval_type_name(&arrays[i]));
+				zend_argument_type_error(i + 2, "must be of type array, %s given", zend_zval_type_name(&arrays[i]));
 				efree(array_pos);
 				RETURN_THROWS();
 			}
@@ -6291,7 +6291,7 @@ PHP_FUNCTION(array_key_exists)
 			RETVAL_BOOL(zend_hash_index_exists(ht, Z_RES_HANDLE_P(key)));
 			break;
 		default:
-			zend_type_error("Illegal offset type");
+			zend_argument_type_error(1, "must be a valid array offset type");
 			break;
 	}
 }
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index d15854f7ce038..88a7af1c241ca 100755
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1938,7 +1938,7 @@ PHP_FUNCTION(sleep)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (num < 0) {
-		zend_value_error("Number of seconds must be greater than or equal to 0");
+		zend_argument_value_error(1, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -1958,7 +1958,7 @@ PHP_FUNCTION(usleep)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (num < 0) {
-		zend_value_error("Number of microseconds must be greater than or equal to 0");
+		zend_argument_value_error(1, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 	if (usleep((unsigned int)num) < 0) {
@@ -1985,11 +1985,11 @@ PHP_FUNCTION(time_nanosleep)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (tv_sec < 0) {
-		zend_value_error("The seconds value must be greater than 0");
+		zend_argument_value_error(1, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 	if (tv_nsec < 0) {
-		zend_value_error("The nanoseconds value must be greater than 0");
+		zend_argument_value_error(2, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index d343abcd00f1d..cdf983787b546 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -484,7 +484,7 @@ PHP_FUNCTION(escapeshellcmd)
 
 	if (command_len) {
 		if (command_len != strlen(command)) {
-			zend_type_error("Input string contains NULL bytes");
+			zend_argument_type_error(1, "must not contain any null bytes");
 			RETURN_THROWS();
 		}
 		RETVAL_STR(php_escape_shell_cmd(command));
@@ -506,7 +506,7 @@ PHP_FUNCTION(escapeshellarg)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (argument_len != strlen(argument)) {
-		zend_type_error("Input string contains NULL bytes");
+		zend_argument_type_error(1, "must not contain any null bytes");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/file.c b/ext/standard/file.c
index bdb56d542895a..bf18f0ca30e2f 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -543,7 +543,7 @@ PHP_FUNCTION(file_get_contents)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ZEND_NUM_ARGS() == 5 && maxlen < 0) {
-		zend_value_error("Length must be greater than or equal to zero");
+		zend_argument_value_error(5, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -1040,7 +1040,7 @@ PHPAPI PHP_FUNCTION(fgets)
 		efree(buf);
 	} else if (argc > 1) {
 		if (len <= 0) {
-			zend_value_error("Length parameter must be greater than 0");
+			zend_argument_value_error(2, "must be greater than 0");
 			RETURN_THROWS();
 		}
 
@@ -1750,7 +1750,7 @@ PHPAPI PHP_FUNCTION(fread)
 	PHP_STREAM_TO_ZVAL(stream, res);
 
 	if (len <= 0) {
-		zend_value_error("Length parameter must be greater than 0");
+		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
@@ -1829,7 +1829,7 @@ PHP_FUNCTION(fputcsv)
 	if (delimiter_str != NULL) {
 		/* Make sure that there is at least one character in string */
 		if (delimiter_str_len < 1) {
-			zend_value_error("delimiter must be a character");
+			zend_argument_value_error(3, "must be a single character");
 			RETURN_THROWS();
 		} else if (delimiter_str_len > 1) {
 			php_error_docref(NULL, E_NOTICE, "delimiter must be a single character");
@@ -1841,7 +1841,7 @@ PHP_FUNCTION(fputcsv)
 
 	if (enclosure_str != NULL) {
 		if (enclosure_str_len < 1) {
-			zend_value_error("enclosure must be a character");
+			zend_argument_value_error(4, "must be a single character");
 			RETURN_THROWS();
 		} else if (enclosure_str_len > 1) {
 			php_error_docref(NULL, E_NOTICE, "enclosure must be a single character");
@@ -1967,7 +1967,7 @@ PHP_FUNCTION(fgetcsv)
 		if (delimiter_str != NULL) {
 			/* Make sure that there is at least one character in string */
 			if (delimiter_str_len < 1) {
-				zend_value_error("delimiter must be a character");
+				zend_argument_value_error(3, "must be a single character");
 				RETURN_THROWS();
 			} else if (delimiter_str_len > 1) {
 				php_error_docref(NULL, E_NOTICE, "delimiter must be a single character");
@@ -1979,7 +1979,7 @@ PHP_FUNCTION(fgetcsv)
 
 		if (enclosure_str != NULL) {
 			if (enclosure_str_len < 1) {
-				zend_value_error("enclosure must be a character");
+				zend_argument_value_error(4, "must be a single character");
 				RETURN_THROWS();
 			} else if (enclosure_str_len > 1) {
 				php_error_docref(NULL, E_NOTICE, "enclosure must be a single character");
@@ -2004,7 +2004,7 @@ PHP_FUNCTION(fgetcsv)
 		if (len_zv != NULL && Z_TYPE_P(len_zv) != IS_NULL) {
 			len = zval_get_long(len_zv);
 			if (len < 0) {
-				zend_value_error("Length parameter may not be negative");
+				zend_argument_value_error(2, "must be a greater than or equal to 0");
 				RETURN_THROWS();
 			} else if (len == 0) {
 				len = -1;
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 5aad3d990a824..35090bde5463e 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -353,7 +353,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
 				option = PHP_STREAM_META_GROUP_NAME;
 				value = Z_STRVAL_P(group);
 			} else {
-				zend_type_error("chgrp(): Argument #2 ($group) must be of type string|int, %s given", zend_zval_type_name(group));
+				zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(group));
 				RETURN_THROWS();
 			}
 			if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
@@ -382,7 +382,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
 			RETURN_FALSE;
 		}
 	} else {
-		zend_type_error("chgrp(): Argument #2 ($group) must be of type string|int, %s given", zend_zval_type_name(group));
+		zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(group));
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/math.c b/ext/standard/math.c
index a97e781fd0ac6..ef52dcaf76fcf 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -623,7 +623,7 @@ PHP_FUNCTION(log)
 	}
 
 	if (base <= 0.0) {
-		zend_value_error("Base must be greater than 0");
+		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/password.c b/ext/standard/password.c
index cac1637fde493..0efa624bf3469 100644
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -669,7 +669,7 @@ PHP_FUNCTION(password_hash)
 	algo = php_password_algo_find_zval(zalgo);
 	if (!algo) {
 		zend_string *algostr = zval_get_string(zalgo);
-		zend_value_error("Unknown password hashing algorithm: %s", ZSTR_VAL(algostr));
+		zend_argument_value_error(2, "must be a valid password hashing algorithm");
 		zend_string_release(algostr);
 		RETURN_THROWS();
 	}
diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c
index f525f868e468f..c5743c3361003 100644
--- a/ext/standard/php_fopen_wrapper.c
+++ b/ext/standard/php_fopen_wrapper.c
@@ -197,7 +197,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa
 			path += 11;
 			max_memory = ZEND_STRTOL(path, NULL, 10);
 			if (max_memory < 0) {
-				zend_throw_error(NULL, "Max memory must be >= 0");
+				zend_argument_value_error(2, "must be greater than or equal to 0");
 				return NULL;
 			}
 		}
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 6f3ddbea78555..267874acb44db 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -629,7 +629,7 @@ PHP_FUNCTION(proc_open)
 		zval *ztype;
 
 		if (str_index) {
-			zend_value_error("Descriptor spec must be an integer indexed array");
+			zend_argument_value_error(2, "must be an integer indexed array");
 			goto exit_fail;
 		}
 
diff --git a/ext/standard/random.c b/ext/standard/random.c
index a887d97e8a874..a824d649084cc 100644
--- a/ext/standard/random.c
+++ b/ext/standard/random.c
@@ -205,7 +205,7 @@ PHP_FUNCTION(random_bytes)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (size < 1) {
-		zend_throw_exception(zend_ce_error, "Length must be greater than 0", 0);
+		zend_argument_value_error(1, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
@@ -280,7 +280,7 @@ PHP_FUNCTION(random_int)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (min > max) {
-		zend_throw_exception(zend_ce_error, "Minimum value must be less than or equal to the maximum value", 0);
+		zend_argument_value_error(1, "must be less than or equal to argument #2 ($max)");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index b04d36e9b5663..1bc338dc92f52 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -383,7 +383,7 @@ PHP_FUNCTION(stream_socket_recvfrom)
 	}
 
 	if (to_read <= 0) {
-		zend_value_error("Length parameter must be greater than 0");
+		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
@@ -789,10 +789,10 @@ PHP_FUNCTION(stream_select)
 	/* If seconds is not set to null, build the timeval, else we wait indefinitely */
 	if (!secnull) {
 		if (sec < 0) {
-			zend_value_error("The seconds parameter must be greater than 0");
+			zend_argument_value_error(4, "must be greater than or equal to 0");
 			RETURN_THROWS();
 		} else if (usec < 0) {
-			zend_value_error("The microseconds parameter must be greater than 0");
+			zend_argument_value_error(4, "must be greater than or equal to 0");
 			RETURN_THROWS();
 		}
 
@@ -968,7 +968,7 @@ PHP_FUNCTION(stream_context_get_options)
 
 	context = decode_context_param(zcontext);
 	if (!context) {
-		zend_type_error("Invalid stream/context parameter");
+		zend_argument_type_error(1, "must be a valid stream/context");
 		RETURN_THROWS();
 	}
 
@@ -993,7 +993,7 @@ PHP_FUNCTION(stream_context_set_option)
 
 		/* figure out where the context is coming from exactly */
 		if (!(context = decode_context_param(zcontext))) {
-			zend_type_error("Invalid stream/context parameter");
+			zend_argument_type_error(1, "must be a valid stream/context");
 			RETURN_THROWS();
 		}
 
@@ -1012,7 +1012,7 @@ PHP_FUNCTION(stream_context_set_option)
 
 		/* figure out where the context is coming from exactly */
 		if (!(context = decode_context_param(zcontext))) {
-			zend_type_error("Invalid stream/context parameter");
+			zend_argument_type_error(1, "must be a valid stream/context");
 			RETURN_THROWS();
 		}
 
@@ -1035,7 +1035,7 @@ PHP_FUNCTION(stream_context_set_params)
 
 	context = decode_context_param(zcontext);
 	if (!context) {
-		zend_type_error("Invalid stream/context parameter");
+		zend_argument_type_error(1, "must be a valid stream/context");
 		RETURN_THROWS();
 	}
 
@@ -1056,7 +1056,7 @@ PHP_FUNCTION(stream_context_get_params)
 
 	context = decode_context_param(zcontext);
 	if (!context) {
-		zend_type_error("Invalid stream/context parameter");
+		zend_argument_type_error(1, "must be a valid stream/context");
 		RETURN_THROWS();
 	}
 
@@ -1294,7 +1294,7 @@ PHP_FUNCTION(stream_get_line)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (max_length < 0) {
-		zend_value_error("The maximum allowed length must be greater than or equal to zero");
+		zend_argument_value_error(2, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 	if (!max_length) {
@@ -1430,7 +1430,7 @@ PHP_FUNCTION(stream_set_chunk_size)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (csize <= 0) {
-		zend_value_error("The chunk size must be a positive integer, " ZEND_LONG_FMT " given", csize);
+		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 	/* stream.chunk_size is actually a size_t, but php_stream_set_option
@@ -1438,7 +1438,7 @@ PHP_FUNCTION(stream_set_chunk_size)
 	 * In any case, values larger than INT_MAX for a chunk size make no sense.
 	 */
 	if (csize > INT_MAX) {
-		zend_value_error("The chunk size cannot be larger than %d", INT_MAX);
+		zend_argument_value_error(2, "is too large");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/string.c b/ext/standard/string.c
index b242a44e0bcde..a22992aa81737 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1284,7 +1284,7 @@ PHP_FUNCTION(implode)
 		pieces = arg1_array;
 	} else {
 		if (arg1_str == NULL) {
-			zend_type_error("%s(): Argument #1 ($glue) must be of type string, array given", get_active_function_name());
+			zend_argument_type_error(1, "must be of type string, array given");
 			RETURN_THROWS();
 		}
 	}
@@ -1633,7 +1633,7 @@ PHP_FUNCTION(dirname)
 		ZSTR_LEN(ret) = zend_dirname(ZSTR_VAL(ret), str_len);
 #endif
 	} else if (levels < 1) {
-		zend_value_error("Invalid argument, levels must be >= 1");
+		zend_argument_value_error(2, "must be greater than or equal to 1");
 		zend_string_efree(ret);
 		RETURN_THROWS();
 	} else {
@@ -2161,7 +2161,7 @@ PHP_FUNCTION(chunk_split)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (chunklen <= 0) {
-		zend_value_error("Chunk length should be greater than zero");
+		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
@@ -3265,10 +3265,10 @@ PHP_FUNCTION(strtr)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ac == 2 && from_ht == NULL) {
-		zend_type_error("If two arguments are passed, the second argument must be an array");
+		zend_argument_type_error(2, "must be of type array, string given");
 		RETURN_THROWS();
 	} else if (ac != 2 && from_str == NULL) {
-		zend_type_error("If three arguments are passed, the second argument must be a string");
+		zend_argument_type_error(2, "must be of type string, array given");
 		RETURN_THROWS();
 	}
 
@@ -5517,7 +5517,7 @@ PHP_FUNCTION(substr_count)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (needle_len == 0) {
-		zend_value_error("Empty substring");
+		zend_argument_value_error(2, "must be a non-empty string");
 		RETURN_THROWS();
 	}
 
@@ -5528,7 +5528,7 @@ PHP_FUNCTION(substr_count)
 		offset += (zend_long)haystack_len;
 	}
 	if ((offset < 0) || ((size_t)offset > haystack_len)) {
-		zend_value_error("Offset not contained in string");
+		zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
 		RETURN_THROWS();
 	}
 	p += offset;
@@ -5594,12 +5594,12 @@ PHP_FUNCTION(str_pad)
 	}
 
 	if (pad_str_len == 0) {
-		zend_value_error("Padding string cannot be empty");
+		zend_argument_value_error(3, "must be a non-empty string");
 		RETURN_THROWS();
 	}
 
 	if (pad_type_val < STR_PAD_LEFT || pad_type_val > STR_PAD_BOTH) {
-		zend_value_error("Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
+		zend_argument_value_error(4, "must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
 		RETURN_THROWS();
 	}
 
@@ -5859,7 +5859,7 @@ PHP_FUNCTION(str_word_count)
 			/* nothing to be done */
 			break;
 		default:
-			zend_value_error("Invalid format value " ZEND_LONG_FMT, type);
+			zend_argument_value_error(2, "must be a valid format value");
 			RETURN_THROWS();
 	}
 
@@ -5924,11 +5924,10 @@ PHP_FUNCTION(str_split)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (split_length <= 0) {
-		zend_value_error("The length of each segment must be greater than zero");
+		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
-
 	if (0 == ZSTR_LEN(str) || (size_t)split_length >= ZSTR_LEN(str)) {
 		array_init_size(return_value, 1);
 		add_next_index_stringl(return_value, ZSTR_VAL(str), ZSTR_LEN(str));
@@ -5964,7 +5963,7 @@ PHP_FUNCTION(strpbrk)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!ZSTR_LEN(char_list)) {
-		zend_value_error("The character list cannot be empty");
+		zend_argument_value_error(2, "must be a non-empty string");
 		RETURN_THROWS();
 	}
 
@@ -6003,7 +6002,7 @@ PHP_FUNCTION(substr_compare)
 		if (len == 0) {
 			RETURN_LONG(0L);
 		} else {
-			zend_value_error("The length must be greater than or equal to zero");
+			zend_argument_value_error(4, "must be greater than or equal to 0");
 			RETURN_THROWS();
 		}
 	}
diff --git a/ext/standard/tests/array/array_diff_1.phpt b/ext/standard/tests/array/array_diff_1.phpt
index 2e2b135128aa4..b936463e079d1 100644
--- a/ext/standard/tests/array/array_diff_1.phpt
+++ b/ext/standard/tests/array/array_diff_1.phpt
@@ -14,6 +14,6 @@ try {
 //-=-=-=-=-=-
 echo "OK!";
 ?>
---EXPECTF--
-Expected parameter 2 to be an array, int given
+--EXPECT--
+array_diff(): Argument #2 ($arr2) must be of type array, int given
 OK!
diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index a723930b34450..8966c54691177 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -106,80 +106,80 @@ echo "Done";
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
-Expected parameter 1 to be an array, int given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 -- Iteration 2 --
-Expected parameter 1 to be an array, int given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 -- Iteration 3 --
-Expected parameter 1 to be an array, int given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 -- Iteration 4 --
-Expected parameter 1 to be an array, int given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 -- Iteration 5 --
-Expected parameter 1 to be an array, float given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 -- Iteration 6 --
-Expected parameter 1 to be an array, float given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 -- Iteration 7 --
-Expected parameter 1 to be an array, float given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 -- Iteration 8 --
-Expected parameter 1 to be an array, float given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 -- Iteration 9 --
-Expected parameter 1 to be an array, float given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 -- Iteration 10 --
-Expected parameter 1 to be an array, null given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 -- Iteration 11 --
-Expected parameter 1 to be an array, null given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 -- Iteration 12 --
-Expected parameter 1 to be an array, bool given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 -- Iteration 13 --
-Expected parameter 1 to be an array, bool given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 -- Iteration 14 --
-Expected parameter 1 to be an array, bool given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 -- Iteration 15 --
-Expected parameter 1 to be an array, bool given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 -- Iteration 16 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 17 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 18 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 19 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 20 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 21 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 22 --
-Expected parameter 1 to be an array, string given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 23 --
-Expected parameter 1 to be an array, object given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, object given
 
 -- Iteration 24 --
-Expected parameter 1 to be an array, null given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 -- Iteration 25 --
-Expected parameter 1 to be an array, null given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 -- Iteration 26 --
-Expected parameter 1 to be an array, resource given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
index dc5e7c87c3c9f..c5d5383e9de3f 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -106,80 +106,80 @@ echo "Done";
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
-Expected parameter 2 to be an array, int given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 -- Iteration 2 --
-Expected parameter 2 to be an array, int given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 -- Iteration 3 --
-Expected parameter 2 to be an array, int given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 -- Iteration 4 --
-Expected parameter 2 to be an array, int given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 -- Iteration 5 --
-Expected parameter 2 to be an array, float given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 -- Iteration 6 --
-Expected parameter 2 to be an array, float given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 -- Iteration 7 --
-Expected parameter 2 to be an array, float given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 -- Iteration 8 --
-Expected parameter 2 to be an array, float given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 -- Iteration 9 --
-Expected parameter 2 to be an array, float given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 -- Iteration 10 --
-Expected parameter 2 to be an array, null given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 -- Iteration 11 --
-Expected parameter 2 to be an array, null given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 -- Iteration 12 --
-Expected parameter 2 to be an array, bool given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 -- Iteration 13 --
-Expected parameter 2 to be an array, bool given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 -- Iteration 14 --
-Expected parameter 2 to be an array, bool given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 -- Iteration 15 --
-Expected parameter 2 to be an array, bool given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 -- Iteration 16 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 17 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 18 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 19 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 20 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 21 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 22 --
-Expected parameter 2 to be an array, string given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 23 --
-Expected parameter 2 to be an array, object given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, object given
 
 -- Iteration 24 --
-Expected parameter 2 to be an array, null given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 -- Iteration 25 --
-Expected parameter 2 to be an array, null given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 -- Iteration 26 --
-Expected parameter 2 to be an array, resource given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt
index bdfac2c196488..af334626cb618 100644
--- a/ext/standard/tests/array/array_diff_key_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation1.phpt
@@ -108,105 +108,105 @@ fclose($fp);
 *** Testing array_diff_key() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_diff_key(): Argument #1 ($arr1) must be of type array, object given
+array_diff_key(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_diff_key(): Argument #1 ($arr1) must be of type array, object given
+array_diff_key(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($arr1) must be of type array, null given
 
 --resource--
-Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+array_diff_key(): Argument #1 ($arr1) must be of type array, resource given
+array_diff_key(): Argument #1 ($arr1) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt
index 4f84db5dd1f29..2dd3c95907378 100644
--- a/ext/standard/tests/array/array_diff_key_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation2.phpt
@@ -109,105 +109,105 @@ fclose($fp);
 *** Testing array_diff_key() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_diff_key(): Argument #2 ($arr2) must be of type array, object given
+array_diff_key(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_diff_key(): Argument #2 ($arr2) must be of type array, object given
+array_diff_key(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($arr2) must be of type array, null given
 
 --resource--
-Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+array_diff_key(): Argument #2 ($arr2) must be of type array, resource given
+array_diff_key(): Argument #2 ($arr2) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
index 0891cd2ee108e..368fce24db565 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
@@ -116,79 +116,79 @@ fclose($fp);
 *** Testing array_diff_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --resource--
-Expected parameter 1 to be an array, resource given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
index 0d5271d6ec7aa..e906b450e544f 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
@@ -116,79 +116,79 @@ fclose($fp);
 *** Testing array_diff_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --resource--
-Expected parameter 2 to be an array, resource given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
index a48ad44fd1e49..5aef21c0c3587 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
@@ -116,105 +116,105 @@ fclose($fp);
 *** Testing array_diff_ukey() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --resource--
-Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, resource given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
index d39453086df03..368e9873cae27 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
@@ -120,105 +120,105 @@ fclose($fp);
 *** Testing array_diff_ukey() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --resource--
-Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, resource given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt
index 765fae39cdd9e..94025ec65455d 100644
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -106,55 +106,55 @@ echo "Done";
 --EXPECT--
 *** Testing array_diff() : usage variations ***
 
--- Iteration 1 --Expected parameter 1 to be an array, int given
+-- Iteration 1 --array_diff(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 2 --Expected parameter 1 to be an array, int given
+-- Iteration 2 --array_diff(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 3 --Expected parameter 1 to be an array, int given
+-- Iteration 3 --array_diff(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 4 --Expected parameter 1 to be an array, int given
+-- Iteration 4 --array_diff(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 5 --Expected parameter 1 to be an array, float given
+-- Iteration 5 --array_diff(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 6 --Expected parameter 1 to be an array, float given
+-- Iteration 6 --array_diff(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 7 --Expected parameter 1 to be an array, float given
+-- Iteration 7 --array_diff(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 8 --Expected parameter 1 to be an array, float given
+-- Iteration 8 --array_diff(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 9 --Expected parameter 1 to be an array, float given
+-- Iteration 9 --array_diff(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 10 --Expected parameter 1 to be an array, null given
+-- Iteration 10 --array_diff(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 11 --Expected parameter 1 to be an array, null given
+-- Iteration 11 --array_diff(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 12 --Expected parameter 1 to be an array, bool given
+-- Iteration 12 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 13 --Expected parameter 1 to be an array, bool given
+-- Iteration 13 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 14 --Expected parameter 1 to be an array, bool given
+-- Iteration 14 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 15 --Expected parameter 1 to be an array, bool given
+-- Iteration 15 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 16 --Expected parameter 1 to be an array, string given
+-- Iteration 16 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 17 --Expected parameter 1 to be an array, string given
+-- Iteration 17 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 18 --Expected parameter 1 to be an array, string given
+-- Iteration 18 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 19 --Expected parameter 1 to be an array, string given
+-- Iteration 19 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 20 --Expected parameter 1 to be an array, string given
+-- Iteration 20 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 21 --Expected parameter 1 to be an array, string given
+-- Iteration 21 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 22 --Expected parameter 1 to be an array, string given
+-- Iteration 22 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 23 --Expected parameter 1 to be an array, object given
+-- Iteration 23 --array_diff(): Argument #1 ($arr1) must be of type array, object given
 
--- Iteration 24 --Expected parameter 1 to be an array, null given
+-- Iteration 24 --array_diff(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 25 --Expected parameter 1 to be an array, null given
+-- Iteration 25 --array_diff(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 26 --Expected parameter 1 to be an array, resource given
+-- Iteration 26 --array_diff(): Argument #1 ($arr1) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt
index 0bceeea1f0435..f81f81388a529 100644
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -105,55 +105,55 @@ echo "Done";
 --EXPECT--
 *** Testing array_diff() : usage variations ***
 
--- Iteration 1 --Expected parameter 2 to be an array, int given
+-- Iteration 1 --array_diff(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 2 --Expected parameter 2 to be an array, int given
+-- Iteration 2 --array_diff(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 3 --Expected parameter 2 to be an array, int given
+-- Iteration 3 --array_diff(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 4 --Expected parameter 2 to be an array, int given
+-- Iteration 4 --array_diff(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 5 --Expected parameter 2 to be an array, float given
+-- Iteration 5 --array_diff(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 6 --Expected parameter 2 to be an array, float given
+-- Iteration 6 --array_diff(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 7 --Expected parameter 2 to be an array, float given
+-- Iteration 7 --array_diff(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 8 --Expected parameter 2 to be an array, float given
+-- Iteration 8 --array_diff(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 9 --Expected parameter 2 to be an array, float given
+-- Iteration 9 --array_diff(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 10 --Expected parameter 2 to be an array, null given
+-- Iteration 10 --array_diff(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 11 --Expected parameter 2 to be an array, null given
+-- Iteration 11 --array_diff(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 12 --Expected parameter 2 to be an array, bool given
+-- Iteration 12 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 13 --Expected parameter 2 to be an array, bool given
+-- Iteration 13 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 14 --Expected parameter 2 to be an array, bool given
+-- Iteration 14 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 15 --Expected parameter 2 to be an array, bool given
+-- Iteration 15 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 16 --Expected parameter 2 to be an array, string given
+-- Iteration 16 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 17 --Expected parameter 2 to be an array, string given
+-- Iteration 17 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 18 --Expected parameter 2 to be an array, string given
+-- Iteration 18 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 19 --Expected parameter 2 to be an array, string given
+-- Iteration 19 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 20 --Expected parameter 2 to be an array, string given
+-- Iteration 20 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 21 --Expected parameter 2 to be an array, string given
+-- Iteration 21 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 22 --Expected parameter 2 to be an array, string given
+-- Iteration 22 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 23 --Expected parameter 2 to be an array, object given
+-- Iteration 23 --array_diff(): Argument #2 ($arr2) must be of type array, object given
 
--- Iteration 24 --Expected parameter 2 to be an array, null given
+-- Iteration 24 --array_diff(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 25 --Expected parameter 2 to be an array, null given
+-- Iteration 25 --array_diff(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 26 --Expected parameter 2 to be an array, resource given
+-- Iteration 26 --array_diff(): Argument #2 ($arr2) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
index f4de4c68e71be..fee88db0b08fc 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
@@ -119,75 +119,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect_assoc() : Passing non-array values to $arr1 argument ***
 
--- Iteration 1 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iteration 1 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 2 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iteration 2 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 3 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iteration 3 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 4 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iteration 4 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
--- Iteration 5 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iteration 5 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 6 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iteration 6 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 7 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iteration 7 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 8 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iteration 8 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 9 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iteration 9 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
--- Iteration 10 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iteration 10 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 11 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iteration 11 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 12 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iteration 12 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 13 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iteration 13 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 14 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iteration 14 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 15 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iteration 15 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iteration 16 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iteration 16 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 17 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iteration 17 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 18 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iteration 18 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 19 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iteration 19 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 20 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iteration 20 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 21 --Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+-- Iteration 21 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, object given
 
--- Iteration 22 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iteration 22 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 23 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iteration 23 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
--- Iteration 24 --Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+-- Iteration 24 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, resource given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
index e3d12cd90d824..e79d6c86dfb76 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
@@ -120,75 +120,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect_assoc() : Passing non-array values to $arr2 argument ***
 
--- Iteration 1 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iteration 1 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 2 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iteration 2 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 3 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iteration 3 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 4 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iteration 4 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
--- Iteration 5 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iteration 5 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 6 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iteration 6 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 7 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iteration 7 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 8 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iteration 8 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 9 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iteration 9 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
--- Iteration 10 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iteration 10 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 11 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iteration 11 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 12 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iteration 12 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 13 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iteration 13 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 14 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iteration 14 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 15 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iteration 15 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iteration 16 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iteration 16 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 17 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iteration 17 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 18 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iteration 18 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 19 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iteration 19 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 20 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iteration 20 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 21 --Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+-- Iteration 21 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, object given
 
--- Iteration 22 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iteration 22 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 23 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iteration 23 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
--- Iteration 24 --Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+-- Iteration 24 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, resource given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt
index fc1d858516efa..821e5f5a1ada0 100644
--- a/ext/standard/tests/array/array_intersect_key_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt
@@ -112,105 +112,105 @@ fclose($fp);
 *** Testing array_intersect_key() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
 
 --resource var--
-Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, resource given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt
index bae7600b9d89c..b6c791ce57d42 100644
--- a/ext/standard/tests/array/array_intersect_key_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt
@@ -113,105 +113,105 @@ fclose($fp);
 *** Testing array_intersect_key() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
 
 --resource var--
-Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, resource given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
index c663269b2a817..f6872377326aa 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
@@ -120,105 +120,105 @@ fclose($fp);
 *** Testing array_intersect_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --resource--
-Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, resource given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
index 20701a5c0bf09..32633b6a0fbd2 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
@@ -120,105 +120,105 @@ fclose($fp);
 *** Testing array_intersect_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --resource--
-Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, resource given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
index a02d3c03e31d2..fd0b9f603863a 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
@@ -118,105 +118,105 @@ fclose($fp);
 *** Testing array_intersect_ukey() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
 
 --resource var--
-Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, resource given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
index a8f01201d5184..dc272a78119bf 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
@@ -118,105 +118,105 @@ fclose($fp);
 *** Testing array_intersect_ukey() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
 
 --resource var--
-Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, resource given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, resource given
diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt
index f0b1144ed3cf3..9fb64263ecd2a 100644
--- a/ext/standard/tests/array/array_intersect_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_variation1.phpt
@@ -118,75 +118,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect() : Passing non-array values to $arr1 argument ***
 
--- Iterator 1 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iterator 1 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
+array_intersect(): Argument #1 ($arr1) must be of type array, int given
 
--- Iterator 2 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iterator 2 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
+array_intersect(): Argument #1 ($arr1) must be of type array, int given
 
--- Iterator 3 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iterator 3 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
+array_intersect(): Argument #1 ($arr1) must be of type array, int given
 
--- Iterator 4 --Expected parameter 1 to be an array, int given
-Expected parameter 1 to be an array, int given
+-- Iterator 4 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
+array_intersect(): Argument #1 ($arr1) must be of type array, int given
 
--- Iterator 5 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iterator 5 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
+array_intersect(): Argument #1 ($arr1) must be of type array, float given
 
--- Iterator 6 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iterator 6 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
+array_intersect(): Argument #1 ($arr1) must be of type array, float given
 
--- Iterator 7 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iterator 7 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
+array_intersect(): Argument #1 ($arr1) must be of type array, float given
 
--- Iterator 8 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iterator 8 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
+array_intersect(): Argument #1 ($arr1) must be of type array, float given
 
--- Iterator 9 --Expected parameter 1 to be an array, float given
-Expected parameter 1 to be an array, float given
+-- Iterator 9 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
+array_intersect(): Argument #1 ($arr1) must be of type array, float given
 
--- Iterator 10 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iterator 10 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
+array_intersect(): Argument #1 ($arr1) must be of type array, null given
 
--- Iterator 11 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iterator 11 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
+array_intersect(): Argument #1 ($arr1) must be of type array, null given
 
--- Iterator 12 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iterator 12 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iterator 13 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iterator 13 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iterator 14 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iterator 14 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iterator 15 --Expected parameter 1 to be an array, bool given
-Expected parameter 1 to be an array, bool given
+-- Iterator 15 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+array_intersect(): Argument #1 ($arr1) must be of type array, bool given
 
--- Iterator 16 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iterator 16 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
+array_intersect(): Argument #1 ($arr1) must be of type array, string given
 
--- Iterator 17 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iterator 17 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
+array_intersect(): Argument #1 ($arr1) must be of type array, string given
 
--- Iterator 18 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iterator 18 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
+array_intersect(): Argument #1 ($arr1) must be of type array, string given
 
--- Iterator 19 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iterator 19 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
+array_intersect(): Argument #1 ($arr1) must be of type array, string given
 
--- Iterator 20 --Expected parameter 1 to be an array, string given
-Expected parameter 1 to be an array, string given
+-- Iterator 20 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
+array_intersect(): Argument #1 ($arr1) must be of type array, string given
 
--- Iterator 21 --Expected parameter 1 to be an array, object given
-Expected parameter 1 to be an array, object given
+-- Iterator 21 --array_intersect(): Argument #1 ($arr1) must be of type array, object given
+array_intersect(): Argument #1 ($arr1) must be of type array, object given
 
--- Iterator 22 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iterator 22 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
+array_intersect(): Argument #1 ($arr1) must be of type array, null given
 
--- Iterator 23 --Expected parameter 1 to be an array, null given
-Expected parameter 1 to be an array, null given
+-- Iterator 23 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
+array_intersect(): Argument #1 ($arr1) must be of type array, null given
 
--- Iterator 24 --Expected parameter 1 to be an array, resource given
-Expected parameter 1 to be an array, resource given
+-- Iterator 24 --array_intersect(): Argument #1 ($arr1) must be of type array, resource given
+array_intersect(): Argument #1 ($arr1) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt
index dae028898c2c2..e4986c103bb9d 100644
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -119,75 +119,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect() : Passing non-array values to $arr2 argument ***
 
--- Iterator 1 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iterator 1 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
+array_intersect(): Argument #2 ($arr2) must be of type array, int given
 
--- Iterator 2 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iterator 2 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
+array_intersect(): Argument #2 ($arr2) must be of type array, int given
 
--- Iterator 3 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iterator 3 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
+array_intersect(): Argument #2 ($arr2) must be of type array, int given
 
--- Iterator 4 --Expected parameter 2 to be an array, int given
-Expected parameter 2 to be an array, int given
+-- Iterator 4 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
+array_intersect(): Argument #2 ($arr2) must be of type array, int given
 
--- Iterator 5 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iterator 5 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
+array_intersect(): Argument #2 ($arr2) must be of type array, float given
 
--- Iterator 6 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iterator 6 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
+array_intersect(): Argument #2 ($arr2) must be of type array, float given
 
--- Iterator 7 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iterator 7 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
+array_intersect(): Argument #2 ($arr2) must be of type array, float given
 
--- Iterator 8 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iterator 8 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
+array_intersect(): Argument #2 ($arr2) must be of type array, float given
 
--- Iterator 9 --Expected parameter 2 to be an array, float given
-Expected parameter 2 to be an array, float given
+-- Iterator 9 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
+array_intersect(): Argument #2 ($arr2) must be of type array, float given
 
--- Iterator 10 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iterator 10 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
+array_intersect(): Argument #2 ($arr2) must be of type array, null given
 
--- Iterator 11 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iterator 11 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
+array_intersect(): Argument #2 ($arr2) must be of type array, null given
 
--- Iterator 12 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iterator 12 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iterator 13 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iterator 13 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iterator 14 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iterator 14 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iterator 15 --Expected parameter 2 to be an array, bool given
-Expected parameter 2 to be an array, bool given
+-- Iterator 15 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+array_intersect(): Argument #2 ($arr2) must be of type array, bool given
 
--- Iterator 16 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iterator 16 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
+array_intersect(): Argument #2 ($arr2) must be of type array, string given
 
--- Iterator 17 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iterator 17 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
+array_intersect(): Argument #2 ($arr2) must be of type array, string given
 
--- Iterator 18 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iterator 18 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
+array_intersect(): Argument #2 ($arr2) must be of type array, string given
 
--- Iterator 19 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iterator 19 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
+array_intersect(): Argument #2 ($arr2) must be of type array, string given
 
--- Iterator 20 --Expected parameter 2 to be an array, string given
-Expected parameter 2 to be an array, string given
+-- Iterator 20 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
+array_intersect(): Argument #2 ($arr2) must be of type array, string given
 
--- Iterator 21 --Expected parameter 2 to be an array, object given
-Expected parameter 2 to be an array, object given
+-- Iterator 21 --array_intersect(): Argument #2 ($arr2) must be of type array, object given
+array_intersect(): Argument #2 ($arr2) must be of type array, object given
 
--- Iterator 22 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iterator 22 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
+array_intersect(): Argument #2 ($arr2) must be of type array, null given
 
--- Iterator 23 --Expected parameter 2 to be an array, null given
-Expected parameter 2 to be an array, null given
+-- Iterator 23 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
+array_intersect(): Argument #2 ($arr2) must be of type array, null given
 
--- Iterator 24 --Expected parameter 2 to be an array, resource given
-Expected parameter 2 to be an array, resource given
+-- Iterator 24 --array_intersect(): Argument #2 ($arr2) must be of type array, resource given
+array_intersect(): Argument #2 ($arr2) must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt
index d5324f3e28878..f56f69ac76473 100644
--- a/ext/standard/tests/array/array_map_variation10.phpt
+++ b/ext/standard/tests/array/array_map_variation10.phpt
@@ -88,5 +88,5 @@ array(3) {
   NULL
 }
 -- passing NULL as 'arr1' --
-Expected parameter 2 to be an array, null given
+array_map(): Argument #2 ($arr1) must be of type array, null given
 Done
diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
index 3d15d56b81eea..55ed56cbcc0bd 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
@@ -118,98 +118,98 @@ echo "Done";
 *** Testing array_merge_recursive() : Passing non array values to $arr1 argument ***
 
 -- Iteration 1 --
--- With default argument --Expected parameter 1 to be an array, int given
--- With more arguments --Expected parameter 1 to be an array, int given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, int given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, int given
 
 -- Iteration 2 --
--- With default argument --Expected parameter 1 to be an array, int given
--- With more arguments --Expected parameter 1 to be an array, int given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, int given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, int given
 
 -- Iteration 3 --
--- With default argument --Expected parameter 1 to be an array, int given
--- With more arguments --Expected parameter 1 to be an array, int given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, int given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, int given
 
 -- Iteration 4 --
--- With default argument --Expected parameter 1 to be an array, int given
--- With more arguments --Expected parameter 1 to be an array, int given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, int given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, int given
 
 -- Iteration 5 --
--- With default argument --Expected parameter 1 to be an array, float given
--- With more arguments --Expected parameter 1 to be an array, float given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, float given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, float given
 
 -- Iteration 6 --
--- With default argument --Expected parameter 1 to be an array, float given
--- With more arguments --Expected parameter 1 to be an array, float given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, float given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, float given
 
 -- Iteration 7 --
--- With default argument --Expected parameter 1 to be an array, float given
--- With more arguments --Expected parameter 1 to be an array, float given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, float given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, float given
 
 -- Iteration 8 --
--- With default argument --Expected parameter 1 to be an array, float given
--- With more arguments --Expected parameter 1 to be an array, float given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, float given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, float given
 
 -- Iteration 9 --
--- With default argument --Expected parameter 1 to be an array, float given
--- With more arguments --Expected parameter 1 to be an array, float given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, float given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, float given
 
 -- Iteration 10 --
--- With default argument --Expected parameter 1 to be an array, null given
--- With more arguments --Expected parameter 1 to be an array, null given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, null given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, null given
 
 -- Iteration 11 --
--- With default argument --Expected parameter 1 to be an array, null given
--- With more arguments --Expected parameter 1 to be an array, null given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, null given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, null given
 
 -- Iteration 12 --
--- With default argument --Expected parameter 1 to be an array, bool given
--- With more arguments --Expected parameter 1 to be an array, bool given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, bool given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, bool given
 
 -- Iteration 13 --
--- With default argument --Expected parameter 1 to be an array, bool given
--- With more arguments --Expected parameter 1 to be an array, bool given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, bool given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, bool given
 
 -- Iteration 14 --
--- With default argument --Expected parameter 1 to be an array, bool given
--- With more arguments --Expected parameter 1 to be an array, bool given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, bool given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, bool given
 
 -- Iteration 15 --
--- With default argument --Expected parameter 1 to be an array, bool given
--- With more arguments --Expected parameter 1 to be an array, bool given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, bool given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, bool given
 
 -- Iteration 16 --
--- With default argument --Expected parameter 1 to be an array, string given
--- With more arguments --Expected parameter 1 to be an array, string given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, string given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, string given
 
 -- Iteration 17 --
--- With default argument --Expected parameter 1 to be an array, string given
--- With more arguments --Expected parameter 1 to be an array, string given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, string given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, string given
 
 -- Iteration 18 --
--- With default argument --Expected parameter 1 to be an array, string given
--- With more arguments --Expected parameter 1 to be an array, string given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, string given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, string given
 
 -- Iteration 19 --
--- With default argument --Expected parameter 1 to be an array, string given
--- With more arguments --Expected parameter 1 to be an array, string given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, string given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, string given
 
 -- Iteration 20 --
--- With default argument --Expected parameter 1 to be an array, string given
--- With more arguments --Expected parameter 1 to be an array, string given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, string given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, string given
 
 -- Iteration 21 --
--- With default argument --Expected parameter 1 to be an array, null given
--- With more arguments --Expected parameter 1 to be an array, null given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, null given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, null given
 
 -- Iteration 22 --
--- With default argument --Expected parameter 1 to be an array, null given
--- With more arguments --Expected parameter 1 to be an array, null given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, null given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, null given
 
 -- Iteration 23 --
--- With default argument --Expected parameter 1 to be an array, resource given
--- With more arguments --Expected parameter 1 to be an array, resource given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, resource given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, resource given
 
 -- Iteration 24 --
--- With default argument --Expected parameter 1 to be an array, object given
--- With more arguments --Expected parameter 1 to be an array, object given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, object given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, object given
 Done
diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
index eec9634630fd0..ef1c52928f5b2 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
@@ -105,51 +105,51 @@ echo "Done";
 --EXPECT--
 *** Testing array_merge_recursive() : Passing non array values to $arr2 argument ***
 
--- Iteration 1 --Expected parameter 2 to be an array, int given
+-- Iteration 1 --array_merge_recursive(): Argument #2 must be of type array, int given
 
--- Iteration 2 --Expected parameter 2 to be an array, int given
+-- Iteration 2 --array_merge_recursive(): Argument #2 must be of type array, int given
 
--- Iteration 3 --Expected parameter 2 to be an array, int given
+-- Iteration 3 --array_merge_recursive(): Argument #2 must be of type array, int given
 
--- Iteration 4 --Expected parameter 2 to be an array, int given
+-- Iteration 4 --array_merge_recursive(): Argument #2 must be of type array, int given
 
--- Iteration 5 --Expected parameter 2 to be an array, float given
+-- Iteration 5 --array_merge_recursive(): Argument #2 must be of type array, float given
 
--- Iteration 6 --Expected parameter 2 to be an array, float given
+-- Iteration 6 --array_merge_recursive(): Argument #2 must be of type array, float given
 
--- Iteration 7 --Expected parameter 2 to be an array, float given
+-- Iteration 7 --array_merge_recursive(): Argument #2 must be of type array, float given
 
--- Iteration 8 --Expected parameter 2 to be an array, float given
+-- Iteration 8 --array_merge_recursive(): Argument #2 must be of type array, float given
 
--- Iteration 9 --Expected parameter 2 to be an array, float given
+-- Iteration 9 --array_merge_recursive(): Argument #2 must be of type array, float given
 
--- Iteration 10 --Expected parameter 2 to be an array, null given
+-- Iteration 10 --array_merge_recursive(): Argument #2 must be of type array, null given
 
--- Iteration 11 --Expected parameter 2 to be an array, null given
+-- Iteration 11 --array_merge_recursive(): Argument #2 must be of type array, null given
 
--- Iteration 12 --Expected parameter 2 to be an array, bool given
+-- Iteration 12 --array_merge_recursive(): Argument #2 must be of type array, bool given
 
--- Iteration 13 --Expected parameter 2 to be an array, bool given
+-- Iteration 13 --array_merge_recursive(): Argument #2 must be of type array, bool given
 
--- Iteration 14 --Expected parameter 2 to be an array, bool given
+-- Iteration 14 --array_merge_recursive(): Argument #2 must be of type array, bool given
 
--- Iteration 15 --Expected parameter 2 to be an array, bool given
+-- Iteration 15 --array_merge_recursive(): Argument #2 must be of type array, bool given
 
--- Iteration 16 --Expected parameter 2 to be an array, string given
+-- Iteration 16 --array_merge_recursive(): Argument #2 must be of type array, string given
 
--- Iteration 17 --Expected parameter 2 to be an array, string given
+-- Iteration 17 --array_merge_recursive(): Argument #2 must be of type array, string given
 
--- Iteration 18 --Expected parameter 2 to be an array, string given
+-- Iteration 18 --array_merge_recursive(): Argument #2 must be of type array, string given
 
--- Iteration 19 --Expected parameter 2 to be an array, string given
+-- Iteration 19 --array_merge_recursive(): Argument #2 must be of type array, string given
 
--- Iteration 20 --Expected parameter 2 to be an array, string given
+-- Iteration 20 --array_merge_recursive(): Argument #2 must be of type array, string given
 
--- Iteration 21 --Expected parameter 2 to be an array, null given
+-- Iteration 21 --array_merge_recursive(): Argument #2 must be of type array, null given
 
--- Iteration 22 --Expected parameter 2 to be an array, null given
+-- Iteration 22 --array_merge_recursive(): Argument #2 must be of type array, null given
 
--- Iteration 23 --Expected parameter 2 to be an array, resource given
+-- Iteration 23 --array_merge_recursive(): Argument #2 must be of type array, resource given
 
--- Iteration 24 --Expected parameter 2 to be an array, object given
+-- Iteration 24 --array_merge_recursive(): Argument #2 must be of type array, object given
 Done
diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt
index 16e702e8a15e4..4c466be01115a 100644
--- a/ext/standard/tests/array/array_merge_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_variation1.phpt
@@ -102,7 +102,7 @@ echo "Done";
 
 -- Iteration 1 --
 
-Fatal error: Uncaught TypeError: Expected parameter 1 to be an array, int given in %s:%d
+Fatal error: Uncaught TypeError: array_merge(): Argument #1 must be of type array, int given in %s:%d
 Stack trace:
 #0 %s(%d): array_merge(0, Array)
 #1 {main}
diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt
index 57715d484be12..21148cdb91182 100644
--- a/ext/standard/tests/array/array_merge_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_variation2.phpt
@@ -105,55 +105,55 @@ echo "Done";
 *** Testing array_merge() : usage variations ***
 
 -- Iteration 1 --
-Expected parameter 2 to be an array, int given
+array_merge(): Argument #2 must be of type array, int given
 
 -- Iteration 2 --
-Expected parameter 2 to be an array, int given
+array_merge(): Argument #2 must be of type array, int given
 
 -- Iteration 3 --
-Expected parameter 2 to be an array, int given
+array_merge(): Argument #2 must be of type array, int given
 
 -- Iteration 4 --
-Expected parameter 2 to be an array, int given
+array_merge(): Argument #2 must be of type array, int given
 
 -- Iteration 5 --
-Expected parameter 2 to be an array, float given
+array_merge(): Argument #2 must be of type array, float given
 
 -- Iteration 6 --
-Expected parameter 2 to be an array, float given
+array_merge(): Argument #2 must be of type array, float given
 
 -- Iteration 7 --
-Expected parameter 2 to be an array, float given
+array_merge(): Argument #2 must be of type array, float given
 
 -- Iteration 8 --
-Expected parameter 2 to be an array, float given
+array_merge(): Argument #2 must be of type array, float given
 
 -- Iteration 9 --
-Expected parameter 2 to be an array, float given
+array_merge(): Argument #2 must be of type array, float given
 
 -- Iteration 10 --
-Expected parameter 2 to be an array, null given
+array_merge(): Argument #2 must be of type array, null given
 
 -- Iteration 11 --
-Expected parameter 2 to be an array, null given
+array_merge(): Argument #2 must be of type array, null given
 
 -- Iteration 12 --
-Expected parameter 2 to be an array, bool given
+array_merge(): Argument #2 must be of type array, bool given
 
 -- Iteration 13 --
-Expected parameter 2 to be an array, bool given
+array_merge(): Argument #2 must be of type array, bool given
 
 -- Iteration 14 --
-Expected parameter 2 to be an array, bool given
+array_merge(): Argument #2 must be of type array, bool given
 
 -- Iteration 15 --
-Expected parameter 2 to be an array, bool given
+array_merge(): Argument #2 must be of type array, bool given
 
 -- Iteration 16 --
-Expected parameter 2 to be an array, string given
+array_merge(): Argument #2 must be of type array, string given
 
 -- Iteration 17 --
-Expected parameter 2 to be an array, string given
+array_merge(): Argument #2 must be of type array, string given
 
 -- Iteration 18 --
 array(2) {
@@ -164,23 +164,23 @@ array(2) {
 }
 
 -- Iteration 19 --
-Expected parameter 2 to be an array, string given
+array_merge(): Argument #2 must be of type array, string given
 
 -- Iteration 20 --
-Expected parameter 2 to be an array, string given
+array_merge(): Argument #2 must be of type array, string given
 
 -- Iteration 21 --
-Expected parameter 2 to be an array, string given
+array_merge(): Argument #2 must be of type array, string given
 
 -- Iteration 22 --
-Expected parameter 2 to be an array, object given
+array_merge(): Argument #2 must be of type array, object given
 
 -- Iteration 23 --
-Expected parameter 2 to be an array, null given
+array_merge(): Argument #2 must be of type array, null given
 
 -- Iteration 24 --
-Expected parameter 2 to be an array, null given
+array_merge(): Argument #2 must be of type array, null given
 
 -- Iteration 25 --
-Expected parameter 2 to be an array, resource given
+array_merge(): Argument #2 must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt
index 63d59e58f0591..fa82424b7bbd9 100644
--- a/ext/standard/tests/array/array_multisort_error.phpt
+++ b/ext/standard/tests/array/array_multisort_error.phpt
@@ -31,7 +31,7 @@ try {
 *** Testing array_multisort() : error conditions ***
 
 -- Testing array_multisort() function with repeated flags --
-Argument #3 is expected to be an array or sorting flag that has not already been specified
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
 
 -- Testing array_multisort() function with repeated flags --
-Argument #3 is expected to be an array or sorting flag that has not already been specified
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt
index 4cedadf071224..5845012c40228 100644
--- a/ext/standard/tests/array/array_multisort_variation1.phpt
+++ b/ext/standard/tests/array/array_multisort_variation1.phpt
@@ -109,76 +109,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_multisort() : usage variation ***
 
 --int 0--
-Argument #1 is expected to be an array or sorting flag that has not already been specified
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag that has not already been specified
 
 --int 1--
-Argument #1 is expected to be an array or sorting flag that has not already been specified
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag that has not already been specified
 
 --int 12345--
-Argument #1 is an unknown sort flag
+array_multisort(): Argument #1 ($arr1) must be a valid sort flag
 
 --int -12345--
-Argument #1 is an unknown sort flag
+array_multisort(): Argument #1 ($arr1) must be a valid sort flag
 
 --float 10.5--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --float -10.5--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --float 12.3456789000e10--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --float -12.3456789000e10--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --float .5--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --uppercase NULL--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --lowercase null--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --lowercase true--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --lowercase false--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --uppercase TRUE--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --uppercase FALSE--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --empty string DQ--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --empty string SQ--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --string DQ--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --string SQ--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --mixed case string--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --heredoc--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --instance of classWithToString--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --instance of classWithoutToString--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --undefined var--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
 
 --unset var--
-Argument #1 is expected to be an array or a sort flag
+array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt
index 4900b838ae939..ed4eebc331635 100644
--- a/ext/standard/tests/array/array_multisort_variation2.phpt
+++ b/ext/standard/tests/array/array_multisort_variation2.phpt
@@ -123,25 +123,25 @@ bool(true)
 bool(true)
 
 --int 12345--
-Argument #2 is an unknown sort flag
+array_multisort(): Argument #2 ($sort_order) must be a valid sort flag
 
 --int -12345--
-Argument #2 is an unknown sort flag
+array_multisort(): Argument #2 ($sort_order) must be a valid sort flag
 
 --float 10.5--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --float -10.5--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --float 12.3456789000e10--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --float -12.3456789000e10--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --float .5--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --empty array--
 Array sizes are inconsistent
@@ -156,49 +156,49 @@ bool(true)
 Array sizes are inconsistent
 
 --uppercase NULL--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --lowercase null--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --lowercase true--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --lowercase false--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --uppercase TRUE--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --uppercase FALSE--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --empty string DQ--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --empty string SQ--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --string DQ--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --string SQ--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --mixed case string--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --heredoc--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --instance of classWithToString--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --instance of classWithoutToString--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --undefined var--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
 
 --unset var--
-Argument #2 is expected to be an array or a sort flag
+array_multisort(): Argument #2 ($sort_order) must be an array or a sort flag
diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt
index 02883e87d14d3..46488d580d3e5 100644
--- a/ext/standard/tests/array/array_multisort_variation3.phpt
+++ b/ext/standard/tests/array/array_multisort_variation3.phpt
@@ -109,76 +109,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_multisort() : usage variation ***
 
 --int 0--
-Argument #3 is expected to be an array or sorting flag that has not already been specified
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
 
 --int 1--
-Argument #3 is expected to be an array or sorting flag that has not already been specified
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
 
 --int 12345--
-Argument #3 is an unknown sort flag
+array_multisort(): Argument #3 ($sort_flags) must be a valid sort flag
 
 --int -12345--
-Argument #3 is an unknown sort flag
+array_multisort(): Argument #3 ($sort_flags) must be a valid sort flag
 
 --float 10.5--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --float -10.5--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --float 12.3456789000e10--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --float -12.3456789000e10--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --float .5--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --uppercase NULL--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --lowercase null--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --lowercase true--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --lowercase false--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --uppercase TRUE--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --uppercase FALSE--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --empty string DQ--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --empty string SQ--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --string DQ--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --string SQ--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --mixed case string--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --heredoc--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --instance of classWithToString--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --instance of classWithoutToString--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --undefined var--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
 
 --unset var--
-Argument #3 is expected to be an array or a sort flag
+array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
index 76dd2972c5837..dfb6ce0f645f3 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_assoc() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
index 9b84e8d48945b..3a4bbda98a6a0 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_assoc() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
index e59012cbb68f4..10180cbce14ed 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
@@ -105,76 +105,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
index ee7cf405dc283..8540bc3d3bfe6 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
@@ -105,76 +105,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt
index 9e98bda727d43..35ab7f52878f3 100644
--- a/ext/standard/tests/array/array_udiff_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_variation1.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_udiff(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_udiff(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_udiff(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_udiff(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_udiff(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_udiff(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_udiff(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_udiff(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_udiff(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_udiff(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_udiff(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_udiff(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_udiff(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_udiff(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_udiff(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_udiff(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_udiff(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_udiff(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_udiff(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt
index 28f1e8e1b1467..a11bc787e49e2 100644
--- a/ext/standard/tests/array/array_udiff_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_variation2.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_udiff(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_udiff(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_udiff(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_udiff(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_udiff(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_udiff(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_udiff(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_udiff(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_udiff(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_udiff(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_udiff(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_udiff(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_udiff(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_udiff(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_udiff(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_udiff(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_udiff(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_udiff(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_udiff(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
index 8111006e3c952..70d8ab88c7e8f 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_assoc() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
index 5ce935321f870..6eb40634a8b22 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_assoc() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
index 908b39c859082..15ed8461d6965 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
@@ -105,76 +105,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
index c9b3e051c3414..0e7aff3d23fb2 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
@@ -105,76 +105,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_uassoc() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt
index 336ce0a169f81..4acf4b1d56dfc 100644
--- a/ext/standard/tests/array/array_uintersect_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation1.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect() : usage variation ***
 
 --int 0--
-Expected parameter 1 to be an array, int given
+array_uintersect(): Argument #1 ($arr1) must be of type array, int given
 
 --int 1--
-Expected parameter 1 to be an array, int given
+array_uintersect(): Argument #1 ($arr1) must be of type array, int given
 
 --int 12345--
-Expected parameter 1 to be an array, int given
+array_uintersect(): Argument #1 ($arr1) must be of type array, int given
 
 --int -12345--
-Expected parameter 1 to be an array, int given
+array_uintersect(): Argument #1 ($arr1) must be of type array, int given
 
 --float 10.5--
-Expected parameter 1 to be an array, float given
+array_uintersect(): Argument #1 ($arr1) must be of type array, float given
 
 --float -10.5--
-Expected parameter 1 to be an array, float given
+array_uintersect(): Argument #1 ($arr1) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_uintersect(): Argument #1 ($arr1) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 1 to be an array, float given
+array_uintersect(): Argument #1 ($arr1) must be of type array, float given
 
 --float .5--
-Expected parameter 1 to be an array, float given
+array_uintersect(): Argument #1 ($arr1) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 1 to be an array, null given
+array_uintersect(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase null--
-Expected parameter 1 to be an array, null given
+array_uintersect(): Argument #1 ($arr1) must be of type array, null given
 
 --lowercase true--
-Expected parameter 1 to be an array, bool given
+array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 1 to be an array, bool given
+array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 1 to be an array, bool given
+array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 1 to be an array, bool given
+array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 1 to be an array, string given
+array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 1 to be an array, string given
+array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --string DQ--
-Expected parameter 1 to be an array, string given
+array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --string SQ--
-Expected parameter 1 to be an array, string given
+array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --mixed case string--
-Expected parameter 1 to be an array, string given
+array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --heredoc--
-Expected parameter 1 to be an array, string given
+array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 1 to be an array, object given
+array_uintersect(): Argument #1 ($arr1) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 1 to be an array, object given
+array_uintersect(): Argument #1 ($arr1) must be of type array, object given
 
 --undefined var--
-Expected parameter 1 to be an array, null given
+array_uintersect(): Argument #1 ($arr1) must be of type array, null given
 
 --unset var--
-Expected parameter 1 to be an array, null given
+array_uintersect(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt
index 851927e98b104..ce2d3117029e2 100644
--- a/ext/standard/tests/array/array_uintersect_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation2.phpt
@@ -104,76 +104,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect() : usage variation ***
 
 --int 0--
-Expected parameter 2 to be an array, int given
+array_uintersect(): Argument #2 ($arr2) must be of type array, int given
 
 --int 1--
-Expected parameter 2 to be an array, int given
+array_uintersect(): Argument #2 ($arr2) must be of type array, int given
 
 --int 12345--
-Expected parameter 2 to be an array, int given
+array_uintersect(): Argument #2 ($arr2) must be of type array, int given
 
 --int -12345--
-Expected parameter 2 to be an array, int given
+array_uintersect(): Argument #2 ($arr2) must be of type array, int given
 
 --float 10.5--
-Expected parameter 2 to be an array, float given
+array_uintersect(): Argument #2 ($arr2) must be of type array, float given
 
 --float -10.5--
-Expected parameter 2 to be an array, float given
+array_uintersect(): Argument #2 ($arr2) must be of type array, float given
 
 --float 12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_uintersect(): Argument #2 ($arr2) must be of type array, float given
 
 --float -12.3456789000e10--
-Expected parameter 2 to be an array, float given
+array_uintersect(): Argument #2 ($arr2) must be of type array, float given
 
 --float .5--
-Expected parameter 2 to be an array, float given
+array_uintersect(): Argument #2 ($arr2) must be of type array, float given
 
 --uppercase NULL--
-Expected parameter 2 to be an array, null given
+array_uintersect(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase null--
-Expected parameter 2 to be an array, null given
+array_uintersect(): Argument #2 ($arr2) must be of type array, null given
 
 --lowercase true--
-Expected parameter 2 to be an array, bool given
+array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
 
 --lowercase false--
-Expected parameter 2 to be an array, bool given
+array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase TRUE--
-Expected parameter 2 to be an array, bool given
+array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
 
 --uppercase FALSE--
-Expected parameter 2 to be an array, bool given
+array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
 
 --empty string DQ--
-Expected parameter 2 to be an array, string given
+array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --empty string SQ--
-Expected parameter 2 to be an array, string given
+array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --string DQ--
-Expected parameter 2 to be an array, string given
+array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --string SQ--
-Expected parameter 2 to be an array, string given
+array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --mixed case string--
-Expected parameter 2 to be an array, string given
+array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --heredoc--
-Expected parameter 2 to be an array, string given
+array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-Expected parameter 2 to be an array, object given
+array_uintersect(): Argument #2 ($arr2) must be of type array, object given
 
 --instance of classWithoutToString--
-Expected parameter 2 to be an array, object given
+array_uintersect(): Argument #2 ($arr2) must be of type array, object given
 
 --undefined var--
-Expected parameter 2 to be an array, null given
+array_uintersect(): Argument #2 ($arr2) must be of type array, null given
 
 --unset var--
-Expected parameter 2 to be an array, null given
+array_uintersect(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/bug77931.phpt b/ext/standard/tests/array/bug77931.phpt
index 45a241f27f451..4f73daeb07e82 100644
--- a/ext/standard/tests/array/bug77931.phpt
+++ b/ext/standard/tests/array/bug77931.phpt
@@ -21,6 +21,6 @@ try {
 
 ?>
 --EXPECT--
-Expected parameter 3 to be an array, int given
-Expected parameter 4 to be an array, bool given
-Expected parameter 5 to be an array, null given
+array_map(): Argument #3 must be of type array, int given
+array_map(): Argument #4 must be of type array, bool given
+array_map(): Argument #5 must be of type array, null given
diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt
index dacd470ada0e5..d1e6dc269a407 100644
--- a/ext/standard/tests/array/max.phpt
+++ b/ext/standard/tests/array/max.phpt
@@ -33,9 +33,9 @@ var_dump(max(0, true, false, true));
 
 ?>
 --EXPECT--
-When only one parameter is given, it must be an array
-Array must contain at least one element
-When only one parameter is given, it must be an array
+max(): Argument #1 ($arg) must be of type array, int given
+max(): Argument #1 ($arg) must contain at least one element
+max(): Argument #1 ($arg) must be of type array, object given
 int(2)
 float(2.11)
 string(1) "t"
diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt
index 144cd815a81cd..eac37be7ddac7 100644
--- a/ext/standard/tests/array/min.phpt
+++ b/ext/standard/tests/array/min.phpt
@@ -33,9 +33,9 @@ var_dump(min(0, true, false, true));
 
 ?>
 --EXPECT--
-When only one parameter is given, it must be an array
-Array must contain at least one element
-When only one parameter is given, it must be an array
+min(): Argument #1 ($arg) must be of type array, int given
+min(): Argument #1 ($arg) must contain at least one element
+min(): Argument #1 ($arg) must be of type array, object given
 int(1)
 float(2.09)
 string(0) ""
diff --git a/ext/standard/tests/file/fgetcsv_error_conditions.phpt b/ext/standard/tests/file/fgetcsv_error_conditions.phpt
index 2dcd505a7b6ad..684ef7258a0a7 100644
--- a/ext/standard/tests/file/fgetcsv_error_conditions.phpt
+++ b/ext/standard/tests/file/fgetcsv_error_conditions.phpt
@@ -50,12 +50,12 @@ try {
 ?>
 --EXPECT--
 fgetcsv() with negative length
-Length parameter may not be negative
-Length parameter may not be negative
-Length parameter may not be negative
+fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
+fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
+fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
 fgetcsv() with delimiter as NULL
-delimiter must be a character
+fgetcsv(): Argument #3 ($delimiter) must be a single character
 fgetcsv() with enclosure as NULL
-enclosure must be a character
+fgetcsv(): Argument #4 ($enclosure) must be a single character
 fgetcsv() with delimiter & enclosure as NULL
-delimiter must be a character
+fgetcsv(): Argument #3 ($delimiter) must be a single character
diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index ffc21ee588028..0df1db9399f36 100644
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -33,6 +33,6 @@ var_dump( fgets($fp, $len) ); // return length - 1 always, expect false
 --EXPECT--
 *** Testing error conditions ***
 -- Testing fgets() with invalid length arguments --
-Length parameter must be greater than 0
-Length parameter must be greater than 0
+fgets(): Argument #2 ($length) must be greater than 0
+fgets(): Argument #2 ($length) must be greater than 0
 bool(false)
diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt
index 47c528ddb5665..44fbf58002867 100644
--- a/ext/standard/tests/file/file_get_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_error.phpt
@@ -51,6 +51,6 @@ if(file_exists($file_path."/file_put_contents1.tmp")) {
 Warning: file_get_contents(/no/such/file/or/dir): Failed to open stream: No such file or directory in %s on line %d
 
 -- Testing for invalid negative maxlen values --
-Length must be greater than or equal to zero
+file_get_contents(): Argument #5 ($maxlen) must be greater than or equal to 0
 
 *** Done ***
diff --git a/ext/standard/tests/file/file_get_contents_error002.phpt b/ext/standard/tests/file/file_get_contents_error002.phpt
index 4c9faf91ea171..6624279d748ce 100644
--- a/ext/standard/tests/file/file_get_contents_error002.phpt
+++ b/ext/standard/tests/file/file_get_contents_error002.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-Length must be greater than or equal to zero
+file_get_contents(): Argument #5 ($maxlen) must be greater than or equal to 0
diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
index 12c0ee6753718..1cc9b17178a6b 100644
--- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
@@ -47,6 +47,6 @@ unlink($file_path."/file_put_contents1.tmp");
 Warning: file_get_contents(/no/such/file/or/dir): Failed to open stream: No such file or directory in %s on line %d
 
 -- Testing for invalid negative maxlen values --
-Length must be greater than or equal to zero
+file_get_contents(): Argument #5 ($maxlen) must be greater than or equal to 0
 
 *** Done ***
diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt
index 6625ef6ffe0f8..69c7d64c0516c 100644
--- a/ext/standard/tests/file/fputcsv_variation2.phpt
+++ b/ext/standard/tests/file/fputcsv_variation2.phpt
@@ -80,649 +80,649 @@ echo "Done\n";
 *** Testing fputcsv() : with delimiter as NULL ***
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt
index 326e92939ceca..7d45a74dfe25c 100644
--- a/ext/standard/tests/file/fputcsv_variation3.phpt
+++ b/ext/standard/tests/file/fputcsv_variation3.phpt
@@ -80,649 +80,649 @@ echo "Done\n";
 *** Testing fputcsv() : with enclosure as NULL ***
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-enclosure must be a character
+fputcsv(): Argument #4 ($enclosure) must be a single character
 int(0)
 bool(false)
 string(0) ""
diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt
index 90cdfd724a8e0..2debbcff217da 100644
--- a/ext/standard/tests/file/fputcsv_variation4.phpt
+++ b/ext/standard/tests/file/fputcsv_variation4.phpt
@@ -80,649 +80,649 @@ echo "Done\n";
 *** Testing fputcsv() : with delimiter and enclosure as NULL ***
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in r+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in a+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in w+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+ --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+b --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
 
 -- file opened in x+t --
-delimiter must be a character
+fputcsv(): Argument #3 ($delimiter) must be a single character
 int(0)
 bool(false)
 string(0) ""
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 953df79556696..be6b83984015d 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -33,5 +33,5 @@ try {
 --EXPECT--
 *** Testing error conditions ***
 -- Testing fread() with invalid length arguments --
-Length parameter must be greater than 0
-Length parameter must be greater than 0
+fread(): Argument #2 ($length) must be greater than 0
+fread(): Argument #2 ($length) must be greater than 0
diff --git a/ext/standard/tests/filters/001.phpt b/ext/standard/tests/filters/001.phpt
index 0c502d4611858..8afe3bbaf3b93 100644
--- a/ext/standard/tests/filters/001.phpt
+++ b/ext/standard/tests/filters/001.phpt
@@ -24,9 +24,9 @@ var_dump(stream_filter_register("------", "nonexistentclass"));
 
 echo "Done\n";
 ?>
---EXPECTF--
-Filter name cannot be empty
-Class name cannot be empty
-Filter name cannot be empty
+--EXPECT--
+stream_filter_register(): Argument #1 ($filtername) must be a non-empty string
+stream_filter_register(): Argument #2 ($classname) must be a non-empty string
+stream_filter_register(): Argument #1 ($filtername) must be a non-empty string
 bool(true)
 Done
diff --git a/ext/standard/tests/general_functions/escapeshellarg_bug71039.phpt b/ext/standard/tests/general_functions/escapeshellarg_bug71039.phpt
index b6bc828a87bef..ac85410593b31 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_bug71039.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_bug71039.phpt
@@ -7,7 +7,7 @@ escapeshellarg("hello\0world");
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Uncaught TypeError: Input string contains NULL bytes in %s:%d
+Fatal error: Uncaught TypeError: escapeshellarg(): Argument #1 ($arg) must not contain any null bytes in %s:%d
 Stack trace:
 #0 %s(%d): escapeshellarg('hello\x00world')
 #1 {main}
diff --git a/ext/standard/tests/general_functions/escapeshellcmd_bug71039.phpt b/ext/standard/tests/general_functions/escapeshellcmd_bug71039.phpt
index 7ce31fb8ddd62..acb337f55629b 100644
--- a/ext/standard/tests/general_functions/escapeshellcmd_bug71039.phpt
+++ b/ext/standard/tests/general_functions/escapeshellcmd_bug71039.phpt
@@ -7,7 +7,7 @@ escapeshellcmd("hello\0world");
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Uncaught TypeError: Input string contains NULL bytes in %s:%d
+Fatal error: Uncaught TypeError: escapeshellcmd(): Argument #1 ($command) must not contain any null bytes in %s:%d
 Stack trace:
 #0 %s(%d): escapeshellcmd('hello\x00world')
 #1 {main}
diff --git a/ext/standard/tests/general_functions/gettype_settype_error.phpt b/ext/standard/tests/general_functions/gettype_settype_error.phpt
index e310f9e0ac3fe..62e13e7259bde 100644
--- a/ext/standard/tests/general_functions/gettype_settype_error.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_error.phpt
@@ -28,5 +28,5 @@ echo "Done\n";
 **** Testing gettype() and settype() functions ****
 
 *** Testing settype(): error conditions ***
-Invalid type
+settype(): Argument #2 ($type) must be a valid type
 Done
diff --git a/ext/standard/tests/general_functions/sleep_error.phpt b/ext/standard/tests/general_functions/sleep_error.phpt
index 4bf3e9fefc8e0..bfe66480fa035 100644
--- a/ext/standard/tests/general_functions/sleep_error.phpt
+++ b/ext/standard/tests/general_functions/sleep_error.phpt
@@ -7,7 +7,7 @@ sleep(-10);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: Number of seconds must be greater than or equal to 0 in %s
+Fatal error: Uncaught ValueError: sleep(): Argument #1 ($seconds) must be greater than or equal to 0 in %s:%d
 Stack trace:
 #0 %s(%d): sleep(-10)
 #1 {main}
diff --git a/ext/standard/tests/general_functions/usleep_error.phpt b/ext/standard/tests/general_functions/usleep_error.phpt
index 25bc0b68667a9..46bd4420580be 100644
--- a/ext/standard/tests/general_functions/usleep_error.phpt
+++ b/ext/standard/tests/general_functions/usleep_error.phpt
@@ -7,7 +7,7 @@ usleep(-10);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: Number of microseconds must be greater than or equal to 0 in %s
+Fatal error: Uncaught ValueError: usleep(): Argument #1 ($microseconds) must be greater than or equal to 0 in %s:%d
 Stack trace:
 #0 %s(%d): usleep(-10)
 #1 {main}
diff --git a/ext/standard/tests/math/log_error.phpt b/ext/standard/tests/math/log_error.phpt
index b49ccacf6d700..4c90c20a2052f 100644
--- a/ext/standard/tests/math/log_error.phpt
+++ b/ext/standard/tests/math/log_error.phpt
@@ -11,4 +11,4 @@ try {
 }
 ?>
 --EXPECT--
-Base must be greater than 0
+log(): Argument #2 ($base) must be greater than 0
diff --git a/ext/standard/tests/misc/time_nanosleep_error3.phpt b/ext/standard/tests/misc/time_nanosleep_error3.phpt
index 6aed304f1a4c6..5caff50ce717d 100644
--- a/ext/standard/tests/misc/time_nanosleep_error3.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error3.phpt
@@ -13,7 +13,7 @@ time_nanosleep(-2, 1000);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: The seconds value must be greater than 0 in %s:%d
+Fatal error: Uncaught ValueError: time_nanosleep(): Argument #1 ($seconds) must be greater than or equal to 0 in %s:%d
 Stack trace:
 #0 %s(%d): time_nanosleep(-2, 1000)
 #1 {main}
diff --git a/ext/standard/tests/misc/time_nanosleep_error4.phpt b/ext/standard/tests/misc/time_nanosleep_error4.phpt
index 3d60c516b1489..740a68b8344b0 100644
--- a/ext/standard/tests/misc/time_nanosleep_error4.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error4.phpt
@@ -14,7 +14,7 @@ time_nanosleep(0, -10);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: The nanoseconds value must be greater than 0 in %s:%d
+Fatal error: Uncaught ValueError: time_nanosleep(): Argument #2 ($nanoseconds) must be greater than or equal to 0 in %s:%d
 Stack trace:
 #0 %s(%d): time_nanosleep(0, -10)
 #1 {main}
diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt
index c3c924b46b787..3def367df080d 100644
--- a/ext/standard/tests/password/password_hash_error.phpt
+++ b/ext/standard/tests/password/password_hash_error.phpt
@@ -39,7 +39,7 @@ try {
 password_hash() expects at least 2 parameters, 1 given
 
 Warning: Array to string conversion in %s on line %d
-Unknown password hashing algorithm: Array
+password_hash(): Argument #2 ($algo) must be a valid password hashing algorithm
 password_hash(): Argument #3 ($options) must be of type array, object given
 password_hash(): Argument #3 ($options) must be of type array, string given
 password_hash(): Argument #1 ($password) must be of type string, array given
diff --git a/ext/standard/tests/random/random_bytes_error.phpt b/ext/standard/tests/random/random_bytes_error.phpt
index c1607c01ffa7c..5a8b1d097c16f 100644
--- a/ext/standard/tests/random/random_bytes_error.phpt
+++ b/ext/standard/tests/random/random_bytes_error.phpt
@@ -19,4 +19,4 @@ try {
 ?>
 --EXPECT--
 random_bytes() expects exactly 1 parameter, 0 given
-Length must be greater than 0
+random_bytes(): Argument #1 ($length) must be greater than 0
diff --git a/ext/standard/tests/random/random_int_error.phpt b/ext/standard/tests/random/random_int_error.phpt
index 9b98bdd7c0bc6..6d91b38258117 100644
--- a/ext/standard/tests/random/random_int_error.phpt
+++ b/ext/standard/tests/random/random_int_error.phpt
@@ -26,4 +26,4 @@ try {
 --EXPECT--
 random_int() expects exactly 2 parameters, 0 given
 random_int() expects exactly 2 parameters, 1 given
-Minimum value must be less than or equal to the maximum value
+random_int(): Argument #1 ($min) must be less than or equal to argument #2 ($max)
diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt
index ac50db6867c11..baeb583e3b975 100644
--- a/ext/standard/tests/streams/stream_set_chunk_size.phpt
+++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt
@@ -84,5 +84,5 @@ write with size: 250
 int(3)
 
 error conditions
-The chunk size must be a positive integer, 0 given
-The chunk size must be a positive integer, -1 given
+stream_set_chunk_size(): Argument #2 ($size) must be greater than 0
+stream_set_chunk_size(): Argument #2 ($size) must be greater than 0
diff --git a/ext/standard/tests/strings/bug33605.phpt b/ext/standard/tests/strings/bug33605.phpt
index dd937851ca03d..94b57b20dcd08 100644
--- a/ext/standard/tests/strings/bug33605.phpt
+++ b/ext/standard/tests/strings/bug33605.phpt
@@ -10,4 +10,4 @@ try {
 
 ?>
 --EXPECT--
-The length must be greater than or equal to zero
+substr_compare(): Argument #4 ($length) must be greater than or equal to 0
diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt
index 9e409bf271175..5f35b4da44429 100644
--- a/ext/standard/tests/strings/bug40754.phpt
+++ b/ext/standard/tests/strings/bug40754.phpt
@@ -67,12 +67,12 @@ string(4) "bcde"
 string(6) "abcdex"
 bool(false)
 bool(false)
-Offset not contained in string
+substr_count(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 
 Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d
 bool(false)
 Offset not contained in string
-Offset not contained in string
+substr_count(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 
 Warning: substr_count(): Invalid length value in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt
index 37af77afd8e1a..7cdff8c6cdfbd 100644
Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ
diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 9a499067a41e4..cff7079607310 100644
--- a/ext/standard/tests/strings/chunk_split_variation8.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation8.phpt
@@ -59,14 +59,14 @@ for($count = 0; $count < count($values); $count++) {
 --EXPECT--
 *** Testing chunk_split() : different 'chunklen' with heredoc 'str' ***
 -- Iteration 1 --
-Chunk length should be greater than zero
+chunk_split(): Argument #2 ($chunklen) must be greater than 0
 -- Iteration 2 --
 string(504) "T:::h:::i:::s:::':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t:::r:::i:::n:::g::: :::w:::i:::t:::h::: :::	::: :::a:::n:::d::: :::
 ::: :::w:::h:::i:::t:::e::: :::s:::p:::a:::c:::e::: :::c:::h:::a:::r:::.:::
 :::I:::t::: :::h:::a:::s::: :::_:::s:::p:::e:::c:::i:::@:::l::: :::c:::h:::@:::r:::$::: :::2:::2:::2:::2::: :::!:::!:::!:::N:::o:::w::: :::\:::k::: :::a:::s::: :::e:::s:::c:::a:::p:::e::: :::c:::h:::a:::r::: :::t:::o::: :::t:::e:::s:::t:::
 :::c:::h:::u:::n:::k:::_:::s:::p:::l:::i:::t:::(:::):::"
 -- Iteration 3 --
-Chunk length should be greater than zero
+chunk_split(): Argument #2 ($chunklen) must be greater than 0
 -- Iteration 4 --
 string(129) "This's heredoc string with 	 and 
  white space char.
@@ -85,4 +85,4 @@ chunk_split():::"
 -- Iteration 7 --
 chunk_split(): Argument #2 ($chunklen) must be of type int, float given
 -- Iteration 8 --
-Chunk length should be greater than zero
+chunk_split(): Argument #2 ($chunklen) must be greater than 0
diff --git a/ext/standard/tests/strings/dirname_error.phpt b/ext/standard/tests/strings/dirname_error.phpt
index 99d0f288072d4..4bc01b6ff8b36 100644
--- a/ext/standard/tests/strings/dirname_error.phpt
+++ b/ext/standard/tests/strings/dirname_error.phpt
@@ -17,4 +17,4 @@ try {
 ?>
 --EXPECT--
 *** Testing error conditions ***
-Invalid argument, levels must be >= 1
+dirname(): Argument #2 ($levels) must be greater than or equal to 1
diff --git a/ext/standard/tests/strings/dirname_multi.phpt b/ext/standard/tests/strings/dirname_multi.phpt
index 62943fe69a752..58e9aaec8a5dd 100644
--- a/ext/standard/tests/strings/dirname_multi.phpt
+++ b/ext/standard/tests/strings/dirname_multi.phpt
@@ -20,7 +20,7 @@ for ($i=0 ; $i<5 ; $i++) {
 var_dump(dirname("/foo/bar/baz", PHP_INT_MAX));
 ?>
 --EXPECT--
-Invalid argument, levels must be >= 1
+dirname(): Argument #2 ($levels) must be greater than or equal to 1
 string(8) "/foo/bar"
 string(4) "/foo"
 string(1) "/"
diff --git a/ext/standard/tests/strings/dirname_multi_win.phpt b/ext/standard/tests/strings/dirname_multi_win.phpt
index d63d5e7950206..c6b0a59aa1227 100644
--- a/ext/standard/tests/strings/dirname_multi_win.phpt
+++ b/ext/standard/tests/strings/dirname_multi_win.phpt
@@ -24,7 +24,7 @@ var_dump(dirname("g:/foo/bar/baz", PHP_INT_MAX));
 var_dump(dirname("g:foo/bar/baz", PHP_INT_MAX));
 ?>
 --EXPECT--
-Invalid argument, levels must be >= 1
+dirname(): Argument #2 ($levels) must be greater than or equal to 1
 string(8) "/foo/bar"
 string(4) "/foo"
 string(1) "\"
diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt
index 42b6383a5e487..bcb03237c0a93 100644
--- a/ext/standard/tests/strings/str_pad.phpt
+++ b/ext/standard/tests/strings/str_pad.phpt
@@ -339,6 +339,6 @@ string(16) "\t\variation\t\t"
 #### error conditions ####
 
 --- padding string as null ---
-Padding string cannot be empty
-Padding string cannot be empty
-Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH
+str_pad(): Argument #3 ($pad_string) must be a non-empty string
+str_pad(): Argument #3 ($pad_string) must be a non-empty string
+str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH
diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt
index 270fcad05a0e3..4425baa01cae0 100644
--- a/ext/standard/tests/strings/str_split_variation6.phpt
+++ b/ext/standard/tests/strings/str_split_variation6.phpt
@@ -47,7 +47,7 @@ for($count = 0; $count < count($values); $count++) {
 --EXPECT--
 *** Testing str_split() : different integer values for 'split_length' ***
 -- Iteration 1 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 2 --
 array(42) {
   [0]=>
@@ -136,7 +136,7 @@ array(42) {
   string(1) "t"
 }
 -- Iteration 3 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 4 --
 array(1) {
   [0]=>
@@ -155,4 +155,4 @@ array(1) {
   string(42) "This is a string with 123 & escape char \t"
 }
 -- Iteration 7 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
diff --git a/ext/standard/tests/strings/str_split_variation6_64bit.phpt b/ext/standard/tests/strings/str_split_variation6_64bit.phpt
index f9cd29cef33e4..4c52f9f68e59c 100644
--- a/ext/standard/tests/strings/str_split_variation6_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation6_64bit.phpt
@@ -47,7 +47,7 @@ for($count = 0; $count < count($values); $count++) {
 --EXPECT--
 *** Testing str_split() : different integer values for 'split_length' ***
 -- Iteration 1 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 2 --
 array(42) {
   [0]=>
@@ -136,7 +136,7 @@ array(42) {
   string(1) "t"
 }
 -- Iteration 3 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 4 --
 array(1) {
   [0]=>
@@ -160,4 +160,4 @@ array(1) {
   string(42) "This is a string with 123 & escape char \t"
 }
 -- Iteration 8 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt
index 097607bf8b859..e1e1b1d6b4785 100644
--- a/ext/standard/tests/strings/str_split_variation7.phpt
+++ b/ext/standard/tests/strings/str_split_variation7.phpt
@@ -49,7 +49,7 @@ for($count = 0; $count < count($values); $count++) {
 --EXPECT--
 *** Testing str_split() : different integer values for 'split_length' with heredoc 'str' ***
 -- Iteration 1 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 2 --
 array(30) {
   [0]=>
@@ -114,7 +114,7 @@ array(30) {
   string(1) "."
 }
 -- Iteration 3 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 4 --
 array(1) {
   [0]=>
@@ -133,4 +133,4 @@ array(1) {
   string(30) "string with 123,escape char 	."
 }
 -- Iteration 7 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
diff --git a/ext/standard/tests/strings/str_split_variation7_64bit.phpt b/ext/standard/tests/strings/str_split_variation7_64bit.phpt
index d1771e6e2da21..1de0906b98d5c 100644
--- a/ext/standard/tests/strings/str_split_variation7_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation7_64bit.phpt
@@ -49,7 +49,7 @@ for($count = 0; $count < count($values); $count++) {
 --EXPECT--
 *** Testing str_split() : different integer values for 'split_length' with heredoc 'str' ***
 -- Iteration 1 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 2 --
 array(30) {
   [0]=>
@@ -114,7 +114,7 @@ array(30) {
   string(1) "."
 }
 -- Iteration 3 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
 -- Iteration 4 --
 array(1) {
   [0]=>
@@ -138,4 +138,4 @@ array(1) {
   string(30) "string with 123,escape char 	."
 }
 -- Iteration 8 --
-The length of each segment must be greater than zero
+str_split(): Argument #2 ($split_length) must be greater than 0
diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt
index fda1678daa63f..deb9fe986d929 100644
--- a/ext/standard/tests/strings/str_word_count.phpt
+++ b/ext/standard/tests/strings/str_word_count.phpt
@@ -87,10 +87,10 @@ array(6) {
   string(5) "today"
 }
 int(6)
-Invalid format value 3
-Invalid format value 123
-Invalid format value -1
-Invalid format value 999999999
+str_word_count(): Argument #2 ($format) must be a valid format value
+str_word_count(): Argument #2 ($format) must be a valid format value
+str_word_count(): Argument #2 ($format) must be a valid format value
+str_word_count(): Argument #2 ($format) must be a valid format value
 string(53) "Hello friend, you're
     looking          good today!"
 int(5)
diff --git a/ext/standard/tests/strings/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt
index 9eab1afcbc78e..ad00c1480fd1c 100644
--- a/ext/standard/tests/strings/str_word_count1.phpt
+++ b/ext/standard/tests/strings/str_word_count1.phpt
@@ -21,10 +21,10 @@ var_dump($a);
 ?>
 --EXPECTF--
 int(0)
-Invalid format value -1
+str_word_count(): Argument #2 ($format) must be a valid format value
 
 Warning: Undefined variable: a in %s on line %d
-Invalid format value -1
+str_word_count(): Argument #2 ($format) must be a valid format value
 
 Warning: Undefined variable: a in %s on line %d
 NULL
diff --git a/ext/standard/tests/strings/strpbrk_error.phpt b/ext/standard/tests/strings/strpbrk_error.phpt
index 93f1ac42959bd..2c6584f8bd233 100644
--- a/ext/standard/tests/strings/strpbrk_error.phpt
+++ b/ext/standard/tests/strings/strpbrk_error.phpt
@@ -20,4 +20,4 @@ try {
 ?>
 --EXPECT--
 -- Testing strpbrk() function with empty second argument --
-The character list cannot be empty
+strpbrk(): Argument #2 ($char_list) must be a non-empty string
diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt
index 785891e4220f6..046b3764136ec 100644
--- a/ext/standard/tests/strings/strtr_variation6.phpt
+++ b/ext/standard/tests/strings/strtr_variation6.phpt
@@ -105,11 +105,11 @@ string(6) "m1tatm"
 -- Iteration 6 --
 string(6) "tm0atm"
 -- Iteration 7 --
-If three arguments are passed, the second argument must be a string
+strtr(): Argument #2 ($from) must be of type string, array given
 -- Iteration 8 --
-If three arguments are passed, the second argument must be a string
+strtr(): Argument #2 ($from) must be of type string, array given
 -- Iteration 9 --
-If three arguments are passed, the second argument must be a string
+strtr(): Argument #2 ($from) must be of type string, array given
 -- Iteration 10 --
 string(6) "0a2atm"
 -- Iteration 11 --
diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt
index 131682b9a87ad..aec9d25532334 100644
--- a/ext/standard/tests/strings/strtr_variation8.phpt
+++ b/ext/standard/tests/strings/strtr_variation8.phpt
@@ -94,22 +94,22 @@ echo "*** Done ***";
 *** Testing strtr() function: with unexpected inputs for 'replace_pairs' ***
 
 -- Iteration 1 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 2 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 3 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 4 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 5 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 6 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 7 --
 string(6) "012atm"
@@ -121,32 +121,32 @@ string(6) "012atm"
 string(6) "122atm"
 
 -- Iteration 10 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 11 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 12 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 13 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 14 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 15 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 16 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 17 --
 strtr(): Argument #2 ($from) must be of type string|array, resource given
 
 -- Iteration 18 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 19 --
-If two arguments are passed, the second argument must be an array
+strtr(): Argument #2 ($from) must be of type array, string given
 *** Done ***
diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index 52de7fe394d17..51d093a65fa22 100644
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -34,5 +34,5 @@ int(-1)
 bool(true)
 int(0)
 Test
-The length must be greater than or equal to zero
+substr_compare(): Argument #4 ($length) must be greater than or equal to 0
 bool(true)
diff --git a/ext/standard/tests/strings/substr_count_basic.phpt b/ext/standard/tests/strings/substr_count_basic.phpt
index df77bfd721403..a98a51bea26fc 100644
--- a/ext/standard/tests/strings/substr_count_basic.phpt
+++ b/ext/standard/tests/strings/substr_count_basic.phpt
@@ -34,8 +34,8 @@ var_dump(substr_count($a, "bca", -200, -50));
 ?>
 --EXPECT--
 ***Testing basic operations ***
-Empty substring
-Empty substring
+substr_count(): Argument #2 ($needle) must be a non-empty string
+substr_count(): Argument #2 ($needle) must be a non-empty string
 int(0)
 int(0)
 int(0)
diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt
index 9bdb3843ebce2..648d9b51e8c67 100644
--- a/ext/standard/tests/strings/substr_count_error.phpt
+++ b/ext/standard/tests/strings/substr_count_error.phpt
@@ -32,8 +32,8 @@ echo "Done\n";
 ?>
 --EXPECTF--
 *** Testing error conditions ***
-Offset not contained in string
-Offset not contained in string
+substr_count(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
+substr_count(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 
 Warning: substr_count(): Invalid length value in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/time/bug60222.phpt b/ext/standard/tests/time/bug60222.phpt
index c74d27d53bc58..0256e2de1d5c2 100644
--- a/ext/standard/tests/time/bug60222.phpt
+++ b/ext/standard/tests/time/bug60222.phpt
@@ -14,6 +14,6 @@ Bug #60222 (time_nanosleep() does validate input params)
         echo $exception->getMessage() . "\n";
     }
 ?>
---EXPECTF--
-The seconds value must be greater than 0
-The nanoseconds value must be greater than 0
+--EXPECT--
+time_nanosleep(): Argument #1 ($seconds) must be greater than or equal to 0
+time_nanosleep(): Argument #2 ($nanoseconds) must be greater than or equal to 0
diff --git a/ext/standard/tests/url/parse_url_error_002.phpt b/ext/standard/tests/url/parse_url_error_002.phpt
index 07188c57c7cf6..f1581632d011a 100644
--- a/ext/standard/tests/url/parse_url_error_002.phpt
+++ b/ext/standard/tests/url/parse_url_error_002.phpt
@@ -23,7 +23,7 @@ try {
 
 echo "Done"
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing parse_url() : error conditions: url component specifier out of range ***
 --> Below range:array(8) {
   ["scheme"]=>
@@ -46,5 +46,5 @@ echo "Done"
 
 
 --> Above range:
-Invalid URL component identifier: 99
+parse_url(): Argument #2 ($component) must be a valid URL component identifier, 99 given
 Done
diff --git a/ext/standard/tests/versioning/version_compare_invalid_operator.phpt b/ext/standard/tests/versioning/version_compare_invalid_operator.phpt
index eb1973924af61..c4fffab733283 100644
--- a/ext/standard/tests/versioning/version_compare_invalid_operator.phpt
+++ b/ext/standard/tests/versioning/version_compare_invalid_operator.phpt
@@ -11,4 +11,4 @@ try {
 }
 ?>
 --EXPECT--
-Invalid comparison operator
+version_compare(): Argument #3 ($operator) must be a valid comparison operator
diff --git a/ext/standard/type.c b/ext/standard/type.c
index f9dc9818420e6..b1b7807728575 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -84,7 +84,7 @@ PHP_FUNCTION(settype)
 		if (zend_string_equals_literal_ci(type, "resource")) {
 			zend_value_error("Cannot convert to resource type");
 		} else {
-			zend_value_error("Invalid type");
+			zend_argument_value_error(2, "must be a valid type");
 		}
 		RETURN_THROWS();
 	}
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 26968ea97612a..f2ef2c16d93a9 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -367,7 +367,7 @@ PHP_FUNCTION(parse_url)
 				if (resource->fragment != NULL) RETVAL_STR_COPY(resource->fragment);
 				break;
 			default:
-				zend_value_error("Invalid URL component identifier: " ZEND_LONG_FMT, key);
+				zend_argument_value_error(2, "must be a valid URL component identifier, " ZEND_LONG_FMT " given", key);
 				break;
 		}
 		goto done;
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 0d98ffa8247bb..cadd9ff8e74ad 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -551,12 +551,12 @@ PHP_FUNCTION(stream_filter_register)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!ZSTR_LEN(filtername)) {
-		zend_value_error("Filter name cannot be empty");
+		zend_argument_value_error(1, "must be a non-empty string");
 		RETURN_THROWS();
 	}
 
 	if (!ZSTR_LEN(classname)) {
-		zend_value_error("Class name cannot be empty");
+		zend_argument_value_error(2, "must be a non-empty string");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/versioning.c b/ext/standard/versioning.c
index c736c8241f34a..036575de05f63 100644
--- a/ext/standard/versioning.c
+++ b/ext/standard/versioning.c
@@ -238,7 +238,7 @@ PHP_FUNCTION(version_compare)
 		RETURN_BOOL(compare != 0);
 	}
 
-	zend_value_error("Invalid comparison operator");
+	zend_argument_value_error(3, "must be a valid comparison operator");
 }
 
 /* }}} */
diff --git a/ext/zlib/tests/gzread_error2.phpt b/ext/zlib/tests/gzread_error2.phpt
index 1c3cce3e87717..ff0dfe80289fe 100644
--- a/ext/zlib/tests/gzread_error2.phpt
+++ b/ext/zlib/tests/gzread_error2.phpt
@@ -28,7 +28,7 @@ gzclose($h);
 ?>
 --EXPECT--
 string(10) "When you'r"
-Length parameter must be greater than 0
+gzread(): Argument #2 ($length) must be greater than 0
 string(5) "e tau"
-Length parameter must be greater than 0
+gzread(): Argument #2 ($length) must be greater than 0
 string(8) "ght thro"