From 21f5ce2081f1951992770be37c5ab5de4b7eaa6e Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Thu, 20 Aug 2020 18:15:26 -0500 Subject: [PATCH 1/2] Rename array_diff parameter names to be more user-friendly. --- ext/standard/basic_functions.stub.php | 16 +-- ext/standard/basic_functions_arginfo.h | 26 +++-- ext/standard/tests/array/array_diff_1.phpt | 2 +- .../array/array_diff_assoc_variation1.phpt | 52 ++++----- .../array/array_diff_assoc_variation2.phpt | 52 ++++----- .../array/array_diff_key_variation1.phpt | 104 +++++++++--------- .../array/array_diff_key_variation2.phpt | 104 +++++++++--------- .../array/array_diff_uassoc_variation1.phpt | 52 ++++----- .../array/array_diff_uassoc_variation2.phpt | 52 ++++----- .../array/array_diff_ukey_variation1.phpt | 104 +++++++++--------- .../array/array_diff_ukey_variation2.phpt | 104 +++++++++--------- .../tests/array/array_diff_variation1.phpt | 52 ++++----- .../tests/array/array_diff_variation2.phpt | 52 ++++----- .../array/array_udiff_assoc_variation1.phpt | 50 ++++----- .../array/array_udiff_assoc_variation2.phpt | 50 ++++----- .../array/array_udiff_uassoc_variation1.phpt | 50 ++++----- .../array/array_udiff_uassoc_variation2.phpt | 50 ++++----- .../tests/array/array_udiff_variation1.phpt | 50 ++++----- .../tests/array/array_udiff_variation2.phpt | 50 ++++----- 19 files changed, 540 insertions(+), 532 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 73a82b627d7c..f60de5de8006 100755 --- a/ext/standard/basic_functions.stub.php +++ b/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 $source, array $exclude, array ...$rest): array {} /** @param array|callable $rest */ -function array_diff_ukey(array $array1, array $array2, ...$rest): array {} +function array_diff_ukey(array $source, array $exclude, ...$rest): array {} -function array_diff(array $array1, array $array2, array ...$arrays): array {} +function array_diff(array $source, array $exclude, array ...$rest): array {} /** @param array|callable $rest */ -function array_udiff(array $array1, array $array2, ...$rest): array {} +function array_udiff(array $source, array $exclude, ...$rest): array {} -function array_diff_assoc(array $array1, array $array2, array ...$arrays): array {} +function array_diff_assoc(array $source, array $exclude, array ...$rest): array {} /** @param array|callable $rest */ -function array_diff_uassoc(array $array1, array $array2, ...$rest): array {} +function array_diff_uassoc(array $source, array $exclude, ...$rest): array {} /** @param array|callable $rest */ -function array_udiff_assoc(array $array1, array $array2, ...$rest): array {} +function array_udiff_assoc(array $source, array $exclude, ...$rest): array {} /** @param array|callable $rest */ -function array_udiff_uassoc(array $array1, array $array2, ...$rest): array {} +function array_udiff_uassoc(array $source, array $exclude, ...$rest): array {} /** * @param array $array1 diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 31200dbb92d3..81ad8695dd6f 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: 8b6ef365e9635c92ef86adb40b2aba077867f3b2 */ + * Stub hash: 51ff985f775bae325186922a1b4b4f7335089081 */ 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, source, 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, source, 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) diff --git a/ext/standard/tests/array/array_diff_1.phpt b/ext/standard/tests/array/array_diff_1.phpt index 39ddfed8b031..1b0cba70500a 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 ($exclude) must be of type array, int given OK! diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 035b343c32b2..22d7381c09df 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 6871540fc4d6..d136c53693f9 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 ($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 diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt index 8159e1316d37..2d8e7ac1c1f7 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 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, classWithToString given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, classWithoutToString given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($source) 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 ($source) must be of type array, resource given +array_diff_key(): Argument #1 ($source) 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 3a404c348c06..8177d40f4d40 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 ($exclude) must be of type array, int given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, int given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, int given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, int given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, classWithToString given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, classWithoutToString given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_key(): Argument #2 ($exclude) 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 ($exclude) must be of type array, resource given +array_diff_key(): Argument #2 ($exclude) must be of type array, resource given diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt index a5e31d44a4ed..ec585b675b61 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 da8dd6650d25..1007ed140769 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ab82d3f87703..09d9686833a6 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 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, classWithToString given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, classWithoutToString given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($source) 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 ($source) must be of type array, resource given +array_diff_ukey(): Argument #1 ($source) 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 d99aaa3d9be1..3ed75779473f 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 ($exclude) must be of type array, int given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, int given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, int given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, int given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, float given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, bool given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, string given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, classWithToString given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, classWithoutToString given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, null given +array_diff_ukey(): Argument #2 ($exclude) 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 ($exclude) must be of type array, resource given +array_diff_ukey(): Argument #2 ($exclude) 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 c7909ab19674..846133673d17 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 470c6b38c4da..de41b0f6cac7 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 9e515ce1bf2e..a4a57b13ce05 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 30f418d31eb7..66000043078e 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 752c1c9a61e6..775698fa3610 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 263657bd5c64..4b45a0cf089c 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 1d929d4e50f1..a1398e62d88b 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) must be of type array, string given --heredoc-- -array_udiff(): Argument #1 ($array1) must be of type array, string given +array_udiff(): Argument #1 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 447395488fd3..524469de741a 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) must be of type array, string given --heredoc-- -array_udiff(): Argument #2 ($array2) must be of type array, string given +array_udiff(): Argument #2 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) 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 ($exclude) must be of type array, null given From f2b7e354f25a9889d23de545f3552eaeb0afe9e1 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Fri, 21 Aug 2020 11:02:47 -0500 Subject: [PATCH 2/2] Switch from source to input. --- ext/standard/basic_functions.stub.php | 16 +-- ext/standard/basic_functions_arginfo.h | 6 +- .../array/array_diff_assoc_variation1.phpt | 52 ++++----- .../array/array_diff_key_variation1.phpt | 104 +++++++++--------- .../array/array_diff_uassoc_variation1.phpt | 52 ++++----- .../array/array_diff_ukey_variation1.phpt | 104 +++++++++--------- .../tests/array/array_diff_variation1.phpt | 52 ++++----- .../array/array_udiff_assoc_variation1.phpt | 50 ++++----- .../array/array_udiff_uassoc_variation1.phpt | 50 ++++----- .../tests/array/array_udiff_variation1.phpt | 50 ++++----- 10 files changed, 268 insertions(+), 268 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index f60de5de8006..24a93f51907f 100755 --- a/ext/standard/basic_functions.stub.php +++ b/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 $source, array $exclude, array ...$rest): array {} +function array_diff_key(array $input, array $exclude, array ...$rest): array {} /** @param array|callable $rest */ -function array_diff_ukey(array $source, array $exclude, ...$rest): array {} +function array_diff_ukey(array $input, array $exclude, ...$rest): array {} -function array_diff(array $source, array $exclude, array ...$rest): array {} +function array_diff(array $input, array $exclude, array ...$rest): array {} /** @param array|callable $rest */ -function array_udiff(array $source, array $exclude, ...$rest): array {} +function array_udiff(array $input, array $exclude, ...$rest): array {} -function array_diff_assoc(array $source, array $exclude, array ...$rest): array {} +function array_diff_assoc(array $input, array $exclude, array ...$rest): array {} /** @param array|callable $rest */ -function array_diff_uassoc(array $source, array $exclude, ...$rest): array {} +function array_diff_uassoc(array $input, array $exclude, ...$rest): array {} /** @param array|callable $rest */ -function array_udiff_assoc(array $source, array $exclude, ...$rest): array {} +function array_udiff_assoc(array $input, array $exclude, ...$rest): array {} /** @param array|callable $rest */ -function array_udiff_uassoc(array $source, array $exclude, ...$rest): array {} +function array_udiff_uassoc(array $input, array $exclude, ...$rest): array {} /** * @param array $array1 diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 81ad8695dd6f..89e3c31c4ac2 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: 51ff985f775bae325186922a1b4b4f7335089081 */ + * 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) @@ -298,13 +298,13 @@ ZEND_END_ARG_INFO() #define arginfo_array_uintersect_uassoc arginfo_array_intersect_ukey ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_diff_key, 0, 2, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, source, 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() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_diff_ukey, 0, 2, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, source, 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() diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 22d7381c09df..af18b9651937 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) 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 ($source) must be of type array, resource given +array_diff_assoc(): Argument #1 ($input) must be of type array, resource given Done diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt index 2d8e7ac1c1f7..adbbdf74bebb 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 ($source) must be of type array, int given -array_diff_key(): Argument #1 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given --int 1-- -array_diff_key(): Argument #1 ($source) must be of type array, int given -array_diff_key(): Argument #1 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_diff_key(): Argument #1 ($source) must be of type array, int given -array_diff_key(): Argument #1 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_diff_key(): Argument #1 ($source) must be of type array, int given -array_diff_key(): Argument #1 ($source) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given +array_diff_key(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_diff_key(): Argument #1 ($source) must be of type array, float given -array_diff_key(): Argument #1 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_diff_key(): Argument #1 ($source) must be of type array, float given -array_diff_key(): Argument #1 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_diff_key(): Argument #1 ($source) must be of type array, float given -array_diff_key(): Argument #1 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_diff_key(): Argument #1 ($source) must be of type array, float given -array_diff_key(): Argument #1 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given --float .5-- -array_diff_key(): Argument #1 ($source) must be of type array, float given -array_diff_key(): Argument #1 ($source) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given +array_diff_key(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_diff_key(): Argument #1 ($source) must be of type array, null given -array_diff_key(): Argument #1 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_diff_key(): Argument #1 ($source) must be of type array, null given -array_diff_key(): Argument #1 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_diff_key(): Argument #1 ($source) must be of type array, bool given -array_diff_key(): Argument #1 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_diff_key(): Argument #1 ($source) must be of type array, bool given -array_diff_key(): Argument #1 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_diff_key(): Argument #1 ($source) must be of type array, bool given -array_diff_key(): Argument #1 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_diff_key(): Argument #1 ($source) must be of type array, bool given -array_diff_key(): Argument #1 ($source) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given +array_diff_key(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_diff_key(): Argument #1 ($source) must be of type array, string given -array_diff_key(): Argument #1 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_diff_key(): Argument #1 ($source) must be of type array, string given -array_diff_key(): Argument #1 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_diff_key(): Argument #1 ($source) must be of type array, string given -array_diff_key(): Argument #1 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_diff_key(): Argument #1 ($source) must be of type array, string given -array_diff_key(): Argument #1 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_diff_key(): Argument #1 ($source) must be of type array, string given -array_diff_key(): Argument #1 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_diff_key(): Argument #1 ($source) must be of type array, string given -array_diff_key(): Argument #1 ($source) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given +array_diff_key(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_diff_key(): Argument #1 ($source) must be of type array, classWithToString given -array_diff_key(): Argument #1 ($source) must be of type array, classWithToString given +array_diff_key(): Argument #1 ($input) must be of type array, classWithToString given +array_diff_key(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_diff_key(): Argument #1 ($source) must be of type array, classWithoutToString given -array_diff_key(): Argument #1 ($source) must be of type array, classWithoutToString given +array_diff_key(): Argument #1 ($input) must be of type array, classWithoutToString given +array_diff_key(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_diff_key(): Argument #1 ($source) must be of type array, null given -array_diff_key(): Argument #1 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given --unset var-- -array_diff_key(): Argument #1 ($source) must be of type array, null given -array_diff_key(): Argument #1 ($source) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given +array_diff_key(): Argument #1 ($input) must be of type array, null given --resource-- -array_diff_key(): Argument #1 ($source) must be of type array, resource given -array_diff_key(): Argument #1 ($source) must be of type array, resource given +array_diff_key(): Argument #1 ($input) must be of type array, resource given +array_diff_key(): Argument #1 ($input) must be of type array, resource given diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt index ec585b675b61..0546b45e633f 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 ($source) must be of type array, int given +array_diff_uassoc(): Argument #1 ($input) must be of type array, int given --int 1-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, int given +array_diff_uassoc(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, int given +array_diff_uassoc(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, int given +array_diff_uassoc(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, float given +array_diff_uassoc(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, float given +array_diff_uassoc(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, float given +array_diff_uassoc(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, float given +array_diff_uassoc(): Argument #1 ($input) must be of type array, float given --float .5-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, float given +array_diff_uassoc(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, null given +array_diff_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, null given +array_diff_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_diff_uassoc(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_diff_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_diff_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_diff_uassoc(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, string given +array_diff_uassoc(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, string given +array_diff_uassoc(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, string given +array_diff_uassoc(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, string given +array_diff_uassoc(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, string given +array_diff_uassoc(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, string given +array_diff_uassoc(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, classWithToString given +array_diff_uassoc(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, classWithoutToString given +array_diff_uassoc(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, null given +array_diff_uassoc(): Argument #1 ($input) must be of type array, null given --unset var-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, null given +array_diff_uassoc(): Argument #1 ($input) must be of type array, null given --resource-- -array_diff_uassoc(): Argument #1 ($source) must be of type array, resource given +array_diff_uassoc(): Argument #1 ($input) 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 09d9686833a6..b2ee7725fedc 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 ($source) must be of type array, int given -array_diff_ukey(): Argument #1 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given --int 1-- -array_diff_ukey(): Argument #1 ($source) must be of type array, int given -array_diff_ukey(): Argument #1 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_diff_ukey(): Argument #1 ($source) must be of type array, int given -array_diff_ukey(): Argument #1 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_diff_ukey(): Argument #1 ($source) must be of type array, int given -array_diff_ukey(): Argument #1 ($source) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given +array_diff_ukey(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_diff_ukey(): Argument #1 ($source) must be of type array, float given -array_diff_ukey(): Argument #1 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_diff_ukey(): Argument #1 ($source) must be of type array, float given -array_diff_ukey(): Argument #1 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_diff_ukey(): Argument #1 ($source) must be of type array, float given -array_diff_ukey(): Argument #1 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_diff_ukey(): Argument #1 ($source) must be of type array, float given -array_diff_ukey(): Argument #1 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given --float .5-- -array_diff_ukey(): Argument #1 ($source) must be of type array, float given -array_diff_ukey(): Argument #1 ($source) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given +array_diff_ukey(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_diff_ukey(): Argument #1 ($source) must be of type array, null given -array_diff_ukey(): Argument #1 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_diff_ukey(): Argument #1 ($source) must be of type array, null given -array_diff_ukey(): Argument #1 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given -array_diff_ukey(): Argument #1 ($source) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given +array_diff_ukey(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_diff_ukey(): Argument #1 ($source) must be of type array, string given -array_diff_ukey(): Argument #1 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_diff_ukey(): Argument #1 ($source) must be of type array, string given -array_diff_ukey(): Argument #1 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_diff_ukey(): Argument #1 ($source) must be of type array, string given -array_diff_ukey(): Argument #1 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_diff_ukey(): Argument #1 ($source) must be of type array, string given -array_diff_ukey(): Argument #1 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_diff_ukey(): Argument #1 ($source) must be of type array, string given -array_diff_ukey(): Argument #1 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_diff_ukey(): Argument #1 ($source) must be of type array, string given -array_diff_ukey(): Argument #1 ($source) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given +array_diff_ukey(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_diff_ukey(): Argument #1 ($source) must be of type array, classWithToString given -array_diff_ukey(): Argument #1 ($source) must be of type array, classWithToString given +array_diff_ukey(): Argument #1 ($input) must be of type array, classWithToString given +array_diff_ukey(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_diff_ukey(): Argument #1 ($source) must be of type array, classWithoutToString given -array_diff_ukey(): Argument #1 ($source) must be of type array, classWithoutToString given +array_diff_ukey(): Argument #1 ($input) must be of type array, classWithoutToString given +array_diff_ukey(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_diff_ukey(): Argument #1 ($source) must be of type array, null given -array_diff_ukey(): Argument #1 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given --unset var-- -array_diff_ukey(): Argument #1 ($source) must be of type array, null given -array_diff_ukey(): Argument #1 ($source) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given +array_diff_ukey(): Argument #1 ($input) must be of type array, null given --resource-- -array_diff_ukey(): Argument #1 ($source) must be of type array, resource given -array_diff_ukey(): Argument #1 ($source) must be of type array, resource given +array_diff_ukey(): Argument #1 ($input) must be of type array, resource given +array_diff_ukey(): Argument #1 ($input) 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 846133673d17..31c28f0347ec 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 ($source) must be of type array, int given +-- Iteration 1 --array_diff(): Argument #1 ($input) must be of type array, int given --- Iteration 2 --array_diff(): Argument #1 ($source) must be of type array, int given +-- Iteration 2 --array_diff(): Argument #1 ($input) must be of type array, int given --- Iteration 3 --array_diff(): Argument #1 ($source) must be of type array, int given +-- Iteration 3 --array_diff(): Argument #1 ($input) must be of type array, int given --- Iteration 4 --array_diff(): Argument #1 ($source) must be of type array, int given +-- Iteration 4 --array_diff(): Argument #1 ($input) must be of type array, int given --- Iteration 5 --array_diff(): Argument #1 ($source) must be of type array, float given +-- Iteration 5 --array_diff(): Argument #1 ($input) must be of type array, float given --- Iteration 6 --array_diff(): Argument #1 ($source) must be of type array, float given +-- Iteration 6 --array_diff(): Argument #1 ($input) must be of type array, float given --- Iteration 7 --array_diff(): Argument #1 ($source) must be of type array, float given +-- Iteration 7 --array_diff(): Argument #1 ($input) must be of type array, float given --- Iteration 8 --array_diff(): Argument #1 ($source) must be of type array, float given +-- Iteration 8 --array_diff(): Argument #1 ($input) must be of type array, float given --- Iteration 9 --array_diff(): Argument #1 ($source) must be of type array, float given +-- Iteration 9 --array_diff(): Argument #1 ($input) must be of type array, float given --- Iteration 10 --array_diff(): Argument #1 ($source) must be of type array, null given +-- Iteration 10 --array_diff(): Argument #1 ($input) must be of type array, null given --- Iteration 11 --array_diff(): Argument #1 ($source) must be of type array, null given +-- Iteration 11 --array_diff(): Argument #1 ($input) must be of type array, null given --- Iteration 12 --array_diff(): Argument #1 ($source) must be of type array, bool given +-- Iteration 12 --array_diff(): Argument #1 ($input) must be of type array, bool given --- Iteration 13 --array_diff(): Argument #1 ($source) must be of type array, bool given +-- Iteration 13 --array_diff(): Argument #1 ($input) must be of type array, bool given --- Iteration 14 --array_diff(): Argument #1 ($source) must be of type array, bool given +-- Iteration 14 --array_diff(): Argument #1 ($input) must be of type array, bool given --- Iteration 15 --array_diff(): Argument #1 ($source) must be of type array, bool given +-- Iteration 15 --array_diff(): Argument #1 ($input) must be of type array, bool given --- Iteration 16 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 16 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 17 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 17 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 18 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 18 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 19 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 19 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 20 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 20 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 21 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 21 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 22 --array_diff(): Argument #1 ($source) must be of type array, string given +-- Iteration 22 --array_diff(): Argument #1 ($input) must be of type array, string given --- Iteration 23 --array_diff(): Argument #1 ($source) must be of type array, classA given +-- Iteration 23 --array_diff(): Argument #1 ($input) must be of type array, classA given --- Iteration 24 --array_diff(): Argument #1 ($source) must be of type array, null given +-- Iteration 24 --array_diff(): Argument #1 ($input) must be of type array, null given --- Iteration 25 --array_diff(): Argument #1 ($source) must be of type array, null given +-- Iteration 25 --array_diff(): Argument #1 ($input) must be of type array, null given --- Iteration 26 --array_diff(): Argument #1 ($source) must be of type array, resource given +-- Iteration 26 --array_diff(): Argument #1 ($input) 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 a4a57b13ce05..9d81c4505e62 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 ($source) must be of type array, int given +array_udiff_assoc(): Argument #1 ($input) must be of type array, int given --int 1-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, int given +array_udiff_assoc(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, int given +array_udiff_assoc(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, int given +array_udiff_assoc(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, float given +array_udiff_assoc(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, float given +array_udiff_assoc(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, float given +array_udiff_assoc(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, float given +array_udiff_assoc(): Argument #1 ($input) must be of type array, float given --float .5-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, float given +array_udiff_assoc(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, null given +array_udiff_assoc(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, null given +array_udiff_assoc(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_assoc(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_assoc(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_assoc(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_assoc(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, string given +array_udiff_assoc(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, string given +array_udiff_assoc(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, string given +array_udiff_assoc(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, string given +array_udiff_assoc(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, string given +array_udiff_assoc(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, string given +array_udiff_assoc(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, classWithToString given +array_udiff_assoc(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, classWithoutToString given +array_udiff_assoc(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, null given +array_udiff_assoc(): Argument #1 ($input) must be of type array, null given --unset var-- -array_udiff_assoc(): Argument #1 ($source) must be of type array, null given +array_udiff_assoc(): Argument #1 ($input) 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 775698fa3610..7a9ea8058fee 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 ($source) must be of type array, int given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, int given --int 1-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, int given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, int given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, int given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, float given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, float given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, float given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, float given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, float given --float .5-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, float given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, null given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, null given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, bool given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, string given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, string given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, string given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, string given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, string given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, string given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, classWithToString given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, classWithoutToString given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, null given +array_udiff_uassoc(): Argument #1 ($input) must be of type array, null given --unset var-- -array_udiff_uassoc(): Argument #1 ($source) must be of type array, null given +array_udiff_uassoc(): Argument #1 ($input) 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 a1398e62d88b..684b2042c144 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 ($source) must be of type array, int given +array_udiff(): Argument #1 ($input) must be of type array, int given --int 1-- -array_udiff(): Argument #1 ($source) must be of type array, int given +array_udiff(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_udiff(): Argument #1 ($source) must be of type array, int given +array_udiff(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_udiff(): Argument #1 ($source) must be of type array, int given +array_udiff(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_udiff(): Argument #1 ($source) must be of type array, float given +array_udiff(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_udiff(): Argument #1 ($source) must be of type array, float given +array_udiff(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_udiff(): Argument #1 ($source) must be of type array, float given +array_udiff(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_udiff(): Argument #1 ($source) must be of type array, float given +array_udiff(): Argument #1 ($input) must be of type array, float given --float .5-- -array_udiff(): Argument #1 ($source) must be of type array, float given +array_udiff(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_udiff(): Argument #1 ($source) must be of type array, null given +array_udiff(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_udiff(): Argument #1 ($source) must be of type array, null given +array_udiff(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_udiff(): Argument #1 ($source) must be of type array, bool given +array_udiff(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_udiff(): Argument #1 ($source) must be of type array, bool given +array_udiff(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_udiff(): Argument #1 ($source) must be of type array, bool given +array_udiff(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_udiff(): Argument #1 ($source) must be of type array, bool given +array_udiff(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_udiff(): Argument #1 ($source) must be of type array, string given +array_udiff(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_udiff(): Argument #1 ($source) must be of type array, string given +array_udiff(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_udiff(): Argument #1 ($source) must be of type array, string given +array_udiff(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_udiff(): Argument #1 ($source) must be of type array, string given +array_udiff(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_udiff(): Argument #1 ($source) must be of type array, string given +array_udiff(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_udiff(): Argument #1 ($source) must be of type array, string given +array_udiff(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_udiff(): Argument #1 ($source) must be of type array, classWithToString given +array_udiff(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_udiff(): Argument #1 ($source) must be of type array, classWithoutToString given +array_udiff(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_udiff(): Argument #1 ($source) must be of type array, null given +array_udiff(): Argument #1 ($input) must be of type array, null given --unset var-- -array_udiff(): Argument #1 ($source) must be of type array, null given +array_udiff(): Argument #1 ($input) must be of type array, null given