Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Update NEWS/UPGRADING with info about incompat ctx

2 files changed, 6 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 0c94ea23e1..29b5c9c0d0 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Improved IS_VAR operands fetching. (Laruence, Dmitry)
   . Implemented internal operator overloading
     (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
+  . Made calls from incompatible context issue an E_DEPRECATED warning instead
+    of E_STRICT (phase 1 of RFC: https://wiki.php.net/rfc/incompat_ctx).
+	(Gustavo)
 
 - Session:
   . Fixed Bug #65315 (session.hash_function silently fallback to default md5)
diff --git a/UPGRADING b/UPGRADING
index 431ad79e99..f392edd54d 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -35,6 +35,9 @@ PHP X.Y UPGRADE NOTES
 3. Deprecated Functionality
 ========================================
 
+- Incompatible context calls:
+  Instance calls from an incompatible context are now deprecated and issue
+  E_DEPRECATED instead of E_STRICT. See https://wiki.php.net/rfc/incompat_ctx
 
 ========================================
 4. Changed Functions