From: Antony Dovgal <tony2001@php.net>
Date: Thu, 9 Nov 2006 01:16:48 +0000 (+0000)
Subject: fix more tests
X-Git-Tag: RELEASE_1_0_0RC1~1096
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fb2cb298bd4b890206bb550568c562e97d1117e;p=php

fix more tests
---

diff --git a/ext/standard/tests/strings/bug21338.phpt b/ext/standard/tests/strings/bug21338.phpt
index c84576563e..3eb7608421 100644
--- 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 9e35d7ab0f..e8ad223354 100644
--- 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 4954fb1ae5..ad414674cb 100644
--- a/ext/standard/tests/strings/bug25707.phpt
+++ b/ext/standard/tests/strings/bug25707.phpt
@@ -10,3 +10,7 @@ var_dump(html_entity_decode("&amp;#38;lt;", ENT_COMPAT, 'ISO-8859-1'));
 string(4) "&lt;"
 string(5) "&#38;"
 string(8) "&#38;lt;"
+--UEXPECT--
+unicode(4) "&lt;"
+unicode(5) "&#38;"
+unicode(8) "&#38;lt;"
diff --git a/ext/standard/tests/strings/bug33076.phpt b/ext/standard/tests/strings/bug33076.phpt
index dafb8161b0..d273bcc562 100644
--- 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 46d732a698..f8967d9165 100644
--- 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