filter test updates

Author: nikic

ext/filter/tests/007.phpt

@@ -14,20 +14,12 @@ 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";
 ?>
@@ -37,28 +29,9 @@ bool(true)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: filter_has_var() expects parameter 2 to be string, array given in %s007.php on line %d
-bool(false)
 bool(true)
 bool(true)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: filter_has_var() expects parameter 2 to be string, array given in %s007.php on line %d
-bool(false)
-bool(false)
-
-Warning: filter_has_var() expects parameter 1 to be int, string given in %s007.php on line %d
-bool(false)
-
-Warning: filter_has_var() expects parameter 1 to be int, array given in %s007.php on line %d
-bool(false)
-
-Warning: filter_has_var() expects parameter 1 to be int, array given in %s007.php on line %d
-bool(false)
-
-Warning: filter_has_var() expects parameter 1 to be int, string given in %s007.php on line %d
-bool(false)
 Done

ext/filter/tests/008.phpt

@@ -6,7 +6,6 @@ filter_list()
 <?php
 
 var_dump(filter_list());
-var_dump(filter_list(array()));
 
 echo "Done\n";
 ?>
@@ -57,7 +56,4 @@ array(22) {
   [21]=>
   string(8) "callback"
 }
-
-Warning: filter_list() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
 Done

ext/filter/tests/009.phpt

@@ -10,23 +10,15 @@ var_dump(filter_id("string"));
 var_dump(filter_id("url"));
 var_dump(filter_id("int"));
 var_dump(filter_id("none"));
-var_dump(filter_id(array()));
 var_dump(filter_id(-1));
-var_dump(filter_id(0,0,0));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(513)
 int(513)
 int(518)
 int(257)
 bool(false)
-
-Warning: filter_id() expects parameter 1 to be string, array given in %s on line %d
-NULL
 bool(false)
-
-Warning: filter_id() expects exactly 1 parameter, 3 given in %s on line %d
-NULL
 Done

ext/filter/tests/010.phpt

@@ -9,7 +9,6 @@ precision=14
 
 var_dump(filter_var(array(1,"1","", "-23234", "text", "asdf234asdfgs", array()), FILTER_VALIDATE_INT, FILTER_REQUIRE_ARRAY));
 var_dump(filter_var(array(1.2,"1.7","", "-23234.123", "text", "asdf234.2asdfgs", array()), FILTER_VALIDATE_FLOAT, FILTER_REQUIRE_ARRAY));
-var_dump(filter_var(1, array()));
 var_dump(filter_var(1, FILTER_SANITIZE_STRING, 1));
 var_dump(filter_var(1, FILTER_SANITIZE_STRING, 0));
 var_dump(filter_var(1, FILTER_SANITIZE_STRING, array()));
@@ -53,9 +52,6 @@ array(7) {
   array(0) {
   }
 }
-
-Warning: filter_var() expects parameter 2 to be int, array given in %s on line %d
-NULL
 string(1) "1"
 string(1) "1"
 string(1) "1"

ext/filter/tests/011.phpt

@@ -20,12 +20,6 @@ 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(filter_var(new stdClass, "d"));
-
-var_dump(filter_input(INPUT_POST, "c", "", ""));
-var_dump(filter_var("", "", "", "", ""));
-var_dump(filter_var(0, 0, 0, 0, 0));
-
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -39,16 +33,4 @@ string(6) "string"
 float(12345.7)
 string(29) "<p>string</p>"
 bool(false)
-
-Warning: filter_var() expects parameter 2 to be int, string given in %s011.php on line %d
-NULL
-
-Warning: filter_input() expects parameter 3 to be int, string given in %s011.php on line %d
-NULL
-
-Warning: filter_var() expects at most 3 parameters, 5 given in %s011.php on line %d
-NULL
-
-Warning: filter_var() expects at most 3 parameters, 5 given in %s011.php on line %d
-NULL
 Done

ext/filter/tests/039.phpt

@@ -6,7 +6,6 @@ filter_var_array() and different arguments
 <?php
 
 echo "-- (1)\n";
-var_dump(filter_var_array(NULL));
 var_dump(filter_var_array(array()));
 var_dump(filter_var_array(array(1,"blah"=>"hoho")));
 var_dump(filter_var_array(array(), -1));
@@ -51,9 +50,6 @@ echo "Done\n";
 ?>
 --EXPECTF--
 -- (1)
-
-Warning: filter_var_array() expects parameter 1 to be array, null given in %s on line %d
-NULL
 array(0) {
 }
 array(2) {

ext/filter/tests/040.phpt

@@ -9,9 +9,7 @@ ap[]=1&bp=test&cp=
 --FILE--
 <?php
 
-var_dump(filter_has_var());
 var_dump(filter_has_var(INPUT_GET,""));
-var_dump(filter_has_var(INPUT_GET,array()));
 var_dump(filter_has_var(INPUT_POST, "ap"));
 var_dump(filter_has_var(INPUT_POST, "cp"));
 var_dump(filter_has_var(INPUT_GET, "a"));
@@ -20,16 +18,10 @@ var_dump(filter_has_var(INPUT_GET, "abc"));
 var_dump(filter_has_var(INPUT_GET, "cc"));
 var_dump(filter_has_var(-1, "cc"));
 var_dump(filter_has_var(0, "cc"));
-var_dump(filter_has_var("", "cc"));
 
 echo "Done\n";
 ?>
---EXPECTF--
-Warning: filter_has_var() expects exactly 2 parameters, 0 given in %s on line %d
-bool(false)
-bool(false)
-
-Warning: filter_has_var() expects parameter 2 to be string, array given in %s on line %d
+--EXPECT--
 bool(false)
 bool(true)
 bool(true)
@@ -39,7 +31,4 @@ bool(false)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: filter_has_var() expects parameter 1 to be int, string given in %s on line %d
-bool(false)
 Done