Allow array_diff() and array_intersect() with single array argument

Both of these functions are well-defined when used with a single
array argument -- rejecting this case was an artificial limitation.
This is not useful when called with explicit arguments, but removes
edge-cases when used with argument unpacking:

    // OK even if $excludes is empty.
    array_diff($array, ...$excludes);

    // OK even if $arrays contains a single array only.
    array_intersect(...$arrays);

This matches the behavior of functions like array_merge() and
array_push(), which also allow calls with no array or a single
array respectively.

Closes GH-6097.

46 files changed, 1251 insertions, 1460 deletions

diff --git a/UPGRADING b/UPGRADING
index 3d37c2db25..f98ae50d1b 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -771,6 +771,14 @@ PHP 8.0 UPGRADE NOTES
   . Sorting functions are now stable, which means that equal-comparing elements
     will retain their original order.
     RFC: https://wiki.php.net/rfc/stable_sorting
+  . array_diff(), array_intersect() and their variations can now be used with
+    a single array as argument. This means that usages like the following are
+    now possible:
+
+        // OK even if $excludes is empty.
+        array_diff($array, ...$excludes);
+        // OK even if $arrays only contains a single array.
+        array_intersect(...$arrays);
 
 - Zip:
   . Extension updated to version 1.19.0
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
index e3b5ad2dee..2b809cdb73 100644
--- a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
+++ b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
@@ -11,7 +11,7 @@ try {
 }
 
 try {
-    array_diff([]);
+    array_diff();
 } catch (ArgumentCountError $e) {
     echo get_class($e) . PHP_EOL;
     echo $e->getMessage(), "\n";
@@ -21,4 +21,4 @@ try {
 ArgumentCountError
 substr() expects at least 2 arguments, 1 given
 ArgumentCountError
-At least 2 arguments are required, 1 given
+array_diff() expects at least 1 argument, 0 given
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 7779ce7806..cb5e6e7dee 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -4613,7 +4613,6 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
 	int (*intersect_data_compare_func)(zval *, zval *) = NULL;
 	zend_bool ok;
 	zval *val, *data;
-	int req_args;
 	char *param_spec;
 	zend_string *key;
 	zend_ulong h;
@@ -4622,13 +4621,11 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
 	argc = ZEND_NUM_ARGS();
 	if (data_compare_type == INTERSECT_COMP_DATA_USER) {
 		/* INTERSECT_COMP_DATA_USER - array_uintersect_assoc() */
-		req_args = 3;
 		param_spec = "+f";
 		intersect_data_compare_func = zval_user_compare;
 	} else {
 		/* 	INTERSECT_COMP_DATA_NONE - array_intersect_key()
 			INTERSECT_COMP_DATA_INTERNAL - array_intersect_assoc() */
-		req_args = 2;
 		param_spec = "+";
 
 		if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {
@@ -4636,11 +4633,6 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
 		}
 	}
 
-	if (argc < req_args) {
-		zend_argument_count_error("At least %d arguments are required, %d given", req_args, argc);
-		RETURN_THROWS();
-	}
-
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), param_spec, &args, &argc, &BG(user_compare_fci), &BG(user_compare_fci_cache)) == FAILURE) {
 		RETURN_THROWS();
 	}
@@ -4701,7 +4693,6 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 	int arr_argc, i, c = 0;
 	uint32_t idx;
 	Bucket **lists, *list, **ptrs, *p;
-	uint32_t req_args;
 	char *param_spec;
 	zend_fcall_info fci1, fci2;
 	zend_fcall_info_cache fci1_cache = empty_fcall_info_cache, fci2_cache = empty_fcall_info_cache;
@@ -4717,12 +4708,10 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 
 		if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {
 			/* array_intersect() */
-			req_args = 2;
 			param_spec = "+";
 			intersect_data_compare_func = php_array_data_compare_string_unstable;
 		} else if (data_compare_type == INTERSECT_COMP_DATA_USER) {
 			/* array_uintersect() */
-			req_args = 3;
 			param_spec = "+f";
 			intersect_data_compare_func = php_array_user_compare_unstable;
 		} else {
@@ -4730,11 +4719,6 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 			return;
 		}
 
-		if (ZEND_NUM_ARGS() < req_args) {
-			zend_argument_count_error("At least %d arguments are required, %d given", req_args, ZEND_NUM_ARGS());
-			RETURN_THROWS();
-		}
-
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), param_spec, &args, &arr_argc, &fci1, &fci1_cache) == FAILURE) {
 			RETURN_THROWS();
 		}
@@ -4747,13 +4731,11 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 
 		if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL && key_compare_type == INTERSECT_COMP_KEY_INTERNAL) {
 			/* array_intersect_assoc() or array_intersect_key() */
-			req_args = 2;
 			param_spec = "+";
 			intersect_key_compare_func = php_array_key_compare_string_unstable;
 			intersect_data_compare_func = php_array_data_compare_string_unstable;
 		} else if (data_compare_type == INTERSECT_COMP_DATA_USER && key_compare_type == INTERSECT_COMP_KEY_INTERNAL) {
 			/* array_uintersect_assoc() */
-			req_args = 3;
 			param_spec = "+f";
 			intersect_key_compare_func = php_array_key_compare_string_unstable;
 			intersect_data_compare_func = php_array_user_compare_unstable;
@@ -4761,7 +4743,6 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 			fci_data_cache = &fci1_cache;
 		} else if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL && key_compare_type == INTERSECT_COMP_KEY_USER) {
 			/* array_intersect_uassoc() or array_intersect_ukey() */
-			req_args = 3;
 			param_spec = "+f";
 			intersect_key_compare_func = php_array_user_key_compare_unstable;
 			intersect_data_compare_func = php_array_data_compare_string_unstable;
@@ -4769,7 +4750,6 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 			fci_key_cache = &fci1_cache;
 		} else if (data_compare_type == INTERSECT_COMP_DATA_USER && key_compare_type == INTERSECT_COMP_KEY_USER) {
 			/* array_uintersect_uassoc() */
-			req_args = 4;
 			param_spec = "+ff";
 			intersect_key_compare_func = php_array_user_key_compare_unstable;
 			intersect_data_compare_func = php_array_user_compare_unstable;
@@ -4782,11 +4762,6 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 			return;
 		}
 
-		if (ZEND_NUM_ARGS() < req_args) {
-			zend_argument_count_error("At least %d arguments are required, %d given", req_args, ZEND_NUM_ARGS());
-			RETURN_THROWS();
-		}
-
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), param_spec, &args, &arr_argc, &fci1, &fci1_cache, &fci2, &fci2_cache) == FAILURE) {
 			RETURN_THROWS();
 		}
@@ -5023,19 +4998,11 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty
 	/* Get the argument count */
 	argc = ZEND_NUM_ARGS();
 	if (data_compare_type == DIFF_COMP_DATA_USER) {
-		if (argc < 3) {
-			zend_argument_count_error("At least 3 arguments are required, %d given", ZEND_NUM_ARGS());
-			RETURN_THROWS();
-		}
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "+f", &args, &argc, &BG(user_compare_fci), &BG(user_compare_fci_cache)) == FAILURE) {
 			RETURN_THROWS();
 		}
 		diff_data_compare_func = zval_user_compare;
 	} else {
-		if (argc < 2) {
-			zend_argument_count_error("At least 2 arguments are required, %d given", ZEND_NUM_ARGS());
-			RETURN_THROWS();
-		}
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
 			RETURN_THROWS();
 		}
@@ -5100,7 +5067,6 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 	int arr_argc, i, c;
 	uint32_t idx;
 	Bucket **lists, *list, **ptrs, *p;
-	uint32_t req_args;
 	char *param_spec;
 	zend_fcall_info fci1, fci2;
 	zend_fcall_info_cache fci1_cache = empty_fcall_info_cache, fci2_cache = empty_fcall_info_cache;
@@ -5116,12 +5082,10 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 
 		if (data_compare_type == DIFF_COMP_DATA_INTERNAL) {
 			/* array_diff */
-			req_args = 2;
 			param_spec = "+";
 			diff_data_compare_func = php_array_data_compare_string_unstable;
 		} else if (data_compare_type == DIFF_COMP_DATA_USER) {
 			/* array_udiff */
-			req_args = 3;
 			param_spec = "+f";
 			diff_data_compare_func = php_array_user_compare_unstable;
 		} else {
@@ -5129,11 +5093,6 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 			return;
 		}
 
-		if (ZEND_NUM_ARGS() < req_args) {
-			zend_argument_count_error("At least %d arguments are required, %d given", req_args, ZEND_NUM_ARGS());
-			RETURN_THROWS();
-		}
-
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), param_spec, &args, &arr_argc, &fci1, &fci1_cache) == FAILURE) {
 			RETURN_THROWS();
 		}
