From f573ba1948a8d5b1356d7741d03f1a18f4921d5d Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 13 Jul 2019 15:37:36 +0200
Subject: [PATCH] Update changelogs

- PHP-7.4 alpha, beta, RC versions already include bugs logged in the
  NEWS
- some links to RFCs
- php_error_docref0
---
 NEWS                | 7 +++++++
 UPGRADING           | 2 ++
 UPGRADING.INTERNALS | 7 +++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 541f16ea55..a2e0976b5c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #78212 (Segfault in built-in webserver). (cmb)
 
+- Libxml:
+  . Fixed bug #78279 (libxml_disable_entity_loader settings is shared between
+    requests (cgi-fcgi)). (Nikita)
+
+- Opcache:
+  . Fixed bug #78271 (Invalid result of if-else). (Nikita)
+
 - Recode:
   . Unbundled the recode extension. (cmb)
 
diff --git a/UPGRADING b/UPGRADING
index cf31367cb7..950b43b431 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -25,6 +25,7 @@ PHP 7.4 UPGRADE NOTES
   . Trying to use values of type null, bool, int, float or resource as an
     array (such as $null["key"]) will now generate a notice. This does not
     affect array accesses performed by list().
+    RFC: https://wiki.php.net/rfc/notice-for-non-valid-array-container
   . get_declared_classes() no longer returns anonymous classes that haven't
     been instantiated yet.
   . "fn" is now a reserved keyword. In particular it can no longer be used as a
@@ -457,6 +458,7 @@ PHP 7.4 UPGRADE NOTES
 - Recode:
   . The recode extension has been moved to PECL. For character set/encoding
     conversion the iconv or mbstring extensions could be used instead.
+    RFC: https://wiki.php.net/rfc/unbundle_recode
 
 - WDDX:
   . The WDDX extension has been deprecated and moved to PECL.
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 48e3c07de5..7a718f397d 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -23,7 +23,8 @@ PHP 7.4 INTERNALS UPGRADE NOTES
   t. Exceptions thrown by string conversions.
   u. Removed uint and ulong typedefs
   v. Compound assignment opcodes
-  z. APACHE symbol removed
+  w. APACHE symbol removed
+  x. php_error_docref0() renamed to php_error_docref()
 
 2. Build system changes
   a. Abstract
@@ -220,7 +221,9 @@ PHP 7.4 INTERNALS UPGRADE NOTES
      ZEND_ASSIGN_DIM_OP, ZEND_ASSIGN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP with
      ZEND_ADD (or other) in extended_value.
 
-  z. APACHE symbol has been removed and is no longer defined.
+  w. APACHE symbol has been removed and is no longer defined.
+
+  x. php_error_docref0() has been removed and renamed to php_error_docref().
 
 ========================
 2. Build system changes
-- 
2.40.0