Merge pull request #6 from jderusse/732

Add support for ICU 73-2
shivammathur · Jun 19, 2023 · 9dad8f2 · 9dad8f2
2 parents 0b9463d + 718a4cb
commit 9dad8f2
Show file tree

Hide file tree

Showing 16 changed files with 71 additions and 16 deletions.
diff --git a/.github/workflows/dispatch-single-php-all-icu-intl.yml b/.github/workflows/dispatch-single-php-all-icu-intl.yml
@@ -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]
+        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]
         ts: [nts, zts]
     name: php-intl
     steps:

diff --git a/.github/workflows/icu.yml b/.github/workflows/icu.yml
@@ -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]
+        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]
     name: icu4c
     steps:
       - name: Checkout

diff --git a/.github/workflows/intl.yml b/.github/workflows/intl.yml
@@ -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']
-        icu: [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: [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:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, ubuntu-20.04]
-        icu: [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: [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

diff --git a/README.md b/README.md
diff --git a/patches/intl/intl-icu-73.2-php5.6-8.0.patch b/patches/intl/intl-icu-73.2-php5.6-8.0.patch
@@ -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;
+
diff --git a/patches/intl/series-php5.6 b/patches/intl/series-php5.6
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php7.0 b/patches/intl/series-php7.0
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php7.1 b/patches/intl/series-php7.1
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php7.2 b/patches/intl/series-php7.2
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php7.3 b/patches/intl/series-php7.3
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php7.4 b/patches/intl/series-php7.4
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php8.0 b/patches/intl/series-php8.0
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php8.1 b/patches/intl/series-php8.1
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php8.2 b/patches/intl/series-php8.2
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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
diff --git a/patches/intl/series-php8.3 b/patches/intl/series-php8.3
@@ -2,3 +2,4 @@ intl-icu-70.1-php5.6-8.0.patch
 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