Merge branch 'PHP-7.2' into PHP-7.3

cmb69 · cmb69 · commit 698088ca7cda · 2019-09-21T16:16:52.000+02:00
* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency
diff --git a/NEWS b/NEWS
@@ -10,6 +10,10 @@ PHP                                                                        NEWS
   . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
 	(Kalle)
 
+- MBString:
+  . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
+    (cmb)
+
 - Mysqlnd:
   . Fixed bug #78525 (Memory leak in pdo when reusing native prepared
     statements). (Nikita)
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -407,6 +407,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_numericentity, 0, 0, 2)
 	ZEND_ARG_INFO(0, string)
 	ZEND_ARG_INFO(0, convmap)
 	ZEND_ARG_INFO(0, encoding)
+	ZEND_ARG_INFO(0, is_hex)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3)
