Skip to content

Commit 3d2d808

Browse files
committed
Drop workaround due to ICU bug 9194
This was fixed in ICU 50.1 which is required as of PHP 7.4
1 parent b835791 commit 3d2d808

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

ext/intl/calendar/calendar_methods.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale)
174174
RETURN_THROWS();
175175
}
176176

177-
//does not work; see ICU bug 9194
178-
// TODO This was fixed in ICU 50.1 see: https://unicode-org.atlassian.net/browse/ICU-9194
179-
#if 0
180177
StringEnumeration *se = Calendar::getKeywordValuesForLocale(key,
181178
Locale::createFromName(locale), (UBool)commonly_used,
182179
status);
@@ -185,18 +182,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale)
185182
"error calling underlying method", 0);
186183
RETURN_FALSE;
187184
}
188-
#else
189-
UEnumeration *uenum = ucal_getKeywordValuesForLocale(
190-
key, locale, !!commonly_used, &status);
191-
if (U_FAILURE(status)) {
192-
uenum_close(uenum);
193-
intl_error_set(NULL, status, "intlcal_get_keyword_values_for_locale: "
194-
"error calling underlying method", 0);
195-
RETURN_FALSE;
196-
}
197-
198-
StringEnumeration *se = new BugStringCharEnumeration(uenum);
199-
#endif
200185

201186
IntlIterator_from_StringEnumeration(se, return_value);
202187
}

0 commit comments

Comments
 (0)