Commit: 22f4a307481f1667bdc95f7ec7c43538427b73ab Author: Gustavo André dos Santos Lopes <cataphr...@php.net> Fri, 6 Apr 2012 22:04:14 +0200 Parents: 81278e1bbbc855f82a8f9a6da7c013a1cc952c09 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22f4a307481f1667bdc95f7ec7c43538427b73ab Log: Fixed two IntlCalendar::setTimeZone() tests. Changed paths: M ext/intl/tests/calendar_setTimeZone_error.phpt M ext/intl/tests/calendar_setTimeZone_variation2.phpt Diff: diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt index 5f83446..ebe4d11 100644 --- a/ext/intl/tests/calendar_setTimeZone_error.phpt +++ b/ext/intl/tests/calendar_setTimeZone_error.phpt @@ -20,24 +20,19 @@ echo "error: $errno, $errstr\n"; set_error_handler('eh'); var_dump($c->setTimeZone($gmt, 2)); -var_dump($c->setTimeZone(1)); var_dump($c->setTimeZone()); -var_dump(intlcal_set_time_zone($c, 1)); +var_dump(intlcal_set_time_zone($c, 1, 2)); var_dump(intlcal_set_time_zone(1, $gmt)); + --EXPECT-- error: 2, IntlCalendar::setTimeZone() expects exactly 1 parameter, 2 given error: 2, IntlCalendar::setTimeZone(): intlcal_set_time_zone: bad arguments bool(false) -error: 4096, Argument 1 passed to IntlCalendar::setTimeZone() must be an instance of IntlTimeZone, integer given -error: 2, IntlCalendar::setTimeZone() expects parameter 1 to be IntlTimeZone, integer given -error: 2, IntlCalendar::setTimeZone(): intlcal_set_time_zone: bad arguments -bool(false) error: 2, IntlCalendar::setTimeZone() expects exactly 1 parameter, 0 given error: 2, IntlCalendar::setTimeZone(): intlcal_set_time_zone: bad arguments bool(false) -error: 4096, Argument 2 passed to intlcal_set_time_zone() must be an instance of IntlTimeZone, integer given -error: 2, intlcal_set_time_zone() expects parameter 2 to be IntlTimeZone, integer given +error: 2, intlcal_set_time_zone() expects exactly 2 parameters, 3 given error: 2, intlcal_set_time_zone(): intlcal_set_time_zone: bad arguments bool(false) error: 4096, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given diff --git a/ext/intl/tests/calendar_setTimeZone_variation2.phpt b/ext/intl/tests/calendar_setTimeZone_variation2.phpt index 26aaf72..7f4a7ff 100644 --- a/ext/intl/tests/calendar_setTimeZone_variation2.phpt +++ b/ext/intl/tests/calendar_setTimeZone_variation2.phpt @@ -23,8 +23,8 @@ var_dump($intlcal->getTimeZone()->getID()); $offsetdate = new DateTime('2012-01-01 00:00:00 -02:30'); $intlcal->setTimeZone($offsetdate->getTimeZone()); var_dump($intlcal->getTimeZone()->getID()); ---EXPECT-- +--EXPECTF-- string(12) "Europe/Paris" string(13) "Europe/Madrid" string(3) "PST" -string(8) "GMT-0230" +string(%d) "GMT-02%S30" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
