Skip to content

Commit 96f2a45

Browse files
committed
update API files
1 parent 09c1085 commit 96f2a45

File tree

5 files changed

+27
-33
lines changed

5 files changed

+27
-33
lines changed

ext/intl/doc/collator_api.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,4 +395,3 @@ function collator_get_error_code( $coll ) {}
395395
* Collator API function call.
396396
*/
397397
function collator_get_error_message( $coll ) {}
398-
?>

ext/intl/doc/common_api.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,3 @@ function intl_is_failure($code) {}
5454
* @return string Error code name.
5555
*/
5656
function intl_error_name($code) {}
57-
58-
?>

ext/intl/doc/datefmt_api.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,3 @@ function datefmt_get_error_code($fmt) {}
434434
* @return string Description of the last error.
435435
*/
436436
function datefmt_get_error_message($fmt) {}
437-
438-
439-
?>

ext/intl/doc/formatter_api.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,5 +498,3 @@ function numfmt_get_error_code($formatter) {}
498498
* @return string Description of the last occured error.
499499
*/
500500
function numfmt_get_error_message($formatter) {}
501-
502-
?>

ext/intl/doc/locale_api.php

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Locale {
4242
* The following static members are used with the getLocale methods of
4343
* the various locale affected classes, such as numfmt.
4444
*/
45-
const DEFAULT_LOCALE = default_locale;
45+
const DEFAULT_LOCALE = null;
4646

4747
/**
4848
* identifiers for the actual locale, valid locale
@@ -59,13 +59,13 @@ class Locale {
5959
/**
6060
* Valid locale tag and subtag values
6161
*/
62-
LANG_TAG = "language";
63-
EXTLANG_TAG = "extlang";
64-
SCRIPT_TAG = "script";
65-
REGION_TAG = "region";
66-
VARIANT_TAG = "variant";
67-
GRANDFATHERED_LANG_TAG = "grandfathered";
68-
PRIVATE_TAG = "private";
62+
const LANG_TAG = "language";
63+
const EXTLANG_TAG = "extlang";
64+
const SCRIPT_TAG = "script";
65+
const REGION_TAG = "region";
66+
const VARIANT_TAG = "variant";
67+
const GRANDFATHERED_LANG_TAG = "grandfathered";
68+
const PRIVATE_TAG = "private";
6969

7070

7171
#############################################################################
@@ -206,9 +206,10 @@ public static function getDisplayVariant($variant, $in_locale = null) {}
206206
*
207207
* @param string $langtag the language tag to check
208208
* @param string $locale the language range to check against
209+
* @param bool $canonicalize Canonicalize parameters?
209210
* @return boolean 'true' if $locale matches $langtag 'false' otherwise
210211
*/
211-
public static function filterMatches($langtag, $locale) {}
212+
public static function filterMatches($langtag, $locale, $canonicalize) {}
212213

213214
/**
214215
* Searchs the items in $langtag for the best match to the language
@@ -263,7 +264,7 @@ public static function parseLocale($locale) {}
263264
*
264265
* @return string the current runtime locale
265266
*/
266-
public static function locale_get_default() {}
267+
function locale_get_default() {}
267268

268269
/**
269270
* sets the default runtime locale to $locale
@@ -273,7 +274,7 @@ public static function locale_get_default() {}
273274
* locale identifier. UAX #35 extensions are accepted.
274275
* @return boolean 'true' if okay, 'false' if an error
275276
*/
276-
public static function locale_set_default($locale) {}
277+
function locale_set_default($locale) {}
277278

278279

279280
/**
@@ -283,7 +284,7 @@ public static function locale_set_default($locale) {}
283284
* @return string the language code associated with the language
284285
* or null in case of error.
285286
*/
286-
public static function locale_get_primary_language($locale) {}
287+
function locale_get_primary_language($locale) {}
287288

288289

289290
/**
@@ -292,7 +293,7 @@ public static function locale_get_primary_language($locale) {}
292293
* @param string $locale the locale to extract the script code from
293294
* @return string the script subtag for the locale or null if not present
294295
*/
295-
public static function locale_get_script($locale) {}
296+
function locale_get_script($locale) {}
296297

297298

298299
/**
@@ -301,7 +302,7 @@ public static function locale_get_script($locale) {}
301302
* @param string $locale the locale to extract the region code from
302303
* @return string the region subtag for the locale or null if not present
303304
*/
304-
public static function locale_get_region($locale) {}
305+
function locale_get_region($locale) {}
305306

306307

307308
/**
@@ -311,7 +312,7 @@ public static function locale_get_region($locale) {}
311312
* @return array the array containing the list of all variants
312313
* subtag for the locale or null if not present
313314
*/
314-
public static function locale_get_all_variants($locale) {}
315+
function locale_get_all_variants($locale) {}
315316

316317

317318
/**
@@ -320,7 +321,7 @@ public static function locale_get_all_variants($locale) {}
320321
* @param string $locale the locale to extract the keywords from
321322
* @return array associative array containing the keyword-value pairs for this locale
322323
*/
323-
public static function locale_get_keywords($locale) {}
324+
function locale_get_keywords($locale) {}
324325

325326

326327
/**
@@ -332,7 +333,7 @@ public static function locale_get_keywords($locale) {}
332333
* @return string display name of the locale in the format
333334
* appropriate for $in_locale.
334335
*/
335-
public static function locale_get_display_name($locale, $in_locale = null) {}
336+
function locale_get_display_name($locale, $in_locale = null) {}
336337

337338

338339
/**
@@ -344,7 +345,7 @@ public static function locale_get_display_name($locale, $in_locale = null) {}
344345
* @return string display name of the language for the $locale in the format
345346
* appropriate for $in_locale.
346347
*/
347-
public static function locale_get_display_language($lang, $in_locale = null) {}
348+
function locale_get_display_language($lang, $in_locale = null) {}
348349

349350
/**
350351
* Returns an appropriately localized display name for script of the input locale
@@ -355,7 +356,7 @@ public static function locale_get_display_language($lang, $in_locale = null) {}
355356
* @return string display name of the script for the $locale in the format
356357
* appropriate for $in_locale.
357358
*/
358-
public static function locale_get_display_script($script, $in_locale = null) {}
359+
function locale_get_display_script($script, $in_locale = null) {}
359360

360361

361362
/**
@@ -367,7 +368,7 @@ public static function locale_get_display_script($script, $in_locale = null) {}
367368
* @return string display name of the region for the $locale in the format
368369
* appropriate for $in_locale.
369370
*/
370-
public static function locale_get_display_region($region, $in_locale = null) {}
371+
function locale_get_display_region($region, $in_locale = null) {}
371372

372373

373374
/**
@@ -379,7 +380,7 @@ public static function locale_get_display_region($region, $in_locale = null) {}
379380
* @return string display name of the variant for the $locale in the format
380381
* appropriate for $in_locale.
381382
*/
382-
public static function locale_get_display_variant($variant, $in_locale = null) {}
383+
function locale_get_display_variant($variant, $in_locale = null) {}
383384

384385

385386
/**
@@ -388,9 +389,10 @@ public static function locale_get_display_variant($variant, $in_locale = null) {
388389
*
389390
* @param string $langtag the language tag to check
390391
* @param string $locale the language range to check against
392+
* @param bool $canonicalize Canonicalize parameters?
391393
* @return boolean 'true' if $locale matches $langtag 'false' otherwise
392394
*/
393-
public static function locale_filter_matches($langtag, $locale) {}
395+
function locale_filter_matches($langtag, $locale, $canonicalize) {}
394396

395397
/**
396398
* Searchs the items in $langtag for the best match to the language
@@ -403,7 +405,7 @@ public static function locale_filter_matches($langtag, $locale) {}
403405
* @return string closest matching language tag, $default,
404406
* or empty string
405407
*/
406-
public static function locale_lookup(array $langtag, $locale, $default = null) {}
408+
function locale_lookup(array $langtag, $locale, $default = null) {}
407409

408410

409411
/**
@@ -415,7 +417,7 @@ public static function locale_lookup(array $langtag, $locale, $default = null) {
415417
*
416418
* @return string the corresponding locale identifier.
417419
*/
418-
public static function locale_compose_locale(array $subtags) {}
420+
function locale_compose_locale(array $subtags) {}
419421

420422

421423
/**
@@ -427,6 +429,6 @@ public static function locale_compose_locale(array $subtags) {}
427429
* the keys identify the particular locale ID subtags,
428430
* and the values are the associated subtag values.
429431
*/
430-
public static function locale_parse_locale($locale) {}
432+
function locale_parse_locale($locale) {}
431433

432434
?>

0 commit comments

Comments
 (0)