Skip to content

Commit 49ca191

Browse files
cmb69cmb69
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Split tests for compatibility with ICU 68.1
2 parents d65a520 + 77b6e95 commit 49ca191

8 files changed

+701
-4
lines changed

‎ext/intl/tests/locale_get_display_language.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
--TEST--
2-
locale_get_display_language()
2+
locale_get_display_language() icu < 68.1
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '68.1') >= 0) die('skip for ICU < 68.1'); ?>
56
--FILE--
67
<?php
78

‎ext/intl/tests/locale_get_display_language2.phpt

Lines changed: 281 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,281 @@
1+
--TEST--
2+
locale_get_display_language() icu >= 68.1
3+
--SKIPIF--
4+
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '68.1') < 0) die('skip for ICU >= 68.1'); ?>
6+
--FILE--
7+
<?php
8+
9+
/*
10+
* Try getting the display_language for different locales
11+
* with Procedural and Object methods.
12+
*/
13+
14+
function ut_main()
15+
{
16+
$res_str='';
17+
18+
$disp_locales=array('en','fr','de');
19+
20+
$locales = array(
21+
'uk-ua_CALIFORNIA@currency=;currency=GRN',
22+
'root',
23+
'uk@currency=EURO',
24+
'Hindi',
25+
//Simple language subtag
26+
'de',
27+
'fr',
28+
'ja',
29+
'i-enochian', //(example of a grandfathered tag)
30+
'art-lojban', //(example of a grandfathered tag)
31+
//Language subtag plus Script subtag:
32+
'zh-Hant',
33+
'zh-Hans',
34+
'sr-Cyrl',
35+
'sr-Latn',
36+
//Language-Script-Region
37+
'zh-Hans-CN',
38+
'sr-Latn-CS',
39+
//Language-Variant
40+
'sl-rozaj',
41+
'sl-nedis',
42+
//Language-Region-Variant
43+
'de-CH-1901',
44+
'sl-IT-nedis',
45+
//Language-Script-Region-Variant
46+
'sl-Latn-IT-nedis',
47+
//Language-Region:
48+
'de-DE',
49+
'en-US',
50+
'es-419',
51+
//Private use subtags:
52+
'de-CH-x-phonebk',
53+
'az-Arab-x-AZE-derbend',
54+
//Extended language subtags
55+
'zh-min',
56+
'zh-min-nan-Hant-CN',
57+
//Private use registry values
58+
'x-whatever',
59+
'qaa-Qaaa-QM-x-southern',
60+
'sr-Latn-QM',
61+
'sr-Qaaa-CS',
62+
/*Tags that use extensions (examples ONLY: extensions MUST be defined
63+
by revision or update to this document or by RFC): */
64+
'en-US-u-islamCal',
65+
'zh-CN-a-myExt-x-private',
66+
'en-a-myExt-b-another',
67+
//Some Invalid Tags:
68+
'de-419-DE',
69+
'a-DE',
70+
'ar-a-aaa-b-bbb-a-ccc'
71+
);
72+
73+
74+
$res_str = '';
75+
76+
foreach( $locales as $locale )
77+
{
78+
$res_str .= "locale='$locale'\n";
79+
foreach( $disp_locales as $disp_locale )
80+
{
81+
$scr = ut_loc_get_display_language( $locale ,$disp_locale );
82+
$res_str .= "disp_locale=$disp_locale : display_language=$scr";
83+
$res_str .= "\n";
84+
}
85+
$res_str .= "-----------------\n";
86+
}
87+
88+
return $res_str;
89+
90+
}
91+
92+
include_once( 'ut_common.inc' );
93+
ut_run();
94+
95+
?>
96+
--EXPECTREGEX--
97+
locale='uk-ua_CALIFORNIA@currency=;currency=GRN'
98+
disp_locale=en : display_language=Ukrainian
99+
disp_locale=fr : display_language=ukrainien
100+
disp_locale=de : display_language=Ukrainisch
101+
-----------------
102+
locale='root'
103+
disp_locale=en : display_language=(Root|Unknown language)
104+
disp_locale=fr : display_language=(racine|langue indéterminée)
105+
disp_locale=de : display_language=([rR]oot|Unbekannte Sprache)
106+
-----------------
107+
locale='uk@currency=EURO'
108+
disp_locale=en : display_language=Ukrainian
109+
disp_locale=fr : display_language=ukrainien
110+
disp_locale=de : display_language=Ukrainisch
111+
-----------------
112+
locale='Hindi'
113+
disp_locale=en : display_language=hindi
114+
disp_locale=fr : display_language=hindi
115+
disp_locale=de : display_language=hindi
116+
-----------------
117+
locale='de'
118+
disp_locale=en : display_language=German
119+
disp_locale=fr : display_language=allemand
120+
disp_locale=de : display_language=Deutsch
121+
-----------------
122+
locale='fr'
123+
disp_locale=en : display_language=French
124+
disp_locale=fr : display_language=français
125+
disp_locale=de : display_language=Französisch
126+
-----------------
127+
locale='ja'
128+
disp_locale=en : display_language=Japanese
129+
disp_locale=fr : display_language=japonais
130+
disp_locale=de : display_language=Japanisch
131+
-----------------
132+
locale='i-enochian'
133+
disp_locale=en : display_language=i-enochian
134+
disp_locale=fr : display_language=i-enochian
135+
disp_locale=de : display_language=i-enochian
136+
-----------------
137+
locale='art-lojban'
138+
disp_locale=en : display_language=Lojban
139+
disp_locale=fr : display_language=lojban
140+
disp_locale=de : display_language=Lojban
141+
-----------------
142+
locale='zh-Hant'
143+
disp_locale=en : display_language=Chinese
144+
disp_locale=fr : display_language=chinois
145+
disp_locale=de : display_language=Chinesisch
146+
-----------------
147+
locale='zh-Hans'
148+
disp_locale=en : display_language=Chinese
149+
disp_locale=fr : display_language=chinois
150+
disp_locale=de : display_language=Chinesisch
151+
-----------------
152+
locale='sr-Cyrl'
153+
disp_locale=en : display_language=Serbian
154+
disp_locale=fr : display_language=serbe
155+
disp_locale=de : display_language=Serbisch
156+
-----------------
157+
locale='sr-Latn'
158+
disp_locale=en : display_language=Serbian
159+
disp_locale=fr : display_language=serbe
160+
disp_locale=de : display_language=Serbisch
161+
-----------------
162+
locale='zh-Hans-CN'
163+
disp_locale=en : display_language=Chinese
164+
disp_locale=fr : display_language=chinois
165+
disp_locale=de : display_language=Chinesisch
166+
-----------------
167+
locale='sr-Latn-CS'
168+
disp_locale=en : display_language=Serbian
169+
disp_locale=fr : display_language=serbe
170+
disp_locale=de : display_language=Serbisch
171+
-----------------
172+
locale='sl-rozaj'
173+
disp_locale=en : display_language=Slovenian
174+
disp_locale=fr : display_language=slovène
175+
disp_locale=de : display_language=Slowenisch
176+
-----------------
177+
locale='sl-nedis'
178+
disp_locale=en : display_language=Slovenian
179+
disp_locale=fr : display_language=slovène
180+
disp_locale=de : display_language=Slowenisch
181+
-----------------
182+
locale='de-CH-1901'
183+
disp_locale=en : display_language=German
184+
disp_locale=fr : display_language=allemand
185+
disp_locale=de : display_language=Deutsch
186+
-----------------
187+
locale='sl-IT-nedis'
188+
disp_locale=en : display_language=Slovenian
189+
disp_locale=fr : display_language=slovène
190+
disp_locale=de : display_language=Slowenisch
191+
-----------------
192+
locale='sl-Latn-IT-nedis'
193+
disp_locale=en : display_language=Slovenian
194+
disp_locale=fr : display_language=slovène
195+
disp_locale=de : display_language=Slowenisch
196+
-----------------
197+
locale='de-DE'
198+
disp_locale=en : display_language=German
199+
disp_locale=fr : display_language=allemand
200+
disp_locale=de : display_language=Deutsch
201+
-----------------
202+
locale='en-US'
203+
disp_locale=en : display_language=English
204+
disp_locale=fr : display_language=anglais
205+
disp_locale=de : display_language=Englisch
206+
-----------------
207+
locale='es-419'
208+
disp_locale=en : display_language=Spanish
209+
disp_locale=fr : display_language=espagnol
210+
disp_locale=de : display_language=Spanisch
211+
-----------------
212+
locale='de-CH-x-phonebk'
213+
disp_locale=en : display_language=German
214+
disp_locale=fr : display_language=allemand
215+
disp_locale=de : display_language=Deutsch
216+
-----------------
217+
locale='az-Arab-x-AZE-derbend'
218+
disp_locale=en : display_language=Azerbaijani
219+
disp_locale=fr : display_language=azerbaïdjanais
220+
disp_locale=de : display_language=Aserbaidschanisch
221+
-----------------
222+
locale='zh-min'
223+
disp_locale=en : display_language=Chinese
224+
disp_locale=fr : display_language=chinois
225+
disp_locale=de : display_language=Chinesisch
226+
-----------------
227+
locale='zh-min-nan-Hant-CN'
228+
disp_locale=en : display_language=Chinese
229+
disp_locale=fr : display_language=chinois
230+
disp_locale=de : display_language=Chinesisch
231+
-----------------
232+
locale='x-whatever'
233+
disp_locale=en : display_language=x-whatever
234+
disp_locale=fr : display_language=x-whatever
235+
disp_locale=de : display_language=x-whatever
236+
-----------------
237+
locale='qaa-Qaaa-QM-x-southern'
238+
disp_locale=en : display_language=qaa
239+
disp_locale=fr : display_language=qaa
240+
disp_locale=de : display_language=qaa
241+
-----------------
242+
locale='sr-Latn-QM'
243+
disp_locale=en : display_language=Serbian
244+
disp_locale=fr : display_language=serbe
245+
disp_locale=de : display_language=Serbisch
246+
-----------------
247+
locale='sr-Qaaa-CS'
248+
disp_locale=en : display_language=Serbian
249+
disp_locale=fr : display_language=serbe
250+
disp_locale=de : display_language=Serbisch
251+
-----------------
252+
locale='en-US-u-islamCal'
253+
disp_locale=en : display_language=English
254+
disp_locale=fr : display_language=anglais
255+
disp_locale=de : display_language=Englisch
256+
-----------------
257+
locale='zh-CN-a-myExt-x-private'
258+
disp_locale=en : display_language=Chinese
259+
disp_locale=fr : display_language=chinois
260+
disp_locale=de : display_language=Chinesisch
261+
-----------------
262+
locale='en-a-myExt-b-another'
263+
disp_locale=en : display_language=English
264+
disp_locale=fr : display_language=anglais
265+
disp_locale=de : display_language=Englisch
266+
-----------------
267+
locale='de-419-DE'
268+
disp_locale=en : display_language=German
269+
disp_locale=fr : display_language=allemand
270+
disp_locale=de : display_language=Deutsch
271+
-----------------
272+
locale='a-DE'
273+
disp_locale=en : display_language=a
274+
disp_locale=fr : display_language=a
275+
disp_locale=de : display_language=a
276+
-----------------
277+
locale='ar-a-aaa-b-bbb-a-ccc'
278+
disp_locale=en : display_language=Arabic
279+
disp_locale=fr : display_language=arabe
280+
disp_locale=de : display_language=Arabisch
281+
-----------------

‎ext/intl/tests/locale_get_display_name7.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
2-
locale_get_display_name() icu >= 64.0
2+
locale_get_display_name() icu >= 65.0 && icu < 68.1
33
--SKIPIF--
44
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
55
<?php if (version_compare(INTL_ICU_VERSION, '65.0') < 0) die('skip for ICU >= 65.0'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '68.1') >= 0) die('skip for ICU < 68.1'); ?>
67
--FILE--
78
<?php
89

0 commit comments

Comments
 (0)