diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-07-25 08:05:48 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-07-25 08:05:48 +0200 |
| commit | fcc080258424a3bc66e74462d0af7a5a919f6c15 (patch) | |
| tree | e817843911bb92af154948cfd68eaf01bd7d4df9 /PHP_CompatInfo-intl.patch | |
| parent | b10a046a917f9bdc8e7ed4cb777bb9808e6a8ef2 (diff) | |
php-bartlett-PHP-CompatInfo: 2.20.0
Diffstat (limited to 'PHP_CompatInfo-intl.patch')
| -rw-r--r-- | PHP_CompatInfo-intl.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/PHP_CompatInfo-intl.patch b/PHP_CompatInfo-intl.patch deleted file mode 100644 index 73abe74..0000000 --- a/PHP_CompatInfo-intl.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 |