Skip to content

Commit 06e06f0

Browse files
committed
Merge branch '5.4'
* 5.4: Fix test title and limit it to ICU >= 4.8 Remove executable bit from files Limit test to ICU 49 Remove executable bit from files
2 parents f855919 + 86ca788 commit 06e06f0

File tree

197 files changed

+5
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+5
-1
lines changed

ext/intl/CREDITS

100755100644
File mode changed.

ext/intl/TODO

100755100644
File mode changed.

ext/intl/collator/collator.c

100755100644
File mode changed.

ext/intl/collator/collator.h

100755100644
File mode changed.

ext/intl/collator/collator_attr.c

100755100644
File mode changed.

ext/intl/collator/collator_attr.h

100755100644
File mode changed.

ext/intl/collator/collator_class.c

100755100644
File mode changed.

ext/intl/collator/collator_class.h

100755100644
File mode changed.

ext/intl/collator/collator_compare.c

100755100644
File mode changed.

ext/intl/collator/collator_compare.h

100755100644
File mode changed.

ext/intl/collator/collator_convert.c

100755100644
File mode changed.

ext/intl/collator/collator_convert.h

100755100644
File mode changed.

ext/intl/collator/collator_create.c

100755100644
File mode changed.

ext/intl/collator/collator_create.h

100755100644
File mode changed.

ext/intl/collator/collator_error.c

100755100644
File mode changed.

ext/intl/collator/collator_error.h

100755100644
File mode changed.

ext/intl/collator/collator_is_numeric.c

100755100644
File mode changed.

ext/intl/collator/collator_is_numeric.h

100755100644
File mode changed.

ext/intl/collator/collator_locale.c

100755100644
File mode changed.

ext/intl/collator/collator_locale.h

100755100644
File mode changed.

ext/intl/collator/collator_sort.c

100755100644
File mode changed.

ext/intl/collator/collator_sort.h

100755100644
File mode changed.

ext/intl/common/common_error.c

100755100644
File mode changed.

ext/intl/common/common_error.h

100755100644
File mode changed.

ext/intl/config.m4

100755100644
File mode changed.

ext/intl/config.w32

100755100644
File mode changed.

ext/intl/dateformat/dateformat.c

100755100644
File mode changed.

ext/intl/dateformat/dateformat.h

100755100644
File mode changed.

ext/intl/dateformat/dateformat_attr.c

100755100644
File mode changed.

ext/intl/dateformat/dateformat_attr.h

100755100644
File mode changed.

ext/intl/dateformat/dateformat_class.c

100755100644
File mode changed.

ext/intl/dateformat/dateformat_class.h

100755100644
File mode changed.

ext/intl/dateformat/dateformat_data.c

100755100644
File mode changed.

ext/intl/dateformat/dateformat_data.h

100755100644
File mode changed.

ext/intl/dateformat/dateformat_format.c

100755100644
File mode changed.

ext/intl/dateformat/dateformat_format.h

100755100644
File mode changed.

ext/intl/dateformat/dateformat_parse.c

100755100644
File mode changed.

ext/intl/dateformat/dateformat_parse.h

100755100644
File mode changed.

ext/intl/doc/Tutorial.txt

100755100644
File mode changed.

ext/intl/doc/collator_api.php

100755100644
File mode changed.

ext/intl/doc/common_api.php

100755100644
File mode changed.

ext/intl/doc/datefmt_api.php

100755100644
File mode changed.

ext/intl/doc/formatter_api.php

100755100644
File mode changed.

ext/intl/doc/grapheme_api.php

100755100644
File mode changed.

ext/intl/doc/locale_api.php

100755100644
File mode changed.

ext/intl/doc/msgfmt_api.php

100755100644
File mode changed.

ext/intl/doc/normalizer_api.php

100755100644
File mode changed.

ext/intl/formatter/formatter.c

100755100644
File mode changed.

ext/intl/formatter/formatter.h

100755100644
File mode changed.

ext/intl/formatter/formatter_attr.c

100755100644
File mode changed.

ext/intl/formatter/formatter_attr.h

100755100644
File mode changed.

ext/intl/formatter/formatter_class.c

100755100644
File mode changed.

ext/intl/formatter/formatter_class.h

100755100644
File mode changed.

ext/intl/formatter/formatter_data.c

100755100644
File mode changed.

ext/intl/formatter/formatter_data.h

100755100644
File mode changed.

ext/intl/formatter/formatter_format.c

100755100644
File mode changed.

ext/intl/formatter/formatter_format.h

100755100644
File mode changed.

ext/intl/formatter/formatter_main.c

