diff options
| author | Anatol Belski <ab@php.net> | 2016-08-17 12:41:38 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-17 12:41:38 +0200 |
| commit | 526e6bf818ab19cd08ad8db2a42386b3a6c07426 (patch) | |
| tree | 30d910176659bca59ab89a78d66c68804c981d48 /ext/standard/tests/strings | |
| parent | 0fd032893383c658428c5bc3f6693482c7acd6e4 (diff) | |
| parent | 05c8a0771ddf97ef33fa9bdcfbca29625abb3042 (diff) | |
| download | php-git-526e6bf818ab19cd08ad8db2a42386b3a6c07426.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix tests
Diffstat (limited to 'ext/standard/tests/strings')
| -rw-r--r-- | ext/standard/tests/strings/bug70436.phpt | 18 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug72663.phpt | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/ext/standard/tests/strings/bug70436.phpt b/ext/standard/tests/strings/bug70436.phpt index c62e468726..1273ee30c6 100644 --- a/ext/standard/tests/strings/bug70436.phpt +++ b/ext/standard/tests/strings/bug70436.phpt @@ -49,17 +49,7 @@ DONE 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 -array(4) { - [0]=> - int(1) - [1]=> - object(obj)#%d (1) { - ["data"]=> - bool(false) - } - [2]=> - string(24) "%s" - [3]=> - bool(false) -} -DONE
\ No newline at end of file + +Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d +bool(false) +DONE diff --git a/ext/standard/tests/strings/bug72663.phpt b/ext/standard/tests/strings/bug72663.phpt index e61f939d4d..ec16e069ff 100644 --- a/ext/standard/tests/strings/bug72663.phpt +++ b/ext/standard/tests/strings/bug72663.phpt @@ -23,4 +23,6 @@ DONE Notice: unserialize(): Unexpected end of serialized data in %sbug72663.php on line %d Notice: unserialize(): Error at offset 46 of 47 bytes in %sbug72663.php on line %d -DONE
\ No newline at end of file + +Notice: unserialize(): Error at offset 79 of 80 bytes in %sbug72663.php on line %d +DONE |