From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 31 Aug 2016 14:43:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cc11dbded25c1071ac91d6506d064db6aaf0199;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

9cc11dbded25c1071ac91d6506d064db6aaf0199
diff --cc ext/standard/tests/file/bug71882.phpt
index ae0137b599,3cb6d85240..c132aa95c7
--- a/ext/standard/tests/file/bug71882.phpt
+++ b/ext/standard/tests/file/bug71882.phpt
@@@ -7,5 -7,5 +7,6 @@@ var_dump(ftruncate($fd, -1))
  ?>
  ==DONE==
  --EXPECTF--
 +Warning: ftruncate(): Negative size is not supported in %s%ebug71882.php on line %d
+ bool(false)
  ==DONE==