cvs: pecl /filter filter.c /filter/tests 006.phpt 010.phpt 011.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt
022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt filter_data.phpt

derick Sat Jan 21 15:57:44 2006 UTC Modified files: /pecl/filter filter.c /pecl/filter/tests 006.phpt 010.phpt 011.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt filter_data.phpt Log: - Fixed constant names in tests.

http://cvs.php.net/viewcvs.cgi/pecl/filter/filter.c?r1=1.33&r2=1.34&diff_format=u Index: pecl/filter/filter.c diff -u pecl/filter/filter.c:1.33 pecl/filter/filter.c:1.34 --- pecl/filter/filter.c:1.33 Sat Jan 21 12:48:45 2006 +++ pecl/filter/filter.c Sat Jan 21 15:57:43 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.33 2006/01/21 12:48:45 derick Exp $ */ +/* $Id: filter.c,v 1.34 2006/01/21 15:57:43 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -175,7 +175,7 @@ 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 @@ 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 @@ 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); @@ -265,7 +265,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.33 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.34 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/006.phpt?r1=1.3&r2=1.4&diff_format=u Index: pecl/filter/tests/006.phpt diff -u pecl/filter/tests/006.phpt:1.3 pecl/filter/tests/006.phpt:1.4 --- pecl/filter/tests/006.phpt:1.3 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/006.phpt Sat Jan 21 15:57:43 2006 @@ -4,7 +4,7 @@ foo=<b>abc</b> --FILE-- <?php -echo input_get(INPUT_POST, 'foo', FS_STRIPPED); +echo input_get(INPUT_POST, 'foo', FILTER_SANITIZE_STRIPPED); ?> --EXPECT-- abc http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/010.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/010.phpt diff -u pecl/filter/tests/010.phpt:1.2 pecl/filter/tests/010.phpt:1.3 --- pecl/filter/tests/010.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/010.phpt Sat Jan 21 15:57:43 2006 @@ -3,12 +3,12 @@ --FILE-- <?php -var_dump(filter_data(array(1,"1","", "-23234", "text", "asdf234asdfgs", array()), FL_INT)); -var_dump(filter_data(array(1.2,"1.7","", "-23234.123", "text", "asdf234.2asdfgs", array()), FL_FLOAT)); +var_dump(filter_data(array(1,"1","", "-23234", "text", "asdf234asdfgs", array()), FILTER_VALIDATE_INT)); +var_dump(filter_data(array(1.2,"1.7","", "-23234.123", "text", "asdf234.2asdfgs", array()), FILTER_VALIDATE_FLOAT)); var_dump(filter_data(1, array())); -var_dump(filter_data(1, FS_STRING, 1)); -var_dump(filter_data(1, FS_STRING, 0)); -var_dump(filter_data(1, FS_STRING, array())); +var_dump(filter_data(1, FILTER_SANITIZE_STRING, 1)); +var_dump(filter_data(1, FILTER_SANITIZE_STRING, 0)); +var_dump(filter_data(1, FILTER_SANITIZE_STRING, array())); var_dump(filter_data(1, -1, array(123))); var_dump(filter_data(1, 0, array())); http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/011.phpt?r1=1.1&r2=1.2&diff_format=u Index: pecl/filter/tests/011.phpt diff -u pecl/filter/tests/011.phpt:1.1 pecl/filter/tests/011.phpt:1.2 --- pecl/filter/tests/011.phpt:1.1 Tue Dec 6 15:18:56 2005 +++ pecl/filter/tests/011.phpt Sat Jan 21 15:57:43 2006 @@ -7,14 +7,14 @@ --FILE-- <?php -var_dump(input_get(INPUT_GET, "a", FS_STRIPPED)); -var_dump(input_get(INPUT_GET, "b", FS_URL)); -var_dump(input_get(INPUT_GET, "a", FS_SPECIAL_CHARS, array(1,2,3,4,5))); -var_dump(input_get(INPUT_GET, "b", FL_FLOAT, new stdClass)); -var_dump(input_get(INPUT_POST, "c", FS_STRIPPED, array(5,6,7,8))); -var_dump(input_get(INPUT_POST, "d", FL_FLOAT)); -var_dump(input_get(INPUT_POST, "c", FS_SPECIAL_CHARS)); -var_dump(input_get(INPUT_POST, "d", FL_INT)); +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(input_get(new stdClass, "d")); http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/013.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/013.phpt diff -u pecl/filter/tests/013.phpt:1.2 pecl/filter/tests/013.phpt:1.3 --- pecl/filter/tests/013.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/013.phpt Sat Jan 21 15:57:43 2006 @@ -3,22 +3,22 @@ --FILE-- <?php -var_dump(filter_data("0xff", FL_INT, array("flags"=>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"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/014.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/014.phpt diff -u pecl/filter/tests/014.phpt:1.2 pecl/filter/tests/014.phpt:1.3 --- pecl/filter/tests/014.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/014.phpt Sat Jan 21 15:57:43 2006 @@ -1,22 +1,22 @@ --TEST-- -filter_data() and FL_BOOLEAN +filter_data() and FILTER_VALIDATE_BOOLEAN --FILE-- <?php -var_dump(filter_data("no", FL_BOOLEAN)); -var_dump(filter_data(new stdClass, FL_BOOLEAN)); -var_dump(filter_data("yes", FL_BOOLEAN)); -var_dump(filter_data("true", FL_BOOLEAN)); -var_dump(filter_data("false", FL_BOOLEAN)); -var_dump(filter_data("off", FL_BOOLEAN)); -var_dump(filter_data("on", FL_BOOLEAN)); -var_dump(filter_data("0", FL_BOOLEAN)); -var_dump(filter_data("1", FL_BOOLEAN)); -var_dump(filter_data("NONE", FL_BOOLEAN)); -var_dump(filter_data("", FL_BOOLEAN)); -var_dump(filter_data(-1, FL_BOOLEAN)); -var_dump(filter_data("000000", FL_BOOLEAN)); -var_dump(filter_data("111111", FL_BOOLEAN)); +var_dump(filter_data("no", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data(new stdClass, FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("yes", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("true", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("false", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("off", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("on", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("0", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("1", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("NONE", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data(-1, FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("000000", FILTER_VALIDATE_BOOLEAN)); +var_dump(filter_data("111111", FILTER_VALIDATE_BOOLEAN)); echo "Done\n"; http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/015.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/015.phpt diff -u pecl/filter/tests/015.phpt:1.2 pecl/filter/tests/015.phpt:1.3 --- pecl/filter/tests/015.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/015.phpt Sat Jan 21 15:57:43 2006 @@ -1,5 +1,5 @@ --TEST-- -filter_data() and FL_URL +filter_data() and FILTER_VALIDATE_URL --FILE-- <?php @@ -24,19 +24,19 @@ array(), ); foreach ($values as $value) { - var_dump(filter_data($value, FL_URL)); + var_dump(filter_data($value, FILTER_VALIDATE_URL)); } -var_dump(filter_data("qwe", FL_URL, FILTER_FLAG_SCHEME_REQUIRED)); -var_dump(filter_data("http://qwe", FL_URL, FILTER_FLAG_SCHEME_REQUIRED)); -var_dump(filter_data("http://", FL_URL, FILTER_FLAG_HOST_REQUIRED)); -var_dump(filter_data("/tmp/test", FL_URL, FILTER_FLAG_HOST_REQUIRED)); -var_dump(filter_data("http://www.example.com", FL_URL, FILTER_FLAG_HOST_REQUIRED)); -var_dump(filter_data("http://www.example.com", FL_URL, FILTER_FLAG_PATH_REQUIRED)); -var_dump(filter_data("http://www.example.com/path/at/the/server/", FL_URL, FILTER_FLAG_PATH_REQUIRED)); -var_dump(filter_data("http://www.example.com/index.html", FL_URL, FILTER_FLAG_QUERY_REQUIRED)); -var_dump(filter_data("http://www.example.com/index.php?a=b&c=d", FL_URL, FILTER_FLAG_QUERY_REQUIRED)); +var_dump(filter_data("qwe", FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED)); +var_dump(filter_data("http://qwe", FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED)); +var_dump(filter_data("http://", FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)); +var_dump(filter_data("/tmp/test", FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)); +var_dump(filter_data("http://www.example.com", FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)); +var_dump(filter_data("http://www.example.com", FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)); +var_dump(filter_data("http://www.example.com/path/at/the/server/", FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)); +var_dump(filter_data("http://www.example.com/index.html", FILTER_VALIDATE_URL, FILTER_FLAG_QUERY_REQUIRED)); +var_dump(filter_data("http://www.example.com/index.php?a=b&c=d", FILTER_VALIDATE_URL, FILTER_FLAG_QUERY_REQUIRED)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/016.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/016.phpt diff -u pecl/filter/tests/016.phpt:1.2 pecl/filter/tests/016.phpt:1.3 --- pecl/filter/tests/016.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/016.phpt Sat Jan 21 15:57:43 2006 @@ -1,5 +1,5 @@ --TEST-- -filter_data() and FL_EMAIL +filter_data() and FILTER_VALIDATE_EMAIL --FILE-- <?php $values = Array( @@ -14,7 +14,7 @@ 'QWERTYUIOPASDFGHJKLZXCVBNM@QWERTYUIOPASDFGHJKLZXCVBNM.NET', ); foreach ($values as $value) { - var_dump(filter_data($value, FL_EMAIL)); + var_dump(filter_data($value, FILTER_VALIDATE_EMAIL)); } echo "Done\n"; http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/017.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/017.phpt diff -u pecl/filter/tests/017.phpt:1.2 pecl/filter/tests/017.phpt:1.3 --- pecl/filter/tests/017.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/017.phpt Sat Jan 21 15:57:43 2006 @@ -1,14 +1,14 @@ --TEST-- -filter_data() and FL_REGEXP +filter_data() and FILTER_VALIDATE_REGEXP --FILE-- <?php -var_dump(filter_data("data", FL_REGEXP, array("regexp"=>'/.*/'))); -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"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/018.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/018.phpt diff -u pecl/filter/tests/018.phpt:1.2 pecl/filter/tests/018.phpt:1.3 --- pecl/filter/tests/018.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/018.phpt Sat Jan 21 15:57:43 2006 @@ -1,28 +1,28 @@ --TEST-- -filter_data() and FL_IP +filter_data() and FILTER_VALIDATE_IP --FILE-- <?php -var_dump(filter_data("192.168.0.1", FL_IP)); -var_dump(filter_data("192.168.0.1.1", FL_IP)); -var_dump(filter_data("::1", FL_IP)); -var_dump(filter_data("fe00::0", FL_IP)); -var_dump(filter_data("::123456", FL_IP)); -var_dump(filter_data("::1::b", FL_IP)); -var_dump(filter_data("127.0.0.1", FL_IP)); -var_dump(filter_data("192.168.0.1", FL_IP, FILTER_FLAG_NO_PRIV_RANGE)); -var_dump(filter_data("192.0.34.166", FL_IP, FILTER_FLAG_NO_PRIV_RANGE)); -var_dump(filter_data("127.0.0.1", FL_IP, FILTER_FLAG_NO_RES_RANGE)); -var_dump(filter_data("192.0.0.1", FL_IP, FILTER_FLAG_NO_RES_RANGE)); -var_dump(filter_data("192.0.34.166", FL_IP)); -var_dump(filter_data("256.1237.123.1", FL_IP)); -var_dump(filter_data("255.255.255.255", FL_IP)); -var_dump(filter_data("255.255.255.255", FL_IP, FILTER_FLAG_NO_RES_RANGE)); -var_dump(filter_data("", FL_IP)); -var_dump(filter_data(-1, FL_IP)); -var_dump(filter_data("::1", FL_IP, FILTER_FLAG_IPV4)); -var_dump(filter_data("127.0.0.1", FL_IP, FILTER_FLAG_IPV6)); -var_dump(filter_data("::1", FL_IP, FILTER_FLAG_IPV6)); -var_dump(filter_data("127.0.0.1", FL_IP, FILTER_FLAG_IPV4)); +var_dump(filter_data("192.168.0.1", FILTER_VALIDATE_IP)); +var_dump(filter_data("192.168.0.1.1", FILTER_VALIDATE_IP)); +var_dump(filter_data("::1", FILTER_VALIDATE_IP)); +var_dump(filter_data("fe00::0", FILTER_VALIDATE_IP)); +var_dump(filter_data("::123456", FILTER_VALIDATE_IP)); +var_dump(filter_data("::1::b", FILTER_VALIDATE_IP)); +var_dump(filter_data("127.0.0.1", FILTER_VALIDATE_IP)); +var_dump(filter_data("192.168.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)); +var_dump(filter_data("192.0.34.166", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)); +var_dump(filter_data("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); +var_dump(filter_data("192.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); +var_dump(filter_data("192.0.34.166", FILTER_VALIDATE_IP)); +var_dump(filter_data("256.1237.123.1", FILTER_VALIDATE_IP)); +var_dump(filter_data("255.255.255.255", FILTER_VALIDATE_IP)); +var_dump(filter_data("255.255.255.255", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); +var_dump(filter_data("", FILTER_VALIDATE_IP)); +var_dump(filter_data(-1, FILTER_VALIDATE_IP)); +var_dump(filter_data("::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)); +var_dump(filter_data("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)); +var_dump(filter_data("::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)); +var_dump(filter_data("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)); echo "Done\n"; ?> --EXPECT-- http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/019.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/019.phpt diff -u pecl/filter/tests/019.phpt:1.2 pecl/filter/tests/019.phpt:1.3 --- pecl/filter/tests/019.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/019.phpt Sat Jan 21 15:57:43 2006 @@ -1,13 +1,13 @@ --TEST-- -filter_data() & FL_IP and weird data +filter_data() & FILTER_VALIDATE_IP and weird data --FILE-- <?php -var_dump(filter_data("....", FL_IP)); -var_dump(filter_data("...", FL_IP)); -var_dump(filter_data("..", FL_IP)); -var_dump(filter_data(".", FL_IP)); -var_dump(filter_data("1.1.1.1", FL_IP)); +var_dump(filter_data("....", FILTER_VALIDATE_IP)); +var_dump(filter_data("...", FILTER_VALIDATE_IP)); +var_dump(filter_data("..", FILTER_VALIDATE_IP)); +var_dump(filter_data(".", FILTER_VALIDATE_IP)); +var_dump(filter_data("1.1.1.1", FILTER_VALIDATE_IP)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/020.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/020.phpt diff -u pecl/filter/tests/020.phpt:1.2 pecl/filter/tests/020.phpt:1.3 --- pecl/filter/tests/020.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/020.phpt Sat Jan 21 15:57:43 2006 @@ -1,12 +1,12 @@ --TEST-- -filter_data() and FS_MAGIC_QUOTES +filter_data() and FILTER_SANITIZE_MAGIC_QUOTES --FILE-- <?php -var_dump(filter_data("test'asd'asd'' asd\'\"asdfasdf", FS_MAGIC_QUOTES)); -var_dump(filter_data("'", FS_MAGIC_QUOTES)); -var_dump(filter_data("", FS_MAGIC_QUOTES)); -var_dump(filter_data(-1, FS_MAGIC_QUOTES)); +var_dump(filter_data("test'asd'asd'' asd\'\"asdfasdf", FILTER_SANITIZE_MAGIC_QUOTES)); +var_dump(filter_data("'", FILTER_SANITIZE_MAGIC_QUOTES)); +var_dump(filter_data("", FILTER_SANITIZE_MAGIC_QUOTES)); +var_dump(filter_data(-1, FILTER_SANITIZE_MAGIC_QUOTES)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/021.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/021.phpt diff -u pecl/filter/tests/021.phpt:1.2 pecl/filter/tests/021.phpt:1.3 --- pecl/filter/tests/021.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/021.phpt Sat Jan 21 15:57:43 2006 @@ -1,25 +1,25 @@ --TEST-- -filter_data() and FS_NUMBER_* +filter_data() and FILTER_SANITIZE_NUMBER_* --FILE-- <?php -var_dump(filter_data("qwertyu123456dfghj", FS_NUMBER_INT)); -var_dump(filter_data("asd123123.asd123.23", FS_NUMBER_INT)); -var_dump(filter_data("123,23", FS_NUMBER_INT)); -var_dump(filter_data("", FS_NUMBER_INT)); -var_dump(filter_data("0", FS_NUMBER_INT)); -var_dump(filter_data("asd123.2asd", FS_NUMBER_INT)); -var_dump(filter_data("qwertyuiop", FS_NUMBER_INT)); -var_dump(filter_data("123.4", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); -var_dump(filter_data("123,4", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); -var_dump(filter_data("123.4", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_THOUSAND)); -var_dump(filter_data("123,4", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_THOUSAND)); -var_dump(filter_data("123.4e", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_SCIENTIFIC)); -var_dump(filter_data("123,4E", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_SCIENTIFIC)); -var_dump(filter_data("qwe123,4qwe", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); -var_dump(filter_data("werty65456.34", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); -var_dump(filter_data("234.56fsfd", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); -var_dump(filter_data("", FS_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); +var_dump(filter_data("qwertyu123456dfghj", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("asd123123.asd123.23", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("123,23", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("0", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("asd123.2asd", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("qwertyuiop", FILTER_SANITIZE_NUMBER_INT)); +var_dump(filter_data("123.4", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); +var_dump(filter_data("123,4", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); +var_dump(filter_data("123.4", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_THOUSAND)); +var_dump(filter_data("123,4", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_THOUSAND)); +var_dump(filter_data("123.4e", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_SCIENTIFIC)); +var_dump(filter_data("123,4E", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_SCIENTIFIC)); +var_dump(filter_data("qwe123,4qwe", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); +var_dump(filter_data("werty65456.34", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); +var_dump(filter_data("234.56fsfd", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); +var_dump(filter_data("", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/022.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/022.phpt diff -u pecl/filter/tests/022.phpt:1.2 pecl/filter/tests/022.phpt:1.3 --- pecl/filter/tests/022.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/022.phpt Sat Jan 21 15:57:43 2006 @@ -1,13 +1,13 @@ --TEST-- -filter_data() and FS_EMAIL +filter_data() and FILTER_SANITIZE_EMAIL --FILE-- <?php -var_dump(filter_data("a@b.c", FS_EMAIL)); -var_dump(filter_data("a[!@#$%^&*()@a@#$%^&*(.com@#$%^&*(", FS_EMAIL)); -var_dump(filter_data("white space here \ \ \" som more", FS_EMAIL)); -var_dump(filter_data("", FS_EMAIL)); -var_dump(filter_data("123456789000000", FS_EMAIL)); +var_dump(filter_data("a@b.c", FILTER_SANITIZE_EMAIL)); +var_dump(filter_data("a[!@#$%^&*()@a@#$%^&*(.com@#$%^&*(", FILTER_SANITIZE_EMAIL)); +var_dump(filter_data("white space here \ \ \" som more", FILTER_SANITIZE_EMAIL)); +var_dump(filter_data("", FILTER_SANITIZE_EMAIL)); +var_dump(filter_data("123456789000000", FILTER_SANITIZE_EMAIL)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/023.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/023.phpt diff -u pecl/filter/tests/023.phpt:1.2 pecl/filter/tests/023.phpt:1.3 --- pecl/filter/tests/023.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/023.phpt Sat Jan 21 15:57:43 2006 @@ -1,13 +1,13 @@ --TEST-- -filter_data() and FS_UNSAFE_RAW +filter_data() and FILTER_UNSAFE_RAW --FILE-- <?php -var_dump(filter_data("}\"<p>test para</p>", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); -var_dump(filter_data("a[!@#<b>$%^&*()@a@#$%^&*(.<br>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 <qwertyuiop> ", FS_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("}\"<p>test para</p>", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); +var_dump(filter_data("a[!@#<b>$%^&*()@a@#$%^&*(.<br>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 <qwertyuiop> ", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/024.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/024.phpt diff -u pecl/filter/tests/024.phpt:1.2 pecl/filter/tests/024.phpt:1.3 --- pecl/filter/tests/024.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/024.phpt Sat Jan 21 15:57:43 2006 @@ -1,12 +1,12 @@ --TEST-- -filter_data() and FS_ENCODED +filter_data() and FILTER_SANITIZE_ENCODED --FILE-- <?php -var_dump(filter_data("\"<br>blah</ph>", 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("\"<br>blah</ph>", 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"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/025.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/025.phpt diff -u pecl/filter/tests/025.phpt:1.2 pecl/filter/tests/025.phpt:1.3 --- pecl/filter/tests/025.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/025.phpt Sat Jan 21 15:57:43 2006 @@ -1,15 +1,15 @@ --TEST-- -filter_data() and FS_STRING +filter_data() and FILTER_SANITIZE_STRING --FILE-- <?php -var_dump(filter_data("", FS_STRING)); -var_dump(filter_data("<>", 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"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/026.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/026.phpt diff -u pecl/filter/tests/026.phpt:1.2 pecl/filter/tests/026.phpt:1.3 --- pecl/filter/tests/026.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/026.phpt Sat Jan 21 15:57:43 2006 @@ -1,19 +1,19 @@ --TEST-- -filter_data() and FS_STRIPPED +filter_data() and FILTER_SANITIZE_STRIPPED --FILE-- <?php -var_dump(filter_data("<p>Let me <font color=\"#000000\">see</font> you <br /><b>Stripped</b> down to the bone</p>", FS_STRIPPED)); -var_dump(filter_data("!@#$%^&*()><<>+_\"'<br><p /><li />", FS_STRIPPED)); -var_dump(filter_data("", FS_STRIPPED)); +var_dump(filter_data("<p>Let me <font color=\"#000000\">see</font> you <br /><b>Stripped</b> down to the bone</p>", FILTER_SANITIZE_STRIPPED)); +var_dump(filter_data("!@#$%^&*()><<>+_\"'<br><p /><li />", FILTER_SANITIZE_STRIPPED)); +var_dump(filter_data("", FILTER_SANITIZE_STRIPPED)); -var_dump(filter_data("<p>Let me <font color=\"#000000\">see</font> you <br /><b>Stripped</b> down to the bone</p>", FS_STRIPPED, FILTER_FLAG_STRIP_LOW)); -var_dump(filter_data("!@#$%^&*()><<>+_\"'<br><p /><li />", FS_STRIPPED, FILTER_FLAG_STRIP_LOW)); -var_dump(filter_data("", FS_STRIPPED, FILTER_FLAG_STRIP_LOW)); +var_dump(filter_data("<p>Let me <font color=\"#000000\">see</font> you <br /><b>Stripped</b> down to the bone</p>", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_LOW)); +var_dump(filter_data("!@#$%^&*()><<>+_\"'<br><p /><li />", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_LOW)); +var_dump(filter_data("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_LOW)); -var_dump(filter_data("<p>Let me <font color=\"#000000\">see</font> you <br /><b>Stripped</b> down to the bone</p>", FS_STRIPPED, FILTER_FLAG_STRIP_HIGH)); -var_dump(filter_data("!@#$%^&*()><<>+_\"'<br><p /><li />", FS_STRIPPED, FILTER_FLAG_STRIP_HIGH)); -var_dump(filter_data("", FS_STRIPPED, FILTER_FLAG_STRIP_HIGH)); +var_dump(filter_data("<p>Let me <font color=\"#000000\">see</font> you <br /><b>Stripped</b> down to the bone</p>", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); +var_dump(filter_data("!@#$%^&*()><<>+_\"'<br><p /><li />", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); +var_dump(filter_data("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/027.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/027.phpt diff -u pecl/filter/tests/027.phpt:1.2 pecl/filter/tests/027.phpt:1.3 --- pecl/filter/tests/027.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/027.phpt Sat Jan 21 15:57:43 2006 @@ -1,19 +1,19 @@ --TEST-- -filter_data() and FS_ENCODED +filter_data() and FILTER_SANITIZE_ENCODED --FILE-- <?php -var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FS_ENCODED)); -var_dump(filter_data("<data&sons>", FS_ENCODED)); -var_dump(filter_data("", FS_ENCODED)); +var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FILTER_SANITIZE_ENCODED)); +var_dump(filter_data("<data&sons>", FILTER_SANITIZE_ENCODED)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED)); -var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FS_ENCODED, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("<data&sons>", FS_ENCODED, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("", FS_ENCODED, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("<data&sons>", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FS_ENCODED, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("<data&sons>", FS_ENCODED, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("", FS_ENCODED, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("<data&sons>", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH)); echo "Done\n"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/028.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/028.phpt diff -u pecl/filter/tests/028.phpt:1.2 pecl/filter/tests/028.phpt:1.3 --- pecl/filter/tests/028.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/028.phpt Sat Jan 21 15:57:43 2006 @@ -1,22 +1,22 @@ --TEST-- -filter_data() and FS_SPECIAL_CHARS +filter_data() and FILTER_SANITIZE_SPECIAL_CHARS --FILE-- <?php -var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FS_SPECIAL_CHARS)); -var_dump(filter_data("<data&sons>", FS_SPECIAL_CHARS)); -var_dump(filter_data("", FS_SPECIAL_CHARS)); +var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FILTER_SANITIZE_SPECIAL_CHARS)); +var_dump(filter_data("<data&sons>", FILTER_SANITIZE_SPECIAL_CHARS)); +var_dump(filter_data("", FILTER_SANITIZE_SPECIAL_CHARS)); -var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("<data&sons>", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("<data&sons>", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); +var_dump(filter_data("", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_LOW)); -var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("<data&sons>", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); -var_dump(filter_data("", FS_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_FLAG_ENCODE_HIGH)); +var_dump(filter_data("<data&sons>", 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"; ?> http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/029.phpt?r1=1.2&r2=1.3&diff_format=u Index: pecl/filter/tests/029.phpt diff -u pecl/filter/tests/029.phpt:1.2 pecl/filter/tests/029.phpt:1.3 --- pecl/filter/tests/029.phpt:1.2 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/029.phpt Sat Jan 21 15:57:43 2006 @@ -1,5 +1,5 @@ --TEST-- -filter_data() and FC_CALLBACK +filter_data() and FILTER_CALLBACK --FILE-- <?php @@ -8,12 +8,12 @@ return strtoupper($var); } -var_dump(filter_data("data", FC_CALLBACK, "test")); -var_dump(filter_data("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", 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 @@ } } -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 @@ 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 @@ } try { - var_dump(filter_data("data", FC_CALLBACK, "test5")); + var_dump(filter_data("data", FILTER_CALLBACK, "test5")); } catch (Exception $e) { var_dump($e->getMessage()); } http://cvs.php.net/viewcvs.cgi/pecl/filter/tests/filter_data.phpt?r1=1.3&r2=1.4&diff_format=u Index: pecl/filter/tests/filter_data.phpt diff -u pecl/filter/tests/filter_data.phpt:1.3 pecl/filter/tests/filter_data.phpt:1.4 --- pecl/filter/tests/filter_data.phpt:1.3 Wed Dec 7 11:53:28 2005 +++ pecl/filter/tests/filter_data.phpt Sat Jan 21 15:57:43 2006 @@ -4,39 +4,39 @@ <?php /* Integer */ -$data = "-123"; var_dump(filter_data($data, FL_INT)); -$data = "0"; var_dump(filter_data($data, FL_INT)); -$data = "123"; var_dump(filter_data($data, FL_INT)); -$data = -123; var_dump(filter_data($data, FL_INT)); -$data = 0; var_dump(filter_data($data, FL_INT)); -$data = 123; var_dump(filter_data($data, FL_INT)); -$data = ""; var_dump(filter_data($data, FL_INT)); +$data = "-123"; var_dump(filter_data($data, FILTER_VALIDATE_INT)); +$data = "0"; var_dump(filter_data($data, FILTER_VALIDATE_INT)); +$data = "123"; var_dump(filter_data($data, FILTER_VALIDATE_INT)); +$data = -123; var_dump(filter_data($data, FILTER_VALIDATE_INT)); +$data = 0; var_dump(filter_data($data, FILTER_VALIDATE_INT)); +$data = 123; var_dump(filter_data($data, FILTER_VALIDATE_INT)); +$data = ""; var_dump(filter_data($data, FILTER_VALIDATE_INT)); echo "\n"; /* Float */ -$data = "-0.123"; var_dump(filter_data($data, FL_FLOAT)); -$data = "0.00"; var_dump(filter_data($data, FL_FLOAT)); -$data = "1.23"; var_dump(filter_data($data, FL_FLOAT)); -$data = -1.23; var_dump(filter_data($data, FL_FLOAT)); -$data = 0.0; var_dump(filter_data($data, FL_FLOAT)); -$data = 1.23; var_dump(filter_data($data, FL_FLOAT)); -$data = ""; var_dump(filter_data($data, FL_FLOAT)); +$data = "-0.123"; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); +$data = "0.00"; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); +$data = "1.23"; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); +$data = -1.23; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); +$data = 0.0; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); +$data = 1.23; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); +$data = ""; var_dump(filter_data($data, FILTER_VALIDATE_FLOAT)); echo "\n"; /* Boolean */ -$data = "on"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "off"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "yes"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "no"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "true"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "false"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "1"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = "0"; var_dump(filter_data($data, FL_BOOLEAN)); -$data = 1; var_dump(filter_data($data, FL_BOOLEAN)); -$data = 0; var_dump(filter_data($data, FL_BOOLEAN)); -$data = true; var_dump(filter_data($data, FL_BOOLEAN)); -$data = false; var_dump(filter_data($data, FL_BOOLEAN)); -$data = ""; var_dump(filter_data($data, FL_BOOLEAN)); +$data = "on"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "off"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "yes"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "no"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "true"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "false"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "1"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = "0"; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = 1; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = 0; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = true; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = false; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); +$data = ""; var_dump(filter_data($data, FILTER_VALIDATE_BOOLEAN)); ?> --EXPECT--