diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-06-09 16:42:24 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-06-09 16:42:24 +0200 |
| commit | 9cb8cb47975b044bbaafd2d12287ff52cdd3b0e9 (patch) | |
| tree | 0103bc25f0059cf89f4c0e4f6c1a7d691d2e3f4c | |
| parent | 8a884d628b5c23c4b33c96c723331fda9e17d2bc (diff) | |
| parent | 7ec3016e29c3e809b87c884b0036a16873c9387d (diff) | |
| download | php-git-9cb8cb47975b044bbaafd2d12287ff52cdd3b0e9.tar.gz | |
Merge branch 'master' into PHP-7.0.0
* master:
fix hard-coded path in test
| -rw-r--r-- | ext/intl/tests/dateformat_calendars_variant3.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/tests/dateformat_calendars_variant3.phpt b/ext/intl/tests/dateformat_calendars_variant3.phpt index c420cc26e3..d5bdac7fcd 100644 --- a/ext/intl/tests/dateformat_calendars_variant3.phpt +++ b/ext/intl/tests/dateformat_calendars_variant3.phpt @@ -41,7 +41,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(44) "Sunday, 6 Tevet 5772 at 5:12:00 AM GMT+05:12" -Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in C:\php-sdk\phpmaster\vc14\x64\php-src\ext\intl\tests\dateformat_calendars_variant3.php:27 +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant3.php:27 Stack trace: #0 %sdateformat_calendars_variant3.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1) #1 {main} |