From: Derick Rethans Date: Sat, 21 Jan 2006 15:57:43 +0000 (+0000) Subject: - Fixed constant names in tests. X-Git-Tag: RELEASE_0_9_4~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c839665f10b249635ef0c1c47f5b9302a3e57300;p=php - Fixed constant names in tests. --- diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 1747d57619..c395acd96c 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -175,7 +175,7 @@ PHP_MINIT_FUNCTION(filter) REGISTER_LONG_CONSTANT("INPUT_SESSION", PARSE_SESSION, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_NONE", FILTER_FLAG_NONE, CONST_CS | CONST_PERSISTENT); -/* + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_INT", FILTER_VALIDATE_INT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_VALIDATE_BOOLEAN", FILTER_VALIDATE_BOOLEAN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_VALIDATE_FLOAT", FILTER_VALIDATE_FLOAT, CONST_CS | CONST_PERSISTENT); @@ -185,7 +185,7 @@ PHP_MINIT_FUNCTION(filter) REGISTER_LONG_CONSTANT("FILTER_VALIDATE_EMAIL", FILTER_VALIDATE_EMAIL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_VALIDATE_IP", FILTER_VALIDATE_IP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FILTER_DEFAULT", FILTER_SANITIZE_DEFAULT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_DEFAULT", FILTER_DEFAULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_UNSAFE_RAW", FILTER_UNSAFE_RAW, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_SANITIZE_STRING", FILTER_SANITIZE_STRING, CONST_CS | CONST_PERSISTENT); @@ -199,7 +199,7 @@ PHP_MINIT_FUNCTION(filter) REGISTER_LONG_CONSTANT("FILTER_SANITIZE_MAGIC_QUOTES", FILTER_SANITIZE_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_CALLBACK", FILTER_CALLBACK, CONST_CS | CONST_PERSISTENT); -*/ + REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_OCTAL", FILTER_FLAG_ALLOW_OCTAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_HEX", FILTER_FLAG_ALLOW_HEX, CONST_CS | CONST_PERSISTENT); diff --git a/ext/filter/tests/006.phpt b/ext/filter/tests/006.phpt index 1f8717c184..189579acf1 100644 --- a/ext/filter/tests/006.phpt +++ b/ext/filter/tests/006.phpt @@ -4,7 +4,7 @@ filter() test foo=abc --FILE-- --EXPECT-- abc diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt index aae5bc43f4..d9c84ffe63 100644 --- a/ext/filter/tests/010.phpt +++ b/ext/filter/tests/010.phpt @@ -3,12 +3,12 @@ filter_data() --FILE-- string

