From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 6 Sep 2016 12:09:59 +0000 (+0200)
Subject: Merge branch 'pull-request/2115' into PHP-7.1
X-Git-Tag: php-7.1.0RC2~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68d35013818af1b404d188f65374cb69a2fcfaaf;p=php

Merge branch 'pull-request/2115' into PHP-7.1
---

68d35013818af1b404d188f65374cb69a2fcfaaf
diff --cc UPGRADING
index 05e18c31bd,05e18c31bd..9cef0095d1
--- a/UPGRADING
+++ b/UPGRADING
@@@ -76,6 -76,6 +76,8 @@@ PHP 7.1 UPGRADE NOTE
    . Calling a function with less arguments than mandatory declared ones in
      signature now issues a Fatal Error (Error Exception) instead of a Warning.
      (RFC https://wiki.php.net/rfc/too_few_args).
++  . The error message for E_RECOVERABLE errors has been changed from "Catchable
++    fatal error" to "Recoverable fatal error".
  
  - JSON:
    . The serialize_precision is used instead of precision when encoding double