Replace ISO_8859-* with ISO8859-* aliases for MBString

We also remove the mbregex ISO 8859 aliases with underscores.

diff --git a/UPGRADING b/UPGRADING
index 709add579d43755acd24330606cf5b1d86efe051..913205e277340853704e3161a1d9e9f4a3021e4d 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -315,6 +315,10 @@ PHP 8.0 UPGRADE NOTES
   . The legacy behaviour of passing the encoding as the third argument instead
     of an offset for the mb_strrpos() function has been removed, provide an
     explicit 0 offset with the encoding as the fourth argument instead.
+  . The ISO_8859-* character encoding aliases have been replaced by ISO8859-*
+    aliases for better interoperability with the iconv extension. The mbregex
+    ISO 8859 aliases with underscores (ISO_8859_* and ISO8859_*) have also been
+    removed.
 
 - PCRE:
   . When passing invalid escape sequences they are no longer interpreted as

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
index 5d593887443a63cc16e29174404e93066ec85b50..7c633d8b3a78dafce32a121b598cf66cd2283f2a 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
@@ -34,7 +34,7 @@
 #include "mbfilter.h"
 #include "mbfilter_iso8859_1.h"
 
-static const char *mbfl_encoding_8859_1_aliases[] = {"ISO_8859-1", "latin1", NULL};
+static const char *mbfl_encoding_8859_1_aliases[] = {"ISO8859-1", "latin1", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_1 = {
        mbfl_no_encoding_8859_1,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
index 15451b9d42d2c3bdf6e1a465464ca4ca9669ac48..65d82868f8b2a88c6bd945b6e14dbf5ece1fc769 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_10.h"
 #include "unicode_table_iso8859_10.h"
 
-static const char *mbfl_encoding_8859_10_aliases[] = {"ISO_8859-10", "latin6", NULL};
+static const char *mbfl_encoding_8859_10_aliases[] = {"ISO8859-10", "latin6", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_10 = {
        mbfl_no_encoding_8859_10,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
index 381d4f6b5d75014a941511a3c3a6a1605be32639..747db1325d0e34fed0c449887cbb10487e031f82 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_13.h"
 #include "unicode_table_iso8859_13.h"
 
-static const char *mbfl_encoding_8859_13_aliases[] = {"ISO_8859-13", NULL};
+static const char *mbfl_encoding_8859_13_aliases[] = {"ISO8859-13", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_13 = {
        mbfl_no_encoding_8859_13,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
index ed2d5b309874ee95f7044fdfb78bdd7583cbf2ce..39268147e0e37281f40f2a6c0162aead295ba8a3 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_14.h"
 #include "unicode_table_iso8859_14.h"
 
-static const char *mbfl_encoding_8859_14_aliases[] = {"ISO_8859-14", "latin8", NULL};
+static const char *mbfl_encoding_8859_14_aliases[] = {"ISO8859-14", "latin8", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_14 = {
        mbfl_no_encoding_8859_14,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
index 4cae1ec5f6dfb5798cb19e37509b6f4c638c3181..1ba311fc4e6ac578d7c3c1b6e15f22761887da09 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_15.h"
 #include "unicode_table_iso8859_15.h"
 
-static const char *mbfl_encoding_8859_15_aliases[] = {"ISO_8859-15", NULL};
+static const char *mbfl_encoding_8859_15_aliases[] = {"ISO8859-15", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_15 = {
        mbfl_no_encoding_8859_15,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
index b2370b41322d96c600dc8c621d18af5a759c1c4c..65a9ce42696e9060cae21fa92e7b0b126896469a 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_16.h"
 #include "unicode_table_iso8859_16.h"
 
-static const char *mbfl_encoding_8859_16_aliases[] = {"ISO_8859-16", NULL};
+static const char *mbfl_encoding_8859_16_aliases[] = {"ISO8859-16", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_16 = {
        mbfl_no_encoding_8859_16,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
index 1496eb0aade29c3fc71241099c75aae3454e0532..23715c1101e5e034d466a739939adfa4da294f6e 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_2.h"
 #include "unicode_table_iso8859_2.h"
 
-static const char *mbfl_encoding_8859_2_aliases[] = {"ISO_8859-2", "latin2", NULL};
+static const char *mbfl_encoding_8859_2_aliases[] = {"ISO8859-2", "latin2", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_2 = {
        mbfl_no_encoding_8859_2,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
index 40866469684217f307034399f470b8534a4ec6f3..6fd12c42f2afba05b565ce3f55ddc5b37e51044d 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_3.h"
 #include "unicode_table_iso8859_3.h"
 
-static const char *mbfl_encoding_8859_3_aliases[] = {"ISO_8859-3", "latin3", NULL};
+static const char *mbfl_encoding_8859_3_aliases[] = {"ISO8859-3", "latin3", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_3 = {
        mbfl_no_encoding_8859_3,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
index 477c18d2592e340e2394d0977a270a90df292e02..ffd647ef11392bd6c9f6b077771be7008d4a2fc3 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_4.h"
 #include "unicode_table_iso8859_4.h"
 
-static const char *mbfl_encoding_8859_4_aliases[] = {"ISO_8859-4", "latin4", NULL};
+static const char *mbfl_encoding_8859_4_aliases[] = {"ISO8859-4", "latin4", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_4 = {
        mbfl_no_encoding_8859_4,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
index 9934dbb5c79aefed055274d349ec5d3b33549fcf..3144e1ff3edab703a8cf129006dba45e4a71a18b 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_5.h"
 #include "unicode_table_iso8859_5.h"
 
-static const char *mbfl_encoding_8859_5_aliases[] = {"ISO_8859-5", "cyrillic", NULL};
+static const char *mbfl_encoding_8859_5_aliases[] = {"ISO8859-5", "cyrillic", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_5 = {
        mbfl_no_encoding_8859_5,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
index 1235fdbd237168875867fa253fcb6d89dae18bc1..443b522f34c8e9efcfdcfb996f3dda5249d2f701 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_6.h"
 #include "unicode_table_iso8859_6.h"
 
-static const char *mbfl_encoding_8859_6_aliases[] = {"ISO_8859-6", "arabic", NULL};
+static const char *mbfl_encoding_8859_6_aliases[] = {"ISO8859-6", "arabic", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_6 = {
        mbfl_no_encoding_8859_6,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
index f62018b9c2a84c7547ac1e4ed644c20e17edeef3..0931054ba026a0574b230c665e7e2e451a6a5111 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_7.h"
 #include "unicode_table_iso8859_7.h"
 
-static const char *mbfl_encoding_8859_7_aliases[] = {"ISO_8859-7", "greek", NULL};
+static const char *mbfl_encoding_8859_7_aliases[] = {"ISO8859-7", "greek", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_7 = {
        mbfl_no_encoding_8859_7,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
index 1ed1cfc50d892db1520a705e905b276b8f24870f..30a34994c704c1463fb63cc0d88d5142254e0566 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_8.h"
 #include "unicode_table_iso8859_8.h"
 
-static const char *mbfl_encoding_8859_8_aliases[] = {"ISO_8859-8", "hebrew", NULL};
+static const char *mbfl_encoding_8859_8_aliases[] = {"ISO8859-8", "hebrew", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_8 = {
        mbfl_no_encoding_8859_8,

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
index 3b686a42be5d350245f5c0d20f35a5ef6cd04b11..cf26ac43f6e13dff135050efd5103bef07b7749e 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
@@ -35,7 +35,7 @@
 #include "mbfilter_iso8859_9.h"
 #include "unicode_table_iso8859_9.h"
 
-static const char *mbfl_encoding_8859_9_aliases[] = {"ISO_8859-9", "latin5", NULL};
+static const char *mbfl_encoding_8859_9_aliases[] = {"ISO8859-9", "latin5", NULL};
 
 const mbfl_encoding mbfl_encoding_8859_9 = {
        mbfl_no_encoding_8859_9,

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index c614b0d5a46c632a9e728d0a3069f6b274183d38..b3c37826b11b133e370e7e8d776028d87788ee2d 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -276,91 +276,91 @@ static const php_mb_regex_enc_name_map_t enc_name_map[] = {
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_1
        {
-               "ISO-8859-1\0ISO8859-1\0ISO_8859_1\0ISO8859_1\0",
+               "ISO-8859-1\0ISO8859-1\0",
                ONIG_ENCODING_ISO_8859_1
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_2
        {
-               "ISO-8859-2\0ISO8859-2\0ISO_8859_2\0ISO8859_2\0",
+               "ISO-8859-2\0ISO8859-2\0",
                ONIG_ENCODING_ISO_8859_2
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_3
        {
-               "ISO-8859-3\0ISO8859-3\0ISO_8859_3\0ISO8859_3\0",
+               "ISO-8859-3\0ISO8859-3\0",
                ONIG_ENCODING_ISO_8859_3
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_4
        {
-               "ISO-8859-4\0ISO8859-4\0ISO_8859_4\0ISO8859_4\0",
+               "ISO-8859-4\0ISO8859-4\0",
                ONIG_ENCODING_ISO_8859_4
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_5
        {
-               "ISO-8859-5\0ISO8859-5\0ISO_8859_5\0ISO8859_5\0",
+               "ISO-8859-5\0ISO8859-5\0",
                ONIG_ENCODING_ISO_8859_5
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_6
        {
-               "ISO-8859-6\0ISO8859-6\0ISO_8859_6\0ISO8859_6\0",
+               "ISO-8859-6\0ISO8859-6\0",
                ONIG_ENCODING_ISO_8859_6
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_7
        {
-               "ISO-8859-7\0ISO8859-7\0ISO_8859_7\0ISO8859_7\0",
+               "ISO-8859-7\0ISO8859-7\0",
                ONIG_ENCODING_ISO_8859_7
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_8
        {
-               "ISO-8859-8\0ISO8859-8\0ISO_8859_8\0ISO8859_8\0",
+               "ISO-8859-8\0ISO8859-8\0",
                ONIG_ENCODING_ISO_8859_8
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_9
        {
-               "ISO-8859-9\0ISO8859-9\0ISO_8859_9\0ISO8859_9\0",
+               "ISO-8859-9\0ISO8859-9\0",
                ONIG_ENCODING_ISO_8859_9
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_10
        {
-               "ISO-8859-10\0ISO8859-10\0ISO_8859_10\0ISO8859_10\0",
+               "ISO-8859-10\0ISO8859-10\0",
                ONIG_ENCODING_ISO_8859_10
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_11
        {
-               "ISO-8859-11\0ISO8859-11\0ISO_8859_11\0ISO8859_11\0",
+               "ISO-8859-11\0ISO8859-11\0",
                ONIG_ENCODING_ISO_8859_11
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_13
        {
-               "ISO-8859-13\0ISO8859-13\0ISO_8859_13\0ISO8859_13\0",
+               "ISO-8859-13\0ISO8859-13\0",
                ONIG_ENCODING_ISO_8859_13
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_14
        {
-               "ISO-8859-14\0ISO8859-14\0ISO_8859_14\0ISO8859_14\0",
+               "ISO-8859-14\0ISO8859-14\0",
                ONIG_ENCODING_ISO_8859_14
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_15
        {
-               "ISO-8859-15\0ISO8859-15\0ISO_8859_15\0ISO8859_15\0",
+               "ISO-8859-15\0ISO8859-15\0",
                ONIG_ENCODING_ISO_8859_15
        },
 #endif
 #ifdef ONIG_ENCODING_ISO_8859_16
        {
-               "ISO-8859-16\0ISO8859-16\0ISO_8859_16\0ISO8859_16\0",
+               "ISO-8859-16\0ISO8859-16\0",
                ONIG_ENCODING_ISO_8859_16
        },
 #endif