fix tests

diff --git a/ext/filter/tests/001.phpt b/ext/filter/tests/001.phpt
index 9fa9d40c745586553f6afe18e2715e64d736ce0f..2755a57363b4e7022da5cbd3f95be3872ee3abce 100644 (file)
--- a/ext/filter/tests/001.phpt
+++ b/ext/filter/tests/001.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Simple GET test
---POST--
 --GET--
 a=1
 --FILE--

diff --git a/ext/filter/tests/002.phpt b/ext/filter/tests/002.phpt
index 8c20bf95f60392c209249f52f57cc29e9de78c6a..7136b251a6fd56eee15d62cf902c2474fe2c9880 100644 (file)
--- a/ext/filter/tests/002.phpt
+++ b/ext/filter/tests/002.phpt
@@ -1,6 +1,5 @@
 --TEST--
 GET test with 2 values and an empty one
---POST--
 --GET--
 a=1&b=&c=3
 --FILE--

diff --git a/ext/filter/tests/005.phpt b/ext/filter/tests/005.phpt
index b97baa4f5f45f882eeed9dde4f8b8e7761352608..f44379153ea7f7127ca15c1b5167bf606011aa2a 100644 (file)
--- a/ext/filter/tests/005.phpt
+++ b/ext/filter/tests/005.phpt
@@ -2,7 +2,6 @@
 GET/REQUEST Test with fifa example data
 --INI--
 filter.default=stripped
---POST--
 --GET--
 id=f03_photos&pgurl=http%3A//fifaworldcup.yahoo.com/03/en/photozone/index.html
 --FILE--

diff --git a/ext/filter/tests/006.phpt b/ext/filter/tests/006.phpt
index eb9077fa667f30cc8b1851f9f8b50e4c2a896ea8..1f8717c184a6da67a404fa52ba56056faac8fbf7 100644 (file)
--- a/ext/filter/tests/006.phpt
+++ b/ext/filter/tests/006.phpt
@@ -2,7 +2,6 @@
 filter() test
 --POST--
 foo=<b>abc</b>
---GET--
 --FILE--
 <?php 
 echo input_get(INPUT_POST, 'foo', FS_STRIPPED);

diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt
index 62b41004c02658e27c4022da5e4beebe3174d52f..eb6963c09925b480671507b3ef53fe773bbb02bc 100644 (file)
--- a/ext/filter/tests/008.phpt
+++ b/ext/filter/tests/008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 input_filters_list()
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/009.phpt b/ext/filter/tests/009.phpt
index 130c5b3e9d6477717af670457250690e36c0a18e..c33fe8ae365b63b29df5456756be4aabe30c6032 100644 (file)
--- a/ext/filter/tests/009.phpt
+++ b/ext/filter/tests/009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 input_name_to_filter()
---GET--
-
 --FILE--
 <?php
 
@@ -22,12 +20,10 @@ int(513)
 int(518)
 int(257)
 NULL
-PHP Warning:  input_name_to_filter() expects parameter 1 to be string, array given in %s on line %d
 
 Warning: input_name_to_filter() expects parameter 1 to be string, array given in %s on line %d
 NULL
 NULL
-PHP Warning:  input_name_to_filter() expects exactly 1 parameter, 3 given in %s on line %d
 
 Warning: input_name_to_filter() expects exactly 1 parameter, 3 given in %s on line %d
 NULL

diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt
index d58223168a4e5742a6058278a9ef3eb0727a5b0d..aae5bc43f43c42bc5d813cad62f7e202664bfa33 100644 (file)
--- a/ext/filter/tests/010.phpt
+++ b/ext/filter/tests/010.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data()
---GET--
-
 --FILE--
 <?php
 
@@ -51,7 +49,6 @@ array(7) {
   array(0) {
   }
 }
-PHP Warning:  filter_data() expects parameter 2 to be long, array given in %s on line %d
 
 Warning: filter_data() expects parameter 2 to be long, array given in %s on line %d
 NULL

diff --git a/ext/filter/tests/012.phpt b/ext/filter/tests/012.phpt
index 99b218de0ae0a2c18410c568d5b216947d84d48d..77c18801376b2c5e3e88cbff96163333f2758ed9 100644 (file)
--- a/ext/filter/tests/012.phpt
+++ b/ext/filter/tests/012.phpt
@@ -1,7 +1,5 @@
 --TEST--
 input_get()
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/013.phpt b/ext/filter/tests/013.phpt
index 6aad0c894686756141baea671f24c48e5df15060..c1c420549c22ffce556f7a2b77010d75c0c6a7ae 100644 (file)
--- a/ext/filter/tests/013.phpt
+++ b/ext/filter/tests/013.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and flags
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/014.phpt b/ext/filter/tests/014.phpt
index 49f0edfefa6eed1733e725d9646e86a40c93d243..2a8cae69d98e031d14db6f9bc3f8399573629a5c 100644 (file)
--- a/ext/filter/tests/014.phpt
+++ b/ext/filter/tests/014.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FL_BOOLEAN
---GET--
-
 --FILE--
 <?php
 
@@ -25,7 +23,6 @@ echo "Done\n";
 ?>
 --EXPECTF--    
 bool(false)
-PHP Notice:  Object of class stdClass to string conversion in %s on line %d
 
 Notice: Object of class stdClass to string conversion in %s on line %d
 NULL

diff --git a/ext/filter/tests/015.phpt b/ext/filter/tests/015.phpt
index 7fef6b0bb247c8d74529e9997817acec62113478..92376c3e5fe55f4bf0f7091a8b1c702ec481dfde 100644 (file)
--- a/ext/filter/tests/015.phpt
+++ b/ext/filter/tests/015.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FL_URL
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/016.phpt b/ext/filter/tests/016.phpt
index 66f85e19572ac1b9eb91259be1724bde18a93f68..a99f25d4a2f699e1e71ebac94a6458fb0d13dda5 100644 (file)
--- a/ext/filter/tests/016.phpt
+++ b/ext/filter/tests/016.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FL_EMAIL
---GET--
-
 --FILE--
 <?php
 $values = Array(

diff --git a/ext/filter/tests/017.phpt b/ext/filter/tests/017.phpt
index bc2aae2030192080196632f21c2590e2cccdd176..214f710d20b0c222d7e3c3a4f1cf35844fcd34c0 100644 (file)
--- a/ext/filter/tests/017.phpt
+++ b/ext/filter/tests/017.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FL_REGEXP
---GET--
-
 --FILE--
 <?php
 
@@ -20,7 +18,6 @@ NULL
 string(4) "data"
 NULL
 NULL
-PHP Warning:  filter_data(): 'regexp' option missing in %s on line %d
 
 Warning: filter_data(): 'regexp' option missing in %s on line %d
 NULL

diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index 39960287dc68dd895782e6e2cfe8faf76aee78fb..729a1fec0d3607b77c0e18d31abfddb1a4606407 100644 (file)
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -1,10 +1,7 @@
 --TEST--
 filter_data() and FL_IP
---GET--
-
 --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));
@@ -22,14 +19,10 @@ 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));
-
 echo "Done\n";
 ?>
 --EXPECT--     

diff --git a/ext/filter/tests/019.phpt b/ext/filter/tests/019.phpt
index 505f783bcb2900bccf097757c7491c13b879898f..0a7826594127446776990cfbcac8522b7a71a79c 100644 (file)
--- a/ext/filter/tests/019.phpt
+++ b/ext/filter/tests/019.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() & FL_IP and weird data
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/020.phpt b/ext/filter/tests/020.phpt
index cbd525c8edcf8bafe2ef26069bbb6c8d08c4eb43..8b88d89290aa8b3e65910458288d42fa7aa2ee36 100644 (file)
--- a/ext/filter/tests/020.phpt
+++ b/ext/filter/tests/020.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_MAGIC_QUOTES
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/021.phpt b/ext/filter/tests/021.phpt
index e27005fadba8e4251dfd48faa381400c2ba5885e..519690a799125b7a08796a8d401f5ae0831a56b9 100644 (file)
--- a/ext/filter/tests/021.phpt
+++ b/ext/filter/tests/021.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_NUMBER_*
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt
index aa1d85f8347f3dea90375470041d7901c127b586..8f1fd1692cac3ce90f29901f21385101d5e0b0ef 100644 (file)
--- a/ext/filter/tests/022.phpt
+++ b/ext/filter/tests/022.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_EMAIL
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/023.phpt b/ext/filter/tests/023.phpt
index 122e27ea3967b665520a04c116ad0a1b8b90feaf..d8abbd7c0a0dc41e7fbbdd4bfe262fa6e90fe669 100644 (file)
--- a/ext/filter/tests/023.phpt
+++ b/ext/filter/tests/023.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_UNSAFE_RAW
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/024.phpt b/ext/filter/tests/024.phpt
index 459572d19447b6fff661a5b57fc8266d87fff7a6..d2caaa9af38f8a2162b4829152bb685b74da6d4f 100644 (file)
--- a/ext/filter/tests/024.phpt
+++ b/ext/filter/tests/024.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_ENCODED
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/025.phpt b/ext/filter/tests/025.phpt
index b7bf94585e1795eb42296fa5e9da8e01abfd527b..0c24c8d6c1cc24034fb5ffa8ce2c4636fe6749d6 100644 (file)
--- a/ext/filter/tests/025.phpt
+++ b/ext/filter/tests/025.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_STRING
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/026.phpt b/ext/filter/tests/026.phpt
index 21aaba10cd6b7d8cc06f34a9175919bf4302faef..5f34831a5db64db9d6528627e51ddaf2c73472f6 100644 (file)
--- a/ext/filter/tests/026.phpt
+++ b/ext/filter/tests/026.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_STRIPPED
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/027.phpt b/ext/filter/tests/027.phpt
index 2532f1e1193b63235d9e7cef2ebe79d2ba9d7b41..fd84801fe48868336fd832401c75223165ecdbd1 100644 (file)
--- a/ext/filter/tests/027.phpt
+++ b/ext/filter/tests/027.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_ENCODED
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/028.phpt b/ext/filter/tests/028.phpt
index a96518afcfeeaa5c30a3639f08b02375edc30254..89830cb231f1e205770c8ecdb98f04efc43eca7f 100644 (file)
--- a/ext/filter/tests/028.phpt
+++ b/ext/filter/tests/028.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FS_SPECIAL_CHARS
---GET--
-
 --FILE--
 <?php
 

diff --git a/ext/filter/tests/029.phpt b/ext/filter/tests/029.phpt
index b3371757c28265d1a64c13012c8729a5211499bb..126cff8cf931032dbeb00a93f4d0d8fdd7722b20 100644 (file)
--- a/ext/filter/tests/029.phpt
+++ b/ext/filter/tests/029.phpt
@@ -1,7 +1,5 @@
 --TEST--
 filter_data() and FC_CALLBACK
---GET--
-
 --FILE--
 <?php
 
@@ -79,15 +77,12 @@ echo "Done\n";
 string(4) "DATA"
 string(46) "~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?"}{:"
 string(0) ""
-PHP Warning:  filter_data(): First argument is expected to be a valid callback in %s on line %d
 
 Warning: filter_data(): First argument is expected to be a valid callback in %s on line %d
 NULL
-PHP Warning:  filter_data(): First argument is expected to be a valid callback in %s on line %d
 
 Warning: filter_data(): First argument is expected to be a valid callback in %s on line %d
 NULL
-PHP Warning:  filter_data(): First argument is expected to be a valid callback in %s on line %d
 
 Warning: filter_data(): First argument is expected to be a valid callback in %s on line %d
 NULL

diff --git a/ext/filter/tests/filter_data.phpt b/ext/filter/tests/filter_data.phpt
index dc2c0f683b2feee96b5346c0f514602547897856..281c85a94c7b87e10fd8a0a8d4a72da2a7cff0f2 100644 (file)
--- a/ext/filter/tests/filter_data.phpt
+++ b/ext/filter/tests/filter_data.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Simple filter_data() tests
---GET--
-
 --FILE--
 <?php