Merge branch 'PHP-5.6' into PHP-7.0

(cherry picked from commit f93fd8ce3278923dce16b241aebe428a6b9aa79d)

diff --git a/ext/standard/tests/file/bug71882.phpt b/ext/standard/tests/file/bug71882.phpt
index ae0137b5999ae5198c777c6e759119fc76251a0b..3cb6d85240b76b9945e9bf4bdc5de326b48f65c8 100644 (file)
--- a/ext/standard/tests/file/bug71882.phpt
+++ b/ext/standard/tests/file/bug71882.phpt
@@ -3,9 +3,9 @@ Bug #71882 (Negative ftruncate() on php://memory exhausts memory)
 --FILE--
 <?php
 $fd = fopen("php://memory", "w+");
-ftruncate($fd, -1);
+var_dump(ftruncate($fd, -1));
 ?>
 ==DONE==
 --EXPECTF--
-Warning: ftruncate(): Negative size is not supported in %s%ebug71882.php on line %d
+bool(false)
 ==DONE==