&d=12345.7 --FILE-- FILTER_FLAG_ALLOW_HEX))); -var_dump(filter_data("07", FL_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))); -var_dump(filter_data("0xff0000", FL_INT, array("flags"=>FILTER_FLAG_ALLOW_HEX))); -var_dump(filter_data("0666", FL_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))); +var_dump(filter_data("0xff", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_HEX))); +var_dump(filter_data("07", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))); +var_dump(filter_data("0xff0000", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_HEX))); +var_dump(filter_data("0666", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))); -var_dump(filter_data("6", FL_INT, array("min_range"=>1, "max_range"=>7))); -var_dump(filter_data("6", FL_INT, array("min_range"=>0, "max_range"=>5))); -var_dump(filter_data(-1, FL_INT, array("min_range"=>1, "max_range"=>7))); -var_dump(filter_data(-1, FL_INT, array("min_range"=>-4, "max_range"=>7))); +var_dump(filter_data("6", FILTER_VALIDATE_INT, array("min_range"=>1, "max_range"=>7))); +var_dump(filter_data("6", FILTER_VALIDATE_INT, array("min_range"=>0, "max_range"=>5))); +var_dump(filter_data(-1, FILTER_VALIDATE_INT, array("min_range"=>1, "max_range"=>7))); +var_dump(filter_data(-1, FILTER_VALIDATE_INT, array("min_range"=>-4, "max_range"=>7))); -var_dump(filter_data("", FL_INT, array("min_range"=>-4, "max_range"=>7))); -var_dump(filter_data("", FL_INT, array("min_range"=>2, "max_range"=>7))); -var_dump(filter_data("", FL_INT, array("min_range"=>-5, "max_range"=>-3))); -var_dump(filter_data(345, FL_INT, array("min_range"=>500, "max_range"=>100))); -var_dump(filter_data("0ff", FL_INT)); -var_dump(filter_data("010", FL_INT)); +var_dump(filter_data("", FILTER_VALIDATE_INT, array("min_range"=>-4, "max_range"=>7))); +var_dump(filter_data("", FILTER_VALIDATE_INT, array("min_range"=>2, "max_range"=>7))); +var_dump(filter_data("", FILTER_VALIDATE_INT, array("min_range"=>-5, "max_range"=>-3))); +var_dump(filter_data(345, FILTER_VALIDATE_INT, array("min_range"=>500, "max_range"=>100))); +var_dump(filter_data("0ff", FILTER_VALIDATE_INT)); +var_dump(filter_data("010", FILTER_VALIDATE_INT)); echo "Done\n"; ?> diff --git a/ext/filter/tests/014.phpt b/ext/filter/tests/014.phpt index 2a8cae69d9..f31fe6e9f4 100644 --- a/ext/filter/tests/014.phpt +++ b/ext/filter/tests/014.phpt @@ -1,22 +1,22 @@ --TEST-- -filter_data() and FL_BOOLEAN +filter_data() and FILTER_VALIDATE_BOOLEAN --FILE-- diff --git a/ext/filter/tests/016.phpt b/ext/filter/tests/016.phpt index a99f25d4a2..727d404bd7 100644 --- a/ext/filter/tests/016.phpt +++ b/ext/filter/tests/016.phpt @@ -1,5 +1,5 @@ --TEST-- -filter_data() and FL_EMAIL +filter_data() and FILTER_VALIDATE_EMAIL --FILE-- '/.*/'))); -var_dump(filter_data("data", FL_REGEXP, array("regexp"=>'/^b(.*)/'))); -var_dump(filter_data("data", FL_REGEXP, array("regexp"=>'/^d(.*)/'))); -var_dump(filter_data("data", FL_REGEXP, array("regexp"=>'blah'))); -var_dump(filter_data("data", FL_REGEXP, array("regexp"=>'['))); -var_dump(filter_data("data", FL_REGEXP)); +var_dump(filter_data("data", FILTER_VALIDATE_REGEXP, array("regexp"=>'/.*/'))); +var_dump(filter_data("data", FILTER_VALIDATE_REGEXP, array("regexp"=>'/^b(.*)/'))); +var_dump(filter_data("data", FILTER_VALIDATE_REGEXP, array("regexp"=>'/^d(.*)/'))); +var_dump(filter_data("data", FILTER_VALIDATE_REGEXP, array("regexp"=>'blah'))); +var_dump(filter_data("data", FILTER_VALIDATE_REGEXP, array("regexp"=>'['))); +var_dump(filter_data("data", FILTER_VALIDATE_REGEXP)); echo "Done\n"; ?> diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt index 729a1fec0d..184f2bb7e8 100644 --- a/ext/filter/tests/018.phpt +++ b/ext/filter/tests/018.phpt @@ -1,28 +1,28 @@ --TEST-- -filter_data() and FL_IP +filter_data() and FILTER_VALIDATE_IP --FILE-- --EXPECT-- diff --git a/ext/filter/tests/019.phpt b/ext/filter/tests/019.phpt index 0a78265941..7a2af50f77 100644 --- a/ext/filter/tests/019.phpt +++ b/ext/filter/tests/019.phpt @@ -1,13 +1,13 @@ --TEST-- -filter_data() & FL_IP and weird data +filter_data() & FILTER_VALIDATE_IP and weird data --FILE-- diff --git a/ext/filter/tests/020.phpt b/ext/filter/tests/020.phpt index 8b88d89290..914c199afb 100644 --- a/ext/filter/tests/020.phpt +++ b/ext/filter/tests/020.phpt @@ -1,12 +1,12 @@ --TEST-- -filter_data() and FS_MAGIC_QUOTES +filter_data() and FILTER_SANITIZE_MAGIC_QUOTES --FILE-- diff --git a/ext/filter/tests/021.phpt b/ext/filter/tests/021.phpt index 519690a799..697fdd69d4 100644 --- a/ext/filter/tests/021.phpt +++ b/ext/filter/tests/021.phpt @@ -1,25 +1,25 @@ --TEST-- -filter_data() and FS_NUMBER_* +filter_data() and FILTER_SANITIZE_NUMBER_* --FILE-- diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt index 8f1fd1692c..28ad64e723 100644 --- a/ext/filter/tests/022.phpt +++ b/ext/filter/tests/022.phpt @@ -1,13 +1,13 @@ --TEST-- -filter_data() and FS_EMAIL +filter_data() and FILTER_SANITIZE_EMAIL --FILE-- diff --git a/ext/filter/tests/023.phpt b/ext/filter/tests/023.phpt index d8abbd7c0a..21fdc49a9b 100644 --- a/ext/filter/tests/023.phpt +++ b/ext/filter/tests/023.phpt @@ -1,13 +1,13 @@ --TEST-- -filter_data() and FS_UNSAFE_RAW +filter_data() and FILTER_UNSAFE_RAW --FILE-- test para

", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); -var_dump(filter_data("a[!@#$%^&*()@a@#$%^&*(.
com@#$%^&*(", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); -var_dump(filter_data("white space here \ \ \" some more", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); -var_dump(filter_data("", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); -var_dump(filter_data(" 123456789000000 ", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("}\"

test para

", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("a[!@#$%^&*()@a@#$%^&*(.
com@#$%^&*(", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("white space here \ \ \" some more", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data(" 123456789000000 ", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); echo "Done\n"; ?> diff --git a/ext/filter/tests/024.phpt b/ext/filter/tests/024.phpt index d2caaa9af3..d405af3f08 100644 --- a/ext/filter/tests/024.phpt +++ b/ext/filter/tests/024.phpt @@ -1,12 +1,12 @@ --TEST-- -filter_data() and FS_ENCODED +filter_data() and FILTER_SANITIZE_ENCODED --FILE-- blah", FS_ENCODED)); -var_dump(filter_data("", FS_ENCODED)); -var_dump(filter_data(" text here ", FS_ENCODED)); -var_dump(filter_data("!@#$%^&*()QWERTYUIOP{ASDFGHJKL:\"ZXCVBNM<>?", FS_ENCODED)); +var_dump(filter_data("\"
blah", FILTER_SANITIZE_ENCODED)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED)); +var_dump(filter_data(" text here ", FILTER_SANITIZE_ENCODED)); +var_dump(filter_data("!@#$%^&*()QWERTYUIOP{ASDFGHJKL:\"ZXCVBNM<>?", FILTER_SANITIZE_ENCODED)); echo "Done\n"; ?> diff --git a/ext/filter/tests/025.phpt b/ext/filter/tests/025.phpt index 0c24c8d6c1..d5e3a88b8a 100644 --- a/ext/filter/tests/025.phpt +++ b/ext/filter/tests/025.phpt @@ -1,15 +1,15 @@ --TEST-- -filter_data() and FS_STRING +filter_data() and FILTER_SANITIZE_STRING --FILE-- ", FS_STRING)); -var_dump(filter_data("<>!@#$%^&*()'\"", FS_STRING, FILTER_FLAG_NO_ENCODE_QUOTES)); -var_dump(filter_data("<>!@#$%^&*()'\"", FS_STRING, FILTER_FLAG_ENCODE_AMP)); -var_dump(filter_data("<>`1234567890", FS_STRING)); -var_dump(filter_data("`123`", FS_STRING)); -var_dump(filter_data(".", FS_STRING)); +var_dump(filter_data("", FILTER_SANITIZE_STRING)); +var_dump(filter_data("<>", FILTER_SANITIZE_STRING)); +var_dump(filter_data("<>!@#$%^&*()'\"", FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES)); +var_dump(filter_data("<>!@#$%^&*()'\"", FILTER_SANITIZE_STRING, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("<>`1234567890", FILTER_SANITIZE_STRING)); +var_dump(filter_data("`123`", FILTER_SANITIZE_STRING)); +var_dump(filter_data(".", FILTER_SANITIZE_STRING)); echo "Done\n"; ?> diff --git a/ext/filter/tests/026.phpt b/ext/filter/tests/026.phpt index 5f34831a5d..d029447182 100644 --- a/ext/filter/tests/026.phpt +++ b/ext/filter/tests/026.phpt @@ -1,19 +1,19 @@ --TEST-- -filter_data() and FS_STRIPPED +filter_data() and FILTER_SANITIZE_STRIPPED --FILE-- Let me see you
Stripped down to the bone

", FS_STRIPPED)); -var_dump(filter_data("!@#$%^&*()><<>+_\"'

  • ", FS_STRIPPED)); -var_dump(filter_data("", FS_STRIPPED)); +var_dump(filter_data("

    Let me see you
    Stripped down to the bone

    ", FILTER_SANITIZE_STRIPPED)); +var_dump(filter_data("!@#$%^&*()><<>+_\"'

  • ", FILTER_SANITIZE_STRIPPED)); +var_dump(filter_data("", FILTER_SANITIZE_STRIPPED)); -var_dump(filter_data("

    Let me see you
    Stripped down to the bone

    ", FS_STRIPPED, FILTER_FLAG_STRIP_LOW)); -var_dump(filter_data("!@#$%^&*()><<>+_\"'

  • ", FS_STRIPPED, FILTER_FLAG_STRIP_LOW)); -var_dump(filter_data("", FS_STRIPPED, FILTER_FLAG_STRIP_LOW)); +var_dump(filter_data("

    Let me see you
    Stripped down to the bone

    ", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_LOW)); +var_dump(filter_data("!@#$%^&*()><<>+_\"'

  • ", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_LOW)); +var_dump(filter_data("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_LOW)); -var_dump(filter_data("

    Let me see you
    Stripped down to the bone

    ", FS_STRIPPED, FILTER_FLAG_STRIP_HIGH)); -var_dump(filter_data("!@#$%^&*()><<>+_\"'

  • ", FS_STRIPPED, FILTER_FLAG_STRIP_HIGH)); -var_dump(filter_data("", FS_STRIPPED, FILTER_FLAG_STRIP_HIGH)); +var_dump(filter_data("

    Let me see you
    Stripped down to the bone

    ", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); +var_dump(filter_data("!@#$%^&*()><<>+_\"'

  • ", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); +var_dump(filter_data("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); echo "Done\n"; ?> diff --git a/ext/filter/tests/027.phpt b/ext/filter/tests/027.phpt index fd84801fe4..048dc362ef 100644 --- a/ext/filter/tests/027.phpt +++ b/ext/filter/tests/027.phpt @@ -1,19 +1,19 @@ --TEST-- -filter_data() and FS_ENCODED +filter_data() and FILTER_SANITIZE_ENCODED --FILE-- ", FS_ENCODED)); -var_dump(filter_data("", FS_ENCODED)); +var_dump(filter_data("?>", FILTER_SANITIZE_ENCODED)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED)); -var_dump(filter_data("?>", FS_ENCODED, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("", FS_ENCODED, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("?>", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("?>", FS_ENCODED, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("", FS_ENCODED, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("?>", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH)); echo "Done\n"; ?> diff --git a/ext/filter/tests/028.phpt b/ext/filter/tests/028.phpt index 89830cb231..1d0d2e2071 100644 --- a/ext/filter/tests/028.phpt +++ b/ext/filter/tests/028.phpt @@ -1,22 +1,22 @@ --TEST-- -filter_data() and FS_SPECIAL_CHARS +filter_data() and FILTER_SANITIZE_SPECIAL_CHARS --FILE-- ", FS_SPECIAL_CHARS)); -var_dump(filter_data("", FS_SPECIAL_CHARS)); +var_dump(filter_data("?>", FILTER_SANITIZE_SPECIAL_CHARS)); +var_dump(filter_data("", FILTER_SANITIZE_SPECIAL_CHARS)); -var_dump(filter_data("?>", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("?>", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("?>", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("?>", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("кириллица", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("кириллица", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("кириллица", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("кириллица", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); echo "Done\n"; ?> diff --git a/ext/filter/tests/029.phpt b/ext/filter/tests/029.phpt index 126cff8cf9..f60c42ef3c 100644 --- a/ext/filter/tests/029.phpt +++ b/ext/filter/tests/029.phpt @@ -1,5 +1,5 @@ --TEST-- -filter_data() and FC_CALLBACK +filter_data() and FILTER_CALLBACK --FILE-- >?\"}{:", FC_CALLBACK, "test")); -var_dump(filter_data("", FC_CALLBACK, "test")); -var_dump(filter_data("qwe", FC_CALLBACK, "no such func")); -var_dump(filter_data("qwe", FC_CALLBACK, "")); -var_dump(filter_data("qwe", FC_CALLBACK)); +var_dump(filter_data("data", FILTER_CALLBACK, "test")); +var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, "test")); +var_dump(filter_data("", FILTER_CALLBACK, "test")); +var_dump(filter_data("qwe", FILTER_CALLBACK, "no such func")); +var_dump(filter_data("qwe", FILTER_CALLBACK, "")); +var_dump(filter_data("qwe", FILTER_CALLBACK)); /* Simple class method callback */ class test_class { @@ -22,35 +22,35 @@ class test_class { } } -var_dump(filter_data("dAtA", FC_CALLBACK, array("test_class", "test"))); -var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FC_CALLBACK, array("test_class","test"))); -var_dump(filter_data("", FC_CALLBACK, array("test_class","test"))); +var_dump(filter_data("dAtA", FILTER_CALLBACK, array("test_class", "test"))); +var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("test_class","test"))); +var_dump(filter_data("", FILTER_CALLBACK, array("test_class","test"))); /* empty function without return value */ function test1($var) { } -var_dump(filter_data("data", FC_CALLBACK, "test1")); -var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FC_CALLBACK, "test1")); -var_dump(filter_data("", FC_CALLBACK, "test1")); +var_dump(filter_data("data", FILTER_CALLBACK, "test1")); +var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, "test1")); +var_dump(filter_data("", FILTER_CALLBACK, "test1")); /* attempting to change data by reference */ function test2(&$var) { $var = 1; } -var_dump(filter_data("data", FC_CALLBACK, "test2")); -var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FC_CALLBACK, "test2")); -var_dump(filter_data("", FC_CALLBACK, "test2")); +var_dump(filter_data("data", FILTER_CALLBACK, "test2")); +var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, "test2")); +var_dump(filter_data("", FILTER_CALLBACK, "test2")); /* unsetting data */ function test3(&$var) { unset($var); } -var_dump(filter_data("data", FC_CALLBACK, "test3")); -var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FC_CALLBACK, "test3")); -var_dump(filter_data("", FC_CALLBACK, "test3")); +var_dump(filter_data("data", FILTER_CALLBACK, "test3")); +var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, "test3")); +var_dump(filter_data("", FILTER_CALLBACK, "test3")); /* unset data and return value */ function test4(&$var) { @@ -58,7 +58,7 @@ function test4(&$var) { return 1; } -var_dump(filter_data("data", FC_CALLBACK, "test4")); +var_dump(filter_data("data", FILTER_CALLBACK, "test4")); /* thrown exception in the callback */ function test5(&$var) { @@ -66,7 +66,7 @@ function test5(&$var) { } try { - var_dump(filter_data("data", FC_CALLBACK, "test5")); + var_dump(filter_data("data", FILTER_CALLBACK, "test5")); } catch (Exception $e) { var_dump($e->getMessage()); } diff --git a/ext/filter/tests/filter_data.phpt b/ext/filter/tests/filter_data.phpt index 281c85a94c..e907d02093 100644 --- a/ext/filter/tests/filter_data.phpt +++ b/ext/filter/tests/filter_data.phpt @@ -4,39 +4,39 @@ Simple filter_data() tests --EXPECT--