Merge branch 'PHP-7.3' into PHP-7.4

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

diff --cc NEWS
index 5959a0373fcc86fe1b3880b76f1a6e8870af7ad0,ff1aa47d3ba448bde4a0c45428f4d4cb501cee9e..67d71eca64b5ea704f3c3562dfd05fdab361fa12
--- 1/NEWS
--- 2/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)

diff --cc ext/dom/php_dom.c
Simple merge