From: foobar <sniper@php.net>
Date: Wed, 7 Dec 2005 11:53:28 +0000 (+0000)
Subject: fix tests
X-Git-Tag: RELEASE_1_0_4~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c90ddd3a1050f944f620eeec7c13cd470802f6d;p=php

fix tests
---

diff --git a/ext/filter/tests/001.phpt b/ext/filter/tests/001.phpt
index 9fa9d40c74..2755a57363 100644
--- 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 8c20bf95f6..7136b251a6 100644
--- 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 b97baa4f5f..f44379153e 100644
--- 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 eb9077fa66..1f8717c184 100644
--- 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 62b41004c0..eb6963c099 100644
--- 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 130c5b3e9d..c33fe8ae36 100644
--- 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 d58223168a..aae5bc43f4 100644
--- 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 99b218de0a..77c1880137 100644
--- 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 6aad0c8946..c1c420549c 100644
--- 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 49f0edfefa..2a8cae69d9 100644
--- 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 7fef6b0bb2..92376c3e5f 100644
--- 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 66f85e1957..a99f25d4a2 100644
--- 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 bc2aae2030..214f710d20 100644
--- 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 39960287dc..729a1fec0d 100644
--- 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 505f783bcb..0a78265941 100644
--- 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 cbd525c8ed..8b88d89290 100644
--- 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 e27005fadb..519690a799 100644
--- 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 aa1d85f834..8f1fd1692c 100644
--- 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 122e27ea39..d8abbd7c0a 100644
--- 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 459572d194..d2caaa9af3 100644
--- 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 b7bf94585e..0c24c8d6c1 100644
--- 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 21aaba10cd..5f34831a5d 100644
--- 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 2532f1e119..fd84801fe4 100644
--- 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 a96518afcf..89830cb231 100644
--- 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 b3371757c2..126cff8cf9 100644
--- 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 dc2c0f683b..281c85a94c 100644
--- 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