Skip to content

Commit f76a6cd

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix tests
2 parents 6b18d95 + e46d589 commit f76a6cd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ext/date/tests/date-time-modify-times.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ foreach ( $tests as $start => $data )
3434
echo "\n";
3535
?>
3636
--EXPECT--
37-
Sat, 23 Oct 2010 00:00:00 +0000
37+
Fri, 15 Oct 2010 23:00:00 +0000
3838
Wed, 15 Dec 2010 16:15:00 +0000
3939
Mon, 20 Dec 2010 00:00:00 +0000
4040
Mon, 20 Dec 2010 10:00:00 +0000
4141
Tue, 21 Dec 2010 12:00:00 +0000
4242
Mon, 03 Jan 2011 00:00:00 +0000
4343
Mon, 03 Jan 2011 09:00:00 +0000
44-
Sat, 23 Oct 2010 00:00:00 +0100
44+
Fri, 15 Oct 2010 23:00:00 +0100
4545
Sun, 28 Mar 2010 00:15:00 +0000
4646
Sun, 28 Mar 2010 02:15:00 +0100
4747
Sun, 28 Mar 2010 02:15:00 +0100

ext/standard/tests/strings/bug70436.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ DONE
4848
--EXPECTF--
4949
Notice: unserialize(): Error at offset 0 of 3 bytes in %sbug70436.php on line %d
5050

51-
Notice: unserialize(): Error at offset 17 of 17 bytes in %sbug70436.php on line %d
51+
Notice: unserialize(): Error at offset 16 of 17 bytes in %sbug70436.php on line %d
5252

5353
Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d
5454
bool(false)

ext/standard/tests/strings/bug72663_3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ unserialize($poc);
1414
?>
1515
DONE
1616
--EXPECTF--
17-
Notice: unserialize(): Error at offset 51 of 50 bytes in %sbug72663_3.php on line %d
17+
Notice: unserialize(): Error at offset 50 of 50 bytes in %sbug72663_3.php on line %d
1818
DONE

0 commit comments

Comments
 (0)