From: Stanislav Malyshev <stas@php.net>
Date: Wed, 5 Jul 2017 03:25:11 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.22RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f76a6cd02368f28f5d11858a0a9a81a0d1f9041e;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix tests
---

f76a6cd02368f28f5d11858a0a9a81a0d1f9041e
diff --cc ext/standard/tests/strings/bug70436.phpt
index 1273ee30c6,469988cc7e..7d6d0f18d9
--- 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 087af8f068,f7d66efd17..3b949b0239
--- 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