Rename standard array function parameters to $array

This is targeting 8.0.

`$arg` seems like a poor choice of a name,
especially if the function were to have arguments added.

In many cases, the php.net documentation already has $array for these functions.
E.g. https://www.php.net/manual/en/function.array-intersect.php

I'd assume that since named arguments was added to 8.0 near the feature freeze,
PHP's maintainers had planned to make the names consistent
and gradually use the same name for  docs and implementation.

diff --git a/Zend/tests/call_user_func_009.phpt b/Zend/tests/call_user_func_009.phpt
index 6f2ec7a4b6b58ba632f5c02d1d5bea2358a38d80..7224dc06fac3e7d1efbb2b2c7fe623f961e061b1 100644 (file)
--- a/Zend/tests/call_user_func_009.phpt
+++ b/Zend/tests/call_user_func_009.phpt
@@ -10,8 +10,8 @@ var_dump(\call_user_func('sort', []));
 
 ?>
 --EXPECTF--
-Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d
+Warning: sort(): Argument #1 ($array) must be passed by reference, value given in %s on line %d
 bool(true)
 
-Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d
+Warning: sort(): Argument #1 ($array) must be passed by reference, value given in %s on line %d
 bool(true)

diff --git a/Zend/tests/named_params/internal.phpt b/Zend/tests/named_params/internal.phpt
index 97260c2564ed47b8ef9264b0110967ed8c590360..d9fef27c93539aba866e324b42b01b5886299ece 100644 (file)
--- a/Zend/tests/named_params/internal.phpt
+++ b/Zend/tests/named_params/internal.phpt
@@ -3,10 +3,10 @@ Named params on internal functions
 --FILE--
 <?php
 
-var_dump(array_slice(arg: [1, 2, 3, 4, 5], offset: 2, length: 2));
-var_dump(array_slice(length: 2, offset: 2, arg: [1, 2, 3, 4, 5]));
+var_dump(array_slice(array: [1, 2, 3, 4, 5], offset: 2, length: 2));
+var_dump(array_slice(length: 2, offset: 2, array: [1, 2, 3, 4, 5]));
 
-var_dump(array_slice(arg: ['a' => 0, 'b' => 1], offset: 1, preserve_keys: true));
+var_dump(array_slice(array: ['a' => 0, 'b' => 1], offset: 1, preserve_keys: true));
 var_dump(array_slice(['a' => 0, 'b' => 1], preserve_keys: true, offset: 1));
 var_dump(str_pad("foo", 6, pad_type: STR_PAD_LEFT));
 

diff --git a/Zend/tests/named_params/missing_param.phpt b/Zend/tests/named_params/missing_param.phpt
index 52dc1b1a547a73b2b0171509481f249563474499..3ee2feae0a41f2ad5c50532ff33acc6dbb513b1d 100644 (file)
--- a/Zend/tests/named_params/missing_param.phpt
+++ b/Zend/tests/named_params/missing_param.phpt
@@ -30,7 +30,7 @@ var_dump(array_keys([41, 42], search_value: 42, strict: true));
 ?>
 --EXPECT--
 test(): Argument #2 ($b) not passed
