diff options
Diffstat (limited to 'ext/intl/tests')
| -rw-r--r-- | ext/intl/tests/idn_uts46_errors.phpt | 11 | ||||
| -rw-r--r-- | ext/intl/tests/normalizer_normalize.phpt | 24 | ||||
| -rw-r--r-- | ext/intl/tests/normalizer_normalize_kc_cf.phpt | 7 |
3 files changed, 4 insertions, 38 deletions
diff --git a/ext/intl/tests/idn_uts46_errors.phpt b/ext/intl/tests/idn_uts46_errors.phpt index 6a99bde649..55d2d56215 100644 --- a/ext/intl/tests/idn_uts46_errors.phpt +++ b/ext/intl/tests/idn_uts46_errors.phpt @@ -21,9 +21,6 @@ var_dump(idn_to_ascii("", 0, INTL_IDNA_VARIANT_UTS46 + 10)); echo "empty domain:", "\n"; var_dump(idn_to_ascii("", 0, INTL_IDNA_VARIANT_UTS46)); -echo "fourth arg for 2003 variant (only notice raised):", "\n"; -var_dump(idn_to_ascii("foo.com", 0, INTL_IDNA_VARIANT_2003, $foo)); - echo "with error, but no details arg:", "\n"; var_dump(idn_to_ascii("www.fußball.com-", 0, INTL_IDNA_VARIANT_UTS46)); @@ -54,18 +51,12 @@ Warning: idn_to_ascii(): idn_to_ascii: bad arguments in %s on line %d NULL bad variant: -Warning: idn_to_ascii(): idn_to_ascii: invalid variant, must be one of {INTL_IDNA_VARIANT_2003, INTL_IDNA_VARIANT_UTS46} in %s on line %d +Warning: idn_to_ascii(): idn_to_ascii: invalid variant, must be INTL_IDNA_VARIANT_UTS46 in %s on line %d bool(false) empty domain: Warning: idn_to_ascii(): idn_to_ascii: empty domain name in %s on line %d bool(false) -fourth arg for 2003 variant (only notice raised): - -Deprecated: idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated in %s on line %d - -Notice: idn_to_ascii(): 4 arguments were provided, but INTL_IDNA_VARIANT_2003 only takes 3 - extra argument ignored in %s on line %d -string(7) "foo.com" with error, but no details arg: bool(false) with error, with details arg: diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt index 5f8c25ec2f..8f15ffb1d8 100644 --- a/ext/intl/tests/normalizer_normalize.phpt +++ b/ext/intl/tests/normalizer_normalize.phpt @@ -19,7 +19,6 @@ function ut_main() Normalizer::FORM_D, Normalizer::FORM_KC, Normalizer::FORM_KD, - Normalizer::NONE, ); $forms_str = array ( @@ -27,15 +26,13 @@ function ut_main() Normalizer::FORM_D => 'UNORM_FORM_D', Normalizer::FORM_KC => 'UNORM_FORM_KC', Normalizer::FORM_KD => 'UNORM_FORM_KD', - Normalizer::NONE => 'UNORM_NONE', ); /* just make sure all the form constants are defined as in the api spec */ if ( Normalizer::FORM_C != Normalizer::NFC || Normalizer::FORM_D != Normalizer::NFD || Normalizer::FORM_KC != Normalizer::NFKC || - Normalizer::FORM_KD != Normalizer::NFKD || - Normalizer::NONE == Normalizer::FORM_C ) { + Normalizer::FORM_KD != Normalizer::NFKD) { $res_str .= "Invalid normalization form declarations!\n"; } @@ -69,12 +66,7 @@ function ut_main() { foreach( $strs as $str ) { - if (Normalizer::NONE == $form) { - /* Hide deprecation warning. */ - $str_norm = @ut_norm_normalize( $str, $form ); - } else { - $str_norm = ut_norm_normalize( $str, $form ); - } + $str_norm = ut_norm_normalize( $str, $form ); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); @@ -150,15 +142,3 @@ ut_run(); is in form 'UNORM_FORM_KD'? = no error info: 'U_ZERO_ERROR' (0) '%E1%BA%9B' normalized to form 'UNORM_FORM_KD' is 's%CC%87' error info: 'U_ZERO_ERROR' (0) is in form 'UNORM_FORM_KD'? = no error info: 'U_ZERO_ERROR' (0) -'ABC' normalized to form 'UNORM_NONE' is 'ABC' error info: 'U_ZERO_ERROR' (0) - is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) -'%C3%A4%7C%7C%C3%A5%7C%7C%C3%B6' normalized to form 'UNORM_NONE' is '%C3%A4%7C%7C%C3%A5%7C%7C%C3%B6' error info: 'U_ZERO_ERROR' (0) - is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) -'%E2%84%AB%7C%7C%C3%85%7C%7CA%CC%8A' normalized to form 'UNORM_NONE' is '%E2%84%AB%7C%7C%C3%85%7C%7CA%CC%8A' error info: 'U_ZERO_ERROR' (0) - is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) -'%E2%84%A6%7C%7C%CE%A9' normalized to form 'UNORM_NONE' is '%E2%84%A6%7C%7C%CE%A9' error info: 'U_ZERO_ERROR' (0) - is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) -'%EF%AC%81' normalized to form 'UNORM_NONE' is '%EF%AC%81' error info: 'U_ZERO_ERROR' (0) - is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) -'%E1%BA%9B' normalized to form 'UNORM_NONE' is '%E1%BA%9B' error info: 'U_ZERO_ERROR' (0) - is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) diff --git a/ext/intl/tests/normalizer_normalize_kc_cf.phpt b/ext/intl/tests/normalizer_normalize_kc_cf.phpt index 246e41baa2..c7a46e617d 100644 --- a/ext/intl/tests/normalizer_normalize_kc_cf.phpt +++ b/ext/intl/tests/normalizer_normalize_kc_cf.phpt @@ -58,12 +58,7 @@ function ut_main() { foreach( $strs as $str ) { - if (Normalizer::NONE == $form) { - /* Hide deprecation warning. */ - $str_norm = @ut_norm_normalize( $str, $form ); - } else { - $str_norm = ut_norm_normalize( $str, $form ); - } + $str_norm = ut_norm_normalize( $str, $form ); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); |