From 3516a9c8f096a71f493b90fb6b2be3ee3b0f0293 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 30 Jun 2020 09:20:06 +0200 Subject: [PATCH] Replace ISO_8859-* with ISO8859-* aliases for MBString We also remove the mbregex ISO 8859 aliases with underscores. --- UPGRADING | 4 +++ .../libmbfl/filters/mbfilter_iso8859_1.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_10.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_13.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_14.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_15.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_16.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_2.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_3.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_4.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_5.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_6.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_7.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_8.c | 2 +- .../libmbfl/filters/mbfilter_iso8859_9.c | 2 +- ext/mbstring/php_mbregex.c | 30 +++++++++---------- 16 files changed, 33 insertions(+), 29 deletions(-) diff --git a/UPGRADING b/UPGRADING index 709add579d..913205e277 100644 --- 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 5d59388744..7c633d8b3a 100644 --- 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 15451b9d42..65d82868f8 100644 --- 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 381d4f6b5d..747db1325d 100644 --- 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 ed2d5b3098..39268147e0 100644 --- 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 4cae1ec5f6..1ba311fc4e 100644 --- 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 b2370b4132..65a9ce4269 100644 --- 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 1496eb0aad..23715c1101 100644 --- 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 4086646968..6fd12c42f2 100644 --- 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 477c18d259..ffd647ef11 100644 --- 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 9934dbb5c7..3144e1ff3e 100644 --- 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 1235fdbd23..443b522f34 100644 --- 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 f62018b9c2..0931054ba0 100644 --- 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 1ed1cfc50d..30a34994c7 100644 --- 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 3b686a42be..cf26ac43f6 100644 --- 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 c614b0d5a4..b3c37826b1 100644 --- 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 -- 2.40.0