-array_keys(): Argument #1 ($arg) not passed
+array_keys(): Argument #1 ($array) not passed
 array_keys(): Argument #2 ($search_value) must be passed explicitly, because the default value is not known
 array(1) {
   [0]=>

diff --git a/Zend/tests/nullsafe_operator/013.phpt b/Zend/tests/nullsafe_operator/013.phpt
index 12101137743490b4088c84056260c0d51f18d2ff..0fef34b2b7644279826f24bb7f15b18943cf05d5 100644 (file)
--- a/Zend/tests/nullsafe_operator/013.phpt
+++ b/Zend/tests/nullsafe_operator/013.phpt
@@ -54,7 +54,7 @@ string(56) "get_called_class() expects exactly 0 parameters, 1 given"
 string(4) "NULL"
 string(53) "func_num_args() expects exactly 0 parameters, 1 given"
 string(53) "func_get_args() expects exactly 0 parameters, 1 given"
-string(67) "array_slice(): Argument #1 ($arg) must be of type array, null given"
+string(69) "array_slice(): Argument #1 ($array) must be of type array, null given"
 array(1) {
   [0]=>
   string(3) "foo"

diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
index da08cc6288198a7fea1c562ee3406c73d0096913..c5a7b727143b64b3e876967f888a010fcfc67f4d 100644 (file)
--- a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
+++ b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
@@ -27,7 +27,7 @@ aux('sort');
 
 echo "=> user function:\n\n";
 
-function ufunc(&$arg1, $arg2) {}
+function ufunc(&$array1, $array2) {}
 
 aux('ufunc');
 
@@ -37,7 +37,7 @@ echo "Done.\n";
 --EXPECT--
 => array_multisort:
 
-Name: arr1
+Name: array1
 Is passed by reference: yes
 Can be passed by value: yes
 
@@ -49,13 +49,13 @@ Name: sort_flags
 Is passed by reference: yes
 Can be passed by value: yes
 
-Name: arr2
+Name: arrays
 Is passed by reference: yes
 Can be passed by value: yes
 
 => sort:
 
-Name: arg
+Name: array
 Is passed by reference: yes
 Can be passed by value: no
 
@@ -65,11 +65,11 @@ Can be passed by value: yes
 
 => user function:
 
-Name: arg1
+Name: array1
 Is passed by reference: yes
 Can be passed by value: no
 
-Name: arg2
+Name: array2
 Is passed by reference: no
 Can be passed by value: yes
 

diff --git a/ext/standard/array.c b/ext/standard/array.c
index de96a46cd5fd88a5752096a8c01ed49b5133721c..d20e7977818376093d2b1220e90b137d2b5cd7b8 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -5811,7 +5811,7 @@ PHP_FUNCTION(array_rand)
        }
 
        if (num_req <= 0 || num_req > num_avail) {
-               zend_argument_value_error(2, "must be between 1 and the number of elements in argument #1 ($arg)");
+               zend_argument_value_error(2, "must be between 1 and the number of elements in argument #1 ($array)");
                RETURN_THROWS();
        }
 

diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index c43eb06d986d42be06c1b43f9d295a405a12c9cb..75626971b61fdb0e09ec186656fa701fcf1e3859 100755 (executable)
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -59,9 +59,9 @@ function stream_wrapper_restore(string $protocol): bool {}
 
 function array_push(array &$stack, mixed ...$args): int {}
 
-function krsort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
+function krsort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
 
-function ksort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
+function ksort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
 
 /** @param array|Countable|null $var */
 function count($var, int $mode = COUNT_NORMAL): int {}
@@ -72,23 +72,23 @@ function count($var, int $mode = COUNT_NORMAL): int {}
  */
 function sizeof($var, int $mode = COUNT_NORMAL): int {}
 
-function natsort(array &$arg): bool {}
+function natsort(array &$array): bool {}
 
-function natcasesort(array &$arg): bool {}
+function natcasesort(array &$array): bool {}
 
-function asort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
+function asort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
 
-function arsort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
+function arsort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
 
-function sort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
+function sort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
 
-function rsort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
+function rsort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
 
-function usort(array &$arg, callable $cmp_function): bool {}
+function usort(array &$array, callable $cmp_function): bool {}
 
-function uasort(array &$arg, callable $cmp_function): bool {}
+function uasort(array &$array, callable $cmp_function): bool {}
 
-function uksort(array &$arg, callable $cmp_function): bool {}
+function uksort(array &$array, callable $cmp_function): bool {}
 
 function end(array|object &$arg): mixed {}
 
@@ -117,8 +117,8 @@ function in_array(mixed $needle, array $haystack, bool $strict = false): bool {}
 
 function array_search(mixed $needle, array $haystack, bool $strict = false): int|string|false {}
 
-/** @prefer-ref $arg */
-function extract(array &$arg, int $extract_type = EXTR_OVERWRITE, string $prefix = ""): int {}
+/** @prefer-ref $array */
+function extract(array &$array, int $extract_type = EXTR_OVERWRITE, string $prefix = ""): int {}
 
 function compact($var_name, ...$var_names): array {}
 
@@ -133,7 +133,7 @@ function array_fill_keys(array $keys, mixed $val): array {}
  */
 function range($low, $high, $step = 1): array {}
 
-function shuffle(array &$arg): bool {}
+function shuffle(array &$array): bool {}
 
 function array_pop(array &$stack): mixed {}
 
@@ -141,95 +141,95 @@ function array_shift(array &$stack): mixed {}
 
 function array_unshift(array &$stack, mixed ...$vars): int {}
 
-function array_splice(array &$arg, int $offset, ?int $length = null, mixed $replacement = []): array {}
+function array_splice(array &$array, int $offset, ?int $length = null, mixed $replacement = []): array {}
 
-function array_slice(array $arg, int $offset, ?int $length = null, bool $preserve_keys = false): array {}
+function array_slice(array $array, int $offset, ?int $length = null, bool $preserve_keys = false): array {}
 
 function array_merge(array ...$arrays): array {}
 
 function array_merge_recursive(array ...$arrays): array {}
 
-function array_replace(array $arr1, array ...$arrays): array {}
+function array_replace(array $array1, array ...$arrays): array {}
 
-function array_replace_recursive(array $arr1, array ...$arrays): array {}
+function array_replace_recursive(array $array1, array ...$arrays): array {}
 
-function array_keys(array $arg, mixed $search_value = UNKNOWN, bool $strict = false): array {}
+function array_keys(array $array, mixed $search_value = UNKNOWN, bool $strict = false): array {}
 
-function array_key_first(array $arg): int|string|null {}
+function array_key_first(array $array): int|string|null {}
 
-function array_key_last(array $arg): int|string|null {}
+function array_key_last(array $array): int|string|null {}
 
-function array_values(array $arg): array {}
+function array_values(array $array): array {}
 
-function array_count_values(array $arg): array {}
+function array_count_values(array $array): array {}
 
-function array_column(array $arg, int|string|null $column_key, int|string|null $index_key = null): array {}
+function array_column(array $array, int|string|null $column_key, int|string|null $index_key = null): array {}
 
 function array_reverse(array $input, bool $preserve_keys = false): array {}
 
-function array_pad(array $arg, int $pad_size, mixed $pad_value): array {}
+function array_pad(array $array, int $pad_size, mixed $pad_value): array {}
 
-function array_flip(array $arg): array {}
+function array_flip(array $array): array {}
 
 function array_change_key_case(array $input, int $case = CASE_LOWER): array {}
 
-function array_unique(array $arg, int $flags = SORT_STRING): array {}
+function array_unique(array $array, int $flags = SORT_STRING): array {}
 
-function array_intersect_key(array $arr1, array $arr2, array ...$arrays): array {}
+function array_intersect_key(array $array1, array $array2, array ...$arrays): array {}
 
-function array_intersect_ukey(array $arr1, array $arr2, ...$rest): array {}
+function array_intersect_ukey(array $array1, array $array2, ...$rest): array {}
 
-function array_intersect(array $arr1, array $arr2, array ...$arrays): array {}
+function array_intersect(array $array1, array $array2, array ...$arrays): array {}
 
-function array_uintersect(array $arr1, array $arr2, ...$rest): array {}
+function array_uintersect(array $array1, array $array2, ...$rest): array {}
 
-function array_intersect_assoc(array $arr1, array $arr2, array ...$arrays): array {}
+function array_intersect_assoc(array $array1, array $array2, array ...$arrays): array {}
 
-function array_uintersect_assoc(array $arr1, array $arr2, ...$rest): array {}
+function array_uintersect_assoc(array $array1, array $array2, ...$rest): array {}
 
-function array_intersect_uassoc(array $arr1, array $arr2, ...$rest): array {}
+function array_intersect_uassoc(array $array1, array $array2, ...$rest): array {}
 
-function array_uintersect_uassoc(array $arr1, array $arr2, ...$rest): array {}
+function array_uintersect_uassoc(array $array1, array $array2, ...$rest): array {}
 
-function array_diff_key(array $arr1, array $arr2, array ...$arrays): array {}
+function array_diff_key(array $array1, array $array2, array ...$arrays): array {}
 
-function array_diff_ukey(array $arr1, array $arr2, ...$rest): array {}
+function array_diff_ukey(array $array1, array $array2, ...$rest): array {}
 
-function array_diff(array $arr1, array $arr2, array ...$arrays): array {}
+function array_diff(array $array1, array $array2, array ...$arrays): array {}
 
-function array_udiff(array $arr1, array $arr2, ...$rest): array {}
+function array_udiff(array $array1, array $array2, ...$rest): array {}
 
-function array_diff_assoc(array $arr1, array $arr2, array ...$arrays): array {}
+function array_diff_assoc(array $array1, array $array2, array ...$arrays): array {}
 
-function array_diff_uassoc(array $arr1, array $arr2, ...$rest): array {}
+function array_diff_uassoc(array $array1, array $array2, ...$rest): array {}
 
-function array_udiff_assoc(array $arr1, array $arr2, ...$rest): array {}
+function array_udiff_assoc(array $array1, array $array2, ...$rest): array {}
 
-function array_udiff_uassoc(array $arr1, array $arr2, ...$rest): array {}
+function array_udiff_uassoc(array $array1, array $array2, ...$rest): array {}
 
 /**
- * @param array $arr1
+ * @param array $array1
  * @param int $sort_order
  * @param int $sort_flags
- * @param array $arr2
- * @prefer-ref $arr1
+ * @param array $array2
+ * @prefer-ref $array1
  * @prefer-ref $sort_order
  * @prefer-ref $sort_flags
- * @prefer-ref $arr2
+ * @prefer-ref $arrays
  */
-function array_multisort(&$arr1, $sort_order = SORT_ASC, $sort_flags = SORT_REGULAR, &...$arr2): bool {}
+function array_multisort(&$array1, $sort_order = SORT_ASC, $sort_flags = SORT_REGULAR, &...$arrays): bool {}
 
-function array_rand(array $arg, int $num_req = 1): int|string|array {}
+function array_rand(array $array, int $num_req = 1): int|string|array {}
 
-function array_sum(array $arg): int|float {}
+function array_sum(array $array): int|float {}
 
-function array_product(array $arg): int|float {}
+function array_product(array $array): int|float {}
 
-function array_reduce(array $arg, callable $callback, mixed $initial = null): mixed {}
+function array_reduce(array $array, callable $callback, mixed $initial = null): mixed {}
 
-function array_filter(array $arg, ?callable $callback = null, int $use_keys = 0): array {}
+function array_filter(array $array, ?callable $callback = null, int $use_keys = 0): array {}
 
-function array_map(?callable $callback, array $arr1, array ...$arrays): array {}
+function array_map(?callable $callback, array $array1, array ...$arrays): array {}
 
 /** @param int|string $key */
 function array_key_exists($key, array $search): bool {}
@@ -240,7 +240,7 @@ function array_key_exists($key, array $search): bool {}
  */
 function key_exists($key, array $search): bool {}
 
-function array_chunk(array $arg, int $size, bool $preserve_keys = false): array {}
+function array_chunk(array $array, int $size, bool $preserve_keys = false): array {}
 
 function array_combine(array $keys, array $values): array {}
 

diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index d470f1caf328e63634d35612bd5b060ece284438..30d7dad50a922834e1f16d4748f0bcdb8ff00314 100755 (executable)
--- 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: ec90be5aaa5a4bb776200e2ab6848d19564f66dd */
+ * Stub hash: a26e702dd4b4a98d07d5ed47ae622431ad373123 */
 
 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)
@@ -75,7 +75,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_push, 0, 1, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_krsort, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_TYPE_INFO(1, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sort_flags, IS_LONG, 0, "SORT_REGULAR")
 ZEND_END_ARG_INFO()
 
@@ -89,7 +89,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_sizeof arginfo_count
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_natsort, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_TYPE_INFO(1, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_natcasesort arginfo_natsort
@@ -103,7 +103,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_rsort arginfo_krsort
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_usort, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_TYPE_INFO(1, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, cmp_function, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
@@ -159,7 +159,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_array_search, 0, 2, MAY_BE_LONG|
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_extract, 0, 1, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(ZEND_SEND_PREFER_REF, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(ZEND_SEND_PREFER_REF, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extract_type, IS_LONG, 0, "EXTR_OVERWRITE")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, prefix, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
@@ -200,14 +200,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unshift, 0, 1, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_splice, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(1, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, replacement, IS_MIXED, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_slice, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preserve_keys, _IS_BOOL, 0, "false")
@@ -220,32 +220,32 @@ 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, arr1, 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, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, search_value, IS_MIXED, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, strict, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_array_key_first, 0, 1, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_array_key_last arginfo_array_key_first
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_values, 0, 1, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_array_count_values arginfo_array_values
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_column, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_MASK(0, column_key, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL, NULL)
        ZEND_ARG_TYPE_MASK(0, index_key, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL, "null")
 ZEND_END_ARG_INFO()
@@ -256,7 +256,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_reverse, 0, 1, IS_ARRAY, 0
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_pad, 0, 3, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, pad_size, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, pad_value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
@@ -269,19 +269,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_change_key_case, 0, 1, IS_
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unique, 0, 1, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SORT_STRING")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_key, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arr1, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arr2, 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()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_ukey, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arr1, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arr2, 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()
 
@@ -314,38 +314,38 @@ ZEND_END_ARG_INFO()
 #define arginfo_array_udiff_uassoc arginfo_array_intersect_ukey
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_multisort, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr1)
+       ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, array1)
        ZEND_ARG_INFO_WITH_DEFAULT_VALUE(ZEND_SEND_PREFER_REF, sort_order, "SORT_ASC")
        ZEND_ARG_INFO_WITH_DEFAULT_VALUE(ZEND_SEND_PREFER_REF, sort_flags, "SORT_REGULAR")
-       ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, arr2)
+       ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, arrays)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_array_rand, 0, 1, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_ARRAY)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, num_req, IS_LONG, 0, "1")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_array_sum, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_array_product arginfo_array_sum
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_reduce, 0, 2, IS_MIXED, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, initial, IS_MIXED, 0, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_filter, 0, 1, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, callback, IS_CALLABLE, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, use_keys, IS_LONG, 0, "0")
 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, arr1, 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()
 
