ASCII character set can still be in Unicode strings, and those are the default type in HEAD now.

-Andrei

Steph Fox wrote:

Hi Henrique,

I just want to check this, because it smells wrong to me.

Those functions return ascii strings - why are unicode strings now expected?

Thanks,

- Steph

----- Original Message ----- From: "Henrique do Nascimento Angelo" <[EMAIL PROTECTED]>
To: <php-cvs@lists.php.net>
Sent: Saturday, June 07, 2008 9:33 PM
Subject: [PHP-CVS] cvs: php-src /ext/date/tests 008.phpt 011.phpt 013.phpt 014.phpt bug41523-64bit.phpt bug41523.phpt bug43808.phpt date_parse_001.phpt



hnangelo Sat Jun  7 20:33:35 2008 UTC

 Modified files:
   /php-src/ext/date/tests 008.phpt 011.phpt 013.phpt 014.phpt
                          bug41523-64bit.phpt bug41523.phpt
                          bug43808.phpt date_parse_001.phpt
 Log:
 Update tests to conform with the unicode functions

http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/008.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/date/tests/008.phpt
diff -u php-src/ext/date/tests/008.phpt:1.2 php-src/ext/date/tests/008.phpt:1.3
--- php-src/ext/date/tests/008.phpt:1.2 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/008.phpt Sat Jun  7 20:33:35 2008
@@ -34,9 +34,9 @@
  [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 @@
  [u"yday"]=>
  int(%d)
  [u"weekday"]=>
-  string(%d) "%s"
+  unicode(%d) "%s"
  [u"month"]=>
-  string(%d) "%s"
+  unicode(%d) "%s"
  [0]=>
  int(%d)
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/011.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/date/tests/011.phpt
diff -u php-src/ext/date/tests/011.phpt:1.1 php-src/ext/date/tests/011.phpt:1.2
--- php-src/ext/date/tests/011.phpt:1.1 Fri Dec 22 13:07:26 2006
+++ php-src/ext/date/tests/011.phpt Sat Jun  7 20:33:35 2008
@@ -16,8 +16,8 @@
--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
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/013.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/date/tests/013.phpt
diff -u php-src/ext/date/tests/013.phpt:1.3 php-src/ext/date/tests/013.phpt:1.4
--- php-src/ext/date/tests/013.phpt:1.3 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/013.phpt Sat Jun  7 20:33:35 2008
@@ -26,7 +26,7 @@
  [u"timezone_type"]=>
  int(3)
  [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
}
unicode(19) "2006.12.12 00:00:00"

http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/014.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/date/tests/014.phpt
diff -u php-src/ext/date/tests/014.phpt:1.3 php-src/ext/date/tests/014.phpt:1.4
--- php-src/ext/date/tests/014.phpt:1.3 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/014.phpt Sat Jun  7 20:33:35 2008
@@ -25,7 +25,7 @@
  [u"timezone_type"]=>
  int(3)
  [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
}
object(DateTimeZone)#%d (0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523-64bit.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/date/tests/bug41523-64bit.phpt
diff -u php-src/ext/date/tests/bug41523-64bit.phpt:1.3 php-src/ext/date/tests/bug41523-64bit.phpt:1.4 --- php-src/ext/date/tests/bug41523-64bit.phpt:1.3 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/bug41523-64bit.phpt Sat Jun  7 20:33:35 2008
@@ -48,6 +48,6 @@
  [u"timezone_type"]=>
  int(3)
  [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
}
-0001-11-30T00:00:00+0000
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/date/tests/bug41523.phpt
diff -u php-src/ext/date/tests/bug41523.phpt:1.5 php-src/ext/date/tests/bug41523.phpt:1.6
--- php-src/ext/date/tests/bug41523.phpt:1.5 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/bug41523.phpt Sat Jun  7 20:33:35 2008
@@ -48,6 +48,6 @@
  [u"timezone_type"]=>
  int(3)
  [u"timezone"]=>
-  string(3) "UTC"
+  unicode(3) "UTC"
}
-0001-11-30T00:00:00+0000
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43808.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/date/tests/bug43808.phpt
diff -u php-src/ext/date/tests/bug43808.phpt:1.2 php-src/ext/date/tests/bug43808.phpt:1.3
--- php-src/ext/date/tests/bug43808.phpt:1.2 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/bug43808.phpt Sat Jun  7 20:33:35 2008
@@ -20,14 +20,14 @@
  [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 @@
  [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"
  }
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_parse_001.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/date/tests/date_parse_001.phpt
diff -u php-src/ext/date/tests/date_parse_001.phpt:1.3 php-src/ext/date/tests/date_parse_001.phpt:1.4 --- php-src/ext/date/tests/date_parse_001.phpt:1.3 Tue May 27 18:16:00 2008
+++ php-src/ext/date/tests/date_parse_001.phpt Sat Jun  7 20:33:35 2008
@@ -98,7 +98,7 @@
  [u"errors"]=>
  array(1) {
    [7]=>
-    string(20) "Unexpected character"
+    unicode(20) "Unexpected character"
  }
  [u"is_localtime"]=>
  bool(true)
@@ -218,9 +218,9 @@
  [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 @@
  [u"errors"]=>
  array(1) {
    [0]=>
-    string(20) "Unexpected character"
+    unicode(20) "Unexpected character"
  }
  [u"is_localtime"]=>
  bool(true)
@@ -292,7 +292,7 @@
  [u"errors"]=>
  array(1) {
    [0]=>
-    string(12) "Empty string"
+    unicode(12) "Empty string"
  }
  [u"is_localtime"]=>
  bool(false)



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php






--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to