From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 7 Apr 2020 11:05:37 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13c9572a792bd3dc92f95ffd9569b460e788114d;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78221: DOMNode::normalize() doesn't remove empty text nodes
---

13c9572a792bd3dc92f95ffd9569b460e788114d
diff --cc NEWS
index 5959a0373f,ff1aa47d3b..67d71eca64
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,15 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.18
  
 -- Core:
 -  . Fixed bug #79434 (PHP 7.3 and PHP-7.4 crash with NULL-pointer dereference
 -    on !CS constant). (Nikita)
 +?? ??? ????, PHP 7.4.6
  
+ - DOM:
+   . Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes).
+     (cmb)
+ 
  - MBString:
    . Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported).
      (Girgias)