Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #79787

diff --cc NEWS
index 6c35059e5e5bcbb1f130513cf2a583d673f704ef,071e456a8894b442a74b349ec1c231cf2273b695..eb336c22afa04ea6fc0e3b422ae7fa64dd5a9887
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -32,12 -25,9 +32,15 @@@ PH
  - FTP:
    . Fixed bug #55857 (ftp_size on large files). (cmb)
  
+ - Mbstring:
+   . Fixed bug #79787 (mb_strimwidth does not trim string). (XXiang)
+ 
 +- Reflection:
 +  . Fixed bug #79487 (::getStaticProperties() ignores property modifications).
 +    (cmb, Nikita)
 +  . Fixed bug #69804 ()::getStaticPropertyValue() throws on protected props).
 +    (cmb, Nikita)
 +
  - Standard:
    . Fixed bug #70362 (Can't copy() large 'data://' with open_basedir). (cmb)
  

diff --cc ext/mbstring/libmbfl/mbfl/mbfilter.c
Simple merge