diff options
| author | Nikita Popov <nikic@php.net> | 2017-01-01 12:17:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2017-01-01 12:17:01 +0100 |
| commit | 1283ea466597bebba2ee887304c4df82fd331e35 (patch) | |
| tree | 120b5666264cb96bd00911012d5c185a25a34649 /ext | |
| parent | 4363c96b14452e00c4a5e55b98b34be7eb6517bb (diff) | |
| parent | 8467c5c9bff6f06f3aa79760fbd26684deb4bc11 (diff) | |
| download | php-git-1283ea466597bebba2ee887304c4df82fd331e35.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/date/tests/bug73426.phpt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/date/tests/bug73426.phpt b/ext/date/tests/bug73426.phpt index c2a700ad95..6f3b19e05d 100644 --- a/ext/date/tests/bug73426.phpt +++ b/ext/date/tests/bug73426.phpt @@ -4,12 +4,12 @@ Bug #73426 (createFromFormat with 'z' format char results in incorrect time) date.timezone=UTC --FILE-- <?php -$date = '12:00:00 15'; -$format = 'H:i:s z'; +$date = '2016 12:00:00 15'; +$format = 'Y H:i:s z'; var_dump(DateTime::createFromFormat($format, $date)); -$date = '16 12:00:00'; -$format = 'z H:i:s'; +$date = '16 12:00:00 2016'; +$format = 'z H:i:s Y'; var_dump(DateTime::createFromFormat($format, $date)); ?> |