Skip to content

Commit 3516a9c

Browse files
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,

0 commit comments

Comments
 (0)