archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Return timezone's names as Unicode strings.

Browse source
This commit is contained in:
Derick Rethans 2006-09-27 18:32:24 +00:00
parent ee67c9ae3f
commit d12d204cf1
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/date/php_date.c
View file

@ -2190,7 +2190,7 @@ PHP_FUNCTION(timezone_name_get)
tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC);
DATE_CHECK_INITIALIZED(tzobj->tz, DateTimeZone); DATE_CHECK_INITIALIZED(tzobj->tz, DateTimeZone);
RETURN_STRING(tzobj->tz->name, 1); RETURN_ASCII_STRING(tzobj->tz->name, 1);
} }
/* }}} */ /* }}} */

2
ext/date/tests/oo_001.phpt
View file

@ -57,7 +57,7 @@ unicode(19) "%d-%d-%d %d:%d:%d"
Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %soo_001.php on line %d Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %soo_001.php on line %d
bool(false) bool(false)
DateTime::__construct(): Failed to parse time string (1am todax) at position 4 (t): The timezone could not be found in the database DateTime::__construct(): Failed to parse time string (1am todax) at position 4 (t): The timezone could not be found in the database
string(3) "UTC" unicode(3) "UTC"
Warning: DateTimeZone::getName(): The DateTimeZone object has not been correctly initialized by its constructor in %soo_001.php on line %d Warning: DateTimeZone::getName(): The DateTimeZone object has not been correctly initialized by its constructor in %soo_001.php on line %d
bool(false) bool(false)

4
ext/date/tests/oo_002.phpt
View file

@ -31,5 +31,5 @@ unicode(29) "Tue, 01 Aug 06 13:00:00 +0000"
unicode(29) "Tue, 01 Aug 06 13:00:00 +0000" unicode(29) "Tue, 01 Aug 06 13:00:00 +0000"
unicode(29) "Tue, 01 Aug 06 14:00:00 +0000" unicode(29) "Tue, 01 Aug 06 14:00:00 +0000"
unicode(29) "Tue, 01 Aug 06 12:59:59 +0000" unicode(29) "Tue, 01 Aug 06 12:59:59 +0000"
string(10) "Asia/Tokyo" unicode(10) "Asia/Tokyo"
string(10) "Asia/Tokyo" unicode(10) "Asia/Tokyo"