Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for ICU 74-1 #7

Merged
merged 1 commit into from Oct 28, 2023
Merged

Add support for ICU 74-1 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dispatch-single-php-all-icu-intl.yml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
icu: [50.2, 51.3, 52.2, 53.2, 54.2, 55.2, 56.2, 57.2, 58.3, 59.2, 60.3, 61.2, 62.2, 63.2, 64.2, 65.1, 66.1, 67.1, 68.1, 68.2, 69.1, 70.1, 71.1, 72.1, 73.1, 73.2]
icu: [50.2, 51.3, 52.2, 53.2, 54.2, 55.2, 56.2, 57.2, 58.3, 59.2, 60.3, 61.2, 62.2, 63.2, 64.2, 65.1, 66.1, 67.1, 68.1, 68.2, 69.1, 70.1, 71.1, 72.1, 73.1, 73.2, 74.1]
ts: [nts, zts]
name: php-intl
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dispatch-single-ts-single-php-all-icu-intl.yml
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
icu: [50.2, 51.3, 52.2, 53.2, 54.2, 55.2, 56.2, 57.2, 58.3, 59.2, 60.3, 61.2, 62.2, 63.2, 64.2, 65.1, 66.1, 67.1, 68.1, 68.2, 69.1, 70.1, 71.1, 72.1, 73.1, 73.2]
icu: [50.2, 51.3, 52.2, 53.2, 54.2, 55.2, 56.2, 57.2, 58.3, 59.2, 60.3, 61.2, 62.2, 63.2, 64.2, 65.1, 66.1, 67.1, 68.1, 68.2, 69.1, 70.1, 71.1, 72.1, 73.1, 73.2, 74.1]
name: php-intl
steps:
- name: ${{github.event.inputs.php}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/icu.yml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
icu: [50.2, 51.3, 52.2, 53.2, 54.2, 55.2, 56.2, 57.2, 58.3, 59.2, 60.3, 61.2, 62.2, 63.2, 64.2, 65.1, 66.1, 67.1, 68.1, 68.2, 69.1, 70.1, 71.1, 72.1, 73.1, 73.2]
icu: [50.2, 51.3, 52.2, 53.2, 54.2, 55.2, 56.2, 57.2, 58.3, 59.2, 60.3, 61.2, 62.2, 63.2, 64.2, 65.1, 66.1, 67.1, 68.1, 68.2, 69.1, 70.1, 71.1, 72.1, 73.1, 73.2, 74.1]
name: icu4c
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/intl.yml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
icu: [73.2, 73.1, 72.1, 71.1, 70.1, 69.1, 68.2, 68.1, 67.1, 66.1, 65.1, 64.2, 63.2, 62.2, 61.2, 60.3, 59.2, 58.3, 57.2, 56.2, 55.2, 54.2, 53.2, 52.2, 51.3, 50.2]
icu: [74.1, 73.2, 73.1, 72.1, 71.1, 70.1, 69.1, 68.2, 68.1, 67.1, 66.1, 65.1, 64.2, 63.2, 62.2, 61.2, 60.3, 59.2, 58.3, 57.2, 56.2, 55.2, 54.2, 53.2, 52.2, 51.3, 50.2]
ts: ['zts', 'nts']
name: php-intl
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-20.04]
icu: [73.2, 73.1, 72.1, 71.1, 70.1, 69.1, 68.2, 68.1, 67.1, 66.1, 65.1, 64.2, 63.2, 62.2, 61.2, 60.3, 59.2, 58.3, 57.2, 56.2, 55.2, 54.2, 53.2, 52.2, 51.3, 50.2]
icu: [74.1, 73.2, 73.1, 72.1, 71.1, 70.1, 69.1, 68.2, 68.1, 67.1, 66.1, 65.1, 64.2, 63.2, 62.2, 61.2, 60.3, 59.2, 58.3, 57.2, 56.2, 55.2, 54.2, 53.2, 52.2, 51.3, 50.2]
ts: ['ts', 'nts']
steps:
- name: Checkout
Expand Down
26 changes: 13 additions & 13 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions patches/intl/intl-icu-74.1-php5.6-8.0.patch
View file
Open in desktop
@@ -0,0 +1,45 @@
From cd1447a6962496fca60a2f5e5d9cf4448575cc24 Mon Sep 17 00:00:00 2001
From: Ben Ramsey <ramsey@php.net>
Date: Tue, 19 Oct 2021 23:59:11 -0500
Subject: [PATCH] Change UBool to bool for equality operators in ICU >= 70.1

Refer to:
- https://github.com/unicode-org/icu/commit/633438f8da99fee815e2c61626ea779a84567a3d
- https://github.com/unicode-org/icu/commit/f6325d49ba57ec26f320b2865ce09ca47db458d9
---
ext/intl/breakiterator/codepointiterator_internal.cpp | 4 ++++
ext/intl/breakiterator/codepointiterator_internal.h | 4 ++++
2 files changed, 8 insertions(+)

diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp
index 71ba056994d0..3982a599af38 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
@@ -73,7 +73,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
clearCurrentCharIter();
}

+#if U_ICU_VERSION_MAJOR_NUM >= 70
+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
+#else
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+#endif
{
if (typeid(*this) != typeid(that)) {
return false;
diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h
index 43ec79d0b776..93b903a20bb8 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.h
+++ b/ext/intl/breakiterator/codepointiterator_internal.h
@@ -37,7 +37,11 @@ namespace PHP {

virtual ~CodePointBreakIterator();

+#if U_ICU_VERSION_MAJOR_NUM >= 70
+ virtual bool operator==(const BreakIterator& that) const;
+#else
virtual UBool operator==(const BreakIterator& that) const;
+#endif

virtual CodePointBreakIterator* clone(void) const;

1 change: 1 addition & 0 deletions patches/intl/series-php5.6
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php7.0
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php7.1
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php7.2
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php7.3
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php7.4
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php8.0
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php8.1
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php8.2
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php8.3
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch
1 change: 1 addition & 0 deletions patches/intl/series-php8.4
View file
Open in desktop
Expand Up @@ -3,3 +3,4 @@ intl-icu-71.1-php5.6-8.0.patch
intl-icu-72.1-php5.6-8.0.patch
intl-icu-73.1-php5.6-8.0.patch
intl-icu-73.2-php5.6-8.0.patch
intl-icu-74.1-php5.6-8.0.patch