From 62df9e7c29924e1e50d72636f890d15f95a95e43 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Fri, 21 Aug 2020 14:51:57 -0500 Subject: [PATCH 1/4] Rename array_replace arguments to be more user-friendly. --- ext/standard/basic_functions.stub.php | 2 +- ext/standard/basic_functions_arginfo.h | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 73a82b627d7c3..9511d0024407f 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -153,7 +153,7 @@ function array_merge(array ...$arrays): array {} function array_merge_recursive(array ...$arrays): array {} -function array_replace(array $array1, array ...$arrays): array {} +function array_replace(array $input, array ...$replacements): array {} function array_replace_recursive(array $array1, array ...$arrays): array {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 31200dbb92d3f..2798490ed202b 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: b592dc72a6de3ed1f299e6640162bd31241d0852 */ 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) @@ -220,12 +220,15 @@ ZEND_END_ARG_INFO() #define arginfo_array_merge_recursive arginfo_array_merge ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_replace, 0, 1, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, input, IS_ARRAY, 0) + ZEND_ARG_VARIADIC_TYPE_INFO(0, replacements, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_replace_recursive, 0, 1, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0) ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0) ZEND_END_ARG_INFO() -#define arginfo_array_replace_recursive arginfo_array_replace - ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_keys, 0, 1, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, search_value, IS_MIXED, 0) From e6576650166184a0ac632b3cb6c3c39cb14b52cd Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Fri, 21 Aug 2020 15:01:08 -0500 Subject: [PATCH 2/4] Update parameter names for array_intersect*() functions to be more user friendly. --- ext/standard/basic_functions.stub.php | 16 +-- ext/standard/basic_functions_arginfo.h | 40 ++++--- .../array_intersect_assoc_variation1.phpt | 96 ++++++++-------- .../array_intersect_assoc_variation2.phpt | 96 ++++++++-------- .../array/array_intersect_key_variation1.phpt | 104 +++++++++--------- .../array/array_intersect_key_variation2.phpt | 104 +++++++++--------- .../array_intersect_uassoc_variation1.phpt | 104 +++++++++--------- .../array_intersect_uassoc_variation2.phpt | 104 +++++++++--------- .../array_intersect_ukey_variation1.phpt | 104 +++++++++--------- .../array_intersect_ukey_variation2.phpt | 104 +++++++++--------- .../array/array_intersect_variation1.phpt | 96 ++++++++-------- .../array/array_intersect_variation2.phpt | 96 ++++++++-------- .../array_uintersect_assoc_variation1.phpt | 50 ++++----- .../array_uintersect_assoc_variation2.phpt | 50 ++++----- .../array_uintersect_uassoc_variation1.phpt | 50 ++++----- .../array_uintersect_uassoc_variation2.phpt | 50 ++++----- .../array/array_uintersect_variation1.phpt | 50 ++++----- .../array/array_uintersect_variation2.phpt | 50 ++++----- 18 files changed, 688 insertions(+), 676 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 9511d0024407f..cb1c2c178a01b 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -179,26 +179,26 @@ function array_change_key_case(array $array, int $case = CASE_LOWER): array {} function array_unique(array $array, int $flags = SORT_STRING): array {} -function array_intersect_key(array $array1, array $array2, array ...$arrays): array {} +function array_intersect_key(array $input, array $include, array ...$arrays): array {} /** @param array|callable $rest */ -function array_intersect_ukey(array $array1, array $array2, ...$rest): array {} +function array_intersect_ukey(array $input, array $include, ...$rest): array {} -function array_intersect(array $array1, array $array2, array ...$arrays): array {} +function array_intersect(array $input, array $include, array ...$arrays): array {} /** @param array|callable $rest */ -function array_uintersect(array $array1, array $array2, ...$rest): array {} +function array_uintersect(array $input, array $include, ...$rest): array {} -function array_intersect_assoc(array $array1, array $array2, array ...$arrays): array {} +function array_intersect_assoc(array $input, array $include, array ...$rest): array {} /** @param array|callable $rest */ -function array_uintersect_assoc(array $array1, array $array2, ...$rest): array {} +function array_uintersect_assoc(array $input, array $include, ...$rest): array {} /** @param array|callable $rest */ -function array_intersect_uassoc(array $array1, array $array2, ...$rest): array {} +function array_intersect_uassoc(array $input, array $include, ...$rest): array {} /** @param array|callable $rest */ -function array_uintersect_uassoc(array $array1, array $array2, ...$rest): array {} +function array_uintersect_uassoc(array $input, array $include, ...$rest): array {} function array_diff_key(array $array1, array $array2, array ...$arrays): array {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 2798490ed202b..51e5347b554d3 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: b592dc72a6de3ed1f299e6640162bd31241d0852 */ + * Stub hash: c2b725713aba7134708d85f68e64a806d578a0ac */ 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) @@ -277,14 +277,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unique, 0, 1, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_key, 0, 2, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, input, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, include, IS_ARRAY, 0) ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_ukey, 0, 2, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, input, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, include, IS_ARRAY, 0) ZEND_ARG_VARIADIC_INFO(0, rest) ZEND_END_ARG_INFO() @@ -292,7 +292,11 @@ ZEND_END_ARG_INFO() #define arginfo_array_uintersect arginfo_array_intersect_ukey -#define arginfo_array_intersect_assoc arginfo_array_intersect_key +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_assoc, 0, 2, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, input, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, include, IS_ARRAY, 0) + ZEND_ARG_VARIADIC_TYPE_INFO(0, rest, IS_ARRAY, 0) +ZEND_END_ARG_INFO() #define arginfo_array_uintersect_assoc arginfo_array_intersect_ukey @@ -300,21 +304,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, array1, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0) + ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, 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, array1, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, array2, 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_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt index 2bae7fb4a94c5..f24fcfd54956a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt @@ -113,75 +113,75 @@ echo "Done"; --EXPECT-- *** Testing array_intersect_assoc() : Passing non-array values to $array1 argument *** --- Iteration 1 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given +-- Iteration 1 --array_intersect_assoc(): Argument #1 ($input) must be of type array, int given +array_intersect_assoc(): Argument #1 ($input) must be of type array, int given --- Iteration 2 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given +-- Iteration 2 --array_intersect_assoc(): Argument #1 ($input) must be of type array, int given +array_intersect_assoc(): Argument #1 ($input) must be of type array, int given --- Iteration 3 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given +-- Iteration 3 --array_intersect_assoc(): Argument #1 ($input) must be of type array, int given +array_intersect_assoc(): Argument #1 ($input) must be of type array, int given --- Iteration 4 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given +-- Iteration 4 --array_intersect_assoc(): Argument #1 ($input) must be of type array, int given +array_intersect_assoc(): Argument #1 ($input) must be of type array, int given --- Iteration 5 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given +-- Iteration 5 --array_intersect_assoc(): Argument #1 ($input) must be of type array, float given +array_intersect_assoc(): Argument #1 ($input) must be of type array, float given --- Iteration 6 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given +-- Iteration 6 --array_intersect_assoc(): Argument #1 ($input) must be of type array, float given +array_intersect_assoc(): Argument #1 ($input) must be of type array, float given --- Iteration 7 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given +-- Iteration 7 --array_intersect_assoc(): Argument #1 ($input) must be of type array, float given +array_intersect_assoc(): Argument #1 ($input) must be of type array, float given --- Iteration 8 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given +-- Iteration 8 --array_intersect_assoc(): Argument #1 ($input) must be of type array, float given +array_intersect_assoc(): Argument #1 ($input) must be of type array, float given --- Iteration 9 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given +-- Iteration 9 --array_intersect_assoc(): Argument #1 ($input) must be of type array, float given +array_intersect_assoc(): Argument #1 ($input) must be of type array, float given --- Iteration 10 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given +-- Iteration 10 --array_intersect_assoc(): Argument #1 ($input) must be of type array, null given +array_intersect_assoc(): Argument #1 ($input) must be of type array, null given --- Iteration 11 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given +-- Iteration 11 --array_intersect_assoc(): Argument #1 ($input) must be of type array, null given +array_intersect_assoc(): Argument #1 ($input) must be of type array, null given --- Iteration 12 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given +-- Iteration 12 --array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given --- Iteration 13 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given +-- Iteration 13 --array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given --- Iteration 14 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given +-- Iteration 14 --array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given --- Iteration 15 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given +-- Iteration 15 --array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_assoc(): Argument #1 ($input) must be of type array, bool given --- Iteration 16 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given +-- Iteration 16 --array_intersect_assoc(): Argument #1 ($input) must be of type array, string given +array_intersect_assoc(): Argument #1 ($input) must be of type array, string given --- Iteration 17 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given +-- Iteration 17 --array_intersect_assoc(): Argument #1 ($input) must be of type array, string given +array_intersect_assoc(): Argument #1 ($input) must be of type array, string given --- Iteration 18 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given +-- Iteration 18 --array_intersect_assoc(): Argument #1 ($input) must be of type array, string given +array_intersect_assoc(): Argument #1 ($input) must be of type array, string given --- Iteration 19 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given +-- Iteration 19 --array_intersect_assoc(): Argument #1 ($input) must be of type array, string given +array_intersect_assoc(): Argument #1 ($input) must be of type array, string given --- Iteration 20 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given +-- Iteration 20 --array_intersect_assoc(): Argument #1 ($input) must be of type array, string given +array_intersect_assoc(): Argument #1 ($input) must be of type array, string given --- Iteration 21 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, classA given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, classA given +-- Iteration 21 --array_intersect_assoc(): Argument #1 ($input) must be of type array, classA given +array_intersect_assoc(): Argument #1 ($input) must be of type array, classA given --- Iteration 22 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given +-- Iteration 22 --array_intersect_assoc(): Argument #1 ($input) must be of type array, null given +array_intersect_assoc(): Argument #1 ($input) must be of type array, null given --- Iteration 23 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given +-- Iteration 23 --array_intersect_assoc(): Argument #1 ($input) must be of type array, null given +array_intersect_assoc(): Argument #1 ($input) must be of type array, null given --- Iteration 24 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, resource given -array_intersect_assoc(): Argument #1 ($array1) must be of type array, resource given +-- Iteration 24 --array_intersect_assoc(): Argument #1 ($input) must be of type array, resource given +array_intersect_assoc(): Argument #1 ($input) must be of type array, resource given Done diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt index 21ff13cc54029..5cef8c088eccd 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt @@ -114,75 +114,75 @@ echo "Done"; --EXPECT-- *** Testing array_intersect_assoc() : Passing non-array values to $array2 argument *** --- Iteration 1 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given +-- Iteration 1 --array_intersect_assoc(): Argument #2 ($include) must be of type array, int given +array_intersect_assoc(): Argument #2 ($include) must be of type array, int given --- Iteration 2 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given +-- Iteration 2 --array_intersect_assoc(): Argument #2 ($include) must be of type array, int given +array_intersect_assoc(): Argument #2 ($include) must be of type array, int given --- Iteration 3 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given +-- Iteration 3 --array_intersect_assoc(): Argument #2 ($include) must be of type array, int given +array_intersect_assoc(): Argument #2 ($include) must be of type array, int given --- Iteration 4 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, int given +-- Iteration 4 --array_intersect_assoc(): Argument #2 ($include) must be of type array, int given +array_intersect_assoc(): Argument #2 ($include) must be of type array, int given --- Iteration 5 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given +-- Iteration 5 --array_intersect_assoc(): Argument #2 ($include) must be of type array, float given +array_intersect_assoc(): Argument #2 ($include) must be of type array, float given --- Iteration 6 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given +-- Iteration 6 --array_intersect_assoc(): Argument #2 ($include) must be of type array, float given +array_intersect_assoc(): Argument #2 ($include) must be of type array, float given --- Iteration 7 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given +-- Iteration 7 --array_intersect_assoc(): Argument #2 ($include) must be of type array, float given +array_intersect_assoc(): Argument #2 ($include) must be of type array, float given --- Iteration 8 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given +-- Iteration 8 --array_intersect_assoc(): Argument #2 ($include) must be of type array, float given +array_intersect_assoc(): Argument #2 ($include) must be of type array, float given --- Iteration 9 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, float given +-- Iteration 9 --array_intersect_assoc(): Argument #2 ($include) must be of type array, float given +array_intersect_assoc(): Argument #2 ($include) must be of type array, float given --- Iteration 10 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given +-- Iteration 10 --array_intersect_assoc(): Argument #2 ($include) must be of type array, null given +array_intersect_assoc(): Argument #2 ($include) must be of type array, null given --- Iteration 11 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given +-- Iteration 11 --array_intersect_assoc(): Argument #2 ($include) must be of type array, null given +array_intersect_assoc(): Argument #2 ($include) must be of type array, null given --- Iteration 12 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given +-- Iteration 12 --array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given --- Iteration 13 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given +-- Iteration 13 --array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given --- Iteration 14 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given +-- Iteration 14 --array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given --- Iteration 15 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, bool given +-- Iteration 15 --array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_assoc(): Argument #2 ($include) must be of type array, bool given --- Iteration 16 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given +-- Iteration 16 --array_intersect_assoc(): Argument #2 ($include) must be of type array, string given +array_intersect_assoc(): Argument #2 ($include) must be of type array, string given --- Iteration 17 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given +-- Iteration 17 --array_intersect_assoc(): Argument #2 ($include) must be of type array, string given +array_intersect_assoc(): Argument #2 ($include) must be of type array, string given --- Iteration 18 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given +-- Iteration 18 --array_intersect_assoc(): Argument #2 ($include) must be of type array, string given +array_intersect_assoc(): Argument #2 ($include) must be of type array, string given --- Iteration 19 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given +-- Iteration 19 --array_intersect_assoc(): Argument #2 ($include) must be of type array, string given +array_intersect_assoc(): Argument #2 ($include) must be of type array, string given --- Iteration 20 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, string given +-- Iteration 20 --array_intersect_assoc(): Argument #2 ($include) must be of type array, string given +array_intersect_assoc(): Argument #2 ($include) must be of type array, string given --- Iteration 21 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, classA given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, classA given +-- Iteration 21 --array_intersect_assoc(): Argument #2 ($include) must be of type array, classA given +array_intersect_assoc(): Argument #2 ($include) must be of type array, classA given --- Iteration 22 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given +-- Iteration 22 --array_intersect_assoc(): Argument #2 ($include) must be of type array, null given +array_intersect_assoc(): Argument #2 ($include) must be of type array, null given --- Iteration 23 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, null given +-- Iteration 23 --array_intersect_assoc(): Argument #2 ($include) must be of type array, null given +array_intersect_assoc(): Argument #2 ($include) must be of type array, null given --- Iteration 24 --array_intersect_assoc(): Argument #2 ($array2) must be of type array, resource given -array_intersect_assoc(): Argument #2 ($array2) must be of type array, resource given +-- Iteration 24 --array_intersect_assoc(): Argument #2 ($include) must be of type array, resource given +array_intersect_assoc(): Argument #2 ($include) must be of type array, resource given Done diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt index cdf9938984e72..8add53d5cba2c 100644 --- a/ext/standard/tests/array/array_intersect_key_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt @@ -107,105 +107,105 @@ fclose($fp); *** Testing array_intersect_key() : usage variation *** --int 0-- -array_intersect_key(): Argument #1 ($array1) must be of type array, int given -array_intersect_key(): Argument #1 ($array1) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given --int 1-- -array_intersect_key(): Argument #1 ($array1) must be of type array, int given -array_intersect_key(): Argument #1 ($array1) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_intersect_key(): Argument #1 ($array1) must be of type array, int given -array_intersect_key(): Argument #1 ($array1) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_intersect_key(): Argument #1 ($array1) must be of type array, int given -array_intersect_key(): Argument #1 ($array1) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given +array_intersect_key(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_intersect_key(): Argument #1 ($array1) must be of type array, float given -array_intersect_key(): Argument #1 ($array1) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_intersect_key(): Argument #1 ($array1) must be of type array, float given -array_intersect_key(): Argument #1 ($array1) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_intersect_key(): Argument #1 ($array1) must be of type array, float given -array_intersect_key(): Argument #1 ($array1) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_intersect_key(): Argument #1 ($array1) must be of type array, float given -array_intersect_key(): Argument #1 ($array1) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given --float .5-- -array_intersect_key(): Argument #1 ($array1) must be of type array, float given -array_intersect_key(): Argument #1 ($array1) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given +array_intersect_key(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_intersect_key(): Argument #1 ($array1) must be of type array, null given -array_intersect_key(): Argument #1 ($array1) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_intersect_key(): Argument #1 ($array1) must be of type array, null given -array_intersect_key(): Argument #1 ($array1) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given -array_intersect_key(): Argument #1 ($array1) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given +array_intersect_key(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_intersect_key(): Argument #1 ($array1) must be of type array, string given -array_intersect_key(): Argument #1 ($array1) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_intersect_key(): Argument #1 ($array1) must be of type array, string given -array_intersect_key(): Argument #1 ($array1) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_intersect_key(): Argument #1 ($array1) must be of type array, string given -array_intersect_key(): Argument #1 ($array1) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_intersect_key(): Argument #1 ($array1) must be of type array, string given -array_intersect_key(): Argument #1 ($array1) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_intersect_key(): Argument #1 ($array1) must be of type array, string given -array_intersect_key(): Argument #1 ($array1) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_intersect_key(): Argument #1 ($array1) must be of type array, string given -array_intersect_key(): Argument #1 ($array1) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given +array_intersect_key(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_intersect_key(): Argument #1 ($array1) must be of type array, classWithToString given -array_intersect_key(): Argument #1 ($array1) must be of type array, classWithToString given +array_intersect_key(): Argument #1 ($input) must be of type array, classWithToString given +array_intersect_key(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_intersect_key(): Argument #1 ($array1) must be of type array, classWithoutToString given -array_intersect_key(): Argument #1 ($array1) must be of type array, classWithoutToString given +array_intersect_key(): Argument #1 ($input) must be of type array, classWithoutToString given +array_intersect_key(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_intersect_key(): Argument #1 ($array1) must be of type array, null given -array_intersect_key(): Argument #1 ($array1) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given --unset var-- -array_intersect_key(): Argument #1 ($array1) must be of type array, null given -array_intersect_key(): Argument #1 ($array1) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given +array_intersect_key(): Argument #1 ($input) must be of type array, null given --resource var-- -array_intersect_key(): Argument #1 ($array1) must be of type array, resource given -array_intersect_key(): Argument #1 ($array1) must be of type array, resource given +array_intersect_key(): Argument #1 ($input) must be of type array, resource given +array_intersect_key(): Argument #1 ($input) must be of type array, resource given diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt index 65491a2682f11..8ea2df4336e03 100644 --- a/ext/standard/tests/array/array_intersect_key_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt @@ -108,105 +108,105 @@ fclose($fp); *** Testing array_intersect_key() : usage variation *** --int 0-- -array_intersect_key(): Argument #2 ($array2) must be of type array, int given -array_intersect_key(): Argument #2 ($array2) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given --int 1-- -array_intersect_key(): Argument #2 ($array2) must be of type array, int given -array_intersect_key(): Argument #2 ($array2) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given --int 12345-- -array_intersect_key(): Argument #2 ($array2) must be of type array, int given -array_intersect_key(): Argument #2 ($array2) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given --int -12345-- -array_intersect_key(): Argument #2 ($array2) must be of type array, int given -array_intersect_key(): Argument #2 ($array2) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given +array_intersect_key(): Argument #2 ($include) must be of type array, int given --float 10.5-- -array_intersect_key(): Argument #2 ($array2) must be of type array, float given -array_intersect_key(): Argument #2 ($array2) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given --float -10.5-- -array_intersect_key(): Argument #2 ($array2) must be of type array, float given -array_intersect_key(): Argument #2 ($array2) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given --float 12.3456789000e10-- -array_intersect_key(): Argument #2 ($array2) must be of type array, float given -array_intersect_key(): Argument #2 ($array2) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given --float -12.3456789000e10-- -array_intersect_key(): Argument #2 ($array2) must be of type array, float given -array_intersect_key(): Argument #2 ($array2) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given --float .5-- -array_intersect_key(): Argument #2 ($array2) must be of type array, float given -array_intersect_key(): Argument #2 ($array2) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given +array_intersect_key(): Argument #2 ($include) must be of type array, float given --uppercase NULL-- -array_intersect_key(): Argument #2 ($array2) must be of type array, null given -array_intersect_key(): Argument #2 ($array2) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given --lowercase null-- -array_intersect_key(): Argument #2 ($array2) must be of type array, null given -array_intersect_key(): Argument #2 ($array2) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given --lowercase true-- -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given --lowercase false-- -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given --uppercase TRUE-- -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given --uppercase FALSE-- -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given -array_intersect_key(): Argument #2 ($array2) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given +array_intersect_key(): Argument #2 ($include) must be of type array, bool given --empty string DQ-- -array_intersect_key(): Argument #2 ($array2) must be of type array, string given -array_intersect_key(): Argument #2 ($array2) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given --empty string SQ-- -array_intersect_key(): Argument #2 ($array2) must be of type array, string given -array_intersect_key(): Argument #2 ($array2) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given --string DQ-- -array_intersect_key(): Argument #2 ($array2) must be of type array, string given -array_intersect_key(): Argument #2 ($array2) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given --string SQ-- -array_intersect_key(): Argument #2 ($array2) must be of type array, string given -array_intersect_key(): Argument #2 ($array2) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given --mixed case string-- -array_intersect_key(): Argument #2 ($array2) must be of type array, string given -array_intersect_key(): Argument #2 ($array2) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given --heredoc-- -array_intersect_key(): Argument #2 ($array2) must be of type array, string given -array_intersect_key(): Argument #2 ($array2) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given +array_intersect_key(): Argument #2 ($include) must be of type array, string given --instance of classWithToString-- -array_intersect_key(): Argument #2 ($array2) must be of type array, classWithToString given -array_intersect_key(): Argument #2 ($array2) must be of type array, classWithToString given +array_intersect_key(): Argument #2 ($include) must be of type array, classWithToString given +array_intersect_key(): Argument #2 ($include) must be of type array, classWithToString given --instance of classWithoutToString-- -array_intersect_key(): Argument #2 ($array2) must be of type array, classWithoutToString given -array_intersect_key(): Argument #2 ($array2) must be of type array, classWithoutToString given +array_intersect_key(): Argument #2 ($include) must be of type array, classWithoutToString given +array_intersect_key(): Argument #2 ($include) must be of type array, classWithoutToString given --undefined var-- -array_intersect_key(): Argument #2 ($array2) must be of type array, null given -array_intersect_key(): Argument #2 ($array2) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given --unset var-- -array_intersect_key(): Argument #2 ($array2) must be of type array, null given -array_intersect_key(): Argument #2 ($array2) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given +array_intersect_key(): Argument #2 ($include) must be of type array, null given --resource var-- -array_intersect_key(): Argument #2 ($array2) must be of type array, resource given -array_intersect_key(): Argument #2 ($array2) must be of type array, resource given +array_intersect_key(): Argument #2 ($include) must be of type array, resource given +array_intersect_key(): Argument #2 ($include) must be of type array, resource given diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index c686e646894c2..9f0cd3b4accb6 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -115,105 +115,105 @@ fclose($fp); *** Testing array_intersect_uassoc() : usage variation *** --int 0-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given --int 1-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given --float .5-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, classWithToString given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, classWithoutToString given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given --unset var-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, null given --resource-- -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, resource given -array_intersect_uassoc(): Argument #1 ($array1) must be of type array, resource given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, resource given +array_intersect_uassoc(): Argument #1 ($input) must be of type array, resource given diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index 741b3a9405155..435f1b29a413e 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -115,105 +115,105 @@ fclose($fp); *** Testing array_intersect_uassoc() : usage variation *** --int 0-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given --int 1-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given --int 12345-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given --int -12345-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, int given --float 10.5-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given --float -10.5-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given --float 12.3456789000e10-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given --float -12.3456789000e10-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given --float .5-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, float given --uppercase NULL-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given --lowercase null-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given --lowercase true-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given --lowercase false-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given --uppercase TRUE-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given --uppercase FALSE-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, bool given --empty string DQ-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given --empty string SQ-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given --string DQ-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given --string SQ-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given --mixed case string-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given --heredoc-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, string given --instance of classWithToString-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, classWithToString given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, classWithToString given --instance of classWithoutToString-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, classWithoutToString given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, classWithoutToString given --undefined var-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given --unset var-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, null given --resource-- -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, resource given -array_intersect_uassoc(): Argument #2 ($array2) must be of type array, resource given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, resource given +array_intersect_uassoc(): Argument #2 ($include) must be of type array, resource given diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index e73bbd32676d5..810621bfb1f27 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -113,105 +113,105 @@ fclose($fp); *** Testing array_intersect_ukey() : usage variation *** --int 0-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given --int 1-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given +array_intersect_ukey(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given --float .5-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given +array_intersect_ukey(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given +array_intersect_ukey(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given +array_intersect_ukey(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithToString given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithToString given +array_intersect_ukey(): Argument #1 ($input) must be of type array, classWithToString given +array_intersect_ukey(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given +array_intersect_ukey(): Argument #1 ($input) must be of type array, classWithoutToString given +array_intersect_ukey(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given --unset var-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given +array_intersect_ukey(): Argument #1 ($input) must be of type array, null given --resource var-- -array_intersect_ukey(): Argument #1 ($array1) must be of type array, resource given -array_intersect_ukey(): Argument #1 ($array1) must be of type array, resource given +array_intersect_ukey(): Argument #1 ($input) must be of type array, resource given +array_intersect_ukey(): Argument #1 ($input) must be of type array, resource given diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index 7dd5d4c459c16..d039ecd0386b5 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -113,105 +113,105 @@ fclose($fp); *** Testing array_intersect_ukey() : usage variation *** --int 0-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given --int 1-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given --int 12345-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given --int -12345-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given +array_intersect_ukey(): Argument #2 ($include) must be of type array, int given --float 10.5-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given --float -10.5-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given --float 12.3456789000e10-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given --float -12.3456789000e10-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given --float .5-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given +array_intersect_ukey(): Argument #2 ($include) must be of type array, float given --uppercase NULL-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given --lowercase null-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given --lowercase true-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given --lowercase false-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given --uppercase TRUE-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given --uppercase FALSE-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given +array_intersect_ukey(): Argument #2 ($include) must be of type array, bool given --empty string DQ-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given --empty string SQ-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given --string DQ-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given --string SQ-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given --mixed case string-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given --heredoc-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given +array_intersect_ukey(): Argument #2 ($include) must be of type array, string given --instance of classWithToString-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithToString given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithToString given +array_intersect_ukey(): Argument #2 ($include) must be of type array, classWithToString given +array_intersect_ukey(): Argument #2 ($include) must be of type array, classWithToString given --instance of classWithoutToString-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given +array_intersect_ukey(): Argument #2 ($include) must be of type array, classWithoutToString given +array_intersect_ukey(): Argument #2 ($include) must be of type array, classWithoutToString given --undefined var-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given --unset var-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given +array_intersect_ukey(): Argument #2 ($include) must be of type array, null given --resource var-- -array_intersect_ukey(): Argument #2 ($array2) must be of type array, resource given -array_intersect_ukey(): Argument #2 ($array2) must be of type array, resource given +array_intersect_ukey(): Argument #2 ($include) must be of type array, resource given +array_intersect_ukey(): Argument #2 ($include) must be of type array, resource given diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt index f83a4d901eb0c..d6ac5969c96cf 100644 --- a/ext/standard/tests/array/array_intersect_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_variation1.phpt @@ -113,75 +113,75 @@ echo "Done"; --EXPECT-- *** Testing array_intersect() : Passing non-array values to $array1 argument *** --- Iterator 1 --array_intersect(): Argument #1 ($array1) must be of type array, int given -array_intersect(): Argument #1 ($array1) must be of type array, int given +-- Iterator 1 --array_intersect(): Argument #1 ($input) must be of type array, int given +array_intersect(): Argument #1 ($input) must be of type array, int given --- Iterator 2 --array_intersect(): Argument #1 ($array1) must be of type array, int given -array_intersect(): Argument #1 ($array1) must be of type array, int given +-- Iterator 2 --array_intersect(): Argument #1 ($input) must be of type array, int given +array_intersect(): Argument #1 ($input) must be of type array, int given --- Iterator 3 --array_intersect(): Argument #1 ($array1) must be of type array, int given -array_intersect(): Argument #1 ($array1) must be of type array, int given +-- Iterator 3 --array_intersect(): Argument #1 ($input) must be of type array, int given +array_intersect(): Argument #1 ($input) must be of type array, int given --- Iterator 4 --array_intersect(): Argument #1 ($array1) must be of type array, int given -array_intersect(): Argument #1 ($array1) must be of type array, int given +-- Iterator 4 --array_intersect(): Argument #1 ($input) must be of type array, int given +array_intersect(): Argument #1 ($input) must be of type array, int given --- Iterator 5 --array_intersect(): Argument #1 ($array1) must be of type array, float given -array_intersect(): Argument #1 ($array1) must be of type array, float given +-- Iterator 5 --array_intersect(): Argument #1 ($input) must be of type array, float given +array_intersect(): Argument #1 ($input) must be of type array, float given --- Iterator 6 --array_intersect(): Argument #1 ($array1) must be of type array, float given -array_intersect(): Argument #1 ($array1) must be of type array, float given +-- Iterator 6 --array_intersect(): Argument #1 ($input) must be of type array, float given +array_intersect(): Argument #1 ($input) must be of type array, float given --- Iterator 7 --array_intersect(): Argument #1 ($array1) must be of type array, float given -array_intersect(): Argument #1 ($array1) must be of type array, float given +-- Iterator 7 --array_intersect(): Argument #1 ($input) must be of type array, float given +array_intersect(): Argument #1 ($input) must be of type array, float given --- Iterator 8 --array_intersect(): Argument #1 ($array1) must be of type array, float given -array_intersect(): Argument #1 ($array1) must be of type array, float given +-- Iterator 8 --array_intersect(): Argument #1 ($input) must be of type array, float given +array_intersect(): Argument #1 ($input) must be of type array, float given --- Iterator 9 --array_intersect(): Argument #1 ($array1) must be of type array, float given -array_intersect(): Argument #1 ($array1) must be of type array, float given +-- Iterator 9 --array_intersect(): Argument #1 ($input) must be of type array, float given +array_intersect(): Argument #1 ($input) must be of type array, float given --- Iterator 10 --array_intersect(): Argument #1 ($array1) must be of type array, null given -array_intersect(): Argument #1 ($array1) must be of type array, null given +-- Iterator 10 --array_intersect(): Argument #1 ($input) must be of type array, null given +array_intersect(): Argument #1 ($input) must be of type array, null given --- Iterator 11 --array_intersect(): Argument #1 ($array1) must be of type array, null given -array_intersect(): Argument #1 ($array1) must be of type array, null given +-- Iterator 11 --array_intersect(): Argument #1 ($input) must be of type array, null given +array_intersect(): Argument #1 ($input) must be of type array, null given --- Iterator 12 --array_intersect(): Argument #1 ($array1) must be of type array, bool given -array_intersect(): Argument #1 ($array1) must be of type array, bool given +-- Iterator 12 --array_intersect(): Argument #1 ($input) must be of type array, bool given +array_intersect(): Argument #1 ($input) must be of type array, bool given --- Iterator 13 --array_intersect(): Argument #1 ($array1) must be of type array, bool given -array_intersect(): Argument #1 ($array1) must be of type array, bool given +-- Iterator 13 --array_intersect(): Argument #1 ($input) must be of type array, bool given +array_intersect(): Argument #1 ($input) must be of type array, bool given --- Iterator 14 --array_intersect(): Argument #1 ($array1) must be of type array, bool given -array_intersect(): Argument #1 ($array1) must be of type array, bool given +-- Iterator 14 --array_intersect(): Argument #1 ($input) must be of type array, bool given +array_intersect(): Argument #1 ($input) must be of type array, bool given --- Iterator 15 --array_intersect(): Argument #1 ($array1) must be of type array, bool given -array_intersect(): Argument #1 ($array1) must be of type array, bool given +-- Iterator 15 --array_intersect(): Argument #1 ($input) must be of type array, bool given +array_intersect(): Argument #1 ($input) must be of type array, bool given --- Iterator 16 --array_intersect(): Argument #1 ($array1) must be of type array, string given -array_intersect(): Argument #1 ($array1) must be of type array, string given +-- Iterator 16 --array_intersect(): Argument #1 ($input) must be of type array, string given +array_intersect(): Argument #1 ($input) must be of type array, string given --- Iterator 17 --array_intersect(): Argument #1 ($array1) must be of type array, string given -array_intersect(): Argument #1 ($array1) must be of type array, string given +-- Iterator 17 --array_intersect(): Argument #1 ($input) must be of type array, string given +array_intersect(): Argument #1 ($input) must be of type array, string given --- Iterator 18 --array_intersect(): Argument #1 ($array1) must be of type array, string given -array_intersect(): Argument #1 ($array1) must be of type array, string given +-- Iterator 18 --array_intersect(): Argument #1 ($input) must be of type array, string given +array_intersect(): Argument #1 ($input) must be of type array, string given --- Iterator 19 --array_intersect(): Argument #1 ($array1) must be of type array, string given -array_intersect(): Argument #1 ($array1) must be of type array, string given +-- Iterator 19 --array_intersect(): Argument #1 ($input) must be of type array, string given +array_intersect(): Argument #1 ($input) must be of type array, string given --- Iterator 20 --array_intersect(): Argument #1 ($array1) must be of type array, string given -array_intersect(): Argument #1 ($array1) must be of type array, string given +-- Iterator 20 --array_intersect(): Argument #1 ($input) must be of type array, string given +array_intersect(): Argument #1 ($input) must be of type array, string given --- Iterator 21 --array_intersect(): Argument #1 ($array1) must be of type array, classA given -array_intersect(): Argument #1 ($array1) must be of type array, classA given +-- Iterator 21 --array_intersect(): Argument #1 ($input) must be of type array, classA given +array_intersect(): Argument #1 ($input) must be of type array, classA given --- Iterator 22 --array_intersect(): Argument #1 ($array1) must be of type array, null given -array_intersect(): Argument #1 ($array1) must be of type array, null given +-- Iterator 22 --array_intersect(): Argument #1 ($input) must be of type array, null given +array_intersect(): Argument #1 ($input) must be of type array, null given --- Iterator 23 --array_intersect(): Argument #1 ($array1) must be of type array, null given -array_intersect(): Argument #1 ($array1) must be of type array, null given +-- Iterator 23 --array_intersect(): Argument #1 ($input) must be of type array, null given +array_intersect(): Argument #1 ($input) must be of type array, null given --- Iterator 24 --array_intersect(): Argument #1 ($array1) must be of type array, resource given -array_intersect(): Argument #1 ($array1) must be of type array, resource given +-- Iterator 24 --array_intersect(): Argument #1 ($input) must be of type array, resource given +array_intersect(): Argument #1 ($input) must be of type array, resource given Done diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt index 302ea149d8220..395ec960d6b79 100644 --- a/ext/standard/tests/array/array_intersect_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_variation2.phpt @@ -114,75 +114,75 @@ echo "Done"; --EXPECT-- *** Testing array_intersect() : Passing non-array values to $array2 argument *** --- Iterator 1 --array_intersect(): Argument #2 ($array2) must be of type array, int given -array_intersect(): Argument #2 ($array2) must be of type array, int given +-- Iterator 1 --array_intersect(): Argument #2 ($include) must be of type array, int given +array_intersect(): Argument #2 ($include) must be of type array, int given --- Iterator 2 --array_intersect(): Argument #2 ($array2) must be of type array, int given -array_intersect(): Argument #2 ($array2) must be of type array, int given +-- Iterator 2 --array_intersect(): Argument #2 ($include) must be of type array, int given +array_intersect(): Argument #2 ($include) must be of type array, int given --- Iterator 3 --array_intersect(): Argument #2 ($array2) must be of type array, int given -array_intersect(): Argument #2 ($array2) must be of type array, int given +-- Iterator 3 --array_intersect(): Argument #2 ($include) must be of type array, int given +array_intersect(): Argument #2 ($include) must be of type array, int given --- Iterator 4 --array_intersect(): Argument #2 ($array2) must be of type array, int given -array_intersect(): Argument #2 ($array2) must be of type array, int given +-- Iterator 4 --array_intersect(): Argument #2 ($include) must be of type array, int given +array_intersect(): Argument #2 ($include) must be of type array, int given --- Iterator 5 --array_intersect(): Argument #2 ($array2) must be of type array, float given -array_intersect(): Argument #2 ($array2) must be of type array, float given +-- Iterator 5 --array_intersect(): Argument #2 ($include) must be of type array, float given +array_intersect(): Argument #2 ($include) must be of type array, float given --- Iterator 6 --array_intersect(): Argument #2 ($array2) must be of type array, float given -array_intersect(): Argument #2 ($array2) must be of type array, float given +-- Iterator 6 --array_intersect(): Argument #2 ($include) must be of type array, float given +array_intersect(): Argument #2 ($include) must be of type array, float given --- Iterator 7 --array_intersect(): Argument #2 ($array2) must be of type array, float given -array_intersect(): Argument #2 ($array2) must be of type array, float given +-- Iterator 7 --array_intersect(): Argument #2 ($include) must be of type array, float given +array_intersect(): Argument #2 ($include) must be of type array, float given --- Iterator 8 --array_intersect(): Argument #2 ($array2) must be of type array, float given -array_intersect(): Argument #2 ($array2) must be of type array, float given +-- Iterator 8 --array_intersect(): Argument #2 ($include) must be of type array, float given +array_intersect(): Argument #2 ($include) must be of type array, float given --- Iterator 9 --array_intersect(): Argument #2 ($array2) must be of type array, float given -array_intersect(): Argument #2 ($array2) must be of type array, float given +-- Iterator 9 --array_intersect(): Argument #2 ($include) must be of type array, float given +array_intersect(): Argument #2 ($include) must be of type array, float given --- Iterator 10 --array_intersect(): Argument #2 ($array2) must be of type array, null given -array_intersect(): Argument #2 ($array2) must be of type array, null given +-- Iterator 10 --array_intersect(): Argument #2 ($include) must be of type array, null given +array_intersect(): Argument #2 ($include) must be of type array, null given --- Iterator 11 --array_intersect(): Argument #2 ($array2) must be of type array, null given -array_intersect(): Argument #2 ($array2) must be of type array, null given +-- Iterator 11 --array_intersect(): Argument #2 ($include) must be of type array, null given +array_intersect(): Argument #2 ($include) must be of type array, null given --- Iterator 12 --array_intersect(): Argument #2 ($array2) must be of type array, bool given -array_intersect(): Argument #2 ($array2) must be of type array, bool given +-- Iterator 12 --array_intersect(): Argument #2 ($include) must be of type array, bool given +array_intersect(): Argument #2 ($include) must be of type array, bool given --- Iterator 13 --array_intersect(): Argument #2 ($array2) must be of type array, bool given -array_intersect(): Argument #2 ($array2) must be of type array, bool given +-- Iterator 13 --array_intersect(): Argument #2 ($include) must be of type array, bool given +array_intersect(): Argument #2 ($include) must be of type array, bool given --- Iterator 14 --array_intersect(): Argument #2 ($array2) must be of type array, bool given -array_intersect(): Argument #2 ($array2) must be of type array, bool given +-- Iterator 14 --array_intersect(): Argument #2 ($include) must be of type array, bool given +array_intersect(): Argument #2 ($include) must be of type array, bool given --- Iterator 15 --array_intersect(): Argument #2 ($array2) must be of type array, bool given -array_intersect(): Argument #2 ($array2) must be of type array, bool given +-- Iterator 15 --array_intersect(): Argument #2 ($include) must be of type array, bool given +array_intersect(): Argument #2 ($include) must be of type array, bool given --- Iterator 16 --array_intersect(): Argument #2 ($array2) must be of type array, string given -array_intersect(): Argument #2 ($array2) must be of type array, string given +-- Iterator 16 --array_intersect(): Argument #2 ($include) must be of type array, string given +array_intersect(): Argument #2 ($include) must be of type array, string given --- Iterator 17 --array_intersect(): Argument #2 ($array2) must be of type array, string given -array_intersect(): Argument #2 ($array2) must be of type array, string given +-- Iterator 17 --array_intersect(): Argument #2 ($include) must be of type array, string given +array_intersect(): Argument #2 ($include) must be of type array, string given --- Iterator 18 --array_intersect(): Argument #2 ($array2) must be of type array, string given -array_intersect(): Argument #2 ($array2) must be of type array, string given +-- Iterator 18 --array_intersect(): Argument #2 ($include) must be of type array, string given +array_intersect(): Argument #2 ($include) must be of type array, string given --- Iterator 19 --array_intersect(): Argument #2 ($array2) must be of type array, string given -array_intersect(): Argument #2 ($array2) must be of type array, string given +-- Iterator 19 --array_intersect(): Argument #2 ($include) must be of type array, string given +array_intersect(): Argument #2 ($include) must be of type array, string given --- Iterator 20 --array_intersect(): Argument #2 ($array2) must be of type array, string given -array_intersect(): Argument #2 ($array2) must be of type array, string given +-- Iterator 20 --array_intersect(): Argument #2 ($include) must be of type array, string given +array_intersect(): Argument #2 ($include) must be of type array, string given --- Iterator 21 --array_intersect(): Argument #2 ($array2) must be of type array, classA given -array_intersect(): Argument #2 ($array2) must be of type array, classA given +-- Iterator 21 --array_intersect(): Argument #2 ($include) must be of type array, classA given +array_intersect(): Argument #2 ($include) must be of type array, classA given --- Iterator 22 --array_intersect(): Argument #2 ($array2) must be of type array, null given -array_intersect(): Argument #2 ($array2) must be of type array, null given +-- Iterator 22 --array_intersect(): Argument #2 ($include) must be of type array, null given +array_intersect(): Argument #2 ($include) must be of type array, null given --- Iterator 23 --array_intersect(): Argument #2 ($array2) must be of type array, null given -array_intersect(): Argument #2 ($array2) must be of type array, null given +-- Iterator 23 --array_intersect(): Argument #2 ($include) must be of type array, null given +array_intersect(): Argument #2 ($include) must be of type array, null given --- Iterator 24 --array_intersect(): Argument #2 ($array2) must be of type array, resource given -array_intersect(): Argument #2 ($array2) must be of type array, resource given +-- Iterator 24 --array_intersect(): Argument #2 ($include) must be of type array, resource given +array_intersect(): Argument #2 ($include) must be of type array, resource given Done diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index c339b9094b20b..2e9e36cf2ef07 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) { *** Testing array_uintersect_assoc() : usage variation *** --int 0-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, int given --int 1-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, float given --float .5-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, classWithToString given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, classWithoutToString given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, null given --unset var-- -array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_assoc(): Argument #1 ($input) must be of type array, null given diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index 69b61d1a24b56..0475c2cce8e2f 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) { *** Testing array_uintersect_assoc() : usage variation *** --int 0-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, int given --int 1-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, int given --int 12345-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, int given --int -12345-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, int given --float 10.5-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, float given --float -10.5-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, float given --float 12.3456789000e10-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, float given --float -12.3456789000e10-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, float given --float .5-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, float given --uppercase NULL-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, null given --lowercase null-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, null given --lowercase true-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, bool given --lowercase false-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, bool given --uppercase TRUE-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, bool given --uppercase FALSE-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, bool given --empty string DQ-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, string given --empty string SQ-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, string given --string DQ-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, string given --string SQ-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, string given --mixed case string-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, string given --heredoc-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, string given --instance of classWithToString-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, classWithToString given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, classWithToString given --instance of classWithoutToString-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, classWithoutToString given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, classWithoutToString given --undefined var-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, null given --unset var-- -array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_assoc(): Argument #2 ($include) must be of type array, null given diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index c946c1f634b09..2650042297356 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) { *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, int given --int 1-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, float given --float .5-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, null given --unset var-- -array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given +array_uintersect_uassoc(): Argument #1 ($input) must be of type array, null given diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index e2171f1453469..0cf851715804a 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) { *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, int given --int 1-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, int given --int 12345-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, int given --int -12345-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, int given --float 10.5-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, float given --float -10.5-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, float given --float 12.3456789000e10-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, float given --float -12.3456789000e10-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, float given --float .5-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, float given --uppercase NULL-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, null given --lowercase null-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, null given --lowercase true-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, bool given --lowercase false-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, bool given --uppercase TRUE-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, bool given --uppercase FALSE-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, bool given --empty string DQ-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, string given --empty string SQ-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, string given --string DQ-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, string given --string SQ-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, string given --mixed case string-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, string given --heredoc-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, string given --instance of classWithToString-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, classWithToString given --instance of classWithoutToString-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, classWithoutToString given --undefined var-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, null given --unset var-- -array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given +array_uintersect_uassoc(): Argument #2 ($include) must be of type array, null given diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index c593a95fe678c..8c4fcf32a370e 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) { *** Testing array_uintersect() : usage variation *** --int 0-- -array_uintersect(): Argument #1 ($array1) must be of type array, int given +array_uintersect(): Argument #1 ($input) must be of type array, int given --int 1-- -array_uintersect(): Argument #1 ($array1) must be of type array, int given +array_uintersect(): Argument #1 ($input) must be of type array, int given --int 12345-- -array_uintersect(): Argument #1 ($array1) must be of type array, int given +array_uintersect(): Argument #1 ($input) must be of type array, int given --int -12345-- -array_uintersect(): Argument #1 ($array1) must be of type array, int given +array_uintersect(): Argument #1 ($input) must be of type array, int given --float 10.5-- -array_uintersect(): Argument #1 ($array1) must be of type array, float given +array_uintersect(): Argument #1 ($input) must be of type array, float given --float -10.5-- -array_uintersect(): Argument #1 ($array1) must be of type array, float given +array_uintersect(): Argument #1 ($input) must be of type array, float given --float 12.3456789000e10-- -array_uintersect(): Argument #1 ($array1) must be of type array, float given +array_uintersect(): Argument #1 ($input) must be of type array, float given --float -12.3456789000e10-- -array_uintersect(): Argument #1 ($array1) must be of type array, float given +array_uintersect(): Argument #1 ($input) must be of type array, float given --float .5-- -array_uintersect(): Argument #1 ($array1) must be of type array, float given +array_uintersect(): Argument #1 ($input) must be of type array, float given --uppercase NULL-- -array_uintersect(): Argument #1 ($array1) must be of type array, null given +array_uintersect(): Argument #1 ($input) must be of type array, null given --lowercase null-- -array_uintersect(): Argument #1 ($array1) must be of type array, null given +array_uintersect(): Argument #1 ($input) must be of type array, null given --lowercase true-- -array_uintersect(): Argument #1 ($array1) must be of type array, bool given +array_uintersect(): Argument #1 ($input) must be of type array, bool given --lowercase false-- -array_uintersect(): Argument #1 ($array1) must be of type array, bool given +array_uintersect(): Argument #1 ($input) must be of type array, bool given --uppercase TRUE-- -array_uintersect(): Argument #1 ($array1) must be of type array, bool given +array_uintersect(): Argument #1 ($input) must be of type array, bool given --uppercase FALSE-- -array_uintersect(): Argument #1 ($array1) must be of type array, bool given +array_uintersect(): Argument #1 ($input) must be of type array, bool given --empty string DQ-- -array_uintersect(): Argument #1 ($array1) must be of type array, string given +array_uintersect(): Argument #1 ($input) must be of type array, string given --empty string SQ-- -array_uintersect(): Argument #1 ($array1) must be of type array, string given +array_uintersect(): Argument #1 ($input) must be of type array, string given --string DQ-- -array_uintersect(): Argument #1 ($array1) must be of type array, string given +array_uintersect(): Argument #1 ($input) must be of type array, string given --string SQ-- -array_uintersect(): Argument #1 ($array1) must be of type array, string given +array_uintersect(): Argument #1 ($input) must be of type array, string given --mixed case string-- -array_uintersect(): Argument #1 ($array1) must be of type array, string given +array_uintersect(): Argument #1 ($input) must be of type array, string given --heredoc-- -array_uintersect(): Argument #1 ($array1) must be of type array, string given +array_uintersect(): Argument #1 ($input) must be of type array, string given --instance of classWithToString-- -array_uintersect(): Argument #1 ($array1) must be of type array, classWithToString given +array_uintersect(): Argument #1 ($input) must be of type array, classWithToString given --instance of classWithoutToString-- -array_uintersect(): Argument #1 ($array1) must be of type array, classWithoutToString given +array_uintersect(): Argument #1 ($input) must be of type array, classWithoutToString given --undefined var-- -array_uintersect(): Argument #1 ($array1) must be of type array, null given +array_uintersect(): Argument #1 ($input) must be of type array, null given --unset var-- -array_uintersect(): Argument #1 ($array1) must be of type array, null given +array_uintersect(): Argument #1 ($input) must be of type array, null given diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index 515b1ef207c0b..d242be17492f9 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) { *** Testing array_uintersect() : usage variation *** --int 0-- -array_uintersect(): Argument #2 ($array2) must be of type array, int given +array_uintersect(): Argument #2 ($include) must be of type array, int given --int 1-- -array_uintersect(): Argument #2 ($array2) must be of type array, int given +array_uintersect(): Argument #2 ($include) must be of type array, int given --int 12345-- -array_uintersect(): Argument #2 ($array2) must be of type array, int given +array_uintersect(): Argument #2 ($include) must be of type array, int given --int -12345-- -array_uintersect(): Argument #2 ($array2) must be of type array, int given +array_uintersect(): Argument #2 ($include) must be of type array, int given --float 10.5-- -array_uintersect(): Argument #2 ($array2) must be of type array, float given +array_uintersect(): Argument #2 ($include) must be of type array, float given --float -10.5-- -array_uintersect(): Argument #2 ($array2) must be of type array, float given +array_uintersect(): Argument #2 ($include) must be of type array, float given --float 12.3456789000e10-- -array_uintersect(): Argument #2 ($array2) must be of type array, float given +array_uintersect(): Argument #2 ($include) must be of type array, float given --float -12.3456789000e10-- -array_uintersect(): Argument #2 ($array2) must be of type array, float given +array_uintersect(): Argument #2 ($include) must be of type array, float given --float .5-- -array_uintersect(): Argument #2 ($array2) must be of type array, float given +array_uintersect(): Argument #2 ($include) must be of type array, float given --uppercase NULL-- -array_uintersect(): Argument #2 ($array2) must be of type array, null given +array_uintersect(): Argument #2 ($include) must be of type array, null given --lowercase null-- -array_uintersect(): Argument #2 ($array2) must be of type array, null given +array_uintersect(): Argument #2 ($include) must be of type array, null given --lowercase true-- -array_uintersect(): Argument #2 ($array2) must be of type array, bool given +array_uintersect(): Argument #2 ($include) must be of type array, bool given --lowercase false-- -array_uintersect(): Argument #2 ($array2) must be of type array, bool given +array_uintersect(): Argument #2 ($include) must be of type array, bool given --uppercase TRUE-- -array_uintersect(): Argument #2 ($array2) must be of type array, bool given +array_uintersect(): Argument #2 ($include) must be of type array, bool given --uppercase FALSE-- -array_uintersect(): Argument #2 ($array2) must be of type array, bool given +array_uintersect(): Argument #2 ($include) must be of type array, bool given --empty string DQ-- -array_uintersect(): Argument #2 ($array2) must be of type array, string given +array_uintersect(): Argument #2 ($include) must be of type array, string given --empty string SQ-- -array_uintersect(): Argument #2 ($array2) must be of type array, string given +array_uintersect(): Argument #2 ($include) must be of type array, string given --string DQ-- -array_uintersect(): Argument #2 ($array2) must be of type array, string given +array_uintersect(): Argument #2 ($include) must be of type array, string given --string SQ-- -array_uintersect(): Argument #2 ($array2) must be of type array, string given +array_uintersect(): Argument #2 ($include) must be of type array, string given --mixed case string-- -array_uintersect(): Argument #2 ($array2) must be of type array, string given +array_uintersect(): Argument #2 ($include) must be of type array, string given --heredoc-- -array_uintersect(): Argument #2 ($array2) must be of type array, string given +array_uintersect(): Argument #2 ($include) must be of type array, string given --instance of classWithToString-- -array_uintersect(): Argument #2 ($array2) must be of type array, classWithToString given +array_uintersect(): Argument #2 ($include) must be of type array, classWithToString given --instance of classWithoutToString-- -array_uintersect(): Argument #2 ($array2) must be of type array, classWithoutToString given +array_uintersect(): Argument #2 ($include) must be of type array, classWithoutToString given --undefined var-- -array_uintersect(): Argument #2 ($array2) must be of type array, null given +array_uintersect(): Argument #2 ($include) must be of type array, null given --unset var-- -array_uintersect(): Argument #2 ($array2) must be of type array, null given +array_uintersect(): Argument #2 ($include) must be of type array, null given From e334d19a8590f9d398360c055044dc2bf1b0c00b Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Fri, 21 Aug 2020 15:18:34 -0500 Subject: [PATCH 3/4] Update array_map parameter names to be more user friendly. --- ext/standard/basic_functions.stub.php | 2 +- ext/standard/basic_functions_arginfo.h | 6 +++--- ext/standard/tests/array/array_map_variation10.phpt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index cb1c2c178a01b..e0ac0e0c0ee0f 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -243,7 +243,7 @@ function array_reduce(array $array, callable $callback, mixed $initial = null): function array_filter(array $array, ?callable $callback = null, int $use_keys = 0): array {} -function array_map(?callable $callback, array $array1, array ...$arrays): array {} +function array_map(?callable $callback, array $input, array ...$rest): array {} /** @param int|string $key */ function array_key_exists($key, array $search): bool {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 51e5347b554d3..61422b1587f9a 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: c2b725713aba7134708d85f68e64a806d578a0ac */ + * Stub hash: 4669bad28e24cd6d8e49b3315dd8d3924cfed1e5 */ 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) @@ -360,8 +360,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_map, 0, 2, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1) - ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0) - ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, input, 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_key_exists, 0, 2, _IS_BOOL, 0) diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt index e226b7c71d46d..a4757866912bf 100644 --- a/ext/standard/tests/array/array_map_variation10.phpt +++ b/ext/standard/tests/array/array_map_variation10.phpt @@ -83,5 +83,5 @@ array(3) { NULL } -- passing NULL as 'array1' -- -array_map(): Argument #2 ($array1) must be of type array, null given +array_map(): Argument #2 ($input) must be of type array, null given Done From 5d5c7c767d879085bc957691ce7799462401fa2f Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Fri, 21 Aug 2020 15:19:32 -0500 Subject: [PATCH 4/4] Update array_replace_recursive() parameters to be more user-friendly. --- ext/standard/basic_functions.stub.php | 2 +- ext/standard/basic_functions_arginfo.h | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index e0ac0e0c0ee0f..669fb1c26395d 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -155,7 +155,7 @@ function array_merge_recursive(array ...$arrays): array {} function array_replace(array $input, array ...$replacements): array {} -function array_replace_recursive(array $array1, array ...$arrays): array {} +function array_replace_recursive(array $input, array ...$replacements): array {} function array_keys(array $array, mixed $search_value = UNKNOWN, bool $strict = false): array {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 61422b1587f9a..25134124ab3a4 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: 4669bad28e24cd6d8e49b3315dd8d3924cfed1e5 */ + * Stub hash: 0f6a324f551636fb1d95c9c0c3f75da312f2d38a */ 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) @@ -224,10 +224,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_replace, 0, 1, IS_ARRAY, 0 ZEND_ARG_VARIADIC_TYPE_INFO(0, replacements, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_replace_recursive, 0, 1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0) - ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0) -ZEND_END_ARG_INFO() +#define arginfo_array_replace_recursive arginfo_array_replace ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_keys, 0, 1, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)