Add GB18030-2022 to default encoding list for zh-CN

Author: HeRaNO

NEWS

@@ -20,6 +20,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-20483 (ASAN stack overflow with fiber.stack_size INI
     small value). (David Carlier)
 
+- Mbstring:
+  . Added GB18030-2022 to default encoding list for zh-CN. (HeRaNO)
+
 - Opcache:
   . Fixed bug GH-20051 (apache2 shutdowns when restart is requested during
     preloading). (Arnaud, welcomycozyhom)

UPGRADING.INTERNALS

@@ -64,6 +64,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . Removed the XML_GetCurrentByteCount() libxml compatibility wrapper,
     as it was unused and could return the wrong result.
 
+- ext/mbstring:
+  . Added GB18030-2022 to default encoding list for zh-CN.
+
 ========================
 4. OpCode changes
 ========================

ext/mbstring/mbstring.c

@@ -116,7 +116,8 @@ static const enum mbfl_no_encoding php_mb_default_identify_list_cn[] = {
 	mbfl_no_encoding_ascii,
 	mbfl_no_encoding_utf8,
 	mbfl_no_encoding_euc_cn,
-	mbfl_no_encoding_cp936
+	mbfl_no_encoding_cp936,
+	mbfl_no_encoding_gb18030_2022
 };
 
 static const enum mbfl_no_encoding php_mb_default_identify_list_tw_hk[] = {

ext/mbstring/tests/zh_CN_default_encodings.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Default encodings in Simplified Chinese
+--EXTENSIONS--
+mbstring
+--INI--
+mbstring.language=Simplified Chinese
+--FILE--
+<?php
+var_dump(mb_detect_order());
+
+?>
+--EXPECT--
+array(5) {
+  [0]=>
+  string(5) "ASCII"
+  [1]=>
+  string(5) "UTF-8"
+  [2]=>
+  string(6) "EUC-CN"
+  [3]=>
+  string(5) "CP936"
+  [4]=>
+  string(12) "GB18030-2022"
+}