diff options
| author | Stanislav Malyshev <stas@php.net> | 2017-07-04 20:25:11 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2017-07-04 21:05:06 -0700 |
| commit | f76a6cd02368f28f5d11858a0a9a81a0d1f9041e (patch) | |
| tree | 6c489c2196b2adde2d7414ae650cd55775977d1e | |
| parent | 6b18d956de38ecd8913c3d82ce96eb0368a1f9e5 (diff) | |
| parent | e46d5896240012f5291fe3f730c76d5f0d124fe4 (diff) | |
| download | php-git-f76a6cd02368f28f5d11858a0a9a81a0d1f9041e.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix tests
| -rw-r--r-- | ext/date/tests/date-time-modify-times.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug70436.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug72663_3.phpt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/date/tests/date-time-modify-times.phpt b/ext/date/tests/date-time-modify-times.phpt index 258ddbd420..e355f18e06 100644 --- a/ext/date/tests/date-time-modify-times.phpt +++ b/ext/date/tests/date-time-modify-times.phpt @@ -34,14 +34,14 @@ foreach ( $tests as $start => $data ) echo "\n"; ?> --EXPECT-- -Sat, 23 Oct 2010 00:00:00 +0000 +Fri, 15 Oct 2010 23:00:00 +0000 Wed, 15 Dec 2010 16:15:00 +0000 Mon, 20 Dec 2010 00:00:00 +0000 Mon, 20 Dec 2010 10:00:00 +0000 Tue, 21 Dec 2010 12:00:00 +0000 Mon, 03 Jan 2011 00:00:00 +0000 Mon, 03 Jan 2011 09:00:00 +0000 -Sat, 23 Oct 2010 00:00:00 +0100 +Fri, 15 Oct 2010 23:00:00 +0100 Sun, 28 Mar 2010 00:15:00 +0000 Sun, 28 Mar 2010 02:15:00 +0100 Sun, 28 Mar 2010 02:15:00 +0100 diff --git a/ext/standard/tests/strings/bug70436.phpt b/ext/standard/tests/strings/bug70436.phpt index 1273ee30c6..7d6d0f18d9 100644 --- a/ext/standard/tests/strings/bug70436.phpt +++ b/ext/standard/tests/strings/bug70436.phpt @@ -48,7 +48,7 @@ DONE --EXPECTF-- Notice: unserialize(): Error at offset 0 of 3 bytes in %sbug70436.php on line %d -Notice: unserialize(): Error at offset 17 of 17 bytes in %sbug70436.php on line %d +Notice: unserialize(): Error at offset 16 of 17 bytes in %sbug70436.php on line %d Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d bool(false) diff --git a/ext/standard/tests/strings/bug72663_3.phpt b/ext/standard/tests/strings/bug72663_3.phpt index 087af8f068..3b949b0239 100644 --- a/ext/standard/tests/strings/bug72663_3.phpt +++ b/ext/standard/tests/strings/bug72663_3.phpt @@ -14,5 +14,5 @@ unserialize($poc); ?> DONE --EXPECTF-- -Notice: unserialize(): Error at offset 51 of 50 bytes in %sbug72663_3.php on line %d +Notice: unserialize(): Error at offset 50 of 50 bytes in %sbug72663_3.php on line %d DONE |