- Unicodifing

diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
index efae733ca2440e93ebcf932f57fba0a983d9c9e3..ae9ad06ef55a7cb00d59c4442ae15e351d9c9994 100644 (file)
--- a/ext/mbstring/tests/bug20087.phpt
+++ b/ext/mbstring/tests/bug20087.phpt
@@ -14,7 +14,7 @@ var_dump($test);
 ?>
 --EXPECT--
 bool(true)
-string(0) ""
+unicode(0) ""
 bool(true)
-string(3) "moo"
+unicode(3) "moo"
 

diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt
index e420312da1d8253b8c234175250510bb78b16a17..2a36e6c4bc990b09e152b75513f3ea402ca0ff46 100644 (file)
--- a/ext/mbstring/tests/mb_ereg1.phpt
+++ b/ext/mbstring/tests/mb_ereg1.phpt
@@ -33,9 +33,9 @@ array(3) {
 int(1)
 array(3) {
   [0]=>
-  string(0) ""
+  unicode(0) ""
   [1]=>
-  string(0) ""
+  unicode(0) ""
   [2]=>
   array(1) {
     [0]=>
@@ -55,7 +55,7 @@ array(3) {
   string(0) ""
 }
 
-Warning: mb_ereg() expects parameter 2 to be string, array given in %s on line %d
+Warning: mb_ereg() expects parameter 2 to be binary string, array given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -64,14 +64,14 @@ array(3) {
   array(0) {
   }
   [2]=>
-  string(0) ""
+  unicode(0) ""
 }
 bool(false)
 array(3) {
   [0]=>
   int(1)
   [1]=>
-  string(0) ""
+  unicode(0) ""
   [2]=>
   array(0) {
   }

diff --git a/ext/mbstring/tests/mb_ereg2.phpt b/ext/mbstring/tests/mb_ereg2.phpt
index 922a8e78d44efc52e5eabe2b0f164e2470ab8677..5de76d7aa19da74e8a6860e31f5e5521803f3872 100644 (file)
--- a/ext/mbstring/tests/mb_ereg2.phpt
+++ b/ext/mbstring/tests/mb_ereg2.phpt
@@ -31,7 +31,7 @@ array(1) {
   string(2) "-1"
 }
 
-Notice: Array to string conversion in %s on line %d
+Warning: mbereg_search_init() expects parameter 3 to be binary string, array given in %s on line %d
 int(-1)
 int(-1)
 array(1) {

diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt
index 14913f40f12a88c37441ae8e62feb3f9b15c285f..a0cda24f32b268c6122b684f0a4bdd7a93419b6d 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation1.phpt
@@ -187,14 +187,14 @@ NULL
 int(6)
 array(1) {
   [0]=>
-  string(6) "string"
+  unicode(6) "string"
 }
 
 -- Iteration 19 --
 int(6)
 array(1) {
   [0]=>
-  string(6) "string"
+  unicode(6) "string"
 }
 
 -- Iteration 20 --

diff --git a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
index b7d71f9d23dbee04dbfdf4fc262878f3f62bbd83..051f6013e75d2a008603cbe163d6b33e26749a1b 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
+++ b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
@@ -17,4 +17,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"

diff --git a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
index d8c21f406fb01ef3ca9908458f1ef9395fc37ebf..109da20085ddde4adae2f55133f516c9c731d44b 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
+++ b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
@@ -17,4 +17,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(18) "e38386e382b9e38388"
+unicode(18) "e38386e382b9e38388"

diff --git a/ext/mbstring/tests/mb_parse_str02.phpt b/ext/mbstring/tests/mb_parse_str02.phpt
index 44ed44865cd0e3ce5633ac701d59f952ca07feee..579e1772c60be22a6423561effba8949f1c9c4e7 100644 (file)
--- a/ext/mbstring/tests/mb_parse_str02.phpt
+++ b/ext/mbstring/tests/mb_parse_str02.phpt
@@ -31,74 +31,74 @@ foreach ($queries as $query) {
 ?>
 --EXPECT--
 array(3) {
-  ["foo"]=>
-  string(3) "abc"
-  ["bar"]=>
-  string(3) "def"
-  ["fubar"]=>
-  string(3) "ghi"
+  [u"foo"]=>
+  unicode(3) "abc"
+  [u"bar"]=>
+  unicode(3) "def"
+  [u"fubar"]=>
+  unicode(3) "ghi"
 }
-string(0) ""
-string(0) ""
-string(0) ""
-string(3) "abc"
-string(3) "def"
-string(3) "ghi"
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(3) "abc"
+unicode(3) "def"
+unicode(3) "ghi"
 array(3) {
-  ["+foo"]=>
-  string(3) "def"
-  ["-bar"]=>
-  string(3) "jkl"
-  ["fubar"]=>
-  string(0) ""
+  [u"+foo"]=>
+  unicode(3) "def"
+  [u"-bar"]=>
+  unicode(3) "jkl"
+  [u"fubar"]=>
+  unicode(0) ""
 }
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
 array(3) {
-  ["foo"]=>
+  [u"foo"]=>
   array(4) {
     [0]=>
-    string(3) "abc"
+    unicode(3) "abc"
     [1]=>
-    string(3) "def"
+    unicode(3) "def"
     [2]=>
-    string(3) "ghi"
+    unicode(3) "ghi"
     [3]=>
-    string(0) ""
+    unicode(0) ""
   }
-  ["bar"]=>
+  [u"bar"]=>
   array(1) {
     [0]=>
-    string(0) ""
+    unicode(0) ""
   }
-  ["fubar"]=>
+  [u"fubar"]=>
   array(1) {
     [0]=>
-    string(1) "="
+    unicode(1) "="
   }
 }
-string(0) ""
-string(0) ""
-string(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
 array(4) {
   [0]=>
-  string(3) "abc"
+  unicode(3) "abc"
   [1]=>
-  string(3) "def"
+  unicode(3) "def"
   [2]=>
-  string(3) "ghi"
+  unicode(3) "ghi"
   [3]=>
-  string(0) ""
+  unicode(0) ""
 }
 array(1) {
   [0]=>
-  string(0) ""
+  unicode(0) ""
 }
 array(1) {
   [0]=>
-  string(1) "="
+  unicode(1) "="
 }

diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt
index b2824d9fe9d4d7b6832ce989d5f1ca08551be9e1..b6c4bacc2fc8723ecc86ac43cba163c23f8d9b29 100644 (file)
--- a/ext/mbstring/tests/mb_strtolower_basic.phpt
+++ b/ext/mbstring/tests/mb_strtolower_basic.phpt
@@ -46,7 +46,7 @@ if ($mb == $greek_lower) {
 echo "Done";
 ?>
 --EXPECT--
-**** Testing mb_strtolower() : basic functionality***
+**** Testing mb_strtolower() : basic functionality****
 
 -- ASCII String --
 string(26) "abcdefghijklmnopqrstuvwxyz"

diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt
index 9f35f1d2662f548c53bd5b1b1b2de9bb6ad5ff07..c52caefc19cf4630d23abd3349d7d22e1fa7b20d 100644 (file)
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@ -31,15 +31,15 @@ var_dump(mb_substitute_character('BAD_NAME'));
 --EXPECT--
 bool(true)
 int(12356)
-string(8) "82a282a0"
+unicode(8) "82a282a0"
 bool(true)
-string(4) "long"
-string(16) "552b3236363082a0"
+unicode(4) "long"
+unicode(16) "552b3236363082a0"
 bool(true)
-string(4) "none"
-string(4) "82a0"
+unicode(4) "none"
+unicode(4) "82a0"
 bool(true)
-string(6) "entity"
-string(20) "262378323636303b82a0"
+unicode(6) "entity"
+unicode(20) "262378323636303b82a0"
 ERR: Warning
 bool(false)