diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-07-12 09:41:07 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-07-12 09:41:07 +0200 |
| commit | baa2617fd04aeda318eb1dd8c30ab28ea87740c2 (patch) | |
| tree | ef8c6b5684c50a7421f45bc62815582b043e1264 /PHP_CompatInfo-intl.patch | |
| parent | dfb3914823d97b63bff53afd7ec05b358ce6823a (diff) | |
php-bartlett-PHP-CompatInfo: 2.19.0
Diffstat (limited to 'PHP_CompatInfo-intl.patch')
| -rw-r--r-- | PHP_CompatInfo-intl.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/PHP_CompatInfo-intl.patch b/PHP_CompatInfo-intl.patch new file mode 100644 index 0000000..73abe74 --- /dev/null +++ b/PHP_CompatInfo-intl.patch @@ -0,0 +1,83 @@ +diff --git a/PHP/CompatInfo/Reference/intl.php b/PHP/CompatInfo/Reference/intl.php +index 64a088f..6266150 100644 +--- a/PHP/CompatInfo/Reference/intl.php ++++ b/PHP/CompatInfo/Reference/intl.php +@@ -342,6 +342,10 @@ class PHP_CompatInfo_Reference_Intl + => array('5.5.0', ''), + 'intlcal_get_minimum' => array('5.5.0', ''), + 'intlcal_get_now' => array('5.5.0', ''), ++ 'intlcal_get_repeated_wall_time_option' ++ => array('5.5.0', ''), ++ 'intlcal_get_skipped_wall_time_option' ++ => array('5.5.0', ''), + 'intlcal_get_time' => array('5.5.0', ''), + 'intlcal_get_time_zone' => array('5.5.0', ''), + 'intlcal_get_type' => array('5.5.0', ''), +@@ -355,6 +359,10 @@ class PHP_CompatInfo_Reference_Intl + 'intlcal_set' => array('5.5.0', ''), + 'intlcal_set_first_day_of_week' => array('5.5.0', ''), + 'intlcal_set_lenient' => array('5.5.0', ''), ++ 'intlcal_set_repeated_wall_time_option' ++ => array('5.5.0', ''), ++ 'intlcal_set_skipped_wall_time_option' ++ => array('5.5.0', ''), + 'intlcal_set_time' => array('5.5.0', ''), + 'intlcal_set_time_zone' => array('5.5.0', ''), + 'intlcal_to_date_time' => array('5.5.0', ''), +@@ -377,6 +385,7 @@ class PHP_CompatInfo_Reference_Intl + 'intltz_get_offset' => array('5.5.0', ''), + 'intltz_get_raw_offset' => array('5.5.0', ''), + 'intltz_get_region' => array('5.5.0', ''), ++ 'intltz_get_unknown' => array('5.5.0', ''), + 'intltz_get_tz_data_version' => array('5.5.0', ''), + 'intltz_has_same_rules' => array('5.5.0', ''), + 'intltz_to_date_time_zone' => array('5.5.0', ''), +diff --git a/tests/Reference/IntlTest.php b/tests/Reference/IntlTest.php +index 8636f4f..22c1717 100644 +--- a/tests/Reference/IntlTest.php ++++ b/tests/Reference/IntlTest.php +@@ -51,13 +51,6 @@ class PHP_CompatInfo_Reference_IntlTest + if (PATH_SEPARATOR == ';') { + // Win* + $this->optionalclasses = array('IntlException'); +- $this->ignoredfunctions = array( +- 'intltz_get_unknown', +- 'intlcal_get_repeated_wall_time_option', +- 'intlcal_get_skipped_wall_time_option', +- 'intlcal_set_repeated_wall_time_option', +- 'intlcal_set_skipped_wall_time_option', +- ); + } + + if (version_compare(INTL_ICU_VERSION, '3.8.0', 'lt')) { +@@ -70,6 +63,30 @@ class PHP_CompatInfo_Reference_IntlTest + ); + } + ++ if (version_compare(INTL_ICU_VERSION, '4.8', 'lt')) { ++ // requires libicu >= 4.8 ++ $this->optionalfunctions = array_merge( ++ $this->optionalfunctions, ++ array( ++ 'intltz_create_time_zone_id_enumeration', ++ 'intltz_get_region', ++ ) ++ ); ++ } ++ if (version_compare(INTL_ICU_VERSION, '49', 'lt')) { ++ // requires libicu >= 49 (version scheme change 4.9 become 49) ++ $this->optionalfunctions = array_merge( ++ $this->optionalfunctions, ++ array( ++ 'intltz_get_unknown', ++ 'intlcal_get_repeated_wall_time_option', ++ 'intlcal_get_skipped_wall_time_option', ++ 'intlcal_set_repeated_wall_time_option', ++ 'intlcal_set_skipped_wall_time_option', ++ ) ++ ); ++ } ++ + /* + On Windows platform extension intl 1.1.0 : + - uses libicu 4.6.1 for PHP 5.4.1 or greater |