Skip to content

Commit 3516a9c

Browse files
cmb69cmb69
committed
Replace ISO_8859-* with ISO8859-* aliases for MBString
We also remove the mbregex ISO 8859 aliases with underscores.
1 parent 89b2483 commit 3516a9c

16 files changed

+33
-29
lines changed

‎UPGRADING

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,10 @@ PHP 8.0 UPGRADE NOTES
315315
. The legacy behaviour of passing the encoding as the third argument instead
316316
of an offset for the mb_strrpos() function has been removed, provide an
317317
explicit 0 offset with the encoding as the fourth argument instead.
318+
. The ISO_8859-* character encoding aliases have been replaced by ISO8859-*
319+
aliases for better interoperability with the iconv extension. The mbregex
320+
ISO 8859 aliases with underscores (ISO_8859_* and ISO8859_*) have also been
321+
removed.
318322

319323
- PCRE:
320324
. When passing invalid escape sequences they are no longer interpreted as

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "mbfilter.h"
3535
#include "mbfilter_iso8859_1.h"
3636

37-
static const char *mbfl_encoding_8859_1_aliases[] = {"ISO_8859-1", "latin1", NULL};
37+
static const char *mbfl_encoding_8859_1_aliases[] = {"ISO8859-1", "latin1", NULL};
3838