@@ -5146,13 +5105,11 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 
 		if (data_compare_type == DIFF_COMP_DATA_INTERNAL && key_compare_type == DIFF_COMP_KEY_INTERNAL) {
 			/* array_diff_assoc() or array_diff_key() */
-			req_args = 2;
 			param_spec = "+";
 			diff_key_compare_func = php_array_key_compare_string_unstable;
 			diff_data_compare_func = php_array_data_compare_string_unstable;
 		} else if (data_compare_type == DIFF_COMP_DATA_USER && key_compare_type == DIFF_COMP_KEY_INTERNAL) {
 			/* array_udiff_assoc() */
-			req_args = 3;
 			param_spec = "+f";
 			diff_key_compare_func = php_array_key_compare_string_unstable;
 			diff_data_compare_func = php_array_user_compare_unstable;
@@ -5160,7 +5117,6 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 			fci_data_cache = &fci1_cache;
 		} else if (data_compare_type == DIFF_COMP_DATA_INTERNAL && key_compare_type == DIFF_COMP_KEY_USER) {
 			/* array_diff_uassoc() or array_diff_ukey() */
-			req_args = 3;
 			param_spec = "+f";
 			diff_key_compare_func = php_array_user_key_compare_unstable;
 			diff_data_compare_func = php_array_data_compare_string_unstable;
@@ -5168,7 +5124,6 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 			fci_key_cache = &fci1_cache;
 		} else if (data_compare_type == DIFF_COMP_DATA_USER && key_compare_type == DIFF_COMP_KEY_USER) {
 			/* array_udiff_uassoc() */
-			req_args = 4;
 			param_spec = "+ff";
 			diff_key_compare_func = php_array_user_key_compare_unstable;
 			diff_data_compare_func = php_array_user_compare_unstable;
@@ -5181,11 +5136,6 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 			return;
 		}
 
-		if (ZEND_NUM_ARGS() < req_args) {
-			zend_argument_count_error("At least %d arguments are required, %d given", req_args, ZEND_NUM_ARGS());
-			RETURN_THROWS();
-		}
-
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), param_spec, &args, &arr_argc, &fci1, &fci1_cache, &fci2, &fci2_cache) == FAILURE) {
 			RETURN_THROWS();
 		}
@@ -5377,11 +5327,6 @@ PHP_FUNCTION(array_diff)
 	zend_long idx;
 	zval dummy;
 
-	if (ZEND_NUM_ARGS() < 2) {
-		zend_argument_count_error("At least 2 arguments are required, %d given", ZEND_NUM_ARGS());
-		RETURN_THROWS();
-	}
-
 	ZEND_PARSE_PARAMETERS_START(1, -1)
 		Z_PARAM_VARIADIC('+', args, argc)
 	ZEND_PARSE_PARAMETERS_END();
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 8ec2eef3a7..e9aa1b0c62 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -178,47 +178,47 @@ function array_change_key_case(array $array, int $case = CASE_LOWER): array {}
 
 function array_unique(array $array, int $flags = SORT_STRING): array {}
 
-function array_intersect_key(array $array1, array $array2, array ...$arrays): array {}
+function array_intersect_key(array $array, array ...$arrays): array {}
 
 /** @param array|callable $rest */
-function array_intersect_ukey(array $array1, array $array2, ...$rest): array {}
+function array_intersect_ukey(array $array, ...$rest): array {}
 
-function array_intersect(array $array1, array $array2, array ...$arrays): array {}
+function array_intersect(array $array, array ...$arrays): array {}
 
 /** @param array|callable $rest */
-function array_uintersect(array $array1, array $array2, ...$rest): array {}
+function array_uintersect(array $array, ...$rest): array {}
 
-function array_intersect_assoc(array $array1, array $array2, array ...$arrays): array {}
+function array_intersect_assoc(array $array, array ...$arrays): array {}
 
 /** @param array|callable $rest */
-function array_uintersect_assoc(array $array1, array $array2, ...$rest): array {}
+function array_uintersect_assoc(array $array, ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_intersect_uassoc(array $array1, array $array2, ...$rest): array {}
+function array_intersect_uassoc(array $array, ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_uintersect_uassoc(array $array1, array $array2, ...$rest): array {}
+function array_uintersect_uassoc(array $array, ...$rest): array {}
 
-function array_diff_key(array $array1, array $array2, array ...$arrays): array {}
+function array_diff_key(array $array, array ...$arrays): array {}
 
 /** @param array|callable $rest */
-function array_diff_ukey(array $array1, array $array2, ...$rest): array {}
+function array_diff_ukey(array $array, ...$rest): array {}
 
-function array_diff(array $array1, array $array2, array ...$arrays): array {}
+function array_diff(array $array, array ...$arrays): array {}
 
 /** @param array|callable $rest */
-function array_udiff(array $array1, array $array2, ...$rest): array {}
+function array_udiff(array $array, ...$rest): array {}
 
-function array_diff_assoc(array $array1, array $array2, array ...$arrays): array {}
+function array_diff_assoc(array $array, array ...$arrays): array {}
 
 /** @param array|callable $rest */
-function array_diff_uassoc(array $array1, array $array2, ...$rest): array {}
+function array_diff_uassoc(array $array, ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_udiff_assoc(array $array1, array $array2, ...$rest): array {}
+function array_udiff_assoc(array $array, ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_udiff_uassoc(array $array1, array $array2, ...$rest): array {}
+function array_udiff_uassoc(array $array, ...$rest): array {}
 
 /**
  * @param array $array1
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 17ab235dbb..46204d773b 100755
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1d2a7229aa506c8da54ecbed6480836aa14fd484 */
+ * Stub hash: 56f49d359d2b11383a3f1401d0a3730192c28fc0 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -273,15 +273,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unique, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SORT_STRING")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_key, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_key, 0, 1, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
 	ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_ukey, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_ukey, 0, 1, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
 	ZEND_ARG_VARIADIC_INFO(0, rest)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/standard/tests/array/array_diff_1.phpt b/ext/standard/tests/array/array_diff_1.phpt
index 39ddfed8b0..7b58077e95 100644
--- a/ext/standard/tests/array/array_diff_1.phpt
+++ b/ext/standard/tests/array/array_diff_1.phpt
@@ -15,5 +15,5 @@ try {
 echo "OK!";
 ?>
 --EXPECT--
-array_diff(): Argument #2 ($array2) must be of type array, int given
+array_diff(): Argument #2 must be of type array, int given
 OK!
diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt
deleted file mode 100644
index bc2a1e7936..0000000000
--- a/ext/standard/tests/array/array_diff_assoc_error.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-Test array_diff_assoc() function : error conditions - pass array_diff_assoc() too few/zero arguments
---FILE--
-<?php
-/*
- * Test errors for array_diff with too few\zero arguments
- */
-
-echo "*** Testing array_diff_assoc() : error conditions ***\n";
-
-// Zero arguments
-echo "\n-- Testing array_diff_assoc() function with zero arguments --\n";
-try {
-    var_dump( array_diff_assoc() );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-// Testing array_diff_assoc with one less than the expected number of arguments
-echo "\n-- Testing array_diff_assoc() function with less than expected no. of arguments --\n";
-$arr1 = array(1, 2);
-try {
-    var_dump( array_diff_assoc($arr1) );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "Done";
-?>
---EXPECT--
-*** Testing array_diff_assoc() : error conditions ***
-
--- Testing array_diff_assoc() function with zero arguments --
-At least 2 arguments are required, 0 given
-
--- Testing array_diff_assoc() function with less than expected no. of arguments --
-At least 2 arguments are required, 1 given
-Done
diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index 035b343c32..0909348620 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -100,80 +100,80 @@ echo "Done";
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array) must be of type array, int given
 
 -- Iteration 2 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array) must be of type array, int given
 
 -- Iteration 3 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array) must be of type array, int given
 
 -- Iteration 4 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array) must be of type array, int given
 
 -- Iteration 5 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array) must be of type array, float given
 
 -- Iteration 6 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array) must be of type array, float given
 
 -- Iteration 7 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array) must be of type array, float given
 
 -- Iteration 8 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array) must be of type array, float given
 
 -- Iteration 9 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array) must be of type array, float given
 
 -- Iteration 10 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array) must be of type array, null given
 
 -- Iteration 11 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array) must be of type array, null given
 
 -- Iteration 12 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 -- Iteration 13 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 -- Iteration 14 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 -- Iteration 15 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 -- Iteration 16 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 17 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 18 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 19 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 20 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 21 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 22 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array) must be of type array, string given
 
 -- Iteration 23 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, classA given
+array_diff_assoc(): Argument #1 ($array) must be of type array, classA given
 
 -- Iteration 24 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array) must be of type array, null given
 
 -- Iteration 25 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array) must be of type array, null given
 
 -- Iteration 26 --
-array_diff_assoc(): Argument #1 ($array1) must be of type array, resource given
+array_diff_assoc(): Argument #1 ($array) 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 6871540fc4..76967f2ce7 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -100,80 +100,80 @@ echo "Done";
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_assoc(): Argument #2 must be of type array, int given
 
 -- Iteration 2 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_assoc(): Argument #2 must be of type array, int given
 
 -- Iteration 3 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_assoc(): Argument #2 must be of type array, int given
 
 -- Iteration 4 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_assoc(): Argument #2 must be of type array, int given
 
 -- Iteration 5 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_assoc(): Argument #2 must be of type array, float given
 
 -- Iteration 6 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_assoc(): Argument #2 must be of type array, float given
 
 -- Iteration 7 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_assoc(): Argument #2 must be of type array, float given
 
 -- Iteration 8 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_assoc(): Argument #2 must be of type array, float given
 
 -- Iteration 9 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_assoc(): Argument #2 must be of type array, float given
 
 -- Iteration 10 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_assoc(): Argument #2 must be of type array, null given
 
 -- Iteration 11 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_assoc(): Argument #2 must be of type array, null given
 
 -- Iteration 12 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_assoc(): Argument #2 must be of type array, bool given
 
 -- Iteration 13 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_assoc(): Argument #2 must be of type array, bool given
 
 -- Iteration 14 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_assoc(): Argument #2 must be of type array, bool given
 
 -- Iteration 15 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_assoc(): Argument #2 must be of type array, bool given
 
 -- Iteration 16 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 17 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 18 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 19 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 20 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 21 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 22 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_assoc(): Argument #2 must be of type array, string given
 
 -- Iteration 23 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, classA given
+array_diff_assoc(): Argument #2 must be of type array, classA given
 
 -- Iteration 24 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_assoc(): Argument #2 must be of type array, null given
 
 -- Iteration 25 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_assoc(): Argument #2 must be of type array, null given
 
 -- Iteration 26 --
-array_diff_assoc(): Argument #2 ($array2) must be of type array, resource given
+array_diff_assoc(): Argument #2 must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt
deleted file mode 100644
index 37a0681703..0000000000
--- a/ext/standard/tests/array/array_diff_error.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-Test array_diff() function : error conditions - too few arguments passed to function
---FILE--
-<?php
-/*
- * Test array_diff with less than the expected number of arguments
- */
-
-echo "*** Testing array_diff() : error conditions ***\n";
-// Zero arguments
-echo "\n-- Testing array_diff() function with zero arguments --\n";
-try {
-    var_dump( array_diff() );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-
-// Testing array_diff with one less than the expected number of arguments
-echo "\n-- Testing array_diff() function with less than expected no. of arguments --\n";
-$arr1 = array(1, 2);
-try {
-    var_dump( array_diff($arr1) );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "Done";
-?>
---EXPECT--
-*** Testing array_diff() : error conditions ***
-
--- Testing array_diff() function with zero arguments --
-At least 2 arguments are required, 0 given
-
--- Testing array_diff() function with less than expected no. of arguments --
-At least 2 arguments are required, 1 given
-Done
diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt
deleted file mode 100644
index 1ac25ea67c..0000000000
--- a/ext/standard/tests/array/array_diff_key_error.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Test array_diff_key() function : error conditions
---FILE--
-<?php
-echo "*** Testing array_diff_key() : error conditions ***\n";
-
-// Initialise the variables
-$array1 = array('blue' => 1, 'red' => 2, 'green' => 3, 'purple' => 4);
-
-// Testing array_diff_key with one less than the expected number of arguments
-echo "\n-- Testing array_diff_key() function with less than expected no. of arguments --\n";
-try {
-    var_dump( array_diff_key($array1) );
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-// Testing array_diff_key with no arguments
-echo "\n-- Testing array_diff_key() function with no arguments --\n";
-try {
-    var_dump( array_diff_key() );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-?>
---EXPECT--
-*** Testing array_diff_key() : error conditions ***
-
--- Testing array_diff_key() function with less than expected no. of arguments --
-At least 2 arguments are required, 1 given
-
--- Testing array_diff_key() function with no arguments --
-At least 2 arguments are required, 0 given
diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt
index 8159e1316d..525df63819 100644
--- a/ext/standard/tests/array/array_diff_key_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation1.phpt
@@ -103,105 +103,105 @@ fclose($fp);
 *** Testing array_diff_key() : usage variation ***
 
 --int 0--
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
-array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
+array_diff_key(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
-array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
+array_diff_key(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
-array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
+array_diff_key(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
-array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
+array_diff_key(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_key(): Argument #1 ($array1) must be of type array, classWithToString given
-array_diff_key(): Argument #1 ($array1) must be of type array, classWithToString given
+array_diff_key(): Argument #1 ($array) must be of type array, classWithToString given
+array_diff_key(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_key(): Argument #1 ($array1) must be of type array, classWithoutToString given
-array_diff_key(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_diff_key(): Argument #1 ($array) must be of type array, classWithoutToString given
+array_diff_key(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
-array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
+array_diff_key(): Argument #1 ($array) must be of type array, null given
 
 --resource--
-array_diff_key(): Argument #1 ($array1) must be of type array, resource given
-array_diff_key(): Argument #1 ($array1) must be of type array, resource given
+array_diff_key(): Argument #1 ($array) must be of type array, resource given
+array_diff_key(): Argument #1 ($array) 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 3a404c348c..a6e7201cb7 100644
--- a/ext/standard/tests/array/array_diff_key_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation2.phpt
@@ -104,105 +104,105 @@ fclose($fp);
 *** Testing array_diff_key() : usage variation ***
 
 --int 0--
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
 
 --int 1--
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
-array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
+array_diff_key(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
 
 --float .5--
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
-array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
+array_diff_key(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
-array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
+array_diff_key(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
-array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
+array_diff_key(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_diff_key(): Argument #2 ($array2) must be of type array, classWithToString given
-array_diff_key(): Argument #2 ($array2) must be of type array, classWithToString given
+array_diff_key(): Argument #2 must be of type array, classWithToString given
+array_diff_key(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_key(): Argument #2 ($array2) must be of type array, classWithoutToString given
-array_diff_key(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_diff_key(): Argument #2 must be of type array, classWithoutToString given
+array_diff_key(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
 
 --unset var--
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
-array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
+array_diff_key(): Argument #2 must be of type array, null given
 
 --resource--
-array_diff_key(): Argument #2 ($array2) must be of type array, resource given
-array_diff_key(): Argument #2 ($array2) must be of type array, resource given
+array_diff_key(): Argument #2 must be of type array, resource given
+array_diff_key(): Argument #2 must be of type array, resource given
diff --git a/ext/standard/tests/array/array_diff_single_array.phpt b/ext/standard/tests/array/array_diff_single_array.phpt
new file mode 100644
index 0000000000..83355b08eb
--- /dev/null
+++ b/ext/standard/tests/array/array_diff_single_array.phpt
@@ -0,0 +1,50 @@
+--TEST--
+array_diff() with single array argument
+--FILE--
+<?php
+
+$array = ["a" => 42];
+$cmp = function($a, $b) { return $a <=> $b; };
+var_dump(array_diff($array));
+var_dump(array_diff_key($array));
+var_dump(array_diff_ukey($array, $cmp));
+var_dump(array_diff_assoc($array));
+var_dump(array_diff_uassoc($array, $cmp));
+var_dump(array_udiff($array, $cmp));
+var_dump(array_udiff_assoc($array, $cmp));
+var_dump(array_udiff_uassoc($array, $cmp, $cmp));
+
+?>
+--EXPECT--
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
+array(1) {
+  ["a"]=>
+  int(42)
+}
diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt
index 2eddc16d5b..e22e0ad24d 100644
--- a/ext/standard/tests/array/array_diff_uassoc_error.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_error.phpt
@@ -49,4 +49,4 @@ array_diff_uassoc(): Argument #4 must be a valid callback, array must have exact
 array_diff_uassoc(): Argument #6 must be a valid callback, array must have exactly two members
 
 -- Testing array_diff_uassoc() function with less than expected no. of arguments --
-At least 3 arguments are required, 2 given
+array_diff_uassoc(): Argument #2 must be a valid callback, array must have exactly two members
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
index a5e31d44a4..7c02e5d142 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
@@ -110,79 +110,79 @@ fclose($fp);
 *** Testing array_diff_uassoc() : usage variation ***
 
 --int 0--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --resource--
-array_diff_uassoc(): Argument #1 ($array1) must be of type array, resource given
+array_diff_uassoc(): Argument #1 ($array) 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 da8dd6650d..36fd109bb6 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
@@ -110,79 +110,79 @@ fclose($fp);
 *** Testing array_diff_uassoc() : usage variation ***
 
 --int 0--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_uassoc(): Argument #2 must be of type array, int given
 
 --int 1--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_uassoc(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_uassoc(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_diff_uassoc(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_uassoc(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_uassoc(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_uassoc(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_uassoc(): Argument #2 must be of type array, float given
 
 --float .5--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_diff_uassoc(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_uassoc(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_uassoc(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_uassoc(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_uassoc(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_uassoc(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_diff_uassoc(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
+array_diff_uassoc(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_diff_uassoc(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_uassoc(): Argument #2 must be of type array, null given
 
 --unset var--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_diff_uassoc(): Argument #2 must be of type array, null given
 
 --resource--
-array_diff_uassoc(): Argument #2 ($array2) must be of type array, resource given
+array_diff_uassoc(): Argument #2 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 ab82d3f877..9e15307f23 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
@@ -111,105 +111,105 @@ fclose($fp);
 *** Testing array_diff_ukey() : usage variation ***
 
 --int 0--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithToString given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithToString given
+array_diff_ukey(): Argument #1 ($array) must be of type array, classWithToString given
+array_diff_ukey(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #1 ($array) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array) must be of type array, null given
 
 --resource--
-array_diff_ukey(): Argument #1 ($array1) must be of type array, resource given
-array_diff_ukey(): Argument #1 ($array1) must be of type array, resource given
+array_diff_ukey(): Argument #1 ($array) must be of type array, resource given
+array_diff_ukey(): Argument #1 ($array) 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 d99aaa3d9b..dd79e53b5e 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
@@ -115,105 +115,105 @@ fclose($fp);
 *** Testing array_diff_ukey() : usage variation ***
 
 --int 0--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
 
 --int 1--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
+array_diff_ukey(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
 
 --float .5--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
+array_diff_ukey(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
+array_diff_ukey(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
+array_diff_ukey(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithToString given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithToString given
+array_diff_ukey(): Argument #2 must be of type array, classWithToString given
+array_diff_ukey(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #2 must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
 
 --unset var--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
+array_diff_ukey(): Argument #2 must be of type array, null given
 
 --resource--
-array_diff_ukey(): Argument #2 ($array2) must be of type array, resource given
-array_diff_ukey(): Argument #2 ($array2) must be of type array, resource given
+array_diff_ukey(): Argument #2 must be of type array, resource given
+array_diff_ukey(): Argument #2 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 c7909ab196..075cf66f7b 100644
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -100,55 +100,55 @@ echo "Done";
 --EXPECT--
 *** Testing array_diff() : usage variations ***
 
--- Iteration 1 --array_diff(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 1 --array_diff(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 2 --array_diff(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 2 --array_diff(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 3 --array_diff(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 3 --array_diff(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 4 --array_diff(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 4 --array_diff(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 5 --array_diff(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 5 --array_diff(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 6 --array_diff(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 6 --array_diff(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 7 --array_diff(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 7 --array_diff(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 8 --array_diff(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 8 --array_diff(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 9 --array_diff(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 9 --array_diff(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 10 --array_diff(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 10 --array_diff(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 11 --array_diff(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 11 --array_diff(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 12 --array_diff(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 12 --array_diff(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 13 --array_diff(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 13 --array_diff(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 14 --array_diff(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 14 --array_diff(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 15 --array_diff(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 15 --array_diff(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 16 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 16 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 17 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 17 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 18 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 18 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 19 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 19 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 20 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 20 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 21 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 21 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 22 --array_diff(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 22 --array_diff(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 23 --array_diff(): Argument #1 ($array1) must be of type array, classA given
+-- Iteration 23 --array_diff(): Argument #1 ($array) must be of type array, classA given
 
--- Iteration 24 --array_diff(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 24 --array_diff(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 25 --array_diff(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 25 --array_diff(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 26 --array_diff(): Argument #1 ($array1) must be of type array, resource given
+-- Iteration 26 --array_diff(): Argument #1 ($array) 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 470c6b38c4..68e933e299 100644
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -99,55 +99,55 @@ echo "Done";
 --EXPECT--
 *** Testing array_diff() : usage variations ***
 
--- Iteration 1 --array_diff(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 1 --array_diff(): Argument #2 must be of type array, int given
 
--- Iteration 2 --array_diff(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 2 --array_diff(): Argument #2 must be of type array, int given
 
--- Iteration 3 --array_diff(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 3 --array_diff(): Argument #2 must be of type array, int given
 
--- Iteration 4 --array_diff(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 4 --array_diff(): Argument #2 must be of type array, int given
 
--- Iteration 5 --array_diff(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 5 --array_diff(): Argument #2 must be of type array, float given
 
--- Iteration 6 --array_diff(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 6 --array_diff(): Argument #2 must be of type array, float given
 
--- Iteration 7 --array_diff(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 7 --array_diff(): Argument #2 must be of type array, float given
 
--- Iteration 8 --array_diff(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 8 --array_diff(): Argument #2 must be of type array, float given
 
--- Iteration 9 --array_diff(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 9 --array_diff(): Argument #2 must be of type array, float given
 
--- Iteration 10 --array_diff(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 10 --array_diff(): Argument #2 must be of type array, null given
 
--- Iteration 11 --array_diff(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 11 --array_diff(): Argument #2 must be of type array, null given
 
--- Iteration 12 --array_diff(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 12 --array_diff(): Argument #2 must be of type array, bool given
 
--- Iteration 13 --array_diff(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 13 --array_diff(): Argument #2 must be of type array, bool given
 
--- Iteration 14 --array_diff(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 14 --array_diff(): Argument #2 must be of type array, bool given
 
--- Iteration 15 --array_diff(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 15 --array_diff(): Argument #2 must be of type array, bool given
 
--- Iteration 16 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 16 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 17 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 17 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 18 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 18 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 19 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 19 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 20 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 20 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 21 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 21 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 22 --array_diff(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 22 --array_diff(): Argument #2 must be of type array, string given
 
--- Iteration 23 --array_diff(): Argument #2 ($array2) must be of type array, classA given
+-- Iteration 23 --array_diff(): Argument #2 must be of type array, classA given
 
--- Iteration 24 --array_diff(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 24 --array_diff(): Argument #2 must be of type array, null given
 
--- Iteration 25 --array_diff(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 25 --array_diff(): Argument #2 must be of type array, null given
 
--- Iteration 26 --array_diff(): Argument #2 ($array2) must be of type array, resource given
+-- Iteration 26 --array_diff(): Argument #2 must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_intersect_assoc_error.phpt b/ext/standard/tests/array/array_intersect_assoc_error.phpt
deleted file mode 100644
index db59d4e22d..0000000000
--- a/ext/standard/tests/array/array_intersect_assoc_error.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-Test array_intersect_assoc() function : error conditions(Bug#43197)
---FILE--
-<?php
-echo "*** Testing array_intersect_assoc() : error conditions ***\n";
-
-// Zero arguments
-echo "\n-- Testing array_intersect_assoc() function with Zero arguments --\n";
-try {
-    var_dump( array_intersect_assoc() );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-// Testing array_intersect_assoc with one less than the expected number of arguments
-echo "\n-- Testing array_intersect_assoc() function with less than expected no. of arguments --\n";
-$arr1 = array(1, 2);
-try {
-    var_dump( array_intersect_assoc($arr1) );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "Done";
-?>
---EXPECT--
-*** Testing array_intersect_assoc() : error conditions ***
-
--- Testing array_intersect_assoc() function with Zero arguments --
-At least 2 arguments are required, 0 given
-
--- Testing array_intersect_assoc() function with less than expected no. of arguments --
-At least 2 arguments are required, 1 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 2bae7fb4a9..72d862958b 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
@@ -113,75 +113,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect_assoc() : Passing non-array values to $array1 argument ***
 
--- Iteration 1 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 1 --array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 2 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 2 --array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 3 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 3 --array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 4 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+-- Iteration 4 --array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, int given
 
--- Iteration 5 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 5 --array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 6 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 6 --array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 7 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 7 --array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 8 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 8 --array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 9 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+-- Iteration 9 --array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, float given
 
--- Iteration 10 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 10 --array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 11 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 11 --array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 12 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 12 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 13 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 13 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 14 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 14 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 15 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+-- Iteration 15 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
--- Iteration 16 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 16 --array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 17 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 17 --array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 18 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 18 --array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 19 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 19 --array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 20 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+-- Iteration 20 --array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
 
--- Iteration 21 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, classA given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, classA given
+-- Iteration 21 --array_intersect_assoc(): Argument #1 ($array) must be of type array, classA given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, classA given
 
--- Iteration 22 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 22 --array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 23 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+-- Iteration 23 --array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
 
--- Iteration 24 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, resource given
-array_intersect_assoc(): Argument #1 ($array1) must be of type array, resource given
+-- Iteration 24 --array_intersect_assoc(): Argument #1 ($array) must be of type array, resource given
+array_intersect_assoc(): Argument #1 ($array) 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 21ff13cc54..78ed38f153 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
@@ -114,75 +114,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect_assoc() : Passing non-array values to $array2 argument ***
 
--- Iteration 1 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 1 --array_intersect_assoc(): Argument #2 must be of type array, int given
+array_intersect_assoc(): Argument #2 must be of type array, int given
 
--- Iteration 2 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 2 --array_intersect_assoc(): Argument #2 must be of type array, int given
+array_intersect_assoc(): Argument #2 must be of type array, int given
 
--- Iteration 3 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 3 --array_intersect_assoc(): Argument #2 must be of type array, int given
+array_intersect_assoc(): Argument #2 must be of type array, int given
 
--- Iteration 4 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given
+-- Iteration 4 --array_intersect_assoc(): Argument #2 must be of type array, int given
+array_intersect_assoc(): Argument #2 must be of type array, int given
 
--- Iteration 5 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 5 --array_intersect_assoc(): Argument #2 must be of type array, float given
+array_intersect_assoc(): Argument #2 must be of type array, float given
 
--- Iteration 6 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 6 --array_intersect_assoc(): Argument #2 must be of type array, float given
+array_intersect_assoc(): Argument #2 must be of type array, float given
 
--- Iteration 7 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 7 --array_intersect_assoc(): Argument #2 must be of type array, float given
+array_intersect_assoc(): Argument #2 must be of type array, float given
 
--- Iteration 8 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 8 --array_intersect_assoc(): Argument #2 must be of type array, float given
+array_intersect_assoc(): Argument #2 must be of type array, float given
 
--- Iteration 9 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given
+-- Iteration 9 --array_intersect_assoc(): Argument #2 must be of type array, float given
+array_intersect_assoc(): Argument #2 must be of type array, float given
 
--- Iteration 10 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 10 --array_intersect_assoc(): Argument #2 must be of type array, null given
+array_intersect_assoc(): Argument #2 must be of type array, null given
 
--- Iteration 11 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 11 --array_intersect_assoc(): Argument #2 must be of type array, null given
+array_intersect_assoc(): Argument #2 must be of type array, null given
 
--- Iteration 12 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 12 --array_intersect_assoc(): Argument #2 must be of type array, bool given
+array_intersect_assoc(): Argument #2 must be of type array, bool given
 
--- Iteration 13 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 13 --array_intersect_assoc(): Argument #2 must be of type array, bool given
+array_intersect_assoc(): Argument #2 must be of type array, bool given
 
--- Iteration 14 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 14 --array_intersect_assoc(): Argument #2 must be of type array, bool given
+array_intersect_assoc(): Argument #2 must be of type array, bool given
 
--- Iteration 15 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+-- Iteration 15 --array_intersect_assoc(): Argument #2 must be of type array, bool given
+array_intersect_assoc(): Argument #2 must be of type array, bool given
 
--- Iteration 16 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 16 --array_intersect_assoc(): Argument #2 must be of type array, string given
+array_intersect_assoc(): Argument #2 must be of type array, string given
 
--- Iteration 17 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 17 --array_intersect_assoc(): Argument #2 must be of type array, string given
+array_intersect_assoc(): Argument #2 must be of type array, string given
 
--- Iteration 18 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 18 --array_intersect_assoc(): Argument #2 must be of type array, string given
+array_intersect_assoc(): Argument #2 must be of type array, string given
 
--- Iteration 19 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 19 --array_intersect_assoc(): Argument #2 must be of type array, string given
+array_intersect_assoc(): Argument #2 must be of type array, string given
 
--- Iteration 20 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given
+-- Iteration 20 --array_intersect_assoc(): Argument #2 must be of type array, string given
+array_intersect_assoc(): Argument #2 must be of type array, string given
 
--- Iteration 21 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, classA given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, classA given
+-- Iteration 21 --array_intersect_assoc(): Argument #2 must be of type array, classA given
+array_intersect_assoc(): Argument #2 must be of type array, classA given
 
--- Iteration 22 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 22 --array_intersect_assoc(): Argument #2 must be of type array, null given
+array_intersect_assoc(): Argument #2 must be of type array, null given
 
--- Iteration 23 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given
+-- Iteration 23 --array_intersect_assoc(): Argument #2 must be of type array, null given
+array_intersect_assoc(): Argument #2 must be of type array, null given
 
--- Iteration 24 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, resource given
-array_intersect_assoc(): Argument #2 ($array2) must be of type array, resource given
+-- Iteration 24 --array_intersect_assoc(): Argument #2 must be of type array, resource given
+array_intersect_assoc(): Argument #2 must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_intersect_error.phpt b/ext/standard/tests/array/array_intersect_error.phpt
deleted file mode 100644
index 623fd2f9a6..0000000000
--- a/ext/standard/tests/array/array_intersect_error.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-Test array_intersect() function : error conditions
---FILE--
-<?php
-echo "*** Testing array_intersect() : error conditions ***\n";
-
-// Testing array_intersect() with zero arguments
-echo "\n-- Testing array_intersect() function with Zero arguments --\n";
-try {
-    var_dump( array_intersect() );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-// Testing array_intersect() with one less than the expected number of arguments
-echo "\n-- Testing array_intersect() function with less than expected no. of arguments --\n";
-$arr1 = array(1, 2);
-try {
-    var_dump( array_intersect($arr1) );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "Done";
-?>
---EXPECT--
-*** Testing array_intersect() : error conditions ***
-
--- Testing array_intersect() function with Zero arguments --
-At least 2 arguments are required, 0 given
-
--- Testing array_intersect() function with less than expected no. of arguments --
-At least 2 arguments are required, 1 given
-Done
diff --git a/ext/standard/tests/array/array_intersect_key_error.phpt b/ext/standard/tests/array/array_intersect_key_error.phpt
deleted file mode 100644
index 81961f3afc..0000000000
--- a/ext/standard/tests/array/array_intersect_key_error.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Test array_intersect_key() function : error conditions
---FILE--
-<?php
-echo "*** Testing array_intersect_key() : error conditions ***\n";
-
-//Initialise function arguments
-$array1 = array('blue' => 1, 'red' => 2, 'green' => 3, 'purple' => 4);
-
-// Testing array_intersect_key with one less than the expected number of arguments
-echo "\n-- Testing array_intersect_key() function with less than expected no. of arguments --\n";
-try {
-    var_dump( array_intersect_key($array1) );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-// Testing array_intersect_key with one less than the expected number of arguments
-echo "\n-- Testing array_intersect_key() function with no arguments --\n";
-try {
-    var_dump( array_intersect_key() );
-} catch (ArgumentCountError $e) {
-    echo $e->getMessage(), "\n";
-}
-?>
---EXPECT--
-*** Testing array_intersect_key() : error conditions ***
-
--- Testing array_intersect_key() function with less than expected no. of arguments --
-At least 2 arguments are required, 1 given
-
--- Testing array_intersect_key() function with no arguments --
-At least 2 arguments are required, 0 given
diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt
index cdf9938984..9256234597 100644
--- a/ext/standard/tests/array/array_intersect_key_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt
@@ -107,105 +107,105 @@ fclose($fp);
 *** Testing array_intersect_key() : usage variation ***
 
 --int 0--
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
-array_intersect_key(): Argument #1 ($array1) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
+array_intersect_key(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
-array_intersect_key(): Argument #1 ($array1) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
+array_intersect_key(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
+array_intersect_key(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
-array_intersect_key(): Argument #1 ($array1) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
+array_intersect_key(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_key(): Argument #1 ($array1) must be of type array, classWithToString given
-array_intersect_key(): Argument #1 ($array1) must be of type array, classWithToString given
+array_intersect_key(): Argument #1 ($array) must be of type array, classWithToString given
+array_intersect_key(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_key(): Argument #1 ($array1) must be of type array, classWithoutToString given
-array_intersect_key(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_intersect_key(): Argument #1 ($array) must be of type array, classWithoutToString given
+array_intersect_key(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
-array_intersect_key(): Argument #1 ($array1) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
+array_intersect_key(): Argument #1 ($array) must be of type array, null given
 
 --resource var--
-array_intersect_key(): Argument #1 ($array1) must be of type array, resource given
-array_intersect_key(): Argument #1 ($array1) must be of type array, resource given
+array_intersect_key(): Argument #1 ($array) must be of type array, resource given
+array_intersect_key(): Argument #1 ($array) 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 65491a2682..70401e8469 100644
--- a/ext/standard/tests/array/array_intersect_key_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt
@@ -108,105 +108,105 @@ fclose($fp);
 *** Testing array_intersect_key() : usage variation ***
 
 --int 0--
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
 
 --int 1--
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
-array_intersect_key(): Argument #2 ($array2) must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
+array_intersect_key(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
 
 --float .5--
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
-array_intersect_key(): Argument #2 ($array2) must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
+array_intersect_key(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
+array_intersect_key(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
-array_intersect_key(): Argument #2 ($array2) must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
+array_intersect_key(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_key(): Argument #2 ($array2) must be of type array, classWithToString given
-array_intersect_key(): Argument #2 ($array2) must be of type array, classWithToString given
+array_intersect_key(): Argument #2 must be of type array, classWithToString given
+array_intersect_key(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_key(): Argument #2 ($array2) must be of type array, classWithoutToString given
-array_intersect_key(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_intersect_key(): Argument #2 must be of type array, classWithoutToString given
+array_intersect_key(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
 
 --unset var--
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
-array_intersect_key(): Argument #2 ($array2) must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
+array_intersect_key(): Argument #2 must be of type array, null given
 
 --resource var--
-array_intersect_key(): Argument #2 ($array2) must be of type array, resource given
-array_intersect_key(): Argument #2 ($array2) must be of type array, resource given
+array_intersect_key(): Argument #2 must be of type array, resource given
+array_intersect_key(): Argument #2 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 c686e64689..268d169c88 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
@@ -115,105 +115,105 @@ fclose($fp);
 *** Testing array_intersect_uassoc() : usage variation ***
 
 --int 0--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, classWithToString given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, classWithoutToString given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --resource--
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, resource given
-array_intersect_uassoc(): Argument #1 ($array1) must be of type array, resource given
+array_intersect_uassoc(): Argument #1 ($array) must be of type array, resource given
+array_intersect_uassoc(): Argument #1 ($array) 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 741b3a9405..9377a09518 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
@@ -115,105 +115,105 @@ fclose($fp);
 *** Testing array_intersect_uassoc() : usage variation ***
 
 --int 0--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
 
 --int 1--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
+array_intersect_uassoc(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
 
 --float .5--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
+array_intersect_uassoc(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
+array_intersect_uassoc(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
+array_intersect_uassoc(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
+array_intersect_uassoc(): Argument #2 must be of type array, classWithToString given
+array_intersect_uassoc(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_intersect_uassoc(): Argument #2 must be of type array, classWithoutToString given
+array_intersect_uassoc(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
 
 --unset var--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
+array_intersect_uassoc(): Argument #2 must be of type array, null given
 
 --resource--
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, resource given
-array_intersect_uassoc(): Argument #2 ($array2) must be of type array, resource given
+array_intersect_uassoc(): Argument #2 must be of type array, resource given
+array_intersect_uassoc(): Argument #2 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 e73bbd3267..993994fc07 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
@@ -113,105 +113,105 @@ fclose($fp);
 *** Testing array_intersect_ukey() : usage variation ***
 
 --int 0--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithToString given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithToString given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, classWithToString given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, classWithoutToString given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, null given
 
 --resource var--
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, resource given
-array_intersect_ukey(): Argument #1 ($array1) must be of type array, resource given
+array_intersect_ukey(): Argument #1 ($array) must be of type array, resource given
+array_intersect_ukey(): Argument #1 ($array) 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 7dd5d4c459..bdc0686774 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
@@ -113,105 +113,105 @@ fclose($fp);
 *** Testing array_intersect_ukey() : usage variation ***
 
 --int 0--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
 
 --int 1--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
+array_intersect_ukey(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
 
 --float .5--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
+array_intersect_ukey(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
+array_intersect_ukey(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
+array_intersect_ukey(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithToString given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithToString given
+array_intersect_ukey(): Argument #2 must be of type array, classWithToString given
+array_intersect_ukey(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_intersect_ukey(): Argument #2 must be of type array, classWithoutToString given
+array_intersect_ukey(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
 
 --unset var--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
+array_intersect_ukey(): Argument #2 must be of type array, null given
 
 --resource var--
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, resource given
-array_intersect_ukey(): Argument #2 ($array2) must be of type array, resource given
+array_intersect_ukey(): Argument #2 must be of type array, resource given
+array_intersect_ukey(): Argument #2 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 f83a4d901e..81b77bd4aa 100644
--- a/ext/standard/tests/array/array_intersect_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_variation1.phpt
@@ -113,75 +113,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect() : Passing non-array values to $array1 argument ***
 
--- Iterator 1 --array_intersect(): Argument #1 ($array1) must be of type array, int given
-array_intersect(): Argument #1 ($array1) must be of type array, int given
+-- Iterator 1 --array_intersect(): Argument #1 ($array) must be of type array, int given
+array_intersect(): Argument #1 ($array) must be of type array, int given
 
--- Iterator 2 --array_intersect(): Argument #1 ($array1) must be of type array, int given
-array_intersect(): Argument #1 ($array1) must be of type array, int given
+-- Iterator 2 --array_intersect(): Argument #1 ($array) must be of type array, int given
+array_intersect(): Argument #1 ($array) must be of type array, int given
 
--- Iterator 3 --array_intersect(): Argument #1 ($array1) must be of type array, int given
-array_intersect(): Argument #1 ($array1) must be of type array, int given
+-- Iterator 3 --array_intersect(): Argument #1 ($array) must be of type array, int given
+array_intersect(): Argument #1 ($array) must be of type array, int given
 
--- Iterator 4 --array_intersect(): Argument #1 ($array1) must be of type array, int given
-array_intersect(): Argument #1 ($array1) must be of type array, int given
+-- Iterator 4 --array_intersect(): Argument #1 ($array) must be of type array, int given
+array_intersect(): Argument #1 ($array) must be of type array, int given
 
--- Iterator 5 --array_intersect(): Argument #1 ($array1) must be of type array, float given
-array_intersect(): Argument #1 ($array1) must be of type array, float given
+-- Iterator 5 --array_intersect(): Argument #1 ($array) must be of type array, float given
+array_intersect(): Argument #1 ($array) must be of type array, float given
 
--- Iterator 6 --array_intersect(): Argument #1 ($array1) must be of type array, float given
-array_intersect(): Argument #1 ($array1) must be of type array, float given
+-- Iterator 6 --array_intersect(): Argument #1 ($array) must be of type array, float given
+array_intersect(): Argument #1 ($array) must be of type array, float given
 
--- Iterator 7 --array_intersect(): Argument #1 ($array1) must be of type array, float given
-array_intersect(): Argument #1 ($array1) must be of type array, float given
+-- Iterator 7 --array_intersect(): Argument #1 ($array) must be of type array, float given
+array_intersect(): Argument #1 ($array) must be of type array, float given
 
--- Iterator 8 --array_intersect(): Argument #1 ($array1) must be of type array, float given
-array_intersect(): Argument #1 ($array1) must be of type array, float given
+-- Iterator 8 --array_intersect(): Argument #1 ($array) must be of type array, float given
+array_intersect(): Argument #1 ($array) must be of type array, float given
 
--- Iterator 9 --array_intersect(): Argument #1 ($array1) must be of type array, float given
-array_intersect(): Argument #1 ($array1) must be of type array, float given
+-- Iterator 9 --array_intersect(): Argument #1 ($array) must be of type array, float given
+array_intersect(): Argument #1 ($array) must be of type array, float given
 
--- Iterator 10 --array_intersect(): Argument #1 ($array1) must be of type array, null given
-array_intersect(): Argument #1 ($array1) must be of type array, null given
+-- Iterator 10 --array_intersect(): Argument #1 ($array) must be of type array, null given
+array_intersect(): Argument #1 ($array) must be of type array, null given
 
--- Iterator 11 --array_intersect(): Argument #1 ($array1) must be of type array, null given
-array_intersect(): Argument #1 ($array1) must be of type array, null given
+-- Iterator 11 --array_intersect(): Argument #1 ($array) must be of type array, null given
+array_intersect(): Argument #1 ($array) must be of type array, null given
 
--- Iterator 12 --array_intersect(): Argument #1 ($array1) must be of type array, bool given
-array_intersect(): Argument #1 ($array1) must be of type array, bool given
+-- Iterator 12 --array_intersect(): Argument #1 ($array) must be of type array, bool given
+array_intersect(): Argument #1 ($array) must be of type array, bool given
 
--- Iterator 13 --array_intersect(): Argument #1 ($array1) must be of type array, bool given
-array_intersect(): Argument #1 ($array1) must be of type array, bool given
+-- Iterator 13 --array_intersect(): Argument #1 ($array) must be of type array, bool given
+array_intersect(): Argument #1 ($array) must be of type array, bool given
 
--- Iterator 14 --array_intersect(): Argument #1 ($array1) must be of type array, bool given
-array_intersect(): Argument #1 ($array1) must be of type array, bool given
+-- Iterator 14 --array_intersect(): Argument #1 ($array) must be of type array, bool given
+array_intersect(): Argument #1 ($array) must be of type array, bool given
 
--- Iterator 15 --array_intersect(): Argument #1 ($array1) must be of type array, bool given
-array_intersect(): Argument #1 ($array1) must be of type array, bool given
+-- Iterator 15 --array_intersect(): Argument #1 ($array) must be of type array, bool given
+array_intersect(): Argument #1 ($array) must be of type array, bool given
 
--- Iterator 16 --array_intersect(): Argument #1 ($array1) must be of type array, string given
-array_intersect(): Argument #1 ($array1) must be of type array, string given
+-- Iterator 16 --array_intersect(): Argument #1 ($array) must be of type array, string given
+array_intersect(): Argument #1 ($array) must be of type array, string given
 
--- Iterator 17 --array_intersect(): Argument #1 ($array1) must be of type array, string given
-array_intersect(): Argument #1 ($array1) must be of type array, string given
+-- Iterator 17 --array_intersect(): Argument #1 ($array) must be of type array, string given
+array_intersect(): Argument #1 ($array) must be of type array, string given
 
--- Iterator 18 --array_intersect(): Argument #1 ($array1) must be of type array, string given
-array_intersect(): Argument #1 ($array1) must be of type array, string given
+-- Iterator 18 --array_intersect(): Argument #1 ($array) must be of type array, string given
+array_intersect(): Argument #1 ($array) must be of type array, string given
 
--- Iterator 19 --array_intersect(): Argument #1 ($array1) must be of type array, string given
-array_intersect(): Argument #1 ($array1) must be of type array, string given
+-- Iterator 19 --array_intersect(): Argument #1 ($array) must be of type array, string given
+array_intersect(): Argument #1 ($array) must be of type array, string given
 
--- Iterator 20 --array_intersect(): Argument #1 ($array1) must be of type array, string given
-array_intersect(): Argument #1 ($array1) must be of type array, string given
+-- Iterator 20 --array_intersect(): Argument #1 ($array) must be of type array, string given
+array_intersect(): Argument #1 ($array) must be of type array, string given
 
--- Iterator 21 --array_intersect(): Argument #1 ($array1) must be of type array, classA given
-array_intersect(): Argument #1 ($array1) must be of type array, classA given
+-- Iterator 21 --array_intersect(): Argument #1 ($array) must be of type array, classA given
+array_intersect(): Argument #1 ($array) must be of type array, classA given
 
--- Iterator 22 --array_intersect(): Argument #1 ($array1) must be of type array, null given
-array_intersect(): Argument #1 ($array1) must be of type array, null given
+-- Iterator 22 --array_intersect(): Argument #1 ($array) must be of type array, null given
+array_intersect(): Argument #1 ($array) must be of type array, null given
 
--- Iterator 23 --array_intersect(): Argument #1 ($array1) must be of type array, null given
-array_intersect(): Argument #1 ($array1) must be of type array, null given
+-- Iterator 23 --array_intersect(): Argument #1 ($array) must be of type array, null given
+array_intersect(): Argument #1 ($array) must be of type array, null given
 
--- Iterator 24 --array_intersect(): Argument #1 ($array1) must be of type array, resource given
-array_intersect(): Argument #1 ($array1) must be of type array, resource given
+-- Iterator 24 --array_intersect(): Argument #1 ($array) must be of type array, resource given
+array_intersect(): Argument #1 ($array) 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 302ea149d8..d98e116296 100644
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -114,75 +114,75 @@ echo "Done";
 --EXPECT--
 *** Testing array_intersect() : Passing non-array values to $array2 argument ***
 
--- Iterator 1 --array_intersect(): Argument #2 ($array2) must be of type array, int given
-array_intersect(): Argument #2 ($array2) must be of type array, int given
+-- Iterator 1 --array_intersect(): Argument #2 must be of type array, int given
+array_intersect(): Argument #2 must be of type array, int given
 
--- Iterator 2 --array_intersect(): Argument #2 ($array2) must be of type array, int given
-array_intersect(): Argument #2 ($array2) must be of type array, int given
+-- Iterator 2 --array_intersect(): Argument #2 must be of type array, int given
+array_intersect(): Argument #2 must be of type array, int given
 
--- Iterator 3 --array_intersect(): Argument #2 ($array2) must be of type array, int given
-array_intersect(): Argument #2 ($array2) must be of type array, int given
+-- Iterator 3 --array_intersect(): Argument #2 must be of type array, int given
+array_intersect(): Argument #2 must be of type array, int given
 
--- Iterator 4 --array_intersect(): Argument #2 ($array2) must be of type array, int given
-array_intersect(): Argument #2 ($array2) must be of type array, int given
+-- Iterator 4 --array_intersect(): Argument #2 must be of type array, int given
+array_intersect(): Argument #2 must be of type array, int given
 
--- Iterator 5 --array_intersect(): Argument #2 ($array2) must be of type array, float given
-array_intersect(): Argument #2 ($array2) must be of type array, float given
+-- Iterator 5 --array_intersect(): Argument #2 must be of type array, float given
+array_intersect(): Argument #2 must be of type array, float given
 
--- Iterator 6 --array_intersect(): Argument #2 ($array2) must be of type array, float given
-array_intersect(): Argument #2 ($array2) must be of type array, float given
+-- Iterator 6 --array_intersect(): Argument #2 must be of type array, float given
+array_intersect(): Argument #2 must be of type array, float given
 
--- Iterator 7 --array_intersect(): Argument #2 ($array2) must be of type array, float given
-array_intersect(): Argument #2 ($array2) must be of type array, float given
+-- Iterator 7 --array_intersect(): Argument #2 must be of type array, float given
+array_intersect(): Argument #2 must be of type array, float given
 
--- Iterator 8 --array_intersect(): Argument #2 ($array2) must be of type array, float given
-array_intersect(): Argument #2 ($array2) must be of type array, float given
+-- Iterator 8 --array_intersect(): Argument #2 must be of type array, float given
+array_intersect(): Argument #2 must be of type array, float given
 
--- Iterator 9 --array_intersect(): Argument #2 ($array2) must be of type array, float given
-array_intersect(): Argument #2 ($array2) must be of type array, float given
+-- Iterator 9 --array_intersect(): Argument #2 must be of type array, float given
+array_intersect(): Argument #2 must be of type array, float given
 
--- Iterator 10 --array_intersect(): Argument #2 ($array2) must be of type array, null given
-array_intersect(): Argument #2 ($array2) must be of type array, null given
+-- Iterator 10 --array_intersect(): Argument #2 must be of type array, null given
+array_intersect(): Argument #2 must be of type array, null given
 
--- Iterator 11 --array_intersect(): Argument #2 ($array2) must be of type array, null given
-array_intersect(): Argument #2 ($array2) must be of type array, null given
+-- Iterator 11 --array_intersect(): Argument #2 must be of type array, null given
+array_intersect(): Argument #2 must be of type array, null given
 
--- Iterator 12 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
-array_intersect(): Argument #2 ($array2) must be of type array, bool given
+-- Iterator 12 --array_intersect(): Argument #2 must be of type array, bool given
+array_intersect(): Argument #2 must be of type array, bool given
 
--- Iterator 13 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
-array_intersect(): Argument #2 ($array2) must be of type array, bool given
+-- Iterator 13 --array_intersect(): Argument #2 must be of type array, bool given
+array_intersect(): Argument #2 must be of type array, bool given
 
--- Iterator 14 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
-array_intersect(): Argument #2 ($array2) must be of type array, bool given
+-- Iterator 14 --array_intersect(): Argument #2 must be of type array, bool given
+array_intersect(): Argument #2 must be of type array, bool given
 
--- Iterator 15 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
-array_intersect(): Argument #2 ($array2) must be of type array, bool given
+-- Iterator 15 --array_intersect(): Argument #2 must be of type array, bool given
+array_intersect(): Argument #2 must be of type array, bool given
 
--- Iterator 16 --array_intersect(): Argument #2 ($array2) must be of type array, string given
-array_intersect(): Argument #2 ($array2) must be of type array, string given
+-- Iterator 16 --array_intersect(): Argument #2 must be of type array, string given
+array_intersect(): Argument #2 must be of type array, string given
 
--- Iterator 17 --array_intersect(): Argument #2 ($array2) must be of type array, string given
-array_intersect(): Argument #2 ($array2) must be of type array, string given
+-- Iterator 17 --array_intersect(): Argument #2 must be of type array, string given
+array_intersect(): Argument #2 must be of type array, string given
 
--- Iterator 18 --array_intersect(): Argument #2 ($array2) must be of type array, string given
-array_intersect(): Argument #2 ($array2) must be of type array, string given
+-- Iterator 18 --array_intersect(): Argument #2 must be of type array, string given
+array_intersect(): Argument #2 must be of type array, string given
 
--- Iterator 19 --array_intersect(): Argument #2 ($array2) must be of type array, string given
-array_intersect(): Argument #2 ($array2) must be of type array, string given
+-- Iterator 19 --array_intersect(): Argument #2 must be of type array, string given
+array_intersect(): Argument #2 must be of type array, string given
 
--- Iterator 20 --array_intersect(): Argument #2 ($array2) must be of type array, string given
-array_intersect(): Argument #2 ($array2) must be of type array, string given
+-- Iterator 20 --array_intersect(): Argument #2 must be of type array, string given
+array_intersect(): Argument #2 must be of type array, string given
 
--- Iterator 21 --array_intersect(): Argument #2 ($array2) must be of type array, classA given
-array_intersect(): Argument #2 ($array2) must be of type array, classA given
+-- Iterator 21 --array_intersect(): Argument #2 must be of type array, classA given
+array_intersect(): Argument #2 must be of type array, classA given
 
--- Iterator 22 --array_intersect(): Argument #2 ($array2) must be of type array, null given
-array_intersect(): Argument #2 ($array2) must be of type array, null given
+-- Iterator 22 --array_intersect(): Argument #2 must be of type array, null given
+array_intersect(): Argument #2 must be of type array, null given
 
--- Iterator 23 --array_intersect(): Argument #2 ($array2) must be of type array, null given
-array_intersect(): Argument #2 ($array2) must be of type array, null given
+-- Iterator 23 --array_intersect(): Argument #2 must be of type array, null given
+array_intersect(): Argument #2 must be of type array, null given
 
--- Iterator 24 --array_intersect(): Argument #2 ($array2) must be of type array, resource given
-array_intersect(): Argument #2 ($array2) must be of type array, resource given
+-- Iterator 24 --array_intersect(): Argument #2 must be of type array, resource given
+array_intersect(): Argument #2 must be of type array, resource given
 Done
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
index 9e515ce1bf..21239f3ee0 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_assoc() : usage variation ***
 
 --int 0--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, classWithToString given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array) 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 30f418d31e..02bf34f0ec 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_assoc() : usage variation ***
 
 --int 0--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_assoc(): Argument #2 must be of type array, int given
 
 --int 1--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_assoc(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_assoc(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_assoc(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_assoc(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_assoc(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_assoc(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_assoc(): Argument #2 must be of type array, float given
 
 --float .5--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_assoc(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_assoc(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_assoc(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_assoc(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_assoc(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_assoc(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_assoc(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_assoc(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_assoc(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, classWithToString given
+array_udiff_assoc(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_udiff_assoc(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_assoc(): Argument #2 must be of type array, null given
 
 --unset var--
-array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_assoc(): Argument #2 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 752c1c9a61..6ededf9b10 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_uassoc() : usage variation ***
 
 --int 0--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array) 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 263657bd5c..bc6068b5b0 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_uassoc() : usage variation ***
 
 --int 0--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 must be of type array, int given
 
 --int 1--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 must be of type array, float given
 
 --float .5--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
+array_udiff_uassoc(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_udiff_uassoc(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 must be of type array, null given
 
 --unset var--
-array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 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 1d929d4e50..c2cb3074b4 100644
--- a/ext/standard/tests/array/array_udiff_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_variation1.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff() : usage variation ***
 
 --int 0--
-array_udiff(): Argument #1 ($array1) must be of type array, int given
+array_udiff(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_udiff(): Argument #1 ($array1) must be of type array, int given
+array_udiff(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_udiff(): Argument #1 ($array1) must be of type array, int given
+array_udiff(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_udiff(): Argument #1 ($array1) must be of type array, int given
+array_udiff(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_udiff(): Argument #1 ($array1) must be of type array, float given
+array_udiff(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_udiff(): Argument #1 ($array1) must be of type array, float given
+array_udiff(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff(): Argument #1 ($array1) must be of type array, float given
+array_udiff(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff(): Argument #1 ($array1) must be of type array, float given
+array_udiff(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_udiff(): Argument #1 ($array1) must be of type array, float given
+array_udiff(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_udiff(): Argument #1 ($array1) must be of type array, null given
+array_udiff(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_udiff(): Argument #1 ($array1) must be of type array, null given
+array_udiff(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_udiff(): Argument #1 ($array1) must be of type array, bool given
+array_udiff(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_udiff(): Argument #1 ($array1) must be of type array, bool given
+array_udiff(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff(): Argument #1 ($array1) must be of type array, bool given
+array_udiff(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff(): Argument #1 ($array1) must be of type array, bool given
+array_udiff(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_udiff(): Argument #1 ($array1) must be of type array, string given
+array_udiff(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_udiff(): Argument #1 ($array1) must be of type array, string given
+array_udiff(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_udiff(): Argument #1 ($array1) must be of type array, string given
+array_udiff(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_udiff(): Argument #1 ($array1) must be of type array, string given
+array_udiff(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_udiff(): Argument #1 ($array1) must be of type array, string given
+array_udiff(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_udiff(): Argument #1 ($array1) must be of type array, string given
+array_udiff(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff(): Argument #1 ($array1) must be of type array, classWithToString given
+array_udiff(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_udiff(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff(): Argument #1 ($array1) must be of type array, null given
+array_udiff(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_udiff(): Argument #1 ($array1) must be of type array, null given
+array_udiff(): Argument #1 ($array) 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 447395488f..72e814f75b 100644
--- a/ext/standard/tests/array/array_udiff_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_variation2.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff() : usage variation ***
 
 --int 0--
-array_udiff(): Argument #2 ($array2) must be of type array, int given
+array_udiff(): Argument #2 must be of type array, int given
 
 --int 1--
-array_udiff(): Argument #2 ($array2) must be of type array, int given
+array_udiff(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_udiff(): Argument #2 ($array2) must be of type array, int given
+array_udiff(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_udiff(): Argument #2 ($array2) must be of type array, int given
+array_udiff(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_udiff(): Argument #2 ($array2) must be of type array, float given
+array_udiff(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_udiff(): Argument #2 ($array2) must be of type array, float given
+array_udiff(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff(): Argument #2 ($array2) must be of type array, float given
+array_udiff(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff(): Argument #2 ($array2) must be of type array, float given
+array_udiff(): Argument #2 must be of type array, float given
 
 --float .5--
-array_udiff(): Argument #2 ($array2) must be of type array, float given
+array_udiff(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_udiff(): Argument #2 ($array2) must be of type array, null given
+array_udiff(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_udiff(): Argument #2 ($array2) must be of type array, null given
+array_udiff(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_udiff(): Argument #2 ($array2) must be of type array, bool given
+array_udiff(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_udiff(): Argument #2 ($array2) must be of type array, bool given
+array_udiff(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff(): Argument #2 ($array2) must be of type array, bool given
+array_udiff(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff(): Argument #2 ($array2) must be of type array, bool given
+array_udiff(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_udiff(): Argument #2 ($array2) must be of type array, string given
+array_udiff(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_udiff(): Argument #2 ($array2) must be of type array, string given
+array_udiff(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_udiff(): Argument #2 ($array2) must be of type array, string given
+array_udiff(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_udiff(): Argument #2 ($array2) must be of type array, string given
+array_udiff(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_udiff(): Argument #2 ($array2) must be of type array, string given
+array_udiff(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_udiff(): Argument #2 ($array2) must be of type array, string given
+array_udiff(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_udiff(): Argument #2 ($array2) must be of type array, classWithToString given
+array_udiff(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_udiff(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff(): Argument #2 ($array2) must be of type array, null given
+array_udiff(): Argument #2 must be of type array, null given
 
 --unset var--
-array_udiff(): Argument #2 ($array2) must be of type array, null given
+array_udiff(): Argument #2 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 c339b9094b..abfa224b20 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_assoc() : usage variation ***
 
 --int 0--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, classWithToString given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array) 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 69b61d1a24..080d81ceee 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_assoc() : usage variation ***
 
 --int 0--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 must be of type array, int given
 
 --int 1--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 must be of type array, float given
 
 --float .5--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, classWithToString given
+array_uintersect_assoc(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_uintersect_assoc(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 must be of type array, null given
 
 --unset var--
-array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 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 c946c1f634..cc92118bc2 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_uassoc() : usage variation ***
 
 --int 0--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array) 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 e2171f1453..cfa7300b27 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_uassoc() : usage variation ***
 
 --int 0--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 must be of type array, int given
 
 --int 1--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 must be of type array, float given
 
 --float .5--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
+array_uintersect_uassoc(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_uintersect_uassoc(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 must be of type array, null given
 
 --unset var--
-array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 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 c593a95fe6..b5442ed392 100644
--- a/ext/standard/tests/array/array_uintersect_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation1.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect() : usage variation ***
 
 --int 0--
-array_uintersect(): Argument #1 ($array1) must be of type array, int given
+array_uintersect(): Argument #1 ($array) must be of type array, int given
 
 --int 1--
-array_uintersect(): Argument #1 ($array1) must be of type array, int given
+array_uintersect(): Argument #1 ($array) must be of type array, int given
 
 --int 12345--
-array_uintersect(): Argument #1 ($array1) must be of type array, int given
+array_uintersect(): Argument #1 ($array) must be of type array, int given
 
 --int -12345--
-array_uintersect(): Argument #1 ($array1) must be of type array, int given
+array_uintersect(): Argument #1 ($array) must be of type array, int given
 
 --float 10.5--
-array_uintersect(): Argument #1 ($array1) must be of type array, float given
+array_uintersect(): Argument #1 ($array) must be of type array, float given
 
 --float -10.5--
-array_uintersect(): Argument #1 ($array1) must be of type array, float given
+array_uintersect(): Argument #1 ($array) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect(): Argument #1 ($array1) must be of type array, float given
+array_uintersect(): Argument #1 ($array) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect(): Argument #1 ($array1) must be of type array, float given
+array_uintersect(): Argument #1 ($array) must be of type array, float given
 
 --float .5--
-array_uintersect(): Argument #1 ($array1) must be of type array, float given
+array_uintersect(): Argument #1 ($array) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect(): Argument #1 ($array1) must be of type array, null given
+array_uintersect(): Argument #1 ($array) must be of type array, null given
 
 --lowercase null--
-array_uintersect(): Argument #1 ($array1) must be of type array, null given
+array_uintersect(): Argument #1 ($array) must be of type array, null given
 
 --lowercase true--
-array_uintersect(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array) must be of type array, bool given
 
 --lowercase false--
-array_uintersect(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect(): Argument #1 ($array1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect(): Argument #1 ($array1) must be of type array, string given
+array_uintersect(): Argument #1 ($array) must be of type array, string given
 
 --empty string SQ--
-array_uintersect(): Argument #1 ($array1) must be of type array, string given
+array_uintersect(): Argument #1 ($array) must be of type array, string given
 
 --string DQ--
-array_uintersect(): Argument #1 ($array1) must be of type array, string given
+array_uintersect(): Argument #1 ($array) must be of type array, string given
 
 --string SQ--
-array_uintersect(): Argument #1 ($array1) must be of type array, string given
+array_uintersect(): Argument #1 ($array) must be of type array, string given
 
 --mixed case string--
-array_uintersect(): Argument #1 ($array1) must be of type array, string given
+array_uintersect(): Argument #1 ($array) must be of type array, string given
 
 --heredoc--
-array_uintersect(): Argument #1 ($array1) must be of type array, string given
+array_uintersect(): Argument #1 ($array) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect(): Argument #1 ($array1) must be of type array, classWithToString given
+array_uintersect(): Argument #1 ($array) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_uintersect(): Argument #1 ($array) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect(): Argument #1 ($array1) must be of type array, null given
+array_uintersect(): Argument #1 ($array) must be of type array, null given
 
 --unset var--
-array_uintersect(): Argument #1 ($array1) must be of type array, null given
+array_uintersect(): Argument #1 ($array) 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 515b1ef207..2f6b9d3e99 100644
--- a/ext/standard/tests/array/array_uintersect_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation2.phpt
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect() : usage variation ***
 
 --int 0--
-array_uintersect(): Argument #2 ($array2) must be of type array, int given
+array_uintersect(): Argument #2 must be of type array, int given
 
 --int 1--
-array_uintersect(): Argument #2 ($array2) must be of type array, int given
+array_uintersect(): Argument #2 must be of type array, int given
 
 --int 12345--
-array_uintersect(): Argument #2 ($array2) must be of type array, int given
+array_uintersect(): Argument #2 must be of type array, int given
 
 --int -12345--
-array_uintersect(): Argument #2 ($array2) must be of type array, int given
+array_uintersect(): Argument #2 must be of type array, int given
 
 --float 10.5--
-array_uintersect(): Argument #2 ($array2) must be of type array, float given
+array_uintersect(): Argument #2 must be of type array, float given
 
 --float -10.5--
-array_uintersect(): Argument #2 ($array2) must be of type array, float given
+array_uintersect(): Argument #2 must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect(): Argument #2 ($array2) must be of type array, float given
+array_uintersect(): Argument #2 must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect(): Argument #2 ($array2) must be of type array, float given
+array_uintersect(): Argument #2 must be of type array, float given
 
 --float .5--
-array_uintersect(): Argument #2 ($array2) must be of type array, float given
+array_uintersect(): Argument #2 must be of type array, float given
 
 --uppercase NULL--
-array_uintersect(): Argument #2 ($array2) must be of type array, null given
+array_uintersect(): Argument #2 must be of type array, null given
 
 --lowercase null--
-array_uintersect(): Argument #2 ($array2) must be of type array, null given
+array_uintersect(): Argument #2 must be of type array, null given
 
 --lowercase true--
-array_uintersect(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect(): Argument #2 must be of type array, bool given
 
 --lowercase false--
-array_uintersect(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect(): Argument #2 must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect(): Argument #2 must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect(): Argument #2 ($array2) must be of type array, bool given
+array_uintersect(): Argument #2 must be of type array, bool given
 
 --empty string DQ--
-array_uintersect(): Argument #2 ($array2) must be of type array, string given
+array_uintersect(): Argument #2 must be of type array, string given
 
 --empty string SQ--
-array_uintersect(): Argument #2 ($array2) must be of type array, string given
+array_uintersect(): Argument #2 must be of type array, string given
 
 --string DQ--
-array_uintersect(): Argument #2 ($array2) must be of type array, string given
+array_uintersect(): Argument #2 must be of type array, string given
 
 --string SQ--
-array_uintersect(): Argument #2 ($array2) must be of type array, string given
+array_uintersect(): Argument #2 must be of type array, string given
 
 --mixed case string--
-array_uintersect(): Argument #2 ($array2) must be of type array, string given
+array_uintersect(): Argument #2 must be of type array, string given
 
 --heredoc--
-array_uintersect(): Argument #2 ($array2) must be of type array, string given
+array_uintersect(): Argument #2 must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect(): Argument #2 ($array2) must be of type array, classWithToString given
+array_uintersect(): Argument #2 must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_uintersect(): Argument #2 must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect(): Argument #2 ($array2) must be of type array, null given
+array_uintersect(): Argument #2 must be of type array, null given
 
 --unset var--
-array_uintersect(): Argument #2 ($array2) must be of type array, null given
+array_uintersect(): Argument #2 must be of type array, null given