Intl: Fix compile issues with ICU versions lower than 67 #18868
+44
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BogdanUngureanu
force-pushed
the
fix-listformatter-for-lower-icu
branch
from
c9d99fc to
e4dc2d9
Compare
BogdanUngureanu
changed the title
|
@devnexen if you have some spare time, it would be great if you could have a look. |
devnexen
reviewed
Jun 17, 2025
| #include "listformatter_class.h" | ||
| #include "listformatter_arginfo.h" |
There was a problem hiding this comment.
looks fine, did you need that change though ?
There was a problem hiding this comment.
yes, that's needed because the stub contains references to the fallbacks. listformatter_arginfo.h needs to be after.
Otherwise it would fail with
php-src/ext/intl/listformatter/listformatter_arginfo.h:50:35: error: use of undeclared identifier 'INTL_LISTFORMATTER_FALLBACK_TYPE_AND'
devnexen
approved these changes
Jun 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #18860
It gets built, but I'm having some environment issues with setting up ICU 63, so I haven't actually run the tests to see if it's working.When PHP intl is built with an older version of ICU (66 or older), we need a fallback for the AND and WIDE parameters. To solve this, I've added INTL_LISTFORMATTER_FALLBACK_TYPE_AND and INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE.
I've ran it locally with ICU 63 and the change works as expected (the tests pass). There's a failing test related to currencies, but it's unrelated to this change (some CLDR differences between versions).
cc @SjonHortensius