forked from php/php-src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* PHP-8.2: Adapt ext/intl tests for ICU 75.1 and 76.1
- Loading branch information
Showing
8 changed files
with
179 additions
and
18 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --TEST-- | ||
| Bug #62070: Collator::getSortKey() returns garbage | ||
| --EXTENSIONS-- | ||
| intl | ||
| --SKIPIF-- | ||
| <?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?> | ||
| --FILE-- | ||
| <?php | ||
| $s1 = 'Hello'; | ||
|
|
||
| $coll = collator_create('en_US'); | ||
| $res = collator_get_sort_key($coll, $s1); | ||
|
|
||
| echo urlencode($res); | ||
| ?> | ||
| --EXPECT-- | ||
| 93AAG%01%09%01%DC%08 |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| --TEST-- | ||
| collator_get_sort_key() icu >= 62.1 | ||
| --EXTENSIONS-- | ||
| intl | ||
| --SKIPIF-- | ||
| <?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| /* | ||
| * Get sort keys using various locales | ||
| */ | ||
| function sort_arrays( $locale, $data ) | ||
| { | ||
| $res_str = ''; | ||
|
|
||
| $coll = ut_coll_create( $locale ); | ||
|
|
||
| foreach($data as $value) { | ||
| $res_val = ut_coll_get_sort_key( $coll, $value ); | ||
| $res_str .= "source: ".$value."\n". | ||
| "key: ".bin2hex($res_val)."\n"; | ||
| } | ||
|
|
||
| return $res_str; | ||
| } | ||
|
|
||
|
|
||
| function ut_main() | ||
| { | ||
| $res_str = ''; | ||
|
|
||
| // Regular strings keys | ||
| $test_params = array( | ||
| 'abc', 'abd', 'aaa', | ||
| 'аа', 'а', 'z', | ||
| '', '3', | ||
| 'y' , 'i' , 'k' | ||
| ); | ||
|
|
||
| $res_str .= sort_arrays( 'en_US', $test_params ); | ||
|
|
||
| // Sort a non-ASCII array using ru_RU locale. | ||
| $test_params = array( | ||
| 'абг', 'абв', 'жжж', 'эюя' | ||
| ); | ||
|
|
||
| $res_str .= sort_arrays( 'ru_RU', $test_params ); | ||
|
|
||
| // Sort an array using Lithuanian locale. | ||
| $res_str .= sort_arrays( 'lt_LT', $test_params ); | ||
|
|
||
| return $res_str . "\n"; | ||
| } | ||
|
|
||
| include_once( 'ut_common.inc' ); | ||
| ut_run(); | ||
| ?> | ||
| --EXPECT-- | ||
| source: abc | ||
| key: 2b2d2f01070107 | ||
| source: abd | ||
| key: 2b2d3101070107 | ||
| source: aaa | ||
| key: 2b2b2b01070107 | ||
| source: аа | ||
| key: 62060601060106 | ||
| source: а | ||
| key: 620601050105 | ||
| source: z | ||
| key: 5d01050105 | ||
| source: | ||
| key: 0101 | ||
| source: 3 | ||
| key: 1801050105 | ||
| source: y | ||
| key: 5b01050105 | ||
| source: i | ||
| key: 3b01050105 | ||
| source: k | ||
| key: 3f01050105 | ||
| source: абг | ||
| key: 28060c1001070107 | ||
| source: абв | ||
| key: 28060c0e01070107 | ||
| source: жжж | ||
| key: 282c2c2c01070107 | ||
| source: эюя | ||
| key: 28eef0f401070107 | ||
| source: абг | ||
| key: 62060c1001070107 | ||
| source: абв | ||
| key: 62060c0e01070107 | ||
| source: жжж | ||
| key: 622c2c2c01070107 | ||
| source: эюя | ||
| key: 62eef0f401070107 |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| --TEST-- | ||
| IntlTimeZone::getIDForWindowsID basic test | ||
| --EXTENSIONS-- | ||
| intl | ||
| --SKIPIF-- | ||
| <?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| $tzs = array( | ||
| 'Gnomeregan' => array(NULL), | ||
| 'India Standard Time' => array(NULL), | ||
| 'Pacific Standard Time' => array('001', 'CA', 'MX', 'US', 'ZZ'), | ||
| 'Romance Standard Time' => array('001', 'BE', 'DK', 'ES', 'FR'), | ||
| ); | ||
|
|
||
| foreach ($tzs as $tz => $regions) { | ||
| echo "** $tz\n"; | ||
| foreach ($regions as $region) { | ||
| var_dump(IntlTimeZone::getIDForWindowsID($tz, $region)); | ||
| if (intl_get_error_code() != U_ZERO_ERROR) { | ||
| echo "Error: ", intl_get_error_message(), "\n"; | ||
| } | ||
| } | ||
| } | ||
| ?> | ||
| --EXPECTF-- | ||
| ** Gnomeregan | ||
| bool(false) | ||
| Error: %snknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR | ||
| ** India Standard Time | ||
| string(13) "Asia/Calcutta" | ||
| ** Pacific Standard Time | ||
| string(19) "America/Los_Angeles" | ||
| string(17) "America/Vancouver" | ||
| string(19) "America/Los_Angeles" | ||
| string(19) "America/Los_Angeles" | ||
| string(19) "America/Los_Angeles" | ||
| ** Romance Standard Time | ||
| string(12) "Europe/Paris" | ||
| string(15) "Europe/Brussels" | ||
| string(17) "Europe/Copenhagen" | ||
| string(13) "Europe/Madrid" | ||
| string(12) "Europe/Paris" |