- Fixed constant names in tests.

22 files changed, 222 insertions, 222 deletions

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=<b>abc</b>
 --FILE--
 <?php 
-echo input_get(INPUT_POST, 'foo', FS_STRIPPED);
+echo input_get(INPUT_POST, 'foo', FILTER_SANITIZE_STRIPPED);
 ?>
 --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--
 <?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()));
 
diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
index a2e4b5b62c..0d3fa42745 100644
--- a/ext/filter/tests/011.phpt
+++ b/ext/filter/tests/011.phpt
@@ -7,14 +7,14 @@ c=<p>string</p>&d=12345.7
 --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"));
 
diff --git a/ext/filter/tests/013.phpt b/ext/filter/tests/013.phpt
index c1c420549c..2277b79b16 100644
--- a/ext/filter/tests/013.phpt
+++ b/ext/filter/tests/013.phpt
@@ -3,22 +3,22 @@ filter_data() and flags
 --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";
 ?>
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--
 <?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";
diff --git a/ext/filter/tests/015.phpt b/ext/filter/tests/015.phpt
index 92376c3e5f..18285c8512 100644
--- a/ext/filter/tests/015.phpt
+++ b/ext/filter/tests/015.phpt
@@ -1,5 +1,5 @@
 --TEST--
-filter_data() and FL_URL
+filter_data() and FILTER_VALIDATE_URL
 --FILE--
 <?php
 
@@ -24,19 +24,19 @@ $values = Array(
 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";
 ?>
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--
 <?php
 $values = Array(
@@ -14,7 +14,7 @@ $values = Array(
 '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";
diff --git a/ext/filter/tests/017.phpt b/ext/filter/tests/017.phpt
index 214f710d20..ca1b03def7 100644
--- a/ext/filter/tests/017.phpt
+++ b/ext/filter/tests/017.phpt
@@ -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";
 ?>
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--
 <?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--	
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?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";
 ?>
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--
 <?php
 
@@ -8,12 +8,12 @@ function test($var) {
 	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 @@ 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
 <?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--