@@ -357,7 +357,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_key_exists arginfo_array_key_exists
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_chunk, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preserve_keys, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()

diff --git a/ext/standard/tests/array/array_diff_1.phpt b/ext/standard/tests/array/array_diff_1.phpt
index b936463e079d14078ba792914dfa608012b5a323..39ddfed8b031a9150d0ef3776e0aeaf280fa1684 100644 (file)
--- a/ext/standard/tests/array/array_diff_1.phpt
+++ b/ext/standard/tests/array/array_diff_1.phpt
@@ -15,5 +15,5 @@ try {
 echo "OK!";
 ?>
 --EXPECT--
-array_diff(): Argument #2 ($arr2) must be of type array, int given
+array_diff(): Argument #2 ($array2) must be of type array, int given
 OK!

diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index 2b314aec34eda02240ebb4a5e29a1e998bbbb071..035b343c32b2e1710ca08541ff55396c9772777e 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff_assoc() function : usage variations  - unexpected values for 'arr1' argument
+Test array_diff_assoc() function : usage variations  - unexpected values for 'array1' argument
 --FILE--
 <?php
 /*
- * Pass array_diff_assoc arguments that are not arrays in place of $arr1
+ * Pass array_diff_assoc arguments that are not arrays in place of $array1
  */
 
 echo "*** Testing array_diff_assoc() : usage variations ***\n";
@@ -30,7 +30,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-//array of unexpected values to be passed to $arr1 argument
+//array of unexpected values to be passed to $array1 argument
 $inputs = array(
 
        // int data
@@ -100,80 +100,80 @@ echo "Done";
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 -- Iteration 2 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 -- Iteration 3 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 -- Iteration 4 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 -- Iteration 5 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 -- Iteration 6 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 -- Iteration 7 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 -- Iteration 8 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 -- Iteration 9 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 -- Iteration 10 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 -- Iteration 11 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 -- Iteration 12 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 -- Iteration 13 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 -- Iteration 14 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 -- Iteration 15 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 -- Iteration 16 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 17 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 18 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 19 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 20 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 21 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 22 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 -- Iteration 23 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, classA given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, classA given
 
 -- Iteration 24 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 -- Iteration 25 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 -- Iteration 26 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, resource given
+array_diff_assoc(): Argument #1 ($array1) must be of type array, resource given
 Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
index 839935b2944c4932bd79cabfc4546c3257ce6b17..6871540fc4d60203f45d812dfbdc2eb6c248ce30 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff_assoc() function : usage variations  - unexpected values for 'arr1' argument
+Test array_diff_assoc() function : usage variations  - unexpected values for 'array1' argument
 --FILE--
 <?php
 /*
- * pass array_diff_assoc arguments which are not arrays in place of $arr2
+ * pass array_diff_assoc arguments which are not arrays in place of $array2
  */
 
 echo "\n*** Testing array_diff_assoc() : usage variations ***\n";
@@ -30,7 +30,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-//array of unexpected values to be passed to $arr1 argument
+//array of unexpected values to be passed to $array1 argument
 $inputs = array(
 
        // int data
@@ -100,80 +100,80 @@ echo "Done";
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 -- Iteration 2 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 -- Iteration 3 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 -- Iteration 4 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 -- Iteration 5 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 -- Iteration 6 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 -- Iteration 7 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 -- Iteration 8 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 -- Iteration 9 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 -- Iteration 10 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 -- Iteration 11 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 -- Iteration 12 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 -- Iteration 13 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 -- Iteration 14 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 -- Iteration 15 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 -- Iteration 16 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 17 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 18 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 19 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 20 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 21 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 22 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 -- Iteration 23 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, classA given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, classA given
 
 -- Iteration 24 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 -- Iteration 25 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 -- Iteration 26 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, resource given
+array_diff_assoc(): Argument #2 ($array2) must be of type array, resource given
 Done

diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt
index a00aba21607ce864cb42911513ba6ff306e01dce..8159e1316d3786bf53c808150f8d94ed0dad4574 100644 (file)
--- a/ext/standard/tests/array/array_diff_key_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation1.phpt
@@ -82,7 +82,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
@@ -103,105 +103,105 @@ fclose($fp);
 *** Testing array_diff_key() : usage variation ***
 
 --int 0--
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
-array_diff_key(): Argument #1 ($arr1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
+array_diff_key(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
-array_diff_key(): Argument #1 ($arr1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
+array_diff_key(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_key(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
+array_diff_key(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
-array_diff_key(): Argument #1 ($arr1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
+array_diff_key(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_key(): Argument #1 ($arr1) must be of type array, classWithToString given
-array_diff_key(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_diff_key(): Argument #1 ($array1) must be of type array, classWithToString given
+array_diff_key(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
-array_diff_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_diff_key(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_diff_key(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
-array_diff_key(): Argument #1 ($arr1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
+array_diff_key(): Argument #1 ($array1) must be of type array, null given
 
 --resource--
-array_diff_key(): Argument #1 ($arr1) must be of type array, resource given
-array_diff_key(): Argument #1 ($arr1) must be of type array, resource given
+array_diff_key(): Argument #1 ($array1) must be of type array, resource given
+array_diff_key(): Argument #1 ($array1) must be of type array, resource given

diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt
index 5bd84e5008177b0cdba39eddc21dfdbb5840f51e..3a404c348c06a248cb3453292961b9169833d7a5 100644 (file)
--- a/ext/standard/tests/array/array_diff_key_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation2.phpt
@@ -82,7 +82,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -104,105 +104,105 @@ fclose($fp);
 *** Testing array_diff_key() : usage variation ***
 
 --int 0--
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
-array_diff_key(): Argument #2 ($arr2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
+array_diff_key(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
-array_diff_key(): Argument #2 ($arr2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
+array_diff_key(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_key(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
+array_diff_key(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
-array_diff_key(): Argument #2 ($arr2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
+array_diff_key(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_key(): Argument #2 ($arr2) must be of type array, classWithToString given
-array_diff_key(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_diff_key(): Argument #2 ($array2) must be of type array, classWithToString given
+array_diff_key(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
-array_diff_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_diff_key(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_diff_key(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
-array_diff_key(): Argument #2 ($arr2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
+array_diff_key(): Argument #2 ($array2) must be of type array, null given
 
 --resource--
-array_diff_key(): Argument #2 ($arr2) must be of type array, resource given
-array_diff_key(): Argument #2 ($arr2) must be of type array, resource given
+array_diff_key(): Argument #2 ($array2) must be of type array, resource given
+array_diff_key(): Argument #2 ($array2) must be of type array, resource given

diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
index f07b054ae9cbc689679f16cc4cc107fe3fd62787..a5e31d44a4ed279b805917ddf986387e71d0eb7b 100644 (file)
--- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
@@ -93,7 +93,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -110,79 +110,79 @@ fclose($fp);
 *** Testing array_diff_uassoc() : usage variation ***
 
 --int 0--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --resource--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, resource given
+array_diff_uassoc(): Argument #1 ($array1) must be of type array, resource given

diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
index 1a7f09dac0cb0847d26683a34a64b2a585521a5c..da8dd6650d252318ab6b04967bbcb1a112b29d79 100644 (file)
--- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
@@ -93,7 +93,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -110,79 +110,79 @@ fclose($fp);
 *** Testing array_diff_uassoc() : usage variation ***
 
 --int 0--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --resource--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, resource given
+array_diff_uassoc(): Argument #2 ($array2) must be of type array, resource given

diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
index e7d1361a669c58f36fadca1cbcfe3bc28c7024f1..ab82d3f8770332ddd5ccf8109ba3e202c913eae7 100644 (file)
--- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
@@ -90,7 +90,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
@@ -111,105 +111,105 @@ fclose($fp);
 *** Testing array_diff_ukey() : usage variation ***
 
 --int 0--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithToString given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, null given
 
 --resource--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, resource given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, resource given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, resource given
+array_diff_ukey(): Argument #1 ($array1) must be of type array, resource given

diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
index 44b22e5297d0a1e35f282b3a11fc1c2b4c8ede9c..d99aaa3d9be1ecc39e1debec1525d67daa2e2411 100644 (file)
--- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
@@ -93,7 +93,7 @@ $inputs = array(
 
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -115,105 +115,105 @@ fclose($fp);
 *** Testing array_diff_ukey() : usage variation ***
 
 --int 0--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithToString given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, null given
 
 --resource--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, resource given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, resource given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, resource given
+array_diff_ukey(): Argument #2 ($array2) must be of type array, resource given

diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt
index 28c12118415f35fed4ece5c70bdad803d7d1b0d0..c7909ab19674e41adb3ce77568f90faedd4a41d4 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff() function : usage variations - unexpected values for 'arr1' argument
+Test array_diff() function : usage variations - unexpected values for 'array1' argument
 --FILE--
 <?php
 /*
- * Test array_diff by passing non array values in place of $arr1
+ * Test array_diff by passing non array values in place of $array1
  */
 
 echo "*** Testing array_diff() : usage variations ***\n";
@@ -100,55 +100,55 @@ echo "Done";
 --EXPECT--
 *** Testing array_diff() : usage variations ***
 
--- Iteration 1 --array_diff(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 1 --array_diff(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 2 --array_diff(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 2 --array_diff(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 3 --array_diff(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 3 --array_diff(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 4 --array_diff(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 4 --array_diff(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 5 --array_diff(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 5 --array_diff(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 6 --array_diff(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 6 --array_diff(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 7 --array_diff(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 7 --array_diff(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 8 --array_diff(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 8 --array_diff(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 9 --array_diff(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 9 --array_diff(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 10 --array_diff(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 10 --array_diff(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 11 --array_diff(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 11 --array_diff(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 12 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 12 --array_diff(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 13 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 13 --array_diff(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 14 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 14 --array_diff(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 15 --array_diff(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 15 --array_diff(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 16 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 16 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 17 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 17 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 18 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 18 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 19 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 19 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 20 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 20 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 21 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 21 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 22 --array_diff(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 22 --array_diff(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 23 --array_diff(): Argument #1 ($arr1) must be of type array, classA given
+-- Iteration 23 --array_diff(): Argument #1 ($array1) must be of type array, classA given
 
--- Iteration 24 --array_diff(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 24 --array_diff(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 25 --array_diff(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 25 --array_diff(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 26 --array_diff(): Argument #1 ($arr1) must be of type array, resource given
+-- Iteration 26 --array_diff(): Argument #1 ($array1) must be of type array, resource given
 Done

diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt
index 95898e437d83a28a5c025d64e6a42557bb3bfb1a..470c6b38c4da0d61bf527038b47a4c53bba15b74 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff() function : usage variations - unexpected values for 'arr2' argument
+Test array_diff() function : usage variations - unexpected values for 'array2' argument
 --FILE--
 <?php
 /*
- * Test array_diff by passing non array values in place of $arr2
+ * Test array_diff by passing non array values in place of $array2
  */
 
 echo "*** Testing array_diff() : usage variations ***\n";
@@ -99,55 +99,55 @@ echo "Done";
 --EXPECT--
 *** Testing array_diff() : usage variations ***
 
--- Iteration 1 --array_diff(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 1 --array_diff(): Argument #2 ($array2) must be of type array, int given
 
--- Iteration 2 --array_diff(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 2 --array_diff(): Argument #2 ($array2) must be of type array, int given
 
--- Iteration 3 --array_diff(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 3 --array_diff(): Argument #2 ($array2) must be of type array, int given
 
--- Iteration 4 --array_diff(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 4 --array_diff(): Argument #2 ($array2) must be of type array, int given
 
--- Iteration 5 --array_diff(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 5 --array_diff(): Argument #2 ($array2) must be of type array, float given
 
--- Iteration 6 --array_diff(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 6 --array_diff(): Argument #2 ($array2) must be of type array, float given
 
--- Iteration 7 --array_diff(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 7 --array_diff(): Argument #2 ($array2) must be of type array, float given
 
--- Iteration 8 --array_diff(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 8 --array_diff(): Argument #2 ($array2) must be of type array, float given
 
--- Iteration 9 --array_diff(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 9 --array_diff(): Argument #2 ($array2) must be of type array, float given
 
--- Iteration 10 --array_diff(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 10 --array_diff(): Argument #2 ($array2) must be of type array, null given
 
--- Iteration 11 --array_diff(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 11 --array_diff(): Argument #2 ($array2) must be of type array, null given
 
--- Iteration 12 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 12 --array_diff(): Argument #2 ($array2) must be of type array, bool given
 
--- Iteration 13 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 13 --array_diff(): Argument #2 ($array2) must be of type array, bool given
 
--- Iteration 14 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 14 --array_diff(): Argument #2 ($array2) must be of type array, bool given
 
--- Iteration 15 --array_diff(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 15 --array_diff(): Argument #2 ($array2) must be of type array, bool given
 
--- Iteration 16 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 16 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 17 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 17 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 18 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 18 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 19 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 19 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 20 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 20 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 21 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 21 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 22 --array_diff(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 22 --array_diff(): Argument #2 ($array2) must be of type array, string given
 
--- Iteration 23 --array_diff(): Argument #2 ($arr2) must be of type array, classA given
+-- Iteration 23 --array_diff(): Argument #2 ($array2) must be of type array, classA given
 
--- Iteration 24 --array_diff(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 24 --array_diff(): Argument #2 ($array2) must be of type array, null given
 
--- Iteration 25 --array_diff(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 25 --array_diff(): Argument #2 ($array2) must be of type array, null given
 
--- Iteration 26 --array_diff(): Argument #2 ($arr2) must be of type array, resource given
+-- Iteration 26 --array_diff(): Argument #2 ($array2) must be of type array, resource given
 Done

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
index 8e70444ce3d4e01e80f447010f0adefb4b8d4bae..2bae7fb4a94c52fc3fbcac45cf9150c7ca128b9a 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - unexpected values for 'arr1' argument(Bug#43196)
+Test array_intersect_assoc() function : usage variations - unexpected values for 'array1' argument(Bug#43196)
 --FILE--
 <?php
 /*
-* Testing array_intersect_assoc() function by passing values to $arr1 argument other than arrays
+* Testing array_intersect_assoc() function by passing values to $array1 argument other than arrays
 * and see that function emits proper warning messages wherever expected.
-* The $arr2 argument passed is a fixed array.
+* The $array2 argument passed is a fixed array.
 */
 
-echo "*** Testing array_intersect_assoc() : Passing non-array values to \$arr1 argument ***\n";
+echo "*** Testing array_intersect_assoc() : Passing non-array values to \$array1 argument ***\n";
 
-// array to be passsed to $arr2 as default argument
-$arr2 = array(1, 2);
+// array to be passsed to $array2 as default argument
+$array2 = array(1, 2);
 
 // additional array to be passed for intersection
 $arr3 = array(1, 2, "one" => 1, "two" => 2);
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-// unexpected values to be passed to $arr1 argument
+// unexpected values to be passed to $array1 argument
 $arrays = array(
 
        // int data
@@ -91,14 +91,14 @@ foreach($arrays as $unexpected_value) {
 
     // Calling array_intersect_assoc() with default arguments
     try {
-        var_dump( array_intersect_assoc($unexpected_value, $arr2) );
+        var_dump( array_intersect_assoc($unexpected_value, $array2) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
 
     // Calling array_intersect_assoc() with more arguments
     try {
-        var_dump( array_intersect_assoc($unexpected_value, $arr2, $arr3) );
+        var_dump( array_intersect_assoc($unexpected_value, $array2, $arr3) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -111,77 +111,77 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECT--
-*** Testing array_intersect_assoc() : Passing non-array values to $arr1 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $array1 argument ***
 
--- Iteration 1 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 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 2 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 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 3 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 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 4 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 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 5 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 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 6 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 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 7 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 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 8 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 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 9 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 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 10 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 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 11 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 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 12 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 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 13 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 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 14 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 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 15 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 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 16 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 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 17 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 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 18 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 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 19 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 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 20 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 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 21 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, classA given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, classA 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 22 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 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 23 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 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 24 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, resource given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, resource given
+-- 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
 Done

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
index d3e1eae3e135d002ee02b1b6417c8c988f7e0c4d..21ff13cc5402931d402ce84e5d8dac234b2f6717 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - unexpected values for 'arr2' argument(Bug#43196)
+Test array_intersect_assoc() function : usage variations - unexpected values for 'array2' argument(Bug#43196)
 --FILE--
 <?php
 /*
-* Testing array_intersect_assoc() function by passing values to $arr2 argument other than arrays
+* Testing array_intersect_assoc() function by passing values to $array2 argument other than arrays
 * and see that function emits proper warning messages wherever expected.
-* The $arr1 argument passed is a fixed array.
+* The $array1 argument passed is a fixed array.
 */
 
-echo "*** Testing array_intersect_assoc() : Passing non-array values to \$arr2 argument ***\n";
+echo "*** Testing array_intersect_assoc() : Passing non-array values to \$array2 argument ***\n";
 
-// array to be passsed to $arr1 as default argument
-$arr1 = array(1, 2);
+// array to be passsed to $array1 as default argument
+$array1 = array(1, 2);
 
 // additional array to be passed for intersection
 $arr3 = array(1, 2, "one" => 1, "two" => 2);
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-// unexpected values to be passed to $arr2 argument
+// unexpected values to be passed to $array2 argument
 $arrays = array(
 
        // int data
@@ -91,14 +91,14 @@ foreach($arrays as $unexpected_value) {
 
     // Calling array_intersect_assoc() with default arguments
     try {
-        var_dump( array_intersect_assoc($arr1,$unexpected_value) );
+        var_dump( array_intersect_assoc($array1,$unexpected_value) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
 
     // Calling array_intersect_assoc() with more arguments
     try {
-        var_dump( array_intersect_assoc($arr1, $unexpected_value, $arr3) );
+        var_dump( array_intersect_assoc($array1, $unexpected_value, $arr3) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -112,77 +112,77 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECT--
-*** Testing array_intersect_assoc() : Passing non-array values to $arr2 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $array2 argument ***
 
--- Iteration 1 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 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 2 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 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 3 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 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 4 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+-- Iteration 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 5 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 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 6 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 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 7 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 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 8 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 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 9 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+-- Iteration 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 10 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 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 11 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 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 12 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 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 13 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 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 14 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 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 15 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+-- Iteration 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 16 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 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 17 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 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 18 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 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 19 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 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 20 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+-- Iteration 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 21 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, classA given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, classA 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 22 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 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 23 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+-- Iteration 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 24 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, resource given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, resource given
+-- 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
 Done

diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt
index 2e43094d20d8b4dbd664be0114cdaf7c1f551c0b..cdf9938984e72a0669be5a45edb3144529da116e 100644 (file)
--- a/ext/standard/tests/array/array_intersect_key_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt
@@ -86,7 +86,7 @@ $inputs = array(
       'resource var' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
@@ -107,105 +107,105 @@ fclose($fp);
 *** Testing array_intersect_key() : usage variation ***
 
 --int 0--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int 1--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int 12345--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int -12345--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --float 10.5--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float -10.5--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float 12.3456789000e10--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float -12.3456789000e10--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float .5--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --uppercase NULL--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --lowercase null--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --lowercase true--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --lowercase false--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --uppercase TRUE--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --uppercase FALSE--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --empty string DQ--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --empty string SQ--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --string DQ--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --string SQ--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --mixed case string--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --heredoc--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --instance of classWithToString--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, classWithToString given
-array_intersect_key(): Argument #1 ($arr1) 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 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
-array_intersect_key(): Argument #1 ($arr1) 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 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --unset var--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --resource var--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, resource given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, resource given
+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

diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt
index d8b98c5fa700e2f3ec28092208b69a87c4362f19..65491a2682f11dd61bfdcddd862ce17137af5d1d 100644 (file)
--- a/ext/standard/tests/array/array_intersect_key_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt
@@ -86,7 +86,7 @@ $inputs = array(
       'resource var' => $fp,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -108,105 +108,105 @@ fclose($fp);
 *** Testing array_intersect_key() : usage variation ***
 
 --int 0--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int 1--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int 12345--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int -12345--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --float 10.5--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float -10.5--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float 12.3456789000e10--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float -12.3456789000e10--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float .5--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --uppercase NULL--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --lowercase null--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --lowercase true--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --lowercase false--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --uppercase TRUE--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --uppercase FALSE--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --empty string DQ--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --empty string SQ--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --string DQ--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --string SQ--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --mixed case string--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --heredoc--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --instance of classWithToString--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, classWithToString given
-array_intersect_key(): Argument #2 ($arr2) 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 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
-array_intersect_key(): Argument #2 ($arr2) 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 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --unset var--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --resource var--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, resource given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, resource given
+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

diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
index 48807057fe9f9b4eccc3c0b7773cc28e11531cd2..c686e646894c2cc7f265956dc225ed23d76e5d79 100644 (file)
--- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
@@ -94,7 +94,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
@@ -115,105 +115,105 @@ fclose($fp);
 *** Testing array_intersect_uassoc() : usage variation ***
 
 --int 0--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int 1--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int 12345--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int -12345--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --float 10.5--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float -10.5--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float 12.3456789000e10--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float -12.3456789000e10--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float .5--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --uppercase NULL--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --lowercase null--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --lowercase true--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --lowercase false--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --uppercase TRUE--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --uppercase FALSE--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --empty string DQ--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --empty string SQ--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --string DQ--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --string SQ--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --mixed case string--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --heredoc--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --instance of classWithToString--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
-array_intersect_uassoc(): Argument #1 ($arr1) 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 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
-array_intersect_uassoc(): Argument #1 ($arr1) 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 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --unset var--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --resource--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, resource given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, resource given
+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

diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
index 245fa437c0190cdb4738487f7b9c1d9b371df5fa..741b3a9405155bc6f18db69a557e2c821ff4e528 100644 (file)
--- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
@@ -94,7 +94,7 @@ $inputs = array(
       'resource' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
@@ -115,105 +115,105 @@ fclose($fp);
 *** Testing array_intersect_uassoc() : usage variation ***
 
 --int 0--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int 1--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int 12345--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int -12345--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --float 10.5--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float -10.5--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float 12.3456789000e10--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float -12.3456789000e10--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float .5--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --uppercase NULL--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --lowercase null--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --lowercase true--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --lowercase false--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --uppercase TRUE--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --uppercase FALSE--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --empty string DQ--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --empty string SQ--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --string DQ--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --string SQ--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --mixed case string--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --heredoc--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --instance of classWithToString--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
-array_intersect_uassoc(): Argument #2 ($arr2) 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 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
-array_intersect_uassoc(): Argument #2 ($arr2) 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 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --unset var--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --resource--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, resource given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, resource given
+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

diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
index 4dfe06f7388be6173090913962b0c458a3b7a379..e73bbd32676d5d5aad6efdd89c7a4153dd3b4896 100644 (file)
--- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
@@ -91,7 +91,7 @@ $inputs = array(
       'resource var' => $fp,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -113,105 +113,105 @@ fclose($fp);
 *** Testing array_intersect_ukey() : usage variation ***
 
 --int 0--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int 1--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int 12345--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --int -12345--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, int given
+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
 
 --float 10.5--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float -10.5--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float 12.3456789000e10--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float -12.3456789000e10--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --float .5--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, float given
+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
 
 --uppercase NULL--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --lowercase null--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --lowercase true--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --lowercase false--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --uppercase TRUE--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --uppercase FALSE--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, bool given
+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
 
 --empty string DQ--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --empty string SQ--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --string DQ--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --string SQ--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --mixed case string--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --heredoc--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
+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
 
 --instance of classWithToString--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
-array_intersect_ukey(): Argument #1 ($arr1) 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 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
-array_intersect_ukey(): Argument #1 ($arr1) 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 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --unset var--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
+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
 
 --resource var--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, resource given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, resource given
+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

diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
index bd85523c8901f1cab625cca6f2b7aa3743074c16..7dd5d4c459c16175a6a118136d097d9b5ad5c772 100644 (file)
--- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
@@ -91,7 +91,7 @@ $inputs = array(
       'resource var' => $fp,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
@@ -113,105 +113,105 @@ fclose($fp);
 *** Testing array_intersect_ukey() : usage variation ***
 
 --int 0--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int 1--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int 12345--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --int -12345--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, int given
+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
 
 --float 10.5--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float -10.5--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float 12.3456789000e10--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float -12.3456789000e10--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --float .5--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, float given
+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
 
 --uppercase NULL--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --lowercase null--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --lowercase true--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --lowercase false--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --uppercase TRUE--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --uppercase FALSE--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, bool given
+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
 
 --empty string DQ--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --empty string SQ--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --string DQ--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --string SQ--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --mixed case string--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --heredoc--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
+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
 
 --instance of classWithToString--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
-array_intersect_ukey(): Argument #2 ($arr2) 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 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
-array_intersect_ukey(): Argument #2 ($arr2) 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 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --unset var--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
+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
 
 --resource var--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, resource given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, resource given
+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

diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt
index 8f38702123a19b6fa8186f5d52f3e22432a3f373..f83a4d901eb0cf5efb9a29dc97f9f6aedc42d6c7 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_intersect() function : usage variations - unexpected values for 'arr1' argument
+Test array_intersect() function : usage variations - unexpected values for 'array1' argument
 --FILE--
 <?php
 /*
-* Testing array_intersect() function by passing values to $arr1 argument other than arrays
+* Testing array_intersect() function by passing values to $array1 argument other than arrays
 * and see that function emits proper warning messages wherever expected.
-* The $arr2 argument is a fixed array.
+* The $array2 argument is a fixed array.
 */
 
-echo "*** Testing array_intersect() : Passing non-array values to \$arr1 argument ***\n";
+echo "*** Testing array_intersect() : Passing non-array values to \$array1 argument ***\n";
 
-// array to be passsed to $arr2 as default argument
-$arr2 = array(1, 2);
+// array to be passsed to $array2 as default argument
+$array2 = array(1, 2);
 
 // array to be passed to optional argument
 $arr3 = array(1, 2, "one" => 1, "two" => 2);
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-// unexpected values to be passed to $arr1 argument
+// unexpected values to be passed to $array1 argument
 $arrays = array(
 
        // int data
@@ -91,14 +91,14 @@ foreach($arrays as $unexpected_value) {
 
     // Calling array_intersect() with default arguments
     try {
-        var_dump( array_intersect($unexpected_value,$arr2) );
+        var_dump( array_intersect($unexpected_value,$array2) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
 
     // Calling array_intersect() with more arguments
     try {
-        var_dump( array_intersect($unexpected_value, $arr2, $arr3) );
+        var_dump( array_intersect($unexpected_value, $array2, $arr3) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -111,77 +111,77 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECT--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
+*** Testing array_intersect() : Passing non-array values to $array1 argument ***
 
--- Iterator 1 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
-array_intersect(): Argument #1 ($arr1) must be of type array, int given
+-- Iterator 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 2 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
-array_intersect(): Argument #1 ($arr1) must be of type array, int given
+-- Iterator 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 3 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
-array_intersect(): Argument #1 ($arr1) must be of type array, int given
+-- Iterator 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 4 --array_intersect(): Argument #1 ($arr1) must be of type array, int given
-array_intersect(): Argument #1 ($arr1) must be of type array, int given
+-- Iterator 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 5 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
-array_intersect(): Argument #1 ($arr1) must be of type array, float given
+-- Iterator 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 6 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
-array_intersect(): Argument #1 ($arr1) must be of type array, float given
+-- Iterator 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 7 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
-array_intersect(): Argument #1 ($arr1) must be of type array, float given
+-- Iterator 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 8 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
-array_intersect(): Argument #1 ($arr1) must be of type array, float given
+-- Iterator 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 9 --array_intersect(): Argument #1 ($arr1) must be of type array, float given
-array_intersect(): Argument #1 ($arr1) must be of type array, float given
+-- Iterator 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 10 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
-array_intersect(): Argument #1 ($arr1) must be of type array, null given
+-- Iterator 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 11 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
-array_intersect(): Argument #1 ($arr1) must be of type array, null given
+-- Iterator 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 12 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+-- Iterator 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 13 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+-- Iterator 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 14 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+-- Iterator 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 15 --array_intersect(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect(): Argument #1 ($arr1) must be of type array, bool given
+-- Iterator 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 16 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
-array_intersect(): Argument #1 ($arr1) must be of type array, string given
+-- Iterator 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 17 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
-array_intersect(): Argument #1 ($arr1) must be of type array, string given
+-- Iterator 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 18 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
-array_intersect(): Argument #1 ($arr1) must be of type array, string given
+-- Iterator 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 19 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
-array_intersect(): Argument #1 ($arr1) must be of type array, string given
+-- Iterator 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 20 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
-array_intersect(): Argument #1 ($arr1) must be of type array, string given
+-- Iterator 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 21 --array_intersect(): Argument #1 ($arr1) must be of type array, classA given
-array_intersect(): Argument #1 ($arr1) must be of type array, classA 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 22 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
-array_intersect(): Argument #1 ($arr1) must be of type array, null given
+-- Iterator 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 23 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
-array_intersect(): Argument #1 ($arr1) must be of type array, null given
+-- Iterator 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 24 --array_intersect(): Argument #1 ($arr1) must be of type array, resource given
-array_intersect(): Argument #1 ($arr1) must be of type array, resource given
+-- 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
 Done

diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt
index f8389dd961abc778b512a2748a46b5f8dd308bd8..302ea149d82203525b482dcd3e3dbe7e65d9195c 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_intersect() function : usage variations - unexpected values for 'arr2' argument
+Test array_intersect() function : usage variations - unexpected values for 'array2' argument
 --FILE--
 <?php
 /*
-* Testing array_intersect() function by passing values to $arr2 argument other than arrays
+* Testing array_intersect() function by passing values to $array2 argument other than arrays
 * and see that function emits proper warning messages wherever expected.
-* The $arr1 argument is a fixed array.
+* The $array1 argument is a fixed array.
 */
 
-echo "*** Testing array_intersect() : Passing non-array values to \$arr2 argument ***\n";
+echo "*** Testing array_intersect() : Passing non-array values to \$array2 argument ***\n";
 
-// array to be passsed to $arr1 as default argument
-$arr1 = array(1, 2);
+// array to be passsed to $array1 as default argument
+$array1 = array(1, 2);
 
 // arrays to be passed to optional argument
 $arr3 = array(1, 2, "one" => 1, "two" => 2);
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-// unexpected values to be passed to $arr2 argument
+// unexpected values to be passed to $array2 argument
 $arrays = array(
 
        // int data
@@ -91,14 +91,14 @@ foreach($arrays as $unexpected_value) {
 
     // Calling array_intersect() with default arguments
     try {
-        var_dump( array_intersect($arr1,$unexpected_value) );
+        var_dump( array_intersect($array1,$unexpected_value) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
 
     // Calling array_intersect() with more arguments
     try {
-        var_dump( array_intersect($arr1, $unexpected_value, $arr3) );
+        var_dump( array_intersect($array1, $unexpected_value, $arr3) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -112,77 +112,77 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECT--
-*** Testing array_intersect() : Passing non-array values to $arr2 argument ***
+*** Testing array_intersect() : Passing non-array values to $array2 argument ***
 
--- Iterator 1 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 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 2 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 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 3 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 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 4 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 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 5 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 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 6 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 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 7 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 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 8 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 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 9 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 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 10 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 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 11 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 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 12 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 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 13 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 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 14 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 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 15 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 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 16 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 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 17 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 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 18 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 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 19 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 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 20 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 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 21 --array_intersect(): Argument #2 ($arr2) must be of type array, classA given
-array_intersect(): Argument #2 ($arr2) must be of type array, classA 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 22 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 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 23 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 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 24 --array_intersect(): Argument #2 ($arr2) must be of type array, resource given
-array_intersect(): Argument #2 ($arr2) must be of type array, resource given
+-- 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
 Done

diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt
index b0c3745b3648be49cb376f0c878848d5506c55d5..e226b7c71d46dbff6301c6bdaa47029db5ab2d39 100644 (file)
--- a/ext/standard/tests/array/array_map_variation10.phpt
+++ b/ext/standard/tests/array/array_map_variation10.phpt
@@ -27,7 +27,7 @@ var_dump( array_map( function() { return NULL; }, $array1));
 echo "-- anonymous function with NULL body --\n";
 var_dump( array_map( function($a) { }, $array1));
 
-echo "-- passing NULL as 'arr1' --\n";
+echo "-- passing NULL as 'array1' --\n";
 try {
     var_dump( array_map( function($a) { return array($a); }, NULL));
 } catch (TypeError $e) {
@@ -82,6 +82,6 @@ array(3) {
   [2]=>
   NULL
 }
--- passing NULL as 'arr1' --
-array_map(): Argument #2 ($arr1) must be of type array, null given
+-- passing NULL as 'array1' --
+array_map(): Argument #2 ($array1) must be of type array, null given
 Done

diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt
index b4d76eb79c52997bf63899f376f802eb5d274b50..f93ad2cfc7df95a0a7edf4cd9357c9ccd5ec09d9 100644 (file)
--- a/ext/standard/tests/array/array_multisort_variation1.phpt
+++ b/ext/standard/tests/array/array_multisort_variation1.phpt
@@ -103,76 +103,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_multisort() : usage variation ***
 
 --int 0--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag that has not already been specified
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag that has not already been specified
 
 --int 1--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag that has not already been specified
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag that has not already been specified
 
 --int 12345--
-array_multisort(): Argument #1 ($arr1) must be a valid sort flag
+array_multisort(): Argument #1 ($array1) must be a valid sort flag
 
 --int -12345--
-array_multisort(): Argument #1 ($arr1) must be a valid sort flag
+array_multisort(): Argument #1 ($array1) must be a valid sort flag
 
 --float 10.5--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --float -10.5--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --float 12.3456789000e10--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --float -12.3456789000e10--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --float .5--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --uppercase NULL--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --lowercase null--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --lowercase true--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --lowercase false--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --uppercase TRUE--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --uppercase FALSE--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --empty string DQ--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --empty string SQ--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --string DQ--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --string SQ--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --mixed case string--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --heredoc--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --instance of classWithToString--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --instance of classWithoutToString--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --undefined var--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag
 
 --unset var--
-array_multisort(): Argument #1 ($arr1) must be an array or a sort flag
+array_multisort(): Argument #1 ($array1) must be an array or a sort flag

diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt
index d493e6c5a677f98aebdafcb60d42446f45c053c3..52890dcafd2c50ac4793ac32ee5c4afd3da5685c 100644 (file)
--- a/ext/standard/tests/array/array_rand.phpt
+++ b/ext/standard/tests/array/array_rand.phpt
@@ -38,11 +38,11 @@ var_dump(array_rand(array(1,2,3), 2));
 
 ?>
 --EXPECTF--
-array_rand(): Argument #1 ($arg) cannot be empty
-array_rand(): Argument #1 ($arg) cannot be empty
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #1 ($array) cannot be empty
+array_rand(): Argument #1 ($array) cannot be empty
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
 array(3) {
   [0]=>
   int(%d)

diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt
index 116a8c3263dfe0e2d449d9d0622a2dae4265bf7c..8b877c8a9108cd50c949aba623b86097ba4ffc1a 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation5.phpt
+++ b/ext/standard/tests/array/array_rand_variation5.phpt
@@ -65,13 +65,13 @@ int(%d)
 int(%d)
 
 -- With num_req = 0 --
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
 
 -- With num_req = -1 --
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
 
 -- With num_req = -2 --
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
 
 -- With num_req more than number of members in 'input' array --
-array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)

diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
index 10dfc47a383e2ac20a470d9f8e33cf61a1478b76..9e515ce1bf2e24807875031ea72500f7ec99014a 100644 (file)
--- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
@@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation
 echo "*** Testing array_udiff_assoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr2 = array(1, 2);
+$array2 = array(1, 2);
 
 include('compare_function.inc');
 $key_comp_func = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_udiff_assoc($value, $arr2, $key_comp_func) );
+        var_dump( array_udiff_assoc($value, $array2, $key_comp_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_assoc() : usage variation ***
 
 --int 0--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_assoc(): Argument #1 ($array1) must be of type array, null given

diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
index d0e3431a9995c091ac477288df2a92edbb1157c1..30f418d31eb7af8033eb0542ad84268bd5d41412 100644 (file)
--- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
@@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation
 echo "*** Testing array_udiff_assoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr1 = array(1, 2);
+$array1 = array(1, 2);
 
 include('compare_function.inc');
 $key_comp_func = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_udiff_assoc($arr1, $value, $key_comp_func) );
+        var_dump( array_udiff_assoc($array1, $value, $key_comp_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_assoc() : usage variation ***
 
 --int 0--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_assoc(): Argument #2 ($array2) must be of type array, null given

diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
index a031e0c9e1cea264269a15a5567543144bbc6198..752c1c9a61e6d4281aa407072cb08b71ea5e9332 100644 (file)
--- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
@@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr2 = array(1, 2);
+$array2 = array(1, 2);
 
 include('compare_function.inc');
 $data_comp_func = 'compare_function';
@@ -83,12 +83,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_udiff_uassoc($value, $arr2, $data_comp_func, $key_comp_func) );
+        var_dump( array_udiff_uassoc($value, $array2, $data_comp_func, $key_comp_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_uassoc() : usage variation ***
 
 --int 0--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_udiff_uassoc(): Argument #1 ($array1) must be of type array, null given

diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
index 4a9f1a9239edd5123f1f4dcade1c79f83233b302..263657bd5c645a50654824a019f62f0eddf38d80 100644 (file)
--- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
@@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr1 = array(1, 2);
+$array1 = array(1, 2);
 
 include('compare_function.inc');
 $data_comp_func = 'compare_function';
@@ -83,12 +83,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_udiff_uassoc($arr1, $value, $data_comp_func, $key_comp_func) );
+        var_dump( array_udiff_uassoc($array1, $value, $data_comp_func, $key_comp_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff_uassoc() : usage variation ***
 
 --int 0--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_udiff_uassoc(): Argument #2 ($array2) must be of type array, null given

diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt
index 4927dfd24a0016da6997cee3cd88c6251ec38b2b..1d929d4e50f1a1ad3b425a73851ed5a01692f128 100644 (file)
--- a/ext/standard/tests/array/array_udiff_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_variation1.phpt
@@ -5,7 +5,7 @@ Test array_udiff() function : usage variation
 echo "*** Testing array_udiff() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr2 = array(1, 2);
+$array2 = array(1, 2);
 
 include('compare_function.inc');
 $data_comp_func = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_udiff($value, $arr2, $data_comp_func) );
+        var_dump( array_udiff($value, $array2, $data_comp_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff() : usage variation ***
 
 --int 0--
-array_udiff(): Argument #1 ($arr1) must be of type array, int given
+array_udiff(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_udiff(): Argument #1 ($arr1) must be of type array, int given
+array_udiff(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_udiff(): Argument #1 ($arr1) must be of type array, int given
+array_udiff(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_udiff(): Argument #1 ($arr1) must be of type array, int given
+array_udiff(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_udiff(): Argument #1 ($arr1) must be of type array, float given
+array_udiff(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_udiff(): Argument #1 ($arr1) must be of type array, float given
+array_udiff(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff(): Argument #1 ($arr1) must be of type array, float given
+array_udiff(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff(): Argument #1 ($arr1) must be of type array, float given
+array_udiff(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_udiff(): Argument #1 ($arr1) must be of type array, float given
+array_udiff(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_udiff(): Argument #1 ($arr1) must be of type array, null given
+array_udiff(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_udiff(): Argument #1 ($arr1) must be of type array, null given
+array_udiff(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_udiff(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_udiff(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff(): Argument #1 ($arr1) must be of type array, bool given
+array_udiff(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_udiff(): Argument #1 ($arr1) must be of type array, string given
+array_udiff(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_udiff(): Argument #1 ($arr1) must be of type array, string given
+array_udiff(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_udiff(): Argument #1 ($arr1) must be of type array, string given
+array_udiff(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_udiff(): Argument #1 ($arr1) must be of type array, string given
+array_udiff(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_udiff(): Argument #1 ($arr1) must be of type array, string given
+array_udiff(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_udiff(): Argument #1 ($arr1) must be of type array, string given
+array_udiff(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_udiff(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_udiff(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff(): Argument #1 ($arr1) must be of type array, null given
+array_udiff(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_udiff(): Argument #1 ($arr1) must be of type array, null given
+array_udiff(): Argument #1 ($array1) must be of type array, null given

diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt
index a68c00ee1326c01199cd51fecffc9aec25483432..447395488fd3fdb4587c998e9334513633c93373 100644 (file)
--- a/ext/standard/tests/array/array_udiff_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_variation2.phpt
@@ -5,7 +5,7 @@ Test array_udiff() function : usage variation
 echo "*** Testing array_udiff() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr1 = array(1, 2);
+$array1 = array(1, 2);
 
 include('compare_function.inc');
 $data_comp_func = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_udiff($arr1, $value, $data_comp_func) );
+        var_dump( array_udiff($array1, $value, $data_comp_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_udiff() : usage variation ***
 
 --int 0--
-array_udiff(): Argument #2 ($arr2) must be of type array, int given
+array_udiff(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_udiff(): Argument #2 ($arr2) must be of type array, int given
+array_udiff(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_udiff(): Argument #2 ($arr2) must be of type array, int given
+array_udiff(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_udiff(): Argument #2 ($arr2) must be of type array, int given
+array_udiff(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_udiff(): Argument #2 ($arr2) must be of type array, float given
+array_udiff(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_udiff(): Argument #2 ($arr2) must be of type array, float given
+array_udiff(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_udiff(): Argument #2 ($arr2) must be of type array, float given
+array_udiff(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_udiff(): Argument #2 ($arr2) must be of type array, float given
+array_udiff(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_udiff(): Argument #2 ($arr2) must be of type array, float given
+array_udiff(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_udiff(): Argument #2 ($arr2) must be of type array, null given
+array_udiff(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_udiff(): Argument #2 ($arr2) must be of type array, null given
+array_udiff(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_udiff(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_udiff(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_udiff(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_udiff(): Argument #2 ($arr2) must be of type array, bool given
+array_udiff(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_udiff(): Argument #2 ($arr2) must be of type array, string given
+array_udiff(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_udiff(): Argument #2 ($arr2) must be of type array, string given
+array_udiff(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_udiff(): Argument #2 ($arr2) must be of type array, string given
+array_udiff(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_udiff(): Argument #2 ($arr2) must be of type array, string given
+array_udiff(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_udiff(): Argument #2 ($arr2) must be of type array, string given
+array_udiff(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_udiff(): Argument #2 ($arr2) must be of type array, string given
+array_udiff(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_udiff(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_udiff(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_udiff(): Argument #2 ($arr2) must be of type array, null given
+array_udiff(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_udiff(): Argument #2 ($arr2) must be of type array, null given
+array_udiff(): Argument #2 ($array2) must be of type array, null given

diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
index 67c599dbfc5480a0a5ec636aa67c286c2a5eb06f..c339b9094b20b61aaf8ade90f131be756dcf8241 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
@@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation
 echo "*** Testing array_uintersect_assoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr2 = array(1, 2);
+$array2 = array(1, 2);
 
 include('compare_function.inc');
 $data_compare_function = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_uintersect_assoc($value, $arr2, $data_compare_function) );
+        var_dump( array_uintersect_assoc($value, $array2, $data_compare_function) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_assoc() : usage variation ***
 
 --int 0--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_assoc(): Argument #1 ($array1) 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 6aecd534de28ddff5e7d6158b9c0ed2debfecc87..69b61d1a24b562331d8e48db3ca60fea26e85d84 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
@@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation
 echo "*** Testing array_uintersect_assoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr1 = array(1, 2);
+$array1 = array(1, 2);
 
 include('compare_function.inc');
 $data_compare_function = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_uintersect_assoc($arr1, $value, $data_compare_function) );
+        var_dump( array_uintersect_assoc($array1, $value, $data_compare_function) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_assoc() : usage variation ***
 
 --int 0--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_assoc(): Argument #2 ($array2) 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 27deec619dbb0043aef3a83414c9c6549ef3f608..c946c1f634b09357e067b487b0a0a8ba78980dbb 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
@@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr2 = array(1, 2);
+$array2 = array(1, 2);
 
 include('compare_function.inc');
 $data_compare_func = 'compare_function';
@@ -83,12 +83,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_uintersect_uassoc($value, $arr2, $data_compare_func, $key_compare_func) );
+        var_dump( array_uintersect_uassoc($value, $array2, $data_compare_func, $key_compare_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_uassoc() : usage variation ***
 
 --int 0--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect_uassoc(): Argument #1 ($array1) 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 dcb4e4161f7bfcafe6599808780d8210008ad93e..e2171f14534697dbc029382472fda49dcf347949 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
@@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr1 = array(1, 2);
+$array1 = array(1, 2);
 
 include('compare_function.inc');
 $data_compare_func = 'compare_function';
@@ -83,12 +83,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_uintersect_uassoc($arr1, $value, $data_compare_func, $key_compare_func) );
+        var_dump( array_uintersect_uassoc($array1, $value, $data_compare_func, $key_compare_func) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -99,76 +99,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect_uassoc() : usage variation ***
 
 --int 0--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect_uassoc(): Argument #2 ($array2) 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 7b07d09cfb06a2fa4aec011160ce96b7093a537a..c593a95fe678cd754e4ca496de2287b5abe0d746 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation1.phpt
@@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation
 echo "*** Testing array_uintersect() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr2 = array(1, 2);
+$array2 = array(1, 2);
 
 include('compare_function.inc');
 $data_compare_function = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr1
+// loop through each element of the array for array1
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_uintersect($value, $arr2, $data_compare_function) );
+        var_dump( array_uintersect($value, $array2, $data_compare_function) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect() : usage variation ***
 
 --int 0--
-array_uintersect(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect(): Argument #1 ($array1) must be of type array, int given
 
 --int 1--
-array_uintersect(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect(): Argument #1 ($array1) must be of type array, int given
 
 --int 12345--
-array_uintersect(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect(): Argument #1 ($array1) must be of type array, int given
 
 --int -12345--
-array_uintersect(): Argument #1 ($arr1) must be of type array, int given
+array_uintersect(): Argument #1 ($array1) must be of type array, int given
 
 --float 10.5--
-array_uintersect(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect(): Argument #1 ($array1) must be of type array, float given
 
 --float -10.5--
-array_uintersect(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect(): Argument #1 ($array1) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect(): Argument #1 ($array1) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect(): Argument #1 ($array1) must be of type array, float given
 
 --float .5--
-array_uintersect(): Argument #1 ($arr1) must be of type array, float given
+array_uintersect(): Argument #1 ($array1) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase null--
-array_uintersect(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect(): Argument #1 ($array1) must be of type array, null given
 
 --lowercase true--
-array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array1) must be of type array, bool given
 
 --lowercase false--
-array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array1) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect(): Argument #1 ($arr1) must be of type array, bool given
+array_uintersect(): Argument #1 ($array1) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect(): Argument #1 ($array1) must be of type array, string given
 
 --empty string SQ--
-array_uintersect(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect(): Argument #1 ($array1) must be of type array, string given
 
 --string DQ--
-array_uintersect(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect(): Argument #1 ($array1) must be of type array, string given
 
 --string SQ--
-array_uintersect(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect(): Argument #1 ($array1) must be of type array, string given
 
 --mixed case string--
-array_uintersect(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect(): Argument #1 ($array1) must be of type array, string given
 
 --heredoc--
-array_uintersect(): Argument #1 ($arr1) must be of type array, string given
+array_uintersect(): Argument #1 ($array1) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_uintersect(): Argument #1 ($array1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_uintersect(): Argument #1 ($array1) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect(): Argument #1 ($array1) must be of type array, null given
 
 --unset var--
-array_uintersect(): Argument #1 ($arr1) must be of type array, null given
+array_uintersect(): Argument #1 ($array1) 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 91c41f7cab461c5869b2640cd8f6872ab6142375..515b1ef207c0b573770c799218ae147dddfcbca1 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation2.phpt
@@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation
 echo "*** Testing array_uintersect() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$arr1 = array(1, 2);
+$array1 = array(1, 2);
 
 include('compare_function.inc');
 $data_compare_function = 'compare_function';
@@ -82,12 +82,12 @@ $inputs = array(
       'unset var' => @$unset_var,
 );
 
-// loop through each element of the array for arr2
+// loop through each element of the array for array2
 
 foreach($inputs as $key =>$value) {
     echo "\n--$key--\n";
     try {
-        var_dump( array_uintersect($arr1, $value, $data_compare_function) );
+        var_dump( array_uintersect($array1, $value, $data_compare_function) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -98,76 +98,76 @@ foreach($inputs as $key =>$value) {
 *** Testing array_uintersect() : usage variation ***
 
 --int 0--
-array_uintersect(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect(): Argument #2 ($array2) must be of type array, int given
 
 --int 1--
-array_uintersect(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect(): Argument #2 ($array2) must be of type array, int given
 
 --int 12345--
-array_uintersect(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect(): Argument #2 ($array2) must be of type array, int given
 
 --int -12345--
-array_uintersect(): Argument #2 ($arr2) must be of type array, int given
+array_uintersect(): Argument #2 ($array2) must be of type array, int given
 
 --float 10.5--
-array_uintersect(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect(): Argument #2 ($array2) must be of type array, float given
 
 --float -10.5--
-array_uintersect(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect(): Argument #2 ($array2) must be of type array, float given
 
 --float 12.3456789000e10--
-array_uintersect(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect(): Argument #2 ($array2) must be of type array, float given
 
 --float -12.3456789000e10--
-array_uintersect(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect(): Argument #2 ($array2) must be of type array, float given
 
 --float .5--
-array_uintersect(): Argument #2 ($arr2) must be of type array, float given
+array_uintersect(): Argument #2 ($array2) must be of type array, float given
 
 --uppercase NULL--
-array_uintersect(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase null--
-array_uintersect(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect(): Argument #2 ($array2) must be of type array, null given
 
 --lowercase true--
-array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect(): Argument #2 ($array2) must be of type array, bool given
 
 --lowercase false--
-array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase TRUE--
-array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect(): Argument #2 ($array2) must be of type array, bool given
 
 --uppercase FALSE--
-array_uintersect(): Argument #2 ($arr2) must be of type array, bool given
+array_uintersect(): Argument #2 ($array2) must be of type array, bool given
 
 --empty string DQ--
-array_uintersect(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect(): Argument #2 ($array2) must be of type array, string given
 
 --empty string SQ--
-array_uintersect(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect(): Argument #2 ($array2) must be of type array, string given
 
 --string DQ--
-array_uintersect(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect(): Argument #2 ($array2) must be of type array, string given
 
 --string SQ--
-array_uintersect(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect(): Argument #2 ($array2) must be of type array, string given
 
 --mixed case string--
-array_uintersect(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect(): Argument #2 ($array2) must be of type array, string given
 
 --heredoc--
-array_uintersect(): Argument #2 ($arr2) must be of type array, string given
+array_uintersect(): Argument #2 ($array2) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_uintersect(): Argument #2 ($array2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_uintersect(): Argument #2 ($array2) must be of type array, classWithoutToString given
 
 --undefined var--
-array_uintersect(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect(): Argument #2 ($array2) must be of type array, null given
 
 --unset var--
-array_uintersect(): Argument #2 ($arr2) must be of type array, null given
+array_uintersect(): Argument #2 ($array2) must be of type array, null given

diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt
index 2cfa6279cc35f601326e6f7dd21d7affc29e339c..c1a0d6b6c36718e10ddf37fc67d2867284dad64b 100644 (file)
--- a/ext/standard/tests/array/bug40191.phpt
+++ b/ext/standard/tests/array/bug40191.phpt
@@ -17,5 +17,5 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-array_unique(): Argument #1 ($arg) must be of type array, ArrayObject given
+array_unique(): Argument #1 ($array) must be of type array, ArrayObject given
 Done

diff --git a/ext/standard/tests/general_functions/bug41970.phpt b/ext/standard/tests/general_functions/bug41970.phpt
index 43569e47294c66ce2904fd677ed3c0c8334a30d3..4d78261208583dbf3e91e33a9b5ccdafd69aa2ea 100644 (file)
--- a/ext/standard/tests/general_functions/bug41970.phpt
+++ b/ext/standard/tests/general_functions/bug41970.phpt
@@ -21,11 +21,11 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d
+Warning: sort(): Argument #1 ($array) must be passed by reference, value given in %s on line %d
 bool(true)
 strlen(): Argument #1 ($string) must be of type string, array given
 
-Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d
+Warning: sort(): Argument #1 ($array) must be passed by reference, value given in %s on line %d
 bool(true)
 strlen(): Argument #1 ($string) must be of type string, array given
 Done

diff --git a/ext/standard/tests/general_functions/proc_open_array.phpt b/ext/standard/tests/general_functions/proc_open_array.phpt
index 7e822880d328f991eb7b15aa20c20bef3e29047b..a37aea891ec69294fe7f077648aed78299e1bd8f 100644 (file)
--- a/ext/standard/tests/general_functions/proc_open_array.phpt
+++ b/ext/standard/tests/general_functions/proc_open_array.phpt
@@ -26,7 +26,7 @@ try {
 
 echo "\nNul byte in argument:\n";
 try {
-    proc_open(["php", "arg\0oops"], $ds, $pipes);
+    proc_open(["php", "array\0oops"], $ds, $pipes);
 } catch (ValueError $exception) {
     echo $exception->getMessage() . "\n";
 }