3939
const mbfl_encoding mbfl_encoding_8859_1 = {
4040
mbfl_no_encoding_8859_1,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_10.h"
3636
#include "unicode_table_iso8859_10.h"
3737

38-
static const char *mbfl_encoding_8859_10_aliases[] = {"ISO_8859-10", "latin6", NULL};
38+
static const char *mbfl_encoding_8859_10_aliases[] = {"ISO8859-10", "latin6", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_10 = {
4141
mbfl_no_encoding_8859_10,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_13.h"
3636
#include "unicode_table_iso8859_13.h"
3737

38-
static const char *mbfl_encoding_8859_13_aliases[] = {"ISO_8859-13", NULL};
38+
static const char *mbfl_encoding_8859_13_aliases[] = {"ISO8859-13", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_13 = {
4141
mbfl_no_encoding_8859_13,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_14.h"
3636
#include "unicode_table_iso8859_14.h"
3737

38-
static const char *mbfl_encoding_8859_14_aliases[] = {"ISO_8859-14", "latin8", NULL};
38+
static const char *mbfl_encoding_8859_14_aliases[] = {"ISO8859-14", "latin8", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_14 = {
4141
mbfl_no_encoding_8859_14,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_15.h"
3636
#include "unicode_table_iso8859_15.h"
3737

38-
static const char *mbfl_encoding_8859_15_aliases[] = {"ISO_8859-15", NULL};
38+
static const char *mbfl_encoding_8859_15_aliases[] = {"ISO8859-15", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_15 = {
4141
mbfl_no_encoding_8859_15,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_16.h"
3636
#include "unicode_table_iso8859_16.h"
3737

38-
static const char *mbfl_encoding_8859_16_aliases[] = {"ISO_8859-16", NULL};
38+
static const char *mbfl_encoding_8859_16_aliases[] = {"ISO8859-16", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_16 = {
4141
mbfl_no_encoding_8859_16,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_2.h"
3636
#include "unicode_table_iso8859_2.h"
3737

38-
static const char *mbfl_encoding_8859_2_aliases[] = {"ISO_8859-2", "latin2", NULL};
38+
static const char *mbfl_encoding_8859_2_aliases[] = {"ISO8859-2", "latin2", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_2 = {
4141
mbfl_no_encoding_8859_2,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_3.h"
3636
#include "unicode_table_iso8859_3.h"
3737

38-
static const char *mbfl_encoding_8859_3_aliases[] = {"ISO_8859-3", "latin3", NULL};
38+
static const char *mbfl_encoding_8859_3_aliases[] = {"ISO8859-3", "latin3", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_3 = {
4141
mbfl_no_encoding_8859_3,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_4.h"
3636
#include "unicode_table_iso8859_4.h"
3737

38-
static const char *mbfl_encoding_8859_4_aliases[] = {"ISO_8859-4", "latin4", NULL};
38+
static const char *mbfl_encoding_8859_4_aliases[] = {"ISO8859-4", "latin4", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_4 = {
4141
mbfl_no_encoding_8859_4,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_5.h"
3636
#include "unicode_table_iso8859_5.h"
3737

38-
static const char *mbfl_encoding_8859_5_aliases[] = {"ISO_8859-5", "cyrillic", NULL};
38+
static const char *mbfl_encoding_8859_5_aliases[] = {"ISO8859-5", "cyrillic", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_5 = {
4141
mbfl_no_encoding_8859_5,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_6.h"
3636
#include "unicode_table_iso8859_6.h"
3737

38-
static const char *mbfl_encoding_8859_6_aliases[] = {"ISO_8859-6", "arabic", NULL};
38+
static const char *mbfl_encoding_8859_6_aliases[] = {"ISO8859-6", "arabic", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_6 = {
4141
mbfl_no_encoding_8859_6,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_7.h"
3636
#include "unicode_table_iso8859_7.h"
3737

38-
static const char *mbfl_encoding_8859_7_aliases[] = {"ISO_8859-7", "greek", NULL};
38+
static const char *mbfl_encoding_8859_7_aliases[] = {"ISO8859-7", "greek", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_7 = {
4141
mbfl_no_encoding_8859_7,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_8.h"
3636
#include "unicode_table_iso8859_8.h"
3737

38-
static const char *mbfl_encoding_8859_8_aliases[] = {"ISO_8859-8", "hebrew", NULL};
38+
static const char *mbfl_encoding_8859_8_aliases[] = {"ISO8859-8", "hebrew", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_8 = {
4141
mbfl_no_encoding_8859_8,

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "mbfilter_iso8859_9.h"
3636
#include "unicode_table_iso8859_9.h"
3737

38-
static const char *mbfl_encoding_8859_9_aliases[] = {"ISO_8859-9", "latin5", NULL};
38+
static const char *mbfl_encoding_8859_9_aliases[] = {"ISO8859-9", "latin5", NULL};
3939

4040
const mbfl_encoding mbfl_encoding_8859_9 = {
4141
mbfl_no_encoding_8859_9,

‎ext/mbstring/php_mbregex.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -276,91 +276,91 @@ static const php_mb_regex_enc_name_map_t enc_name_map[] = {
276276
#endif
277277
#ifdef ONIG_ENCODING_ISO_8859_1
278278
{
279-
"ISO-8859-1\0ISO8859-1\0ISO_8859_1\0ISO8859_1\0",
279+
"ISO-8859-1\0ISO8859-1\0",
280280
ONIG_ENCODING_ISO_8859_1
281281
},
282282
#endif
283283
#ifdef ONIG_ENCODING_ISO_8859_2
284284
{
285-
"ISO-8859-2\0ISO8859-2\0ISO_8859_2\0ISO8859_2\0",
285+
"ISO-8859-2\0ISO8859-2\0",
286286
ONIG_ENCODING_ISO_8859_2
287287
},
288288
#endif
289289
#ifdef ONIG_ENCODING_ISO_8859_3
290290
{
291-
"ISO-8859-3\0ISO8859-3\0ISO_8859_3\0ISO8859_3\0",
291+
"ISO-8859-3\0ISO8859-3\0",
292292
ONIG_ENCODING_ISO_8859_3
293293
},
294294
#endif
295295
#ifdef ONIG_ENCODING_ISO_8859_4
296296
{
297-
"ISO-8859-4\0ISO8859-4\0ISO_8859_4\0ISO8859_4\0",
297+
"ISO-8859-4\0ISO8859-4\0",
298298
ONIG_ENCODING_ISO_8859_4
299299
},
300300
#endif
301301
#ifdef ONIG_ENCODING_ISO_8859_5
302302
{
303-
"ISO-8859-5\0ISO8859-5\0ISO_8859_5\0ISO8859_5\0",
303+
"ISO-8859-5\0ISO8859-5\0",
304304
ONIG_ENCODING_ISO_8859_5
305305
},
306306
#endif
307307
#ifdef ONIG_ENCODING_ISO_8859_6
308308
{
309-
"ISO-8859-6\0ISO8859-6\0ISO_8859_6\0ISO8859_6\0",
309+
"ISO-8859-6\0ISO8859-6\0",
310310
ONIG_ENCODING_ISO_8859_6
311311
},
312312
#endif
313313
#ifdef ONIG_ENCODING_ISO_8859_7
314314
{
315-
"ISO-8859-7\0ISO8859-7\0ISO_8859_7\0ISO8859_7\0",
315+
"ISO-8859-7\0ISO8859-7\0",
316316
ONIG_ENCODING_ISO_8859_7
317317
},
318318
#endif
319319
#ifdef ONIG_ENCODING_ISO_8859_8
320320
{
321-
"ISO-8859-8\0ISO8859-8\0ISO_8859_8\0ISO8859_8\0",
321+
"ISO-8859-8\0ISO8859-8\0",
322322
ONIG_ENCODING_ISO_8859_8
323323
},
324324
#endif
325325
#ifdef ONIG_ENCODING_ISO_8859_9
326326
{
327-
"ISO-8859-9\0ISO8859-9\0ISO_8859_9\0ISO8859_9\0",
327+
"ISO-8859-9\0ISO8859-9\0",
328328
ONIG_ENCODING_ISO_8859_9
329329
},
330330
#endif
331331
#ifdef ONIG_ENCODING_ISO_8859_10
332332
{
333-
"ISO-8859-10\0ISO8859-10\0ISO_8859_10\0ISO8859_10\0",
333+
"ISO-8859-10\0ISO8859-10\0",
334334
ONIG_ENCODING_ISO_8859_10
335335
},
336336
#endif
337337
#ifdef ONIG_ENCODING_ISO_8859_11
338338
{
339-
"ISO-8859-11\0ISO8859-11\0ISO_8859_11\0ISO8859_11\0",
339+
"ISO-8859-11\0ISO8859-11\0",
340340
ONIG_ENCODING_ISO_8859_11
341341
},
342342
#endif
343343
#ifdef ONIG_ENCODING_ISO_8859_13
344344
{
345-
"ISO-8859-13\0ISO8859-13\0ISO_8859_13\0ISO8859_13\0",
345+
"ISO-8859-13\0ISO8859-13\0",
346346
ONIG_ENCODING_ISO_8859_13
347347
},
348348
#endif
349349
#ifdef ONIG_ENCODING_ISO_8859_14
350350
{
351-
"ISO-8859-14\0ISO8859-14\0ISO_8859_14\0ISO8859_14\0",
351+
"ISO-8859-14\0ISO8859-14\0",
352352
ONIG_ENCODING_ISO_8859_14
353353
},
354354
#endif
355355
#ifdef ONIG_ENCODING_ISO_8859_15
356356
{
357-
"ISO-8859-15\0ISO8859-15\0ISO_8859_15\0ISO8859_15\0",
357+
"ISO-8859-15\0ISO8859-15\0",
358358
ONIG_ENCODING_ISO_8859_15
359359
},
360360
#endif
361361
#ifdef ONIG_ENCODING_ISO_8859_16
362362
{
363-
"ISO-8859-16\0ISO8859-16\0ISO_8859_16\0ISO8859_16\0",
363+
"ISO-8859-16\0ISO8859-16\0",
364364
ONIG_ENCODING_ISO_8859_16
365365
},
366366
#endif

0 commit comments

Comments
 (0)