diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-18 12:16:12 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-18 12:16:12 +0100 |
commit | 763a7b8ca3127d694fd55cc2df947649c22c3b4c (patch) | |
tree | b9a741eed387c23f966752b01efdcfcacd68fcae | |
parent | 623a11d7de80c9f6c9d7dc223071e701df450820 (diff) | |
parent | b3a669bec1e55ac0e58f84a620efe377f36ab1b3 (diff) | |
download | php-git-763a7b8ca3127d694fd55cc2df947649c22c3b4c.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
-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" |