diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-18 12:16:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-18 12:16:18 +0100 |
| commit | 7ad04a053756902dd87e46e188eb6db0e3ae4dfb (patch) | |
| tree | 295c3c38040387084acf722169da06f344952018 | |
| parent | 65c9a3f1a1649449cde4e276b8fa76147533a779 (diff) | |
| parent | 763a7b8ca3127d694fd55cc2df947649c22c3b4c (diff) | |
| download | php-git-7ad04a053756902dd87e46e188eb6db0e3ae4dfb.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
| -rw-r--r-- | ext/intl/tests/dateformat_bug65683_2.phpt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/intl/tests/dateformat_bug65683_2.phpt b/ext/intl/tests/dateformat_bug65683_2.phpt index 67d9d7884a..1a709e4ae9 100644 --- a/ext/intl/tests/dateformat_bug65683_2.phpt +++ b/ext/intl/tests/dateformat_bug65683_2.phpt @@ -7,6 +7,6 @@ $date_imm = date_create_immutable('1970-01-01'); var_dump(datefmt_format_object($date, null, 'fr_FR')); var_dump(datefmt_format_object($date_imm, null, 'fr_FR')); ?> ---EXPECT-- -string(24) "1 janv. 1970 à 00:00:00" -string(24) "1 janv. 1970 à 00:00:00" +--EXPECTF-- +string(%d) "%s" +string(%d) "%s" |