fix more tests

diff --git a/ext/standard/tests/strings/bug21338.phpt b/ext/standard/tests/strings/bug21338.phpt
index c84576563ef8263a4a171be1645be6998899fd5f..3eb760842182ac26faa68ef735eea8652be0f522 100644 (file)
--- a/ext/standard/tests/strings/bug21338.phpt
+++ b/ext/standard/tests/strings/bug21338.phpt
@@ -8,3 +8,6 @@ Bug #20934 (html_entity_decode() crash when "" is passed)
 --EXPECT--
 string(0) ""
 string(0) ""
+--UEXPECT--
+unicode(0) ""
+unicode(0) ""

diff --git a/ext/standard/tests/strings/bug25671.phpt b/ext/standard/tests/strings/bug25671.phpt
index 9e35d7ab0f6fb712c9b6d8ae65a845d0559149c1..e8ad22335491eeb14314e13f3371118f744f9a4c 100644 (file)
--- a/ext/standard/tests/strings/bug25671.phpt
+++ b/ext/standard/tests/strings/bug25671.phpt
@@ -21,7 +21,7 @@ a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;
 a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";}
 a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";}
 --UEXPECT--
-a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:22:"This is a last strung.";}
-a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:22:"This is a last strung.";}
-a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";}
-a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";}
+a:4:{i:0;U:19:"This is strung one.";i:1;U:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:22:"This is a last strung.";}
+a:4:{i:0;U:19:"This is strung one.";i:1;U:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:22:"This is a last strung.";}
+a:4:{i:0;U:16:"Thisisstringone.";i:1;U:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:18:"Thisisalaststring.";}
+a:4:{i:0;U:16:"Thisisstringone.";i:1;U:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:18:"Thisisalaststring.";}

diff --git a/ext/standard/tests/strings/bug25707.phpt b/ext/standard/tests/strings/bug25707.phpt
index 4954fb1ae5aecf25e0fb1f3b3f50a9f6e00ce504..ad414674cba573974171e3321be4453473a48a04 100644 (file)
--- a/ext/standard/tests/strings/bug25707.phpt
+++ b/ext/standard/tests/strings/bug25707.phpt
@@ -10,3 +10,7 @@ var_dump(html_entity_decode("<", ENT_COMPAT, 'ISO-8859-1'));
 string(4) "<"
 string(5) "&"
 string(8) "<"
+--UEXPECT--
+unicode(4) "<"
+unicode(5) "&"
+unicode(8) "<"

diff --git a/ext/standard/tests/strings/bug33076.phpt b/ext/standard/tests/strings/bug33076.phpt
index dafb8161b0f175c78e4efacd2b947be07c397f7d..d273bcc5626877d3d769281326e4d67cecdb3654 100644 (file)
--- a/ext/standard/tests/strings/bug33076.phpt
+++ b/ext/standard/tests/strings/bug33076.phpt
@@ -12,3 +12,6 @@ echo "Done\n";
 --EXPECT--     
 string(6) "bzexbz"
 Done
+--UEXPECT--
+unicode(6) "bzexbz"
+Done

diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt
index 46d732a698e3ded882b30635d73b72ebf7e0a9dd..f8967d916576865abf5786b2fcf82b95c088418d 100644 (file)
--- a/ext/standard/tests/strings/str_replace.phpt
+++ b/ext/standard/tests/strings/str_replace.phpt
@@ -106,3 +106,57 @@ int(1)
 string(%d) "Resource id #%d"
 int(1)
 Done
+--UEXPECTF--
+unicode(0) ""
+unicode(4) "tbst"
+unicode(0) ""
+int(0)
+unicode(1) "q"
+int(1)
+unicode(0) ""
+int(0)
+unicode(0) ""
+int(0)
+unicode(1) "a"
+int(1)
+unicode(3) "aaa"
+int(0)
+unicode(15) "multimultimulti"
+int(3)
+unicode(15) "multimultimulti"
+int(3)
+unicode(3) "qqq"
+int(3)
+array(2) {
+  [0]=>
+  unicode(3) "qqq"
+  [1]=>
+  unicode(3) "ccc"
+}
+int(6)
+
+Notice: Array to string conversion in %s on line %d
+array(2) {
+  [0]=>
+  unicode(15) "ArrayArrayArray"
+  [1]=>
+  unicode(3) "bbb"
+}
+int(3)
+array(2) {
+  [0]=>
+  unicode(3) "111"
+  [1]=>
+  unicode(3) "bbb"
+}
+int(3)
+array(2) {
+  [0]=>
+  unicode(4) "aaa3"
+  [1]=>
+  unicode(4) "2bbb"
+}
+int(1)
+unicode(%d) "Resource id #%d"
+int(1)
+Done