com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/tests/date-time-modify-times.phpt ext/standard/tests/strings/bug70436.phpt
ext/standard/tests/str ings/bug72663_3.phpt

From: Date: Wed, 05 Jul 2017 08:11:32 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/tests/date-time-modify-times.phpt ext/standard/tests/strings/bug70436.phpt
ext/standard/tests/str ings/bug72663_3.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98369@lists.php.net to get a copy of this message
Commit: 24494f983ea097304cc8d23ee0e784b75300fa09 Author: Stanislav Malyshev <stas@php.net> Tue, 4 Jul 2017 20:25:11 -0700 Committer: Anatol Belski <ab@php.net> Wed, 5 Jul 2017 10:11:32 +0200 Parents: 203a9a61a2db48eeb2411fae41b7ebe07d3eea2c Branches: PHP-7.0.21 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24494f983ea097304cc8d23ee0e784b75300fa09 Log: Merge branch 'PHP-5.6' into PHP-7..0 * PHP-5.6: Fix tests (cherry picked from commit f76a6cd02368f28f5d11858a0a9a81a0d1f9041e) Changed paths: M ext/date/tests/date-time-modify-times.phpt M ext/standard/tests/strings/bug70436.phpt M ext/standard/tests/strings/bug72663_3.phpt Diff: diff --git a/ext/date/tests/date-time-modify-times.phpt b/ext/date/tests/date-time-modify-times.phpt index 258ddbd..e355f18 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 1273ee3..7d6d0f1 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 087af8f..3b949b0 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

« previous php.cvs (#98369) next »