diff options
| -rw-r--r-- | ext/filter/tests/007.phpt | 70 | ||||
| -rw-r--r-- | ext/filter/tests/011.phpt | 40 |
2 files changed, 51 insertions, 59 deletions
diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt index 72670dc795..8012bd36cf 100644 --- a/ext/filter/tests/007.phpt +++ b/ext/filter/tests/007.phpt @@ -1,11 +1,5 @@ --TEST-- -input_has_variable() ---SKIPIF-- -<?php -/* TODO: Check why we get warnings 2x */ -die("skip"); -die("error mode cannot be changed via -d"); -?> +filter_has_var() --GET-- a=qwe&abc=<a>href</a> --POST-- @@ -13,25 +7,25 @@ b=qwe&bbc=<a>href</a> --FILE-- <?php -var_dump(input_has_variable(INPUT_GET, "a")); -var_dump(input_has_variable(INPUT_GET, "abc")); -var_dump(input_has_variable(INPUT_GET, "nonex")); -var_dump(input_has_variable(INPUT_GET, " ")); -var_dump(input_has_variable(INPUT_GET, "")); -var_dump(input_has_variable(INPUT_GET, array())); - -var_dump(input_has_variable(INPUT_POST, "b")); -var_dump(input_has_variable(INPUT_POST, "bbc")); -var_dump(input_has_variable(INPUT_POST, "nonex")); -var_dump(input_has_variable(INPUT_POST, " ")); -var_dump(input_has_variable(INPUT_POST, "")); -var_dump(input_has_variable(INPUT_POST, array())); - -var_dump(input_has_variable(-1, "")); -var_dump(input_has_variable("", "")); -var_dump(input_has_variable(array(), array())); -var_dump(input_has_variable(array(), "")); -var_dump(input_has_variable("", array())); +var_dump(filter_has_var(INPUT_GET, "a")); +var_dump(filter_has_var(INPUT_GET, "abc")); +var_dump(filter_has_var(INPUT_GET, "nonex")); +var_dump(filter_has_var(INPUT_GET, " ")); +var_dump(filter_has_var(INPUT_GET, "")); +var_dump(filter_has_var(INPUT_GET, array())); + +var_dump(filter_has_var(INPUT_POST, "b")); +var_dump(filter_has_var(INPUT_POST, "bbc")); +var_dump(filter_has_var(INPUT_POST, "nonex")); +var_dump(filter_has_var(INPUT_POST, " ")); +var_dump(filter_has_var(INPUT_POST, "")); +var_dump(filter_has_var(INPUT_POST, array())); + +var_dump(filter_has_var(-1, "")); +var_dump(filter_has_var("", "")); +var_dump(filter_has_var(array(), array())); +var_dump(filter_has_var(array(), "")); +var_dump(filter_has_var("", array())); echo "Done\n"; ?> @@ -42,27 +36,27 @@ bool(false) bool(false) bool(false) -Warning: input_has_variable() expects parameter 2 to be string, array given in %s on line %d -NULL +Warning: filter_has_var() expects parameter 2 to be string, array given in %s/007.php on line %d +bool(false) bool(true) bool(true) bool(false) bool(false) bool(false) -Warning: input_has_variable() expects parameter 2 to be string, array given in %s on line %d -NULL +Warning: filter_has_var() expects parameter 2 to be string, array given in %s/007.php on line %d +bool(false) bool(false) -Warning: input_has_variable() expects parameter 1 to be long, string given in %s on line %d -NULL +Warning: filter_has_var() expects parameter 1 to be long, string given in %s/007.php on line %d +bool(false) -Warning: input_has_variable() expects parameter 1 to be long, array given in %s on line %d -NULL +Warning: filter_has_var() expects parameter 1 to be long, array given in %s/007.php on line %d +bool(false) -Warning: input_has_variable() expects parameter 1 to be long, array given in %s on line %d -NULL +Warning: filter_has_var() expects parameter 1 to be long, array given in %s/007.php on line %d +bool(false) -Warning: input_has_variable() expects parameter 1 to be long, string given in %s on line %d -NULL +Warning: filter_has_var() expects parameter 1 to be long, string given in %s/007.php on line %d +bool(false) Done diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt index 1e5d0182cc..f0d4892ebc 100644 --- a/ext/filter/tests/011.phpt +++ b/ext/filter/tests/011.phpt @@ -1,11 +1,5 @@ --TEST-- input_get() ---SKIPIF-- -<?php -/* TODO: Check why we get warnings 2x */ -die("skip"); -die("error mode cannot be changed via -d"); -?> --GET-- a=<b>test</b>&b=http://example.com --POST-- @@ -13,20 +7,20 @@ c=<p>string</p>&d=12345.7 --FILE-- <?php ini_set('html_errors', false); -var_dump(input_get(INPUT_GET, "a", FILTER_SANITIZE_STRIPPED)); -var_dump(input_get(INPUT_GET, "b", FILTER_SANITIZE_URL)); -var_dump(input_get(INPUT_GET, "a", FILTER_SANITIZE_SPECIAL_CHARS, array(1,2,3,4,5))); -var_dump(input_get(INPUT_GET, "b", FILTER_VALIDATE_FLOAT, new stdClass)); -var_dump(input_get(INPUT_POST, "c", FILTER_SANITIZE_STRIPPED, array(5,6,7,8))); -var_dump(input_get(INPUT_POST, "d", FILTER_VALIDATE_FLOAT)); -var_dump(input_get(INPUT_POST, "c", FILTER_SANITIZE_SPECIAL_CHARS)); -var_dump(input_get(INPUT_POST, "d", FILTER_VALIDATE_INT)); +var_dump(filter_input(INPUT_GET, "a", FILTER_SANITIZE_STRIPPED)); +var_dump(filter_input(INPUT_GET, "b", FILTER_SANITIZE_URL)); +var_dump(filter_input(INPUT_GET, "a", FILTER_SANITIZE_SPECIAL_CHARS, array(1,2,3,4,5))); +var_dump(filter_input(INPUT_GET, "b", FILTER_VALIDATE_FLOAT, new stdClass)); +var_dump(filter_input(INPUT_POST, "c", FILTER_SANITIZE_STRIPPED, array(5,6,7,8))); +var_dump(filter_input(INPUT_POST, "d", FILTER_VALIDATE_FLOAT)); +var_dump(filter_input(INPUT_POST, "c", FILTER_SANITIZE_SPECIAL_CHARS)); +var_dump(filter_input(INPUT_POST, "d", FILTER_VALIDATE_INT)); -var_dump(input_get(new stdClass, "d")); +var_dump(filter_var(new stdClass, "d")); -var_dump(input_get(INPUT_POST, "c", "", "")); -var_dump(input_get("", "", "", "", "")); -var_dump(input_get(0, 0, 0, 0, 0)); +var_dump(filter_input(INPUT_POST, "c", "", "")); +var_dump(filter_var("", "", "", "", "")); +var_dump(filter_var(0, 0, 0, 0, 0)); echo "Done\n"; ?> @@ -34,19 +28,23 @@ echo "Done\n"; string(4) "test" string(18) "http://example.com" string(27) "<b>test</b>" + +Notice: Object of class stdClass could not be converted to int in %s/011.php on line %d bool(false) string(6) "string" float(12345.7) string(29) "<p>string</p>" bool(false) -Warning: input_get() expects parameter 1 to be long, object given in %s on line %d +Warning: filter_var() expects parameter 2 to be long, string given in %s/011.php on line %d NULL -Warning: input_get() expects parameter 3 to be long, string given in %s on line %d +Warning: filter_input() expects parameter 3 to be long, string given in %s/011.php on line %d NULL -Warning: input_get() expects parameter 1 to be long, string given in %s on line %d +Warning: filter_var() expects at most 3 parameters, 5 given in %s/011.php on line %d NULL + +Warning: filter_var() expects at most 3 parameters, 5 given in %s/011.php on line %d NULL Done |