diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-05 20:13:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-05 20:13:24 -0700 |
| commit | 63e7b845933424cbc97daa6b8e727c07a1a7ea73 (patch) | |
| tree | 67b38202bfd9a4303a207582af50d374d575fee3 | |
| parent | cf910f351ab7d8a55aba1aa717056ca2576a629b (diff) | |
| parent | ee1b807219cb642e36b6813b4cbc6af686aba537 (diff) | |
| download | php-git-63e7b845933424cbc97daa6b8e727c07a1a7ea73.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix the test according to how new date code does it
fix to work on different ICU versions
| -rw-r--r-- | ext/intl/tests/dateformat_format.phpt | 20 | ||||
| -rw-r--r-- | ext/intl/tests/timezone_toDateTimeZone_basic.phpt | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index c3f6c297d9..8b410876c0 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -359,40 +359,40 @@ Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05', - 'timezone_type' => 3, - 'timezone' => 'America/Los_Angeles', + 'timezone_type' => 2, + 'timezone' => 'PDT', )) ------------ Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05', - 'timezone_type' => 3, - 'timezone' => 'America/Los_Angeles', + 'timezone_type' => 2, + 'timezone' => 'PDT', )) ------------ Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05', - 'timezone_type' => 3, - 'timezone' => 'America/Los_Angeles', + 'timezone_type' => 2, + 'timezone' => 'PDT', )) ------------ Formatted DateTime is : Dec 30, 2000 5:04:05 PM ------------ Date is: DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05', - 'timezone_type' => 3, - 'timezone' => 'America/Los_Angeles', + 'timezone_type' => 2, + 'timezone' => 'PDT', )) ------------ Formatted DateTime is : 12/30/00 5:04 PM ------------ Date is: DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05', - 'timezone_type' => 3, - 'timezone' => 'America/Los_Angeles', + 'timezone_type' => 2, + 'timezone' => 'PDT', )) ------------ Formatted DateTime is : 20001230 05:04 PM diff --git a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt index d22aa689dc..76981a4a91 100644 --- a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt +++ b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt @@ -26,7 +26,7 @@ do_test(IntlTimeZone::createTimeZone('GMT+0405'), true); --EXPECTF-- string(3) "CET" int(3600000) -string(13) "Europe/Berlin" +string(%d) "%rEurope\/Berlin|CET%r" int(3600) string(16) "Europe/Amsterdam" int(3600000) |