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

From: Date: Wed, 05 Jul 2017 04:05:06 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: 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-98354@lists.php.net to get a copy of this message
Commit: f76a6cd02368f28f5d11858a0a9a81a0d1f9041e Author: Stanislav Malyshev <stas@php.net> Tue, 4 Jul 2017 20:25:11 -0700 Parents: 6b18d956de38ecd8913c3d82ce96eb0368a1f9e5 e46d5896240012f5291fe3f730c76d5f0d124fe4 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=f76a6cd02368f28f5d11858a0a9a81a0d1f9041e Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Fix tests Changed paths: MM ext/standard/tests/strings/bug70436.phpt MM ext/standard/tests/strings/bug72663_3.phpt Diff: diff --cc ext/standard/tests/strings/bug70436.phpt index 1273ee3,469988c..7d6d0f1 --- a/ext/standard/tests/strings/bug70436.phpt +++ b/ext/standard/tests/strings/bug70436.phpt @@@ -48,8 -48,18 +48,8 @@@ DON --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 -array(4) { - [0]=> - int(1) - [1]=> - object(obj)#%d (1) { - ["data"]=> - bool(false) - } - [2]=> - string(24) "%s" - [3]=> - bool(false) -} + +Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d +bool(false) DONE diff --cc ext/standard/tests/strings/bug72663_3.phpt index 087af8f,f7d66ef..3b949b0 --- a/ext/standard/tests/strings/bug72663_3.phpt +++ b/ext/standard/tests/strings/bug72663_3.phpt @@@ -14,5 -16,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 (#98354) next »