Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix shift ub in mbstring
  Restore digit check in mb_decode_numericentity()

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

diff --cc ext/mbstring/tests/mb_decode_numericentity.phpt
index 8007eb3443fc620c8fe76660adfc5afa1d953ecf,f70e26a43c3fe1cc1cd5dcec064d2f9d6526af8b..868554df31db44a91f3f92870fd66e9ced654e0e
--- 1/ext/mbstring/tests/mb_decode_numericentity.phpt
--- 2/ext/mbstring/tests/mb_decode_numericentity.phpt
+++ b/ext/mbstring/tests/mb_decode_numericentity.phpt
@@@ -19,17 -19,8 +19,18 @@@ echo mb_decode_numericentity('&#1000000
  echo mb_decode_numericentity('&#9000000000', $convmap), "\n";
  echo mb_decode_numericentity('&#10000000000', $convmap), "\n";
  echo mb_decode_numericentity('&#100000000000', $convmap), "\n";
+ echo mb_decode_numericentity('&#000000000000', $convmap), "\n";
  
 +$convmap = [];
 +echo mb_decode_numericentity('föo', $convmap, "UTF-8")."\n";
 +
 +$convmap = array(0x0, 0x2FFFF, 0); // 3 elements
 +try {
 +    echo mb_decode_numericentity($str3, $convmap, "UTF-8")."\n";
 +} catch (ValueError $ex) {
 +    echo $ex->getMessage()."\n";
 +}
 +
  ?>
  --EXPECT--
  ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ
@@@ -39,5 -30,4 +40,6 @@@ aŒbœcŠdše€f
  &#9000000000
  &#10000000000
  &#100000000000
+ &#000000000000
 +föo
 +count($convmap) must be a multiple of 4