From: Nikita Popov Date: Fri, 31 May 2019 08:35:07 +0000 (+0200) Subject: Convert some warnings to TypeErrors in array functions X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e391ee3a3086d4072012d5ed782517ed41ed400;p=php Convert some warnings to TypeErrors in array functions This is manual type and argument number checking code that was not covered by the zpp move to TypeErrors. --- diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt index 8775bece88..2134dfe0f6 100644 --- a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt +++ b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt @@ -5,14 +5,19 @@ Call internal function with incorrect number of arguments with strict types declare(strict_types=1); try { substr("foo"); -} catch (\Error $e) { +} catch (ArgumentCountError $e) { echo get_class($e) . PHP_EOL; echo $e->getMessage() . PHP_EOL; } -array_diff([]); ---EXPECTF-- +try { + array_diff([]); +} catch (ArgumentCountError $e) { + echo get_class($e) . PHP_EOL; + echo $e->getMessage(), "\n"; +} +--EXPECT-- ArgumentCountError substr() expects at least 2 parameters, 1 given - -Warning: array_diff(): at least 2 parameters are required, 1 given in %s +ArgumentCountError +At least 2 parameters are required, 1 given diff --git a/ext/standard/array.c b/ext/standard/array.c index ce74f94b1a..e11554a370 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3742,8 +3742,8 @@ static zend_always_inline void php_array_replace_wrapper(INTERNAL_FUNCTION_PARAM zval *arg = args + i; if (Z_TYPE_P(arg) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg)); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg)); + return; } } @@ -3786,8 +3786,8 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET zval *arg = args + i; if (Z_TYPE_P(arg) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg)); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(arg)); + return; } count += zend_hash_num_elements(Z_ARRVAL_P(arg)); } @@ -4666,7 +4666,7 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa } if (argc < req_args) { - php_error_docref(NULL, E_WARNING, "at least %d parameters are required, %d given", req_args, argc); + zend_argument_count_error("At least %d parameters are required, %d given", req_args, argc); return; } @@ -4676,8 +4676,8 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa for (i = 0; i < argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + return; } } @@ -4766,7 +4766,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int } if (ZEND_NUM_ARGS() < req_args) { - php_error_docref(NULL, E_WARNING, "at least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); + zend_argument_count_error("At least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); return; } @@ -4818,7 +4818,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int } if (ZEND_NUM_ARGS() < req_args) { - php_error_docref(NULL, E_WARNING, "at least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); + zend_argument_count_error("At least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); return; } @@ -4847,7 +4847,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int for (i = 0; i < arr_argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); arr_argc = i; /* only free up to i - 1 */ goto out; } @@ -5065,7 +5065,7 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty argc = ZEND_NUM_ARGS(); if (data_compare_type == DIFF_COMP_DATA_USER) { if (argc < 3) { - php_error_docref(NULL, E_WARNING, "at least 3 parameters are required, %d given", ZEND_NUM_ARGS()); + zend_argument_count_error("At least 3 parameters are required, %d given", ZEND_NUM_ARGS()); return; } if (zend_parse_parameters(ZEND_NUM_ARGS(), "+f", &args, &argc, &BG(user_compare_fci), &BG(user_compare_fci_cache)) == FAILURE) { @@ -5074,7 +5074,7 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty diff_data_compare_func = zval_user_compare; } else { if (argc < 2) { - php_error_docref(NULL, E_WARNING, "at least 2 parameters are required, %d given", ZEND_NUM_ARGS()); + zend_argument_count_error("At least 2 parameters are required, %d given", ZEND_NUM_ARGS()); return; } if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) { @@ -5087,8 +5087,8 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty for (i = 0; i < argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + return; } } @@ -5177,7 +5177,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_ } if (ZEND_NUM_ARGS() < req_args) { - php_error_docref(NULL, E_WARNING, "at least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); + zend_argument_count_error("At least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); return; } @@ -5229,7 +5229,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_ } if (ZEND_NUM_ARGS() < req_args) { - php_error_docref(NULL, E_WARNING, "at least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); + zend_argument_count_error("At least %d parameters are required, %d given", req_args, ZEND_NUM_ARGS()); return; } @@ -5258,7 +5258,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_ for (i = 0; i < arr_argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); arr_argc = i; /* only free up to i - 1 */ goto out; } @@ -5426,7 +5426,7 @@ PHP_FUNCTION(array_diff) zval dummy; if (ZEND_NUM_ARGS() < 2) { - php_error_docref(NULL, E_WARNING, "at least 2 parameters are required, %d given", ZEND_NUM_ARGS()); + zend_argument_count_error("At least 2 parameters are required, %d given", ZEND_NUM_ARGS()); return; } @@ -5435,16 +5435,16 @@ PHP_FUNCTION(array_diff) ZEND_PARSE_PARAMETERS_END(); if (Z_TYPE(args[0]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter 1 to be an array, %s given", zend_zval_type_name(&args[0])); - RETURN_NULL(); + zend_type_error("Expected parameter 1 to be an array, %s given", zend_zval_type_name(&args[0])); + return; } num = zend_hash_num_elements(Z_ARRVAL(args[0])); if (num == 0) { for (i = 1; i < argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + return; } } RETURN_EMPTY_ARRAY(); @@ -5460,8 +5460,8 @@ PHP_FUNCTION(array_diff) if (!value) { for (i = 1; i < argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + return; } } RETURN_EMPTY_ARRAY(); @@ -5471,8 +5471,8 @@ PHP_FUNCTION(array_diff) for (i = 1; i < argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + return; } if (!found) { ZEND_HASH_FOREACH_VAL_IND(Z_ARRVAL(args[i]), value) { @@ -5501,8 +5501,8 @@ PHP_FUNCTION(array_diff) num = 0; for (i = 1; i < argc; i++) { if (Z_TYPE(args[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); - RETURN_NULL(); + zend_type_error("Expected parameter %d to be an array, %s given", i + 1, zend_zval_type_name(&args[i])); + return; } num += zend_hash_num_elements(Z_ARRVAL(args[i])); } @@ -6156,7 +6156,7 @@ PHP_FUNCTION(array_map) int ret; if (Z_TYPE(arrays[0]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter 2 to be an array, %s given", zend_zval_type_name(&arrays[0])); + zend_type_error("Expected parameter 2 to be an array, %s given", zend_zval_type_name(&arrays[0])); return; } maxlen = zend_hash_num_elements(Z_ARRVAL(arrays[0])); @@ -6197,7 +6197,7 @@ PHP_FUNCTION(array_map) for (i = 0; i < n_arrays; i++) { if (Z_TYPE(arrays[i]) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 2, zend_zval_type_name(&arrays[i])); + zend_type_error("Expected parameter %d to be an array, %s given", i + 2, zend_zval_type_name(&arrays[i])); efree(array_pos); return; } diff --git a/ext/standard/tests/array/array_diff_1.phpt b/ext/standard/tests/array/array_diff_1.phpt index a7ee015346..2e2b135128 100644 --- a/ext/standard/tests/array/array_diff_1.phpt +++ b/ext/standard/tests/array/array_diff_1.phpt @@ -6,10 +6,14 @@ Test array_diff when non-array is passed $a = array(); $b = 3; $c = array(5); -array_diff($a, $b, $c); +try { + array_diff($a, $b, $c); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} //-=-=-=-=-=- echo "OK!"; ?> --EXPECTF-- -Warning: array_diff(): Expected parameter 2 to be an array, int given in %s +Expected parameter 2 to be an array, int given OK! diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt index fc8c70c67c..6aa7864ee9 100644 --- a/ext/standard/tests/array/array_diff_assoc_error.phpt +++ b/ext/standard/tests/array/array_diff_assoc_error.phpt @@ -16,13 +16,20 @@ echo "*** Testing array_diff_assoc() : error conditions ***\n"; // Zero arguments echo "\n-- Testing array_diff_assoc() function with zero arguments --\n"; -var_dump( array_diff_assoc() ); +try { + var_dump( array_diff_assoc() ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} // Testing array_diff_assoc with one less than the expected number of arguments echo "\n-- Testing array_diff_assoc() function with less than expected no. of arguments --\n"; $arr1 = array(1, 2); -var_dump( array_diff_assoc($arr1) ); - +try { + var_dump( array_diff_assoc($arr1) ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} echo "Done"; ?> @@ -30,12 +37,8 @@ echo "Done"; *** Testing array_diff_assoc() : error conditions *** -- Testing array_diff_assoc() function with zero arguments -- - -Warning: array_diff_assoc(): at least 2 parameters are required, 0 given in %s on line %d -NULL +At least 2 parameters are required, 0 given -- Testing array_diff_assoc() function with less than expected no. of arguments -- - -Warning: array_diff_assoc(): at least 2 parameters are required, 1 given in %s on line %d -NULL +At least 2 parameters are required, 1 given Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 2172e695d3..270660a8cf 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt @@ -91,143 +91,95 @@ $inputs = array( // loop through each element of $inputs to check the behavior of array_diff_assoc $iterator = 1; foreach($inputs as $input) { - echo "\n-- Iteration $iterator --\n"; - var_dump( array_diff_assoc($input, $array)); - $iterator++; + echo "\n-- Iteration $iterator --\n"; + try { + var_dump(array_diff_assoc($input, $array)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; }; fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given -- Iteration 2 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given -- Iteration 3 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given -- Iteration 4 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given -- Iteration 5 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given -- Iteration 6 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given -- Iteration 7 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given -- Iteration 8 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given -- Iteration 9 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given -- Iteration 10 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given -- Iteration 11 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given -- Iteration 12 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given -- Iteration 13 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given -- Iteration 14 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given -- Iteration 15 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given -- Iteration 16 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 17 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 18 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 19 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 20 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 21 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 22 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given -- Iteration 23 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given -- Iteration 24 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given -- Iteration 25 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given -- Iteration 26 -- - -Warning: array_diff_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an 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 a57f10fce0..9185b53439 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -91,143 +91,95 @@ $inputs = array( // loop through each element of $inputs to check the behavior of array_diff_assoc $iterator = 1; foreach($inputs as $input) { - echo "\n-- Iteration $iterator --\n"; - var_dump( array_diff_assoc($array, $input)); - $iterator++; + echo "\n-- Iteration $iterator --\n"; + try { + var_dump(array_diff_assoc($array, $input)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; }; fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 2 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 3 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 4 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 5 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 6 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 7 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 8 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 9 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 10 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 11 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 12 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 13 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 14 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 15 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 16 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 17 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 18 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 19 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 20 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 21 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 22 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 23 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given -- Iteration 24 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 25 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 26 -- - -Warning: array_diff_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given Done diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt index 25be6e1c55..d269f010b8 100644 --- a/ext/standard/tests/array/array_diff_error.phpt +++ b/ext/standard/tests/array/array_diff_error.phpt @@ -15,13 +15,21 @@ Test array_diff() function : error conditions - too few arguments passed to func echo "*** Testing array_diff() : error conditions ***\n"; // Zero arguments echo "\n-- Testing array_diff() function with zero arguments --\n"; -var_dump( array_diff() ); +try { + var_dump( array_diff() ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} // Testing array_diff with one less than the expected number of arguments echo "\n-- Testing array_diff() function with less than expected no. of arguments --\n"; $arr1 = array(1, 2); -var_dump( array_diff($arr1) ); +try { + var_dump( array_diff($arr1) ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} echo "Done"; ?> @@ -29,12 +37,8 @@ echo "Done"; *** Testing array_diff() : error conditions *** -- Testing array_diff() function with zero arguments -- - -Warning: array_diff(): at least 2 parameters are required, 0 given in %s on line %d -NULL +At least 2 parameters are required, 0 given -- Testing array_diff() function with less than expected no. of arguments -- - -Warning: array_diff(): at least 2 parameters are required, 1 given in %s on line %d -NULL +At least 2 parameters are required, 1 given Done diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt index 05d5cf3c27..ec5ef10ba8 100644 --- a/ext/standard/tests/array/array_diff_key_error.phpt +++ b/ext/standard/tests/array/array_diff_key_error.phpt @@ -14,23 +14,27 @@ $array1 = array('blue' => 1, 'red' => 2, 'green' => 3, 'purple' => 4); // Testing array_diff_key with one less than the expected number of arguments echo "\n-- Testing array_diff_key() function with less than expected no. of arguments --\n"; -var_dump( array_diff_key($array1) ); +try { + var_dump( array_diff_key($array1) ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} // Testing array_diff_key with no arguments echo "\n-- Testing array_diff_key() function with no arguments --\n"; -var_dump( array_diff_key() ); +try { + var_dump( array_diff_key() ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== --EXPECTF-- *** Testing array_diff_key() : error conditions *** -- Testing array_diff_key() function with less than expected no. of arguments -- - -Warning: array_diff_key(): at least 2 parameters are required, 1 given in %s on line %d -NULL +At least 2 parameters are required, 1 given -- Testing array_diff_key() function with no arguments -- - -Warning: array_diff_key(): at least 2 parameters are required, 0 given in %s on line %d -NULL +At least 2 parameters are required, 0 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 3e689a0e8f..f47042f009 100644 --- a/ext/standard/tests/array/array_diff_key_variation1.phpt +++ b/ext/standard/tests/array/array_diff_key_variation1.phpt @@ -89,222 +89,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_key($value, $array2) ); - var_dump( array_diff_key($value, $array2, $array3) ); + echo "\n--$key--\n"; + try { + var_dump( array_diff_key($value, $array2) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_diff_key($value, $array2, $array3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --int 0-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --resource-- - -Warning: array_diff_key(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt index fb0bcd6796..24ddffb530 100644 --- a/ext/standard/tests/array/array_diff_key_variation2.phpt +++ b/ext/standard/tests/array/array_diff_key_variation2.phpt @@ -90,222 +90,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_key($array1, $value) ); - var_dump( array_diff_key($array1, $value, $array3) ); + echo "\n--$key--\n"; + try { + var_dump( array_diff_key($array1, $value) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_diff_key($array1, $value, $array3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --int 0-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --resource-- - -Warning: array_diff_key(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL - -Warning: array_diff_key(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation3.phpt b/ext/standard/tests/array/array_diff_key_variation3.phpt deleted file mode 100644 index 36741dba33..0000000000 --- a/ext/standard/tests/array/array_diff_key_variation3.phpt +++ /dev/null @@ -1,232 +0,0 @@ ---TEST-- -Test array_diff_key() function : usage variation - Passing unexpected values to third optional argument ---FILE-- - 1, 'red' => 2, 'green' => 3, 'purple' => 4); -$array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8); - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -//resource variable -$fp = fopen(__FILE__, "r"); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = << 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource data - 'resource' => $fp, -); - -// loop through each element of the array for arr1 - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_key($array1, $array2, $value) ); -}; - -fclose($fp); -?> -===DONE=== ---EXPECTF-- -*** Testing array_diff_key() : usage variation *** - ---int 0-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 1-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 12345-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int -12345-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---float 10.5-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -10.5-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float .5-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---uppercase NULL-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase null-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase true-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---lowercase false-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase TRUE-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase FALSE-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---empty string DQ-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---empty string SQ-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string DQ-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string SQ-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---mixed case string-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---heredoc-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---instance of classWithToString-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---undefined var-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---unset var-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---resource-- - -Warning: array_diff_key(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt index f6c6905780..13881f6993 100644 --- a/ext/standard/tests/array/array_diff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_error.phpt @@ -40,11 +40,15 @@ try { // Testing array_diff_uassoc with one less than the expected number of arguments echo "\n-- Testing array_diff_uassoc() function with less than expected no. of arguments --\n"; -var_dump( array_diff_uassoc($array1, $array2) ); +try { + var_dump( array_diff_uassoc($array1, $array2) ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : error conditions *** -- Testing array_diff_uassoc() function with more than expected no. of arguments -- @@ -52,7 +56,5 @@ array_diff_uassoc() expects parameter 4 to be a valid callback, array must have array_diff_uassoc() expects parameter 6 to be a valid callback, array must have exactly two members -- Testing array_diff_uassoc() function with less than expected no. of arguments -- - -Warning: array_diff_uassoc(): at least 3 parameters are required, 2 given in %s on line %d -NULL +At least 3 parameters are required, 2 given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt index aad42705db..03f3160a00 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt @@ -102,143 +102,95 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_uassoc($value, $array2, "key_compare_func") ); + echo "\n--$key--\n"; + try { + var_dump( array_diff_uassoc($value, $array2, "key_compare_func") ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --int 0-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given --resource-- - -Warning: array_diff_uassoc(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt index ae664f9812..7ca05b1fd0 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt @@ -102,143 +102,95 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_uassoc($array1, $value, "key_compare_func") ); + echo "\n--$key--\n"; + try { + var_dump( array_diff_uassoc($array1, $value, "key_compare_func") ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --int 0-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given --resource-- - -Warning: array_diff_uassoc(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt deleted file mode 100644 index 8ea51a4103..0000000000 --- a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt +++ /dev/null @@ -1,246 +0,0 @@ ---TEST-- -Test array_diff_uassoc() function : usage variation -Passing unexpected values as third optional argument ---FILE-- - "green", "b" => "brown", "c" => "blue", "red"); -$array2 = array("a" => "green", "yellow", "red"); - - -function key_compare_func($a, $b) -{ - if ($a === $b) { - return 0; - } - return ($a > $b)? 1:-1; -} - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -//resource variable -$fp = fopen(__FILE__, "r"); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = << 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource data - 'resource' => $fp, -); - -// loop through each element of the array for arr2 - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_uassoc($array1, $array2, $value, "key_compare_func") ); -}; - -fclose($fp); -?> -===DONE=== ---EXPECTF-- -*** Testing array_diff_uassoc() : usage variation *** - ---int 0-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 1-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 12345-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int -12345-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---float 10.5-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -10.5-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float .5-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---uppercase NULL-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase null-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase true-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---lowercase false-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase TRUE-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase FALSE-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---empty string DQ-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---empty string SQ-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string DQ-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string SQ-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---mixed case string-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---heredoc-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---instance of classWithToString-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---undefined var-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---unset var-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---resource-- - -Warning: array_diff_uassoc(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt index bbf349c4fd..3b591018bd 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt @@ -97,222 +97,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_ukey($value, $array2, 'key_compare_func') ); - var_dump( array_diff_ukey($value, $array2, $array3, 'key_compare_func') ); + echo "\n--$key--\n"; + try { + var_dump( array_diff_ukey($value, $array2, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_diff_ukey($value, $array2, $array3, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --int 0-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --resource-- - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt index 38141a430c..3638afcb53 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt @@ -101,222 +101,126 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_ukey($array1, $value, 'key_compare_func') ); - var_dump( array_diff_ukey($array1, $value, $array3, 'key_compare_func') ); + echo "\n--$key--\n"; + try { + var_dump( array_diff_ukey($array1, $value, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_diff_ukey($array1, $value, $array3, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --int 0-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --resource-- - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL - -Warning: array_diff_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation3.phpt b/ext/standard/tests/array/array_diff_ukey_variation3.phpt deleted file mode 100644 index 572061d697..0000000000 --- a/ext/standard/tests/array/array_diff_ukey_variation3.phpt +++ /dev/null @@ -1,240 +0,0 @@ ---TEST-- -Test array_diff_ukey() function : usage variation - Passing unexpected values to third optional argument ---FILE-- - 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8); -$array2 = array('blue' => 1, 'red' => 2, 'green' => 3, 'purple' => 4); - -function key_compare_func($key1, $key2) -{ - if ($key1 == $key2) { - return 0; - } - return ($key1 > $key2)? 1:-1; -} - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -// resource variable -$fp = fopen(__FILE__, "r"); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = << 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource data - 'resource' => $fp, -); - -// loop through each element of the array for key_comp_func - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_diff_ukey($array1, $array2, $value, 'key_compare_func') ); -}; - -fclose($fp); -?> -===DONE=== ---EXPECTF-- -*** Testing array_diff_ukey() : usage variation *** - ---int 0-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 1-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 12345-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int -12345-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---float 10.5-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -10.5-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float .5-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---uppercase NULL-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase null-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase true-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---lowercase false-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase TRUE-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase FALSE-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---empty string DQ-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---empty string SQ-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string DQ-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string SQ-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---mixed case string-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---heredoc-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---instance of classWithToString-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---undefined var-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---unset var-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---resource-- - -Warning: array_diff_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index e162c523d6..5b92231642 100644 --- a/ext/standard/tests/array/array_diff_variation1.phpt +++ b/ext/standard/tests/array/array_diff_variation1.phpt @@ -91,118 +91,70 @@ $inputs = array( // loop through each element of $inputs to check the behavior of array_diff $iterator = 1; foreach($inputs as $input) { - echo "\n-- Iteration $iterator --"; - var_dump( array_diff($input, $array)); - $iterator++; + echo "\n-- Iteration $iterator --"; + try { + var_dump( array_diff($input, $array)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; }; fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** --- Iteration 1 -- -Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- Iteration 1 --Expected parameter 1 to be an array, int given --- Iteration 2 -- -Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- Iteration 2 --Expected parameter 1 to be an array, int given --- Iteration 3 -- -Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- Iteration 3 --Expected parameter 1 to be an array, int given --- Iteration 4 -- -Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- Iteration 4 --Expected parameter 1 to be an array, int given --- Iteration 5 -- -Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- Iteration 5 --Expected parameter 1 to be an array, float given --- Iteration 6 -- -Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- Iteration 6 --Expected parameter 1 to be an array, float given --- Iteration 7 -- -Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- Iteration 7 --Expected parameter 1 to be an array, float given --- Iteration 8 -- -Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- Iteration 8 --Expected parameter 1 to be an array, float given --- Iteration 9 -- -Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- Iteration 9 --Expected parameter 1 to be an array, float given --- Iteration 10 -- -Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 10 --Expected parameter 1 to be an array, null given --- Iteration 11 -- -Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 11 --Expected parameter 1 to be an array, null given --- Iteration 12 -- -Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 12 --Expected parameter 1 to be an array, bool given --- Iteration 13 -- -Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 13 --Expected parameter 1 to be an array, bool given --- Iteration 14 -- -Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 14 --Expected parameter 1 to be an array, bool given --- Iteration 15 -- -Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 15 --Expected parameter 1 to be an array, bool given --- Iteration 16 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 16 --Expected parameter 1 to be an array, string given --- Iteration 17 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 17 --Expected parameter 1 to be an array, string given --- Iteration 18 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 18 --Expected parameter 1 to be an array, string given --- Iteration 19 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 19 --Expected parameter 1 to be an array, string given --- Iteration 20 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 20 --Expected parameter 1 to be an array, string given --- Iteration 21 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 21 --Expected parameter 1 to be an array, string given --- Iteration 22 -- -Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 22 --Expected parameter 1 to be an array, string given --- Iteration 23 -- -Warning: array_diff(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +-- Iteration 23 --Expected parameter 1 to be an array, object given --- Iteration 24 -- -Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 24 --Expected parameter 1 to be an array, null given --- Iteration 25 -- -Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 25 --Expected parameter 1 to be an array, null given --- Iteration 26 -- -Warning: array_diff(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +-- Iteration 26 --Expected parameter 1 to be an 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 5f8183b88d..a9ddb22b82 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -91,117 +91,69 @@ $inputs = array( // loop through each element of $inputs to check the behavior of array_diff $iterator = 1; foreach($inputs as $input) { - echo "\n-- Iteration $iterator --"; - var_dump( array_diff($array, $input)); - $iterator++; + echo "\n-- Iteration $iterator --"; + try { + var_dump( array_diff($array, $input)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; }; fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** --- Iteration 1 -- -Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 1 --Expected parameter 2 to be an array, int given --- Iteration 2 -- -Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 2 --Expected parameter 2 to be an array, int given --- Iteration 3 -- -Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 3 --Expected parameter 2 to be an array, int given --- Iteration 4 -- -Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 4 --Expected parameter 2 to be an array, int given --- Iteration 5 -- -Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 5 --Expected parameter 2 to be an array, float given --- Iteration 6 -- -Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 6 --Expected parameter 2 to be an array, float given --- Iteration 7 -- -Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 7 --Expected parameter 2 to be an array, float given --- Iteration 8 -- -Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 8 --Expected parameter 2 to be an array, float given --- Iteration 9 -- -Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 9 --Expected parameter 2 to be an array, float given --- Iteration 10 -- -Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 10 --Expected parameter 2 to be an array, null given --- Iteration 11 -- -Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 11 --Expected parameter 2 to be an array, null given --- Iteration 12 -- -Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 12 --Expected parameter 2 to be an array, bool given --- Iteration 13 -- -Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 13 --Expected parameter 2 to be an array, bool given --- Iteration 14 -- -Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 14 --Expected parameter 2 to be an array, bool given --- Iteration 15 -- -Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 15 --Expected parameter 2 to be an array, bool given --- Iteration 16 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 16 --Expected parameter 2 to be an array, string given --- Iteration 17 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 17 --Expected parameter 2 to be an array, string given --- Iteration 18 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 18 --Expected parameter 2 to be an array, string given --- Iteration 19 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 19 --Expected parameter 2 to be an array, string given --- Iteration 20 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 20 --Expected parameter 2 to be an array, string given --- Iteration 21 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 21 --Expected parameter 2 to be an array, string given --- Iteration 22 -- -Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 22 --Expected parameter 2 to be an array, string given --- Iteration 23 -- -Warning: array_diff(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +-- Iteration 23 --Expected parameter 2 to be an array, object given --- Iteration 24 -- -Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 24 --Expected parameter 2 to be an array, null given --- Iteration 25 -- -Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 25 --Expected parameter 2 to be an array, null given --- Iteration 26 -- -Warning: array_diff(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +-- Iteration 26 --Expected parameter 2 to be an array, resource given Done diff --git a/ext/standard/tests/array/array_intersect_assoc_error.phpt b/ext/standard/tests/array/array_intersect_assoc_error.phpt index a06dbddefe..fa815118ce 100644 --- a/ext/standard/tests/array/array_intersect_assoc_error.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_error.phpt @@ -12,25 +12,29 @@ echo "*** Testing array_intersect_assoc() : error conditions ***\n"; // Zero arguments echo "\n-- Testing array_intersect_assoc() function with Zero arguments --\n"; -var_dump( array_intersect_assoc() ); +try { + var_dump( array_intersect_assoc() ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} // Testing array_intersect_assoc with one less than the expected number of arguments echo "\n-- Testing array_intersect_assoc() function with less than expected no. of arguments --\n"; $arr1 = array(1, 2); -var_dump( array_intersect_assoc($arr1) ); +try { + var_dump( array_intersect_assoc($arr1) ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : error conditions *** -- Testing array_intersect_assoc() function with Zero arguments -- - -Warning: array_intersect_assoc(): at least 2 parameters are required, 0 given in %s on line %d -NULL +At least 2 parameters are required, 0 given -- Testing array_intersect_assoc() function with less than expected no. of arguments -- - -Warning: array_intersect_assoc(): at least 2 parameters are required, 1 given in %s on line %d -NULL +At least 2 parameters are required, 1 given Done diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt index ca11b7cc9b..3490c4f25c 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt @@ -93,14 +93,22 @@ $arrays = array( // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() $iterator = 1; foreach($arrays as $unexpected_value) { - echo "\n-- Iteration $iterator --"; - - // Calling array_intersect_assoc() with default arguments - var_dump( array_intersect_assoc($unexpected_value, $arr2) ); - - // Calling array_intersect_assoc() with more arguments - var_dump( array_intersect_assoc($unexpected_value, $arr2, $arr3) ); - $iterator++; + echo "\n-- Iteration $iterator --"; + + // Calling array_intersect_assoc() with default arguments + try { + var_dump( array_intersect_assoc($unexpected_value, $arr2) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + // Calling array_intersect_assoc() with more arguments + try { + var_dump( array_intersect_assoc($unexpected_value, $arr2, $arr3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; } // close the file resource used @@ -108,174 +116,78 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing non-array values to $arr1 argument *** --- Iteration 1 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 2 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 3 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 4 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 5 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 6 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 7 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 8 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 9 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 10 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iteration 11 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iteration 12 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - --- Iteration 13 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 1 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 2 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --- Iteration 14 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 3 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 4 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --- Iteration 15 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 5 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iteration 6 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --- Iteration 16 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 7 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 8 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --- Iteration 17 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 9 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 10 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --- Iteration 18 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 11 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 12 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --- Iteration 19 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 13 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 14 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --- Iteration 20 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 15 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iteration 16 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --- Iteration 21 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +-- Iteration 17 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +-- Iteration 18 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --- Iteration 22 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 19 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 20 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --- Iteration 23 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 21 --Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iteration 22 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --- Iteration 24 -- -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +-- Iteration 23 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given -Warning: array_intersect_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +-- Iteration 24 --Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an 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 274da6f7b2..12cf4d7307 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt @@ -93,15 +93,23 @@ $arrays = array( // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() $iterator = 1; foreach($arrays as $unexpected_value) { - echo "\n-- Iteration $iterator --"; - - // Calling array_intersect_assoc() with default arguments - var_dump( array_intersect_assoc($arr1,$unexpected_value) ); - - // Calling array_intersect_assoc() with more arguments - var_dump( array_intersect_assoc($arr1, $unexpected_value, $arr3) ); - - $iterator++; + echo "\n-- Iteration $iterator --"; + + // Calling array_intersect_assoc() with default arguments + try { + var_dump( array_intersect_assoc($arr1,$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) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + $iterator++; } // close the file resource used @@ -109,174 +117,78 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing non-array values to $arr2 argument *** --- Iteration 1 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iteration 2 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iteration 3 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iteration 4 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iteration 5 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iteration 6 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iteration 7 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iteration 8 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iteration 9 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iteration 10 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - --- Iteration 11 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - --- Iteration 12 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - --- Iteration 13 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 1 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 2 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --- Iteration 14 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 3 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 4 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --- Iteration 15 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 5 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 6 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --- Iteration 16 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 7 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 8 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --- Iteration 17 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 9 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 10 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --- Iteration 18 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 11 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 12 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --- Iteration 19 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 13 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 14 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --- Iteration 20 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 15 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 16 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --- Iteration 21 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +-- Iteration 17 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +-- Iteration 18 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --- Iteration 22 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 19 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 20 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --- Iteration 23 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 21 --Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 22 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --- Iteration 24 -- -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +-- Iteration 23 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given -Warning: array_intersect_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +-- Iteration 24 --Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an array, resource given Done diff --git a/ext/standard/tests/array/array_intersect_error.phpt b/ext/standard/tests/array/array_intersect_error.phpt index 373a0ddbe0..81be2634db 100644 --- a/ext/standard/tests/array/array_intersect_error.phpt +++ b/ext/standard/tests/array/array_intersect_error.phpt @@ -11,25 +11,29 @@ echo "*** Testing array_intersect() : error conditions ***\n"; // Testing array_intersect() with zero arguments echo "\n-- Testing array_intersect() function with Zero arguments --\n"; -var_dump( array_intersect() ); +try { + var_dump( array_intersect() ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} // Testing array_intersect() with one less than the expected number of arguments echo "\n-- Testing array_intersect() function with less than expected no. of arguments --\n"; $arr1 = array(1, 2); -var_dump( array_intersect($arr1) ); +try { + var_dump( array_intersect($arr1) ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : error conditions *** -- Testing array_intersect() function with Zero arguments -- - -Warning: array_intersect(): at least 2 parameters are required, 0 given in %s on line %d -NULL +At least 2 parameters are required, 0 given -- Testing array_intersect() function with less than expected no. of arguments -- - -Warning: array_intersect(): at least 2 parameters are required, 1 given in %s on line %d -NULL +At least 2 parameters are required, 1 given Done diff --git a/ext/standard/tests/array/array_intersect_key_error.phpt b/ext/standard/tests/array/array_intersect_key_error.phpt index 10ad8ad342..7db4b7415f 100644 --- a/ext/standard/tests/array/array_intersect_key_error.phpt +++ b/ext/standard/tests/array/array_intersect_key_error.phpt @@ -14,23 +14,27 @@ $array1 = array('blue' => 1, 'red' => 2, 'green' => 3, 'purple' => 4); // Testing array_intersect_key with one less than the expected number of arguments echo "\n-- Testing array_intersect_key() function with less than expected no. of arguments --\n"; -var_dump( array_intersect_key($array1) ); +try { + var_dump( array_intersect_key($array1) ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} // Testing array_intersect_key with one less than the expected number of arguments echo "\n-- Testing array_intersect_key() function with no arguments --\n"; -var_dump( array_intersect_key() ); +try { + var_dump( array_intersect_key() ); +} catch (ArgumentCountError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : error conditions *** -- Testing array_intersect_key() function with less than expected no. of arguments -- - -Warning: array_intersect_key(): at least 2 parameters are required, 1 given in %s on line %d -NULL +At least 2 parameters are required, 1 given -- Testing array_intersect_key() function with no arguments -- - -Warning: array_intersect_key(): at least 2 parameters are required, 0 given in %s on line %d -NULL +At least 2 parameters are required, 0 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 fb9dd2c7aa..0987205b7e 100644 --- a/ext/standard/tests/array/array_intersect_key_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt @@ -93,222 +93,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_key($value, $array2) ); - var_dump( array_intersect_key($value, $array2, $array3) ); + echo "\n--$key--\n"; + try { + var_dump( array_intersect_key($value, $array2) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_intersect_key($value, $array2, $array3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } } fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --int 0-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --resource var-- - -Warning: array_intersect_key(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt index 5d2147b99f..8d46b6efae 100644 --- a/ext/standard/tests/array/array_intersect_key_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt @@ -94,222 +94,126 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_key($array1, $value) ); - var_dump( array_intersect_key($array1, $value, $array3) ); + echo "\n--$key--\n"; + try { + var_dump( array_intersect_key($array1, $value) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_intersect_key($array1, $value, $array3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } } fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --int 0-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --resource var-- - -Warning: array_intersect_key(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_key(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation3.phpt b/ext/standard/tests/array/array_intersect_key_variation3.phpt deleted file mode 100644 index dca52bafc2..0000000000 --- a/ext/standard/tests/array/array_intersect_key_variation3.phpt +++ /dev/null @@ -1,235 +0,0 @@ ---TEST-- -Test array_intersect_key() function : usage variation - Passing unexpected values to optional argument ---FILE-- - 1, 'red' => 2, 'green' => 3, 'purple' => 4); -$array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8); - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -//resource variable -$fp = fopen(__FILE__, "r"); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = << 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource data - 'resource var' => $fp, -); - -// loop through each element of the array for arr2 -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_key($array1, $array2, $value) ); -} - -fclose($fp); -?> -===DONE=== ---EXPECTF-- -*** Testing array_intersect_key() : usage variation *** - ---int 0-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 1-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 12345-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int -12345-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---float 10.5-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -10.5-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float .5-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---uppercase NULL-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase null-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase true-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---lowercase false-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase TRUE-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase FALSE-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---empty string DQ-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---empty string SQ-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string DQ-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string SQ-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---mixed case string-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---heredoc-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---instance of classWithToString-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---undefined var-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---unset var-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---resource var-- - -Warning: array_intersect_key(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index 887ad12d9a..4c4a69250c 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -101,222 +101,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_uassoc($value, $array2, 'key_compare_func') ); - var_dump( array_intersect_uassoc($value, $array2, $array3, 'key_compare_func') ); + echo "\n--$key--\n"; + try { + var_dump( array_intersect_uassoc($value, $array2, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_intersect_uassoc($value, $array2, $array3, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** --int 0-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --resource-- - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index d482e9ffcc..0daa424314 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -101,222 +101,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_uassoc($array1, $value, 'key_compare_func') ); - var_dump( array_intersect_uassoc($array1, $value, $array3, 'key_compare_func') ); + echo "\n--$key--\n"; + try { + var_dump( array_intersect_uassoc($array1, $value, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_intersect_uassoc($array1, $value, $array3, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** --int 0-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --resource-- - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt deleted file mode 100644 index 42e53101dc..0000000000 --- a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt +++ /dev/null @@ -1,243 +0,0 @@ ---TEST-- -Test array_intersect_uassoc() function : usage variation - Passing unexpected values to optional third argument ---FILE-- - "green", "b" => "brown", "c" => "blue", "red"); -$array2 = array("a" => "green", "yellow", "red"); - -//Callback function -function key_compare_func($a, $b) { - if ($a === $b) { - return 0; - } - return ($a > $b) ? 1 : -1; -} - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -//resource variable -$fp = fopen(__FILE__, "r"); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = << 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource data - 'resource' => $fp, -); - -// loop through each element of the array for arr1 -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_uassoc($array1, $array2, $value, 'key_compare_func') ); -}; - -fclose($fp); -?> -===DONE=== ---EXPECTF-- -*** Testing array_intersect_uassoc() : usage variation *** - ---int 0-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 1-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 12345-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int -12345-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---float 10.5-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -10.5-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float .5-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---uppercase NULL-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase null-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase true-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---lowercase false-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase TRUE-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase FALSE-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---empty string DQ-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---empty string SQ-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string DQ-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string SQ-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---mixed case string-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---heredoc-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---instance of classWithToString-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---undefined var-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---unset var-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---resource-- - -Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index 86850094b8..cf1525a519 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -99,222 +99,126 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_ukey($value, $array2, 'key_compare_func') ); - var_dump( array_intersect_ukey($value, $array2, $array3, 'key_compare_func') ); + echo "\n--$key--\n"; + try { + var_dump( array_intersect_ukey($value, $array2, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_intersect_ukey($value, $array2, $array3, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** --int 0-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --resource var-- - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index 82b43628e3..f4df546f8e 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -99,222 +99,126 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_ukey($array1, $value, 'key_compare_func') ); - var_dump( array_intersect_ukey($array1, $value, $array3, 'key_compare_func') ); + echo "\n--$key--\n"; + try { + var_dump( array_intersect_ukey($array1, $value, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + try { + var_dump( array_intersect_ukey($array1, $value, $array3, 'key_compare_func') ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** --int 0-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --resource var-- - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an array, resource given ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt deleted file mode 100644 index 35c0d4a2e6..0000000000 --- a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt +++ /dev/null @@ -1,321 +0,0 @@ ---TEST-- -Test array_intersect_ukey() function : usage variation - Passing unexpected values to optional third argument ---FILE-- - 1, 'red' => 2, 'green' => 3, 'purple' => 4); -$array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8); -$array4 = array('green' => 5, 'cyan' => 8); - -//Call back function -function key_compare_func($key1, $key2) -{ - if ($key1 == $key2) - return 0; - else - return ($key1 > $key2)? 1:-1; -} - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -//resource variable -$fp = fopen(__FILE__, "r"); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = << 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource data - 'resource var' => $fp, -); - -// loop through each element of the array for arr2 - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_intersect_ukey($array1, $array2, $value, 'key_compare_func') ); - var_dump( array_intersect_ukey($array1, $array2, $value, $array4, 'key_compare_func') ); -}; - -fclose($fp); -?> -===DONE=== ---EXPECTF-- -*** Testing array_intersect_ukey() : usage variation *** - ---int 0-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 1-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int 12345-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---int -12345-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d -NULL - ---float 10.5-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -10.5-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---float .5-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d -NULL - ---uppercase NULL-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase null-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---lowercase true-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---lowercase false-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase TRUE-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---uppercase FALSE-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d -NULL - ---empty string DQ-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---empty string SQ-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string DQ-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---string SQ-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---mixed case string-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---heredoc-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d -NULL - ---instance of classWithToString-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d -NULL - ---undefined var-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---unset var-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d -NULL - ---resource var-- - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL - -Warning: array_intersect_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt index 9536dd8c2a..d38a284496 100644 --- a/ext/standard/tests/array/array_intersect_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_variation1.phpt @@ -92,14 +92,22 @@ $arrays = array( // loop through each sub-array within $arrrays to check the behavior of array_intersect() $iterator = 1; foreach($arrays as $unexpected_value) { - echo "\n-- Iterator $iterator --"; - - // Calling array_intersect() with default arguments - var_dump( array_intersect($unexpected_value,$arr2) ); - - // Calling array_intersect() with more arguments - var_dump( array_intersect($unexpected_value, $arr2, $arr3) ); - $iterator++; + echo "\n-- Iterator $iterator --"; + + // Calling array_intersect() with default arguments + try { + var_dump( array_intersect($unexpected_value,$arr2) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + // Calling array_intersect() with more arguments + try { + var_dump( array_intersect($unexpected_value, $arr2, $arr3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; } // close the file resource used @@ -107,174 +115,78 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing non-array values to $arr1 argument *** --- Iterator 1 -- -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iterator 2 -- -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iterator 3 -- -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iterator 4 -- -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iterator 5 -- -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iterator 6 -- -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iterator 7 -- -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iterator 8 -- -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iterator 9 -- -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iterator 10 -- -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iterator 11 -- -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iterator 12 -- -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - --- Iterator 13 -- -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iterator 1 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iterator 2 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --- Iterator 14 -- -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iterator 3 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iterator 4 --Expected parameter 1 to be an array, int given +Expected parameter 1 to be an array, int given --- Iterator 15 -- -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iterator 5 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given -Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- Iterator 6 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --- Iterator 16 -- -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 7 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 8 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given --- Iterator 17 -- -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 9 --Expected parameter 1 to be an array, float given +Expected parameter 1 to be an array, float given -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 10 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --- Iterator 18 -- -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 11 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 12 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --- Iterator 19 -- -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 13 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 14 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given --- Iterator 20 -- -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 15 --Expected parameter 1 to be an array, bool given +Expected parameter 1 to be an array, bool given -Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- Iterator 16 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --- Iterator 21 -- -Warning: array_intersect(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +-- Iterator 17 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given -Warning: array_intersect(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +-- Iterator 18 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --- Iterator 22 -- -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iterator 19 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iterator 20 --Expected parameter 1 to be an array, string given +Expected parameter 1 to be an array, string given --- Iterator 23 -- -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iterator 21 --Expected parameter 1 to be an array, object given +Expected parameter 1 to be an array, object given -Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- Iterator 22 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given --- Iterator 24 -- -Warning: array_intersect(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +-- Iterator 23 --Expected parameter 1 to be an array, null given +Expected parameter 1 to be an array, null given -Warning: array_intersect(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +-- Iterator 24 --Expected parameter 1 to be an array, resource given +Expected parameter 1 to be an 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 1db37b8467..08f6c9bb48 100644 --- a/ext/standard/tests/array/array_intersect_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_variation2.phpt @@ -92,15 +92,23 @@ $arrays = array( // loop through each sub-array within $arrrays to check the behavior of array_intersect() $iterator = 1; foreach($arrays as $unexpected_value) { - echo "\n-- Iterator $iterator --"; - - // Calling array_intersect() with default arguments - var_dump( array_intersect($arr1,$unexpected_value) ); - - // Calling array_intersect() with more arguments - var_dump( array_intersect($arr1, $unexpected_value, $arr3) ); - - $iterator++; + echo "\n-- Iterator $iterator --"; + + // Calling array_intersect() with default arguments + try { + var_dump( array_intersect($arr1,$unexpected_value) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + // Calling array_intersect() with more arguments + try { + var_dump( array_intersect($arr1, $unexpected_value, $arr3) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + $iterator++; } // close the file resource used @@ -108,174 +116,78 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing non-array values to $arr2 argument *** --- Iterator 1 -- -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iterator 2 -- -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iterator 3 -- -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iterator 4 -- -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d -NULL - --- Iterator 5 -- -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iterator 6 -- -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iterator 7 -- -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iterator 8 -- -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iterator 9 -- -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d -NULL - --- Iterator 10 -- -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - --- Iterator 11 -- -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL - --- Iterator 12 -- -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL - --- Iterator 13 -- -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iterator 1 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iterator 2 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --- Iterator 14 -- -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iterator 3 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iterator 4 --Expected parameter 2 to be an array, int given +Expected parameter 2 to be an array, int given --- Iterator 15 -- -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iterator 5 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given -Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iterator 6 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --- Iterator 16 -- -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 7 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 8 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given --- Iterator 17 -- -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 9 --Expected parameter 2 to be an array, float given +Expected parameter 2 to be an array, float given -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 10 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --- Iterator 18 -- -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 11 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 12 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --- Iterator 19 -- -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 13 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 14 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given --- Iterator 20 -- -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 15 --Expected parameter 2 to be an array, bool given +Expected parameter 2 to be an array, bool given -Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iterator 16 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --- Iterator 21 -- -Warning: array_intersect(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +-- Iterator 17 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given -Warning: array_intersect(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +-- Iterator 18 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --- Iterator 22 -- -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iterator 19 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iterator 20 --Expected parameter 2 to be an array, string given +Expected parameter 2 to be an array, string given --- Iterator 23 -- -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iterator 21 --Expected parameter 2 to be an array, object given +Expected parameter 2 to be an array, object given -Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iterator 22 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given --- Iterator 24 -- -Warning: array_intersect(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +-- Iterator 23 --Expected parameter 2 to be an array, null given +Expected parameter 2 to be an array, null given -Warning: array_intersect(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +-- Iterator 24 --Expected parameter 2 to be an array, resource given +Expected parameter 2 to be an 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 5b80126966..df071a414b 100644 --- a/ext/standard/tests/array/array_map_variation10.phpt +++ b/ext/standard/tests/array/array_map_variation10.phpt @@ -33,11 +33,15 @@ echo "-- anonymous function with NULL body --\n"; var_dump( array_map( function($a) { }, $array1)); echo "-- passing NULL as 'arr1' --\n"; -var_dump( array_map( function($a) { return array($a); }, NULL)); +try { + var_dump( array_map( function($a) { return array($a); }, NULL)); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : anonymous callback function *** -- anonymous function with all parameters and body -- array(3) { @@ -84,7 +88,5 @@ array(3) { NULL } -- passing NULL as 'arr1' -- - -Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given Done diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt index 071e9eadb5..3d15d56b81 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt @@ -88,17 +88,25 @@ $arr2 = array(1, array("hello", 'world')); // loop through each element of $arrays and check the behavior of array_merge_recursive() $iterator = 1; foreach($arrays as $arr1) { - echo "\n-- Iteration $iterator --"; - - // with default argument - echo "\n-- With default argument --"; - var_dump( array_merge_recursive($arr1) ); - - // with more arguments - echo "-- With more arguments --"; - var_dump( array_merge_recursive($arr1, $arr2) ); - - $iterator++; + echo "\n-- Iteration $iterator --"; + + // with default argument + echo "\n-- With default argument --"; + try { + var_dump( array_merge_recursive($arr1) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + // with more arguments + echo "-- With more arguments --"; + try { + var_dump( array_merge_recursive($arr1, $arr2) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + + $iterator++; } // close the file resource used @@ -106,198 +114,102 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : Passing non array values to $arr1 argument *** -- Iteration 1 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, int given +-- With more arguments --Expected parameter 1 to be an array, int given -- Iteration 2 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, int given +-- With more arguments --Expected parameter 1 to be an array, int given -- Iteration 3 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, int given +-- With more arguments --Expected parameter 1 to be an array, int given -- Iteration 4 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, int given +-- With more arguments --Expected parameter 1 to be an array, int given -- Iteration 5 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, float given +-- With more arguments --Expected parameter 1 to be an array, float given -- Iteration 6 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, float given +-- With more arguments --Expected parameter 1 to be an array, float given -- Iteration 7 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, float given +-- With more arguments --Expected parameter 1 to be an array, float given -- Iteration 8 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, float given +-- With more arguments --Expected parameter 1 to be an array, float given -- Iteration 9 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, float given +-- With more arguments --Expected parameter 1 to be an array, float given -- Iteration 10 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, null given +-- With more arguments --Expected parameter 1 to be an array, null given -- Iteration 11 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, null given +-- With more arguments --Expected parameter 1 to be an array, null given -- Iteration 12 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, bool given +-- With more arguments --Expected parameter 1 to be an array, bool given -- Iteration 13 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, bool given +-- With more arguments --Expected parameter 1 to be an array, bool given -- Iteration 14 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, bool given +-- With more arguments --Expected parameter 1 to be an array, bool given -- Iteration 15 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, bool given +-- With more arguments --Expected parameter 1 to be an array, bool given -- Iteration 16 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, string given +-- With more arguments --Expected parameter 1 to be an array, string given -- Iteration 17 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, string given +-- With more arguments --Expected parameter 1 to be an array, string given -- Iteration 18 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, string given +-- With more arguments --Expected parameter 1 to be an array, string given -- Iteration 19 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, string given +-- With more arguments --Expected parameter 1 to be an array, string given -- Iteration 20 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, string given +-- With more arguments --Expected parameter 1 to be an array, string given -- Iteration 21 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, null given +-- With more arguments --Expected parameter 1 to be an array, null given -- Iteration 22 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, null given +-- With more arguments --Expected parameter 1 to be an array, null given -- Iteration 23 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, resource given +-- With more arguments --Expected parameter 1 to be an array, resource given -- Iteration 24 -- --- With default argument -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, object given in %s on line %d -NULL --- With more arguments -- -Warning: array_merge_recursive(): Expected parameter 1 to be an array, object given in %s on line %d -NULL +-- With default argument --Expected parameter 1 to be an array, object given +-- With more arguments --Expected parameter 1 to be an array, object given Done diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt index f14d5d9bb3..eec9634630 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt @@ -88,9 +88,13 @@ $arrays = array ( // loop through each element of $arrays and check the behavior of array_merge_recursive() $iterator = 1; foreach($arrays as $arr2) { - echo "\n-- Iteration $iterator --"; - var_dump( array_merge_recursive($arr1, $arr2) ); - $iterator++; + echo "\n-- Iteration $iterator --"; + try { + var_dump( array_merge_recursive($arr1, $arr2) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; } // close the file resource used @@ -98,102 +102,54 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : Passing non array values to $arr2 argument *** --- Iteration 1 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 1 --Expected parameter 2 to be an array, int given --- Iteration 2 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 2 --Expected parameter 2 to be an array, int given --- Iteration 3 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 3 --Expected parameter 2 to be an array, int given --- Iteration 4 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +-- Iteration 4 --Expected parameter 2 to be an array, int given --- Iteration 5 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 5 --Expected parameter 2 to be an array, float given --- Iteration 6 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 6 --Expected parameter 2 to be an array, float given --- Iteration 7 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 7 --Expected parameter 2 to be an array, float given --- Iteration 8 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 8 --Expected parameter 2 to be an array, float given --- Iteration 9 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +-- Iteration 9 --Expected parameter 2 to be an array, float given --- Iteration 10 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 10 --Expected parameter 2 to be an array, null given --- Iteration 11 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 11 --Expected parameter 2 to be an array, null given --- Iteration 12 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 12 --Expected parameter 2 to be an array, bool given --- Iteration 13 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 13 --Expected parameter 2 to be an array, bool given --- Iteration 14 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 14 --Expected parameter 2 to be an array, bool given --- Iteration 15 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +-- Iteration 15 --Expected parameter 2 to be an array, bool given --- Iteration 16 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 16 --Expected parameter 2 to be an array, string given --- Iteration 17 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 17 --Expected parameter 2 to be an array, string given --- Iteration 18 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 18 --Expected parameter 2 to be an array, string given --- Iteration 19 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 19 --Expected parameter 2 to be an array, string given --- Iteration 20 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +-- Iteration 20 --Expected parameter 2 to be an array, string given --- Iteration 21 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 21 --Expected parameter 2 to be an array, null given --- Iteration 22 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +-- Iteration 22 --Expected parameter 2 to be an array, null given --- Iteration 23 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +-- Iteration 23 --Expected parameter 2 to be an array, resource given --- Iteration 24 -- -Warning: array_merge_recursive(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +-- Iteration 24 --Expected parameter 2 to be an array, object given Done diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt index 0335fe473b..16e702e8a1 100644 --- a/ext/standard/tests/array/array_merge_variation1.phpt +++ b/ext/standard/tests/array/array_merge_variation1.phpt @@ -102,129 +102,8 @@ echo "Done"; -- Iteration 1 -- -Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 2 -- - -Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 3 -- - -Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 4 -- - -Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d -NULL - --- Iteration 5 -- - -Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 6 -- - -Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 7 -- - -Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 8 -- - -Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 9 -- - -Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d -NULL - --- Iteration 10 -- - -Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iteration 11 -- - -Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iteration 12 -- - -Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - --- Iteration 13 -- - -Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - --- Iteration 14 -- - -Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - --- Iteration 15 -- - -Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d -NULL - --- Iteration 16 -- - -Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - --- Iteration 17 -- - -Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - --- Iteration 18 -- -array(2) { - [0]=> - int(1) - [1]=> - int(2) -} - --- Iteration 19 -- - -Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - --- Iteration 20 -- - -Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - --- Iteration 21 -- - -Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d -NULL - --- Iteration 22 -- - -Warning: array_merge(): Expected parameter 1 to be an array, object given in %s on line %d -NULL - --- Iteration 23 -- - -Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iteration 24 -- - -Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d -NULL - --- Iteration 25 -- - -Warning: array_merge(): Expected parameter 1 to be an array, resource given in %s on line %d -NULL -Done +Fatal error: Uncaught TypeError: Expected parameter 1 to be an array, int given in %s:%d +Stack trace: +#0 %s(%d): array_merge(0, Array) +#1 {main} + thrown in %s on line %d diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt index fd7e9ccfc8..57715d484b 100644 --- a/ext/standard/tests/array/array_merge_variation2.phpt +++ b/ext/standard/tests/array/array_merge_variation2.phpt @@ -88,102 +88,72 @@ $inputs = array( // loop through each element of $inputs to check the behavior of array_merge() $iterator = 1; foreach($inputs as $input) { - echo "\n-- Iteration $iterator --\n"; - var_dump( array_merge($arr1, $input) ); - $iterator++; + echo "\n-- Iteration $iterator --\n"; + try { + var_dump( array_merge($arr1, $input) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } + $iterator++; }; fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Iteration 1 -- - -Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 2 -- - -Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 3 -- - -Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 4 -- - -Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d -NULL +Expected parameter 2 to be an array, int given -- Iteration 5 -- - -Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 6 -- - -Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 7 -- - -Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 8 -- - -Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 9 -- - -Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d -NULL +Expected parameter 2 to be an array, float given -- Iteration 10 -- - -Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 11 -- - -Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 12 -- - -Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 13 -- - -Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 14 -- - -Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 15 -- - -Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d -NULL +Expected parameter 2 to be an array, bool given -- Iteration 16 -- - -Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 17 -- - -Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 18 -- array(2) { @@ -194,37 +164,23 @@ array(2) { } -- Iteration 19 -- - -Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 20 -- - -Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 21 -- - -Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d -NULL +Expected parameter 2 to be an array, string given -- Iteration 22 -- - -Warning: array_merge(): Expected parameter 2 to be an array, object given in %s on line %d -NULL +Expected parameter 2 to be an array, object given -- Iteration 23 -- - -Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 24 -- - -Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d -NULL +Expected parameter 2 to be an array, null given -- Iteration 25 -- - -Warning: array_merge(): Expected parameter 2 to be an array, resource given in %s on line %d -NULL +Expected parameter 2 to be an array, resource given Done diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt index 2cbc9572d2..9f320c04ad 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff_assoc($value, $arr2, $key_comp_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_udiff_assoc($value, $arr2, $key_comp_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : usage variation *** --int 0-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt index 1a2c1ed978..e0eaaf63ce 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff_assoc($arr1, $value, $key_comp_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_udiff_assoc($arr1, $value, $key_comp_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : usage variation *** --int 0-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt deleted file mode 100644 index 20a5afa202..0000000000 --- a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt +++ /dev/null @@ -1,228 +0,0 @@ ---TEST-- -Test array_udiff_assoc() function : usage variation ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for ... - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff_assoc($arr1, $arr2, $value, $key_comp_func) ); -}; - -?> -===DONE=== ---EXPECTF-- -*** Testing array_udiff_assoc() : usage variation *** - ---int 0-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---int 1-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---int 12345-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---int -12345-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---float 10.5-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---float -10.5-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---float .5-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---uppercase NULL-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---lowercase null-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---lowercase true-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---lowercase false-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---uppercase TRUE-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---uppercase FALSE-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---empty string DQ-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---empty string SQ-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---string DQ-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---string SQ-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---mixed case string-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---heredoc-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---instance of classWithToString-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---undefined var-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d -NULL - ---unset var-- - -Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index 4496194b62..bbc213aee4 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -92,137 +92,91 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff_uassoc($value, $arr2, $data_comp_func, $key_comp_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_udiff_uassoc($value, $arr2, $data_comp_func, $key_comp_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_uassoc() : usage variation *** --int 0-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index 2324c5a47b..9466dc952b 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt @@ -92,137 +92,91 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff_uassoc($arr1, $value, $data_comp_func, $key_comp_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_udiff_uassoc($arr1, $value, $data_comp_func, $key_comp_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_uassoc() : usage variation *** --int 0-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt deleted file mode 100644 index 820f0466ad..0000000000 --- a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt +++ /dev/null @@ -1,229 +0,0 @@ ---TEST-- -Test array_udiff_uassoc() function : usage variation ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for ... - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff_uassoc($arr1, $arr2, $value, $data_comp_func, $key_comp_func) ); -}; - -?> -===DONE=== ---EXPECTF-- -*** Testing array_udiff_uassoc() : usage variation *** - ---int 0-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---int 1-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---int 12345-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---int -12345-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---float 10.5-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---float -10.5-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---float .5-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---uppercase NULL-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---lowercase null-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---lowercase true-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---lowercase false-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---uppercase TRUE-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---uppercase FALSE-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---empty string DQ-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---empty string SQ-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---string DQ-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---string SQ-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---mixed case string-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---heredoc-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---instance of classWithToString-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---undefined var-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d -NULL - ---unset var-- - -Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt index 5eb84146a1..f462be78c0 100644 --- a/ext/standard/tests/array/array_udiff_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_variation1.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff($value, $arr2, $data_comp_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_udiff($value, $arr2, $data_comp_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff() : usage variation *** --int 0-- - -Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_udiff(): Expected parameter 1 to be an array, object given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_udiff(): Expected parameter 1 to be an array, object given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index 61aa1f0c9a..ee478837cd 100644 --- a/ext/standard/tests/array/array_udiff_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_variation2.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff($arr1, $value, $data_comp_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_udiff($arr1, $value, $data_comp_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff() : usage variation *** --int 0-- - -Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_udiff(): Expected parameter 2 to be an array, object given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_udiff(): Expected parameter 2 to be an array, object given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation4.phpt b/ext/standard/tests/array/array_udiff_variation4.phpt deleted file mode 100644 index a92c5ddfdf..0000000000 --- a/ext/standard/tests/array/array_udiff_variation4.phpt +++ /dev/null @@ -1,228 +0,0 @@ ---TEST-- -Test array_udiff() function : usage variation ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for ... - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_udiff($arr1, $arr2, $value, $data_comp_func) ); -}; - -?> -===DONE=== ---EXPECTF-- -*** Testing array_udiff() : usage variation *** - ---int 0-- - -Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d -NULL - ---int 1-- - -Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d -NULL - ---int 12345-- - -Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d -NULL - ---int -12345-- - -Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d -NULL - ---float 10.5-- - -Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d -NULL - ---float -10.5-- - -Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d -NULL - ---float .5-- - -Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d -NULL - ---uppercase NULL-- - -Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d -NULL - ---lowercase null-- - -Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d -NULL - ---lowercase true-- - -Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d -NULL - ---lowercase false-- - -Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d -NULL - ---uppercase TRUE-- - -Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d -NULL - ---uppercase FALSE-- - -Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d -NULL - ---empty string DQ-- - -Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d -NULL - ---empty string SQ-- - -Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d -NULL - ---string DQ-- - -Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d -NULL - ---string SQ-- - -Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d -NULL - ---mixed case string-- - -Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d -NULL - ---heredoc-- - -Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d -NULL - ---instance of classWithToString-- - -Warning: array_udiff(): Expected parameter 3 to be an array, object given in %sarray_udiff_variation4.php on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_udiff(): Expected parameter 3 to be an array, object given in %sarray_udiff_variation4.php on line %d -NULL - ---undefined var-- - -Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d -NULL - ---unset var-- - -Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index a2babcdb02..8a3ffe909d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect_assoc($value, $arr2, $data_compare_function) ); + echo "\n--$key--\n"; + try { + var_dump( array_uintersect_assoc($value, $arr2, $data_compare_function) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : usage variation *** --int 0-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index 8723157506..3c04bd5a36 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect_assoc($arr1, $value, $data_compare_function) ); + echo "\n--$key--\n"; + try { + var_dump( array_uintersect_assoc($arr1, $value, $data_compare_function) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : usage variation *** --int 0-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt deleted file mode 100644 index 3024246a3d..0000000000 --- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt +++ /dev/null @@ -1,228 +0,0 @@ ---TEST-- -Test array_uintersect_assoc() function : usage variation ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for ... - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect_assoc($arr1, $arr2, $value, $data_compare_function ) ); -}; - -?> -===DONE=== ---EXPECTF-- -*** Testing array_uintersect_assoc() : usage variation *** - ---int 0-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---int 1-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---int 12345-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---int -12345-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---float 10.5-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---float -10.5-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---float .5-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---uppercase NULL-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---lowercase null-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---lowercase true-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---lowercase false-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---uppercase TRUE-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---uppercase FALSE-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---empty string DQ-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---empty string SQ-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---string DQ-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---string SQ-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---mixed case string-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---heredoc-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---instance of classWithToString-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---undefined var-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d -NULL - ---unset var-- - -Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index 84d4e634cf..385fffed96 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -92,137 +92,91 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect_uassoc($value, $arr2, $data_compare_func, $key_compare_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_uintersect_uassoc($value, $arr2, $data_compare_func, $key_compare_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index 8692026fc4..74eeddf4ff 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -92,137 +92,91 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect_uassoc($arr1, $value, $data_compare_func, $key_compare_func) ); + echo "\n--$key--\n"; + try { + var_dump( array_uintersect_uassoc($arr1, $value, $data_compare_func, $key_compare_func) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt deleted file mode 100644 index d1db008416..0000000000 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt +++ /dev/null @@ -1,229 +0,0 @@ ---TEST-- -Test array_uintersect_uassoc() function : usage variation ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for ... - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect_uassoc($arr1, $arr2, $value, $data_compare_func, $key_compare_func) ); -}; - -?> -===DONE=== ---EXPECTF-- -*** Testing array_uintersect_uassoc() : usage variation *** - ---int 0-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---int 1-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---int 12345-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---int -12345-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---float 10.5-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---float -10.5-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---float .5-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---uppercase NULL-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---lowercase null-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---lowercase true-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---lowercase false-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---uppercase TRUE-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---uppercase FALSE-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---empty string DQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---empty string SQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---string DQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---string SQ-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---mixed case string-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---heredoc-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---instance of classWithToString-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---undefined var-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL - ---unset var-- - -Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index c88177018b..32e2177758 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr1 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect($value, $arr2, $data_compare_function) ); + echo "\n--$key--\n"; + try { + var_dump( array_uintersect($value, $arr2, $data_compare_function) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect() : usage variation *** --int 0-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 1-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int 12345-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --int -12345-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, int given --float 10.5-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -10.5-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float 12.3456789000e10-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float -12.3456789000e10-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --float .5-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, float given --uppercase NULL-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase null-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --lowercase true-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --lowercase false-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase TRUE-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --uppercase FALSE-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, bool given --empty string DQ-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --empty string SQ-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string DQ-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --string SQ-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --mixed case string-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --heredoc-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, string given --instance of classWithToString-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, object given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --instance of classWithoutToString-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, object given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, object given --undefined var-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given --unset var-- - -Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d -NULL +Expected parameter 1 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index ee52e21c72..bf914e9bc6 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -91,137 +91,91 @@ $inputs = array( // loop through each element of the array for arr2 foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect($arr1, $value, $data_compare_function) ); + echo "\n--$key--\n"; + try { + var_dump( array_uintersect($arr1, $value, $data_compare_function) ); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect() : usage variation *** --int 0-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 1-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int 12345-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --int -12345-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, int given --float 10.5-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -10.5-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float 12.3456789000e10-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float -12.3456789000e10-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --float .5-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, float given --uppercase NULL-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase null-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --lowercase true-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --lowercase false-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase TRUE-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --uppercase FALSE-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, bool given --empty string DQ-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --empty string SQ-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string DQ-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --string SQ-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --mixed case string-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --heredoc-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, string given --instance of classWithToString-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, object given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --instance of classWithoutToString-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, object given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, object given --undefined var-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given --unset var-- - -Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d -NULL +Expected parameter 2 to be an array, null given ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation4.phpt b/ext/standard/tests/array/array_uintersect_variation4.phpt deleted file mode 100644 index abc33e591b..0000000000 --- a/ext/standard/tests/array/array_uintersect_variation4.phpt +++ /dev/null @@ -1,228 +0,0 @@ ---TEST-- -Test array_uintersect() function : usage variation ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for ... - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( array_uintersect($arr1, $arr2, $value, $data_compare_function) ); -}; - -?> -===DONE=== ---EXPECTF-- -*** Testing array_uintersect() : usage variation *** - ---int 0-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d -NULL - ---int 1-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d -NULL - ---int 12345-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d -NULL - ---int -12345-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d -NULL - ---float 10.5-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d -NULL - ---float -10.5-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d -NULL - ---float 12.3456789000e10-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d -NULL - ---float -12.3456789000e10-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d -NULL - ---float .5-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d -NULL - ---uppercase NULL-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d -NULL - ---lowercase null-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d -NULL - ---lowercase true-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d -NULL - ---lowercase false-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d -NULL - ---uppercase TRUE-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d -NULL - ---uppercase FALSE-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d -NULL - ---empty string DQ-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d -NULL - ---empty string SQ-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d -NULL - ---string DQ-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d -NULL - ---string SQ-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d -NULL - ---mixed case string-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d -NULL - ---heredoc-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d -NULL - ---instance of classWithToString-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, object given in %sarray_uintersect_variation4.php on line %d -NULL - ---instance of classWithoutToString-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, object given in %sarray_uintersect_variation4.php on line %d -NULL - ---undefined var-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d -NULL - ---unset var-- - -Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d -NULL -===DONE=== diff --git a/ext/standard/tests/array/bug77931.phpt b/ext/standard/tests/array/bug77931.phpt index 98a2eb91cf..45a241f27f 100644 --- a/ext/standard/tests/array/bug77931.phpt +++ b/ext/standard/tests/array/bug77931.phpt @@ -3,14 +3,24 @@ Bug #77931: Warning for array_map mentions wrong type --FILE-- getMessage(), "\n"; +} +try { + array_map('trim', array(), array(), true); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} +try { + array_map('trim', array(), array(), array(), null); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ---EXPECTF-- -Warning: array_map(): Expected parameter 3 to be an array, int given in %s on line %d - -Warning: array_map(): Expected parameter 4 to be an array, bool given in %s on line %d - -Warning: array_map(): Expected parameter 5 to be an array, null given in %s on line %d +--EXPECT-- +Expected parameter 3 to be an array, int given +Expected parameter 4 to be an array, bool given +Expected parameter 5 to be an array, null given