Patch intl_icu_4.8_fix.0.diff for intl Bug #61448

Patch version 2012-03-20 09:08 UTC

• 2012-03-20 09:08 UTC [diff to current]

Developer: ab@php.net

Index: ext/intl/tests/locale_get_display_variant.phpt
===================================================================
--- ext/intl/tests/locale_get_display_variant.phpt	(revision 324268)
+++ ext/intl/tests/locale_get_display_variant.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_get_display_variant()
+locale_get_display_variant() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt
===================================================================
--- ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-datefmt_parse_timestamp_code()  with parse pos
+datefmt_parse_timestamp_code()  with parse pos icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --INI--
 datetime.timezone="America/Los_Angeles"
 --ENV--
Index: ext/intl/tests/formatter_format_currency.phpt
===================================================================
--- ext/intl/tests/formatter_format_currency.phpt	(revision 324268)
+++ ext/intl/tests/formatter_format_currency.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-numfmt_format_currency()
+numfmt_format_currency() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -46,4 +47,4 @@
 en_US: '$1,234,567.89'
 ru: '1 234 567,89 р.'
 uk: '1 234 567,89 ₴'
-en: '₴1,234,567.89'
\ No newline at end of file
+en: '₴1,234,567.89'
Index: ext/intl/tests/locale_get_display_region.phpt
===================================================================
--- ext/intl/tests/locale_get_display_region.phpt	(revision 324268)
+++ ext/intl/tests/locale_get_display_region.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_get_display_region()
+locale_get_display_region() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/dateformat_set_timezone_id.phpt
===================================================================
--- ext/intl/tests/dateformat_set_timezone_id.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_set_timezone_id.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-datefmt_set_timezone_id_code()
+datefmt_set_timezone_id_code() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -72,4 +73,4 @@
 Trying to set timezone_id= CN
 After call to set_timezone_id :  timezone_id= CN
 Formatting timestamp=0 resulted in  Thursday, January 1, 1970 12:00:00 AM GMT+00:00
-Formatting timestamp=3600 resulted in  Thursday, January 1, 1970 1:00:00 AM GMT+00:00
\ No newline at end of file
+Formatting timestamp=3600 resulted in  Thursday, January 1, 1970 1:00:00 AM GMT+00:00
Index: ext/intl/tests/dateformat_clone.phpt
===================================================================
--- ext/intl/tests/dateformat_clone.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_clone.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-Cloning datefmt
+Cloning datefmt icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 include_once( 'ut_common.inc' );
Index: ext/intl/tests/locale_get_display_script.phpt
===================================================================
--- ext/intl/tests/locale_get_display_script.phpt	(revision 324268)
+++ ext/intl/tests/locale_get_display_script.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_get_display_script()
+locale_get_display_script() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -271,4 +272,4 @@
 disp_locale=en :  display_script=
 disp_locale=fr :  display_script=
 disp_locale=de :  display_script=
------------------
\ No newline at end of file
+-----------------
Index: ext/intl/tests/locale_parse_locale.phpt
===================================================================
--- ext/intl/tests/locale_parse_locale.phpt	(revision 324268)
+++ ext/intl/tests/locale_parse_locale.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_parse_locale()
+locale_parse_locale() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/formatter_format.phpt
===================================================================
--- ext/intl/tests/formatter_format.phpt	(revision 324268)
+++ ext/intl/tests/formatter_format.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-numfmt_format()
+numfmt_format() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -126,4 +127,4 @@
 '1,234,567(th|ᵗʰ)'
 '342:56:07'
 '#####.###'
-Bad formatter!
\ No newline at end of file
+Bad formatter!
Index: ext/intl/tests/dateformat_parse.phpt
===================================================================
--- ext/intl/tests/dateformat_parse.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_parse.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-datefmt_parse_code()
+datefmt_parse_code() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --INI--
 date.timezone="America/Los_Angeles"
 --FILE--
Index: ext/intl/tests/locale_get_display_name.phpt
===================================================================
--- ext/intl/tests/locale_get_display_name.phpt	(revision 324268)
+++ ext/intl/tests/locale_get_display_name.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_get_display_name()
+locale_get_display_name() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
===================================================================
--- ext/intl/tests/dateformat_parse_localtime_parsepos.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_parse_localtime_parsepos.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-datefmt_parse_localtime() with parse pos
+datefmt_parse_localtime() with parse pos icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/dateformat_localtime.phpt
===================================================================
--- ext/intl/tests/dateformat_localtime.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_localtime.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-datefmt_localtime_code()
+datefmt_localtime_code() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/msgfmt_fail.phpt
===================================================================
--- ext/intl/tests/msgfmt_fail.phpt	(revision 324268)
+++ ext/intl/tests/msgfmt_fail.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-msgfmt creation failures
+msgfmt creation failures icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/collator_get_locale.phpt
===================================================================
--- ext/intl/tests/collator_get_locale.phpt	(revision 324268)
+++ ext/intl/tests/collator_get_locale.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-get_locale()
+get_locale() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/dateformat_get_set_pattern.phpt
===================================================================
--- ext/intl/tests/dateformat_get_set_pattern.phpt	(revision 324268)
+++ ext/intl/tests/dateformat_get_set_pattern.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-datefmt_get_pattern_code and datefmt_set_pattern_code()
+datefmt_get_pattern_code and datefmt_set_pattern_code() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 
 <?php
@@ -81,4 +82,4 @@
 Setting IntlDateFormatter with pattern = yyyyMMdd 
 After call to get_pattern :  pattern= yyyyMMdd
 Result of formatting timestamp=0 with the new pattern is :  
-19691231
\ No newline at end of file
+19691231
Index: ext/intl/tests/formatter_get_set_attribute.phpt
===================================================================
--- ext/intl/tests/formatter_get_set_attribute.phpt	(revision 324268)
+++ ext/intl/tests/formatter_get_set_attribute.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-numfmt_get/set_attribute()
+numfmt_get/set_attribute() icu < 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.2', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/formatter_get_set_symbol.phpt
===================================================================
--- ext/intl/tests/formatter_get_set_symbol.phpt	(revision 324268)
+++ ext/intl/tests/formatter_get_set_symbol.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-numfmt_get/set_symbol()
+numfmt_get/set_symbol() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/collator_create.phpt
===================================================================
--- ext/intl/tests/collator_create.phpt	(revision 324268)
+++ ext/intl/tests/collator_create.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-create()
+create() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/locale_filter_matches.phpt
===================================================================
--- ext/intl/tests/locale_filter_matches.phpt	(revision 324268)
+++ ext/intl/tests/locale_filter_matches.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_filter_matches.phpt()
+locale_filter_matches.phpt() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php
 
Index: ext/intl/tests/locale_get_keywords.phpt
===================================================================
--- ext/intl/tests/locale_get_keywords.phpt	(revision 324268)
+++ ext/intl/tests/locale_get_keywords.phpt	(working copy)
@@ -1,7 +1,8 @@
 --TEST--
-locale_get_keywords()
+locale_get_keywords() icu <= 4.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?>
 --FILE--
 <?php