diff options
Diffstat (limited to 'ext/intl/tests')
-rw-r--r-- | ext/intl/tests/bug62082.phpt | 7 | ||||
-rw-r--r-- | ext/intl/tests/bug67397.phpt | 21 | ||||
-rw-r--r-- | ext/intl/tests/dateformat_format.phpt | 20 | ||||
-rw-r--r-- | ext/intl/tests/dateformat_format_variant2.phpt | 20 | ||||
-rw-r--r-- | ext/intl/tests/dateformat_format_variant3.phpt | 20 | ||||
-rw-r--r-- | ext/intl/tests/locale_parse_locale2.phpt | 6 |
6 files changed, 60 insertions, 34 deletions
diff --git a/ext/intl/tests/bug62082.phpt b/ext/intl/tests/bug62082.phpt index e6ca73e30..dab1252af 100644 --- a/ext/intl/tests/bug62082.phpt +++ b/ext/intl/tests/bug62082.phpt @@ -10,6 +10,7 @@ var_dump(locale_get_display_name(str_repeat("a", 300), null)); var_dump(locale_get_display_name(str_repeat("a", 512), null)); var_dump(locale_get_display_name(str_repeat("a", 600), null)); --EXPECT-- -string(300) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -string(512) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -string(600) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +bool(false) +bool(false) +bool(false) + diff --git a/ext/intl/tests/bug67397.phpt b/ext/intl/tests/bug67397.phpt new file mode 100644 index 000000000..b2b2911f8 --- /dev/null +++ b/ext/intl/tests/bug67397.phpt @@ -0,0 +1,21 @@ +--TEST-- +Bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) +--SKIPIF-- +<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> +--FILE-- +<?php + +function ut_main() +{ + $ret = var_export(ut_loc_get_display_name(str_repeat('*', 256), 'en_us'), true); + $ret .= "\n"; + $ret .= var_export(intl_get_error_message(), true); + return $ret; +} + +include_once( 'ut_common.inc' ); +ut_run(); +?> +--EXPECTF-- +false +'locale_get_display_name : name too long: U_ILLEGAL_ARGUMENT_ERROR' diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index 8b410876c..f9a90684d 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -318,7 +318,7 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Thursday, December 31, 2009 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 31, 2009 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 31, 2009 3:02:03 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/31/09 3:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 30, 2000 5:04:05 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/30/00 5:04 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt index eb606a53d..07c67e932 100644 --- a/ext/intl/tests/dateformat_format_variant2.phpt +++ b/ext/intl/tests/dateformat_format_variant2.phpt @@ -318,7 +318,7 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 31, 2009, 3:02:03 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/31/09, 3:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 30, 2000, 5:04:05 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/30/00, 5:04 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) diff --git a/ext/intl/tests/dateformat_format_variant3.phpt b/ext/intl/tests/dateformat_format_variant3.phpt index 40d49c8dc..d770473f4 100644 --- a/ext/intl/tests/dateformat_format_variant3.phpt +++ b/ext/intl/tests/dateformat_format_variant3.phpt @@ -318,7 +318,7 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 31, 2009, 3:02:03 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/31/09, 3:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 30, 2000, 5:04:05 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/30/00, 5:04 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) diff --git a/ext/intl/tests/locale_parse_locale2.phpt b/ext/intl/tests/locale_parse_locale2.phpt index 6012862a4..30cc8cc0a 100644 --- a/ext/intl/tests/locale_parse_locale2.phpt +++ b/ext/intl/tests/locale_parse_locale2.phpt @@ -63,7 +63,8 @@ function ut_main() //Some Invalid Tags: 'de-419-DE', 'a-DE', - 'ar-a-aaa-b-bbb-a-ccc' + 'ar-a-aaa-b-bbb-a-ccc', + 'x-AAAAAA', ); @@ -201,3 +202,6 @@ No values found from Locale parsing. --------------------- ar-a-aaa-b-bbb-a-ccc: language : 'ar' , +--------------------- +x-AAAAAA: +private0 : 'AAAAAA' , |