Skip to content

Commit 595254e

Browse files
committed
feat: require C++17 and ICU >=75.1
1 parent 94780fa commit 595254e

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/continuous-integration.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
php:
4848
- "8.2"
4949
icu:
50-
- "70.1"
50+
- "75.1"
5151

5252
steps:
5353
- name: "Checkout repository"
@@ -99,7 +99,7 @@ jobs:
9999
php:
100100
- "8.3"
101101
icu:
102-
- "73.2"
102+
- "75.1"
103103

104104
steps:
105105
- name: "Checkout repository"
@@ -146,11 +146,7 @@ jobs:
146146
- "8.2"
147147
- "8.3"
148148
icu:
149-
- "70.1"
150-
- "71.1"
151-
- "72.1"
152-
- "73.1"
153-
- "73.2"
149+
- "75.1"
154150

155151
steps:
156152
- name: "Checkout repository"

config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PHP_ARG_ENABLE(
3333
)
3434

3535
if test "$PHP_ECMA_INTL" != "no"; then
36-
PKG_CHECK_MODULES([ICU], [icu-uc >= 70.1 icu-i18n icu-io])
36+
PKG_CHECK_MODULES([ICU], [icu-uc >= 75.1 icu-i18n icu-io])
3737

3838
PHP_EVAL_INCLINE($ICU_CFLAGS)
3939
PHP_EVAL_LIBLINE($ICU_LIBS, ECMA_INTL_SHARED_LIBADD)
@@ -88,7 +88,7 @@ if test "$PHP_ECMA_INTL" != "no"; then
8888
PHP_ADD_BUILD_DIR($ext_builddir/src/php/classes)
8989

9090
PHP_REQUIRE_CXX()
91-
PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_ECMA_INTL_STDCXX)
91+
PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_ECMA_INTL_STDCXX)
9292

9393
EXTRA_CXXFLAGS="$PHP_ECMA_INTL_STDCXX $ICU_CXXFLAGS"
9494
PHP_SUBST(EXTRA_CXXFLAGS)

tests/criterion/ecma402/category_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define CATEGORY_VALUES_TEST(name, category, capacity) \
1414
Test(TEST_SUITE, supportedValuesFor##name##Category) \
1515
{ \
16-
const char **values = (const char **)malloc(sizeof(const char *) * capacity); \
16+
const char **values = (const char **)malloc(sizeof(char *) * capacity); \
1717
const int count = ecma402_supportedValuesForCategory(category, values); \
1818
cr_expect(values != NULL); \
1919
cr_expect(gt(int, count, 0)); \

tests/criterion/ecma402/util_test.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ ParameterizedTest(struct splitTestTuple *tup, TEST_SUITE, split)
551551

552552
ParameterizedTestParameters(TEST_SUITE, toAsciiLower)
553553
{
554-
struct charTestTuple tests[189];
554+
static struct charTestTuple tests[190];
555555
int i = 0;
556556

557557
// For each printable ASCII character...
@@ -570,7 +570,7 @@ ParameterizedTestParameters(TEST_SUITE, toAsciiLower)
570570
}
571571

572572
// For each printable Latin-1 supplement character...
573-
for (wchar_t c = 160; c < 255; c++) {
573+
for (wchar_t c = 160; c <= 255; c++) {
574574
tests[i].test = c;
575575
tests[i].expected = c;
576576

@@ -588,7 +588,7 @@ ParameterizedTest(struct charTestTuple *tup, TEST_SUITE, toAsciiLower)
588588

589589
ParameterizedTestParameters(TEST_SUITE, toAsciiUpper)
590590
{
591-
struct charTestTuple tests[189];
591+
static struct charTestTuple tests[190];
592592
int i = 0;
593593

594594
// For each printable ASCII character...
@@ -607,7 +607,7 @@ ParameterizedTestParameters(TEST_SUITE, toAsciiUpper)
607607
}
608608

609609
// For each printable Latin-1 supplement character...
610-
for (wchar_t c = 160; c < 255; c++) {
610+
for (wchar_t c = 160; c <= 255; c++) {
611611
tests[i].test = c;
612612
tests[i].expected = c;
613613

0 commit comments

Comments
 (0)