100755100644
File mode changed.

ext/intl/formatter/formatter_main.h

100755100644
File mode changed.

ext/intl/formatter/formatter_parse.c

100755100644
File mode changed.

ext/intl/formatter/formatter_parse.h

100755100644
File mode changed.

ext/intl/grapheme/grapheme.h

100755100644
File mode changed.

ext/intl/grapheme/grapheme_string.c

100755100644
File mode changed.

ext/intl/grapheme/grapheme_util.c

100755100644
File mode changed.

ext/intl/grapheme/grapheme_util.h

100755100644
File mode changed.

ext/intl/intl_common.h

100755100644
File mode changed.

ext/intl/intl_convert.c

100755100644
File mode changed.

ext/intl/intl_convert.h

100755100644
File mode changed.

ext/intl/intl_data.h

100755100644
File mode changed.

ext/intl/intl_error.c

100755100644
File mode changed.

ext/intl/intl_error.h

100755100644
File mode changed.

ext/intl/locale/locale.c

100755100644
File mode changed.

ext/intl/locale/locale.h

100755100644
File mode changed.

ext/intl/locale/locale_class.c

100755100644
File mode changed.

ext/intl/locale/locale_class.h

100755100644
File mode changed.

ext/intl/locale/locale_methods.c

100755100644
File mode changed.

ext/intl/locale/locale_methods.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat.c

100755100644
File mode changed.

ext/intl/msgformat/msgformat.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat_attr.c

100755100644
File mode changed.

ext/intl/msgformat/msgformat_attr.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat_class.c

100755100644
File mode changed.

ext/intl/msgformat/msgformat_class.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat_data.c

100755100644
File mode changed.

ext/intl/msgformat/msgformat_data.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat_format.c

100755100644
File mode changed.

ext/intl/msgformat/msgformat_format.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat_helpers.cpp

100755100644
File mode changed.

ext/intl/msgformat/msgformat_helpers.h

100755100644
File mode changed.

ext/intl/msgformat/msgformat_parse.c

100755100644
File mode changed.

ext/intl/msgformat/msgformat_parse.h

100755100644
File mode changed.

ext/intl/normalizer/normalizer.c

100755100644
File mode changed.

ext/intl/normalizer/normalizer.h

100755100644
File mode changed.

ext/intl/normalizer/normalizer_class.c

100755100644
File mode changed.

ext/intl/normalizer/normalizer_class.h

100755100644
File mode changed.

ext/intl/normalizer/normalizer_normalize.c

100755100644
File mode changed.

ext/intl/normalizer/normalizer_normalize.h

100755100644
File mode changed.

ext/intl/php_intl.c

100755100644
File mode changed.

ext/intl/php_intl.h

100755100644
File mode changed.

ext/intl/resourcebundle/TODO

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker.c

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker.h

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker_class.c

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker_class.h

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker_create.c

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker_create.h

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker_main.c

100755100644
File mode changed.

ext/intl/spoofchecker/spoofchecker_main.h

100755100644
File mode changed.

ext/intl/tests/_files/es-bundle.txt

100755100644
File mode changed.

ext/intl/tests/_files/res_index.txt

100755100644
File mode changed.

ext/intl/tests/_files/resourcebundle.txt

100755100644
File mode changed.

ext/intl/tests/_files/resourcebundle/es.res

100755100644
File mode changed.

ext/intl/tests/_files/resourcebundle/res_index.res

100755100644
File mode changed.

ext/intl/tests/_files/resourcebundle/root.res

100755100644
File mode changed.

ext/intl/tests/badargs.phpt

100755100644
File mode changed.

ext/intl/tests/bug12887.phpt

100755100644
File mode changed.

ext/intl/tests/bug14562.phpt

100755100644
File mode changed.

ext/intl/tests/bug62070.phpt

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Bug #62070: Collator::getSortKey() returns garbage
44
<?php
55
if (!extension_loaded('intl'))
66
die('skip intl extension not enabled');
7+
if (version_compare(INTL_ICU_VERSION, '49') < 0)
8+
die('skip ICU >= 49 only');
79
--FILE--
810
<?php
911
$s1 = 'Hello';

ext/intl/tests/collation_customization.phpt

100755100644
File mode changed.

ext/intl/tests/collator_asort.phpt

100755100644
File mode changed.

ext/intl/tests/collator_compare.phpt

100755100644
File mode changed.

ext/intl/tests/collator_create.phpt

100755100644
File mode changed.

ext/intl/tests/collator_get_error_code.phpt

100755100644
File mode changed.

ext/intl/tests/collator_get_error_message.phpt

100755100644
File mode changed.

ext/intl/tests/collator_get_locale.phpt

100755100644
File mode changed.

ext/intl/tests/collator_get_set_attribute.phpt

100755100644
File mode changed.

ext/intl/tests/collator_get_set_strength.phpt

100755100644
File mode changed.

ext/intl/tests/collator_get_sort_key.phpt

100755100644
File mode changed.

ext/intl/tests/collator_sort.phpt

100755100644
File mode changed.

ext/intl/tests/collator_sort_with_sort_keys.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_format.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_format_parse.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_get_datetype.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_get_locale.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_get_set_calendar.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_get_set_pattern.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_get_timetype.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_get_timezone_id.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_is_set_lenient.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_localtime.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_parse.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_parse_localtime_parsepos.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt

100755100644
File mode changed.

ext/intl/tests/dateformat_set_timezone_id.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_fail.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_format.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_format_conv.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_format_currency.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_get_error.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_get_locale.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_get_set_attribute.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_get_set_pattern.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_get_set_symbol.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_get_set_text_attribute.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_parse.phpt

100755100644
File mode changed.

ext/intl/tests/formatter_parse_currency.phpt

100755100644
File mode changed.

ext/intl/tests/grapheme.phpt

100755100644
File mode changed.

ext/intl/tests/idn.phpt

100755100644
File mode changed.

ext/intl/tests/intl_error_name.phpt

100755100644
File mode changed.

ext/intl/tests/intl_get_error_code.phpt

100755100644
File mode changed.

ext/intl/tests/intl_get_error_message.phpt

100755100644
File mode changed.

ext/intl/tests/intl_is_failure.phpt

100755100644
File mode changed.

ext/intl/tests/locale_accept.phpt

100755100644
File mode changed.

ext/intl/tests/locale_compose_locale.phpt

100755100644
File mode changed.

ext/intl/tests/locale_filter_matches.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_all_variants.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_default.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_display_language.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_display_name.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_display_region.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_display_script.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_display_variant.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_keywords.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_primary_language.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_region.phpt

100755100644
File mode changed.

ext/intl/tests/locale_get_script.phpt

100755100644
File mode changed.

ext/intl/tests/locale_lookup.phpt

100755100644
File mode changed.

ext/intl/tests/locale_parse_locale.phpt

100755100644
File mode changed.

ext/intl/tests/locale_set_default.phpt

100755100644
File mode changed.

ext/intl/tests/msgfmt_fail.phpt

100755100644
File mode changed.

ext/intl/tests/msgfmt_format.phpt

100755100644
File mode changed.

ext/intl/tests/msgfmt_get_locale.phpt

100755100644
File mode changed.

ext/intl/tests/msgfmt_get_set_pattern.phpt

100755100644
File mode changed.

ext/intl/tests/msgfmt_parse.phpt

100755100644
File mode changed.

ext/intl/tests/normalizer_normalize.phpt

100755100644
File mode changed.

ext/intl/tests/regression_sort_and_cow.phpt

100755100644
File mode changed.

ext/intl/tests/regression_sort_eq.phpt

100755100644
File mode changed.

ext/intl/tests/regression_sortwsk_and_cow.phpt

100755100644
File mode changed.

ext/intl/tests/regression_sortwsk_eq.phpt

100755100644
File mode changed.

ext/intl/tests/resourcebundle.build

100755100644
File mode changed.

ext/intl/tests/resourcebundle_locales.phpt

100755100644
File mode changed.

ext/intl/tests/resourcebundle_null_mandatory_args.phpt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
--TEST--
2-
IntlCalendar::setTime() basic test
2+
ResourceBundle constructor bundle accepts NULL for first two arguments
33
--INI--
44
date.timezone=Atlantic/Azores
55
--SKIPIF--
66
<?php
77
if (!extension_loaded('intl'))
88
die('skip intl extension not enabled');
9+
if (version_compare(INTL_ICU_VERSION, '4.8') < 0)
10+
die('skip ICU >= 4.8 only');
911
--FILE--
1012
<?php
1113
ini_set("intl.error_level", E_WARNING);

ext/intl/tests/spoofchecker_001.phpt

100755100644
File mode changed.

ext/intl/tests/spoofchecker_002.phpt

100755100644
File mode changed.

ext/intl/tests/spoofchecker_003.phpt

100755100644
File mode changed.

ext/intl/tests/spoofchecker_004.phpt

100755100644
File mode changed.

ext/intl/tests/ut_common.inc

100755100644
File mode changed.

0 commit comments

Comments
 (0)