diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-05-16 19:32:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-05-16 19:32:33 +0800 |
| commit | 8a1713e39cf31f5c13839c8a6aeb784e365e1cd1 (patch) | |
| tree | a7062c989276f469ce2dd42102c24556e46eb902 | |
| parent | 9f49ebb5baf1e52ce3184ea34977274040f835e9 (diff) | |
| parent | d74fbfb38f2cf3dd97d340295672b4b972677426 (diff) | |
| download | php-git-8a1713e39cf31f5c13839c8a6aeb784e365e1cd1.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
variation of icu libraries causes failure
| -rw-r--r-- | ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt b/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt index e67fcab491..6aec1df8a8 100644 --- a/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt +++ b/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt @@ -19,8 +19,8 @@ var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, 'pt_PT')); ?> ==DONE== ---EXPECT-- +--EXPECTF-- string(30) "Western European Standard Time" string(30) "Western European Standard Time" -string(32) "Hora Padrão da Europa Ocidental" +string(32) "Hora %cadrão da Europa Ocidental" ==DONE== |