Rename array_diff parameter names to be more user-friendly.

ext/standard/basic_functions.stub.php

@@ -200,26 +200,26 @@ function array_intersect_uassoc(array $array1, array $array2, ...$rest): array {
 /** @param array|callable $rest */
 function array_uintersect_uassoc(array $array1, array $array2, ...$rest): array {}
 
-function array_diff_key(array $array1, array $array2, array ...$arrays): array {}
+function array_diff_key(array $input, array $exclude, array ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_diff_ukey(array $array1, array $array2, ...$rest): array {}
+function array_diff_ukey(array $input, array $exclude, ...$rest): array {}
 
-function array_diff(array $array1, array $array2, array ...$arrays): array {}
+function array_diff(array $input, array $exclude, array ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_udiff(array $array1, array $array2, ...$rest): array {}
+function array_udiff(array $input, array $exclude, ...$rest): array {}
 
-function array_diff_assoc(array $array1, array $array2, array ...$arrays): array {}
+function array_diff_assoc(array $input, array $exclude, array ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_diff_uassoc(array $array1, array $array2, ...$rest): array {}
+function array_diff_uassoc(array $input, array $exclude, ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_udiff_assoc(array $array1, array $array2, ...$rest): array {}
+function array_udiff_assoc(array $input, array $exclude, ...$rest): array {}
 
 /** @param array|callable $rest */
-function array_udiff_uassoc(array $array1, array $array2, ...$rest): array {}
+function array_udiff_uassoc(array $input, array $exclude, ...$rest): array {}
 
 /**
  * @param array $array1

ext/standard/basic_functions_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 8b6ef365e9635c92ef86adb40b2aba077867f3b2 */
+ * Stub hash: 7a35741aa95538773f364eb8b0b7ab0f046cfb33 */
 
 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)
@@ -297,21 +297,29 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_array_uintersect_uassoc arginfo_array_intersect_ukey
 
-#define arginfo_array_diff_key arginfo_array_intersect_key
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_diff_key, 0, 2, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, input, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, exclude, IS_ARRAY, 0)
+	ZEND_ARG_VARIADIC_TYPE_INFO(0, rest, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_array_diff_ukey arginfo_array_intersect_ukey
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_diff_ukey, 0, 2, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, input, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, exclude, IS_ARRAY, 0)
+	ZEND_ARG_VARIADIC_INFO(0, rest)
+ZEND_END_ARG_INFO()
 
-#define arginfo_array_diff arginfo_array_intersect_key
+#define arginfo_array_diff arginfo_array_diff_key
 
-#define arginfo_array_udiff arginfo_array_intersect_ukey
+#define arginfo_array_udiff arginfo_array_diff_ukey
 
-#define arginfo_array_diff_assoc arginfo_array_intersect_key
+#define arginfo_array_diff_assoc arginfo_array_diff_key
 
-#define arginfo_array_diff_uassoc arginfo_array_intersect_ukey
+#define arginfo_array_diff_uassoc arginfo_array_diff_ukey
 
-#define arginfo_array_udiff_assoc arginfo_array_intersect_ukey
+#define arginfo_array_udiff_assoc arginfo_array_diff_ukey
 
-#define arginfo_array_udiff_uassoc arginfo_array_intersect_ukey
+#define arginfo_array_udiff_uassoc arginfo_array_diff_ukey
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_multisort, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, array1)

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 ($exclude) must be of type array, int given
 OK!

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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) 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 ($input) must be of type array, resource given
 Done

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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) must be of type array, resource given
 Done