- Fixed tests (unicode results, UEXPECT, line endings)

4 files changed, 24 insertions, 24 deletions

diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt
index 96e0b5f18c..76a3737f50 100644
--- a/ext/filter/tests/007.phpt
+++ b/ext/filter/tests/007.phpt
@@ -50,7 +50,7 @@ Warning: filter_has_var() expects parameter 2 to be string, array given in %s007
 bool(false)
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be long, string given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be long, Unicode string given in %s007.php on line %d
 bool(false)
 
 Warning: filter_has_var() expects parameter 1 to be long, array given in %s007.php on line %d
@@ -59,6 +59,6 @@ bool(false)
 Warning: filter_has_var() expects parameter 1 to be long, array given in %s007.php on line %d
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be long, string given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be long, Unicode string given in %s007.php on line %d
 bool(false)
 Done
diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
index 6a9bf1fa34..b728c72f1a 100644
--- a/ext/filter/tests/011.phpt
+++ b/ext/filter/tests/011.phpt
@@ -40,10 +40,10 @@ float(12345.7)
 string(29) "<p>string</p>"
 bool(false)
 
-Warning: filter_var() expects parameter 2 to be long, string given in %s011.php on line %d
+Warning: filter_var() expects parameter 2 to be long, Unicode string given in %s011.php on line %d
 NULL
 
-Warning: filter_input() expects parameter 3 to be long, string given in %s011.php on line %d
+Warning: filter_input() expects parameter 3 to be long, Unicode string given in %s011.php on line %d
 NULL
 
 Warning: filter_var() expects at most 3 parameters, 5 given in %s011.php on line %d
diff --git a/ext/filter/tests/036.phpt b/ext/filter/tests/036.phpt
index 954326661d..4e35a1ea36 100644
--- a/ext/filter/tests/036.phpt
+++ b/ext/filter/tests/036.phpt
@@ -24,16 +24,16 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 array(2) {
-  ["test1"]=>
+  [u"test1"]=>
   int(1)
-  ["test2"]=>
+  [u"test2"]=>
   int(1)
 }
 array(2) {
-  ["test1"]=>
+  [u"test1"]=>
   int(1)
-  ["test2"]=>
-  &string(1) "1"
+  [u"test2"]=>
+  &unicode(1) "1"
 }
-string(1) "1"
+unicode(1) "1"
 Done
diff --git a/ext/filter/tests/039.phpt b/ext/filter/tests/039.phpt
index ae883db3e3..27c91a3142 100644
--- a/ext/filter/tests/039.phpt
+++ b/ext/filter/tests/039.phpt
@@ -58,9 +58,9 @@ array(0) {
 }
 array(2) {
   [0]=>
-  string(1) "1"
-  ["blah"]=>
-  string(4) "hoho"
+  unicode(1) "1"
+  [u"blah"]=>
+  unicode(4) "hoho"
 }
 bool(false)
 bool(false)
@@ -78,16 +78,16 @@ bool(false)
 array(0) {
 }
 array(1) {
-  ["var_name"]=>
+  [u"var_name"]=>
   NULL
 }
 array(1) {
-  ["var_name"]=>
+  [u"var_name"]=>
   NULL
 }
 array(1) {
-  ["var_name"]=>
-  string(0) ""
+  [u"var_name"]=>
+  unicode(0) ""
 }
 -- (5)
 
@@ -98,20 +98,20 @@ Warning: filter_var_array(): Empty keys are not allowed in the definition array
 bool(false)
 bool(false)
 array(1) {
-  [""]=>
-  string(0) ""
+  [u""]=>
+  unicode(0) ""
 }
 int(-1)
 bool(false)
 array(1) {
-  [""]=>
-  string(0) ""
+  [u""]=>
+  unicode(0) ""
 }
 int(100000)
 bool(false)
 array(1) {
-  [""]=>
-  string(0) ""
+  [u""]=>
+  unicode(0) ""
 }
-string(0) ""
+unicode(0) ""
 Done