From: Henrique do Nascimento Angelo <hnangelo@php.net>
Date: Sat, 7 Jun 2008 20:33:35 +0000 (+0000)
Subject: Update tests to conform with the unicode functions
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1576
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f97aeaa334f3a9b5e52d90a8160505d67f42b27b;p=php

Update tests to conform with the unicode functions
---

diff --git a/ext/date/tests/008.phpt b/ext/date/tests/008.phpt
index 700366f7a8..d2396a0125 100644
--- a/ext/date/tests/008.phpt
+++ b/ext/date/tests/008.phpt
@@ -34,9 +34,9 @@ array(11) {
   [u"yday"]=>
   int(177)
   [u"weekday"]=>
-  string(7) "Tuesday"
+  unicode(7) "Tuesday"
   [u"month"]=>
-  string(4) "June"
+  unicode(4) "June"
   [0]=>
   int(1151366400)
 }
@@ -58,9 +58,9 @@ array(11) {
   [u"yday"]=>
   int(%d)
   [u"weekday"]=>
-  string(%d) "%s"
+  unicode(%d) "%s"
   [u"month"]=>
-  string(%d) "%s"
+  unicode(%d) "%s"
   [0]=>
   int(%d)
 }
diff --git a/ext/date/tests/011.phpt b/ext/date/tests/011.phpt
index 1302f1d212..101ab486f9 100644
--- a/ext/date/tests/011.phpt
+++ b/ext/date/tests/011.phpt
@@ -16,8 +16,8 @@ echo "Done\n";
 --EXPECTF--
 Warning: timezone_name_from_abbr() expects at least 1 parameter, 0 given in %s on line 3
 bool(false)
-string(13) "Europe/Berlin"
+unicode(13) "Europe/Berlin"
 bool(false)
 bool(false)
-string(12) "Europe/Paris"
+unicode(12) "Europe/Paris"
 Done
diff --git a/ext/date/tests/013.phpt b/ext/date/tests/013.phpt
index 1b64716214..f743208cc4 100644
--- a/ext/date/tests/013.phpt
+++ b/ext/date/tests/013.phpt
@@ -26,7 +26,7 @@ object(DateTime)#%d (3) {
   [u"timezone_type"]=>
   int(3)
   [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
 }
 unicode(19) "2006.12.12 00:00:00"
 
diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt
index 84ab56f44e..43c2fd2a73 100644
--- a/ext/date/tests/014.phpt
+++ b/ext/date/tests/014.phpt
@@ -25,7 +25,7 @@ object(DateTime)#%d (3) {
   [u"timezone_type"]=>
   int(3)
   [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
 }
 object(DateTimeZone)#%d (0) {
 }
diff --git a/ext/date/tests/bug41523-64bit.phpt b/ext/date/tests/bug41523-64bit.phpt
index 7204646d3d..46dd0c4e1d 100644
--- a/ext/date/tests/bug41523-64bit.phpt
+++ b/ext/date/tests/bug41523-64bit.phpt
@@ -48,6 +48,6 @@ object(DateTime)#1 (3) {
   [u"timezone_type"]=>
   int(3)
   [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
 }
 -0001-11-30T00:00:00+0000
diff --git a/ext/date/tests/bug41523.phpt b/ext/date/tests/bug41523.phpt
index df6189b69b..2aeaaaaa10 100644
--- a/ext/date/tests/bug41523.phpt
+++ b/ext/date/tests/bug41523.phpt
@@ -48,6 +48,6 @@ object(DateTime)#1 (3) {
   [u"timezone_type"]=>
   int(3)
   [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
 }
 -0001-11-30T00:00:00+0000
diff --git a/ext/date/tests/bug43808.phpt b/ext/date/tests/bug43808.phpt
index 29a8bee6a9..37c6c0733d 100644
--- a/ext/date/tests/bug43808.phpt
+++ b/ext/date/tests/bug43808.phpt
@@ -20,14 +20,14 @@ array(4) {
   [u"warnings"]=>
   array(1) {
     [6]=>
-    string(29) "Double timezone specification"
+    unicode(29) "Double timezone specification"
   }
   [u"error_count"]=>
   int(1)
   [u"errors"]=>
   array(1) {
     [0]=>
-    string(47) "The timezone could not be found in the database"
+    unicode(47) "The timezone could not be found in the database"
   }
 }
 array(4) {
@@ -36,13 +36,13 @@ array(4) {
   [u"warnings"]=>
   array(1) {
     [6]=>
-    string(29) "Double timezone specification"
+    unicode(29) "Double timezone specification"
   }
   [u"error_count"]=>
   int(1)
   [u"errors"]=>
   array(1) {
     [0]=>
-    string(47) "The timezone could not be found in the database"
+    unicode(47) "The timezone could not be found in the database"
   }
 }
diff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt
index 6d29c43f4b..5152ce9997 100644
--- a/ext/date/tests/date_parse_001.phpt
+++ b/ext/date/tests/date_parse_001.phpt
@@ -98,7 +98,7 @@ array(15) {
   [u"errors"]=>
   array(1) {
     [7]=>
-    string(20) "Unexpected character"
+    unicode(20) "Unexpected character"
   }
   [u"is_localtime"]=>
   bool(true)
@@ -218,9 +218,9 @@ array(15) {
   [u"errors"]=>
   array(2) {
     [0]=>
-    string(20) "Unexpected character"
+    unicode(20) "Unexpected character"
     [1]=>
-    string(20) "Unexpected character"
+    unicode(20) "Unexpected character"
   }
   [u"is_localtime"]=>
   bool(true)
@@ -256,7 +256,7 @@ array(15) {
   [u"errors"]=>
   array(1) {
     [0]=>
-    string(20) "Unexpected character"
+    unicode(20) "Unexpected character"
   }
   [u"is_localtime"]=>
   bool(true)
@@ -292,7 +292,7 @@ array(12) {
   [u"errors"]=>
   array(1) {
     [0]=>
-    string(12) "Empty string"
+    unicode(12) "Empty string"
   }
   [u"is_localtime"]=>
   bool(false)