Merge branch 'v2'

Conflicts: tests/dateformat_get_set_calendar.phpt tests/dateformat_set_timezone_id2.phpt tests/formatter_get_set_attribute.phpt
cataphract · Dec 26, 2012 · d62ea41 · d62ea41
2 parents e5f3f2d + 57c597f
commit d62ea41
Show file tree

Hide file tree

Showing 16 changed files with 1,472 additions and 32 deletions.
diff --git a/tests/dateformat_calendars.phpt b/tests/dateformat_calendars.phpt
@@ -37,9 +37,9 @@ new IntlDateFormatter('en_US@calendar=hebrew',
 ?>
 ==DONE==
 --EXPECTF--
-string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12"
-string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12"
-string(42) "Sunday, Tevet 6, 5772 5:12:00 AM GMT+05:12"
+string(%d) "Sunday, January 1, 2012 %S5:12:00 AM GMT+05:12"
+string(%d) "Sunday, January 1, 2012 %S5:12:00 AM GMT+05:12"
+string(%d) "Sunday, Tevet 6, 5772 %S5:12:00 AM GMT+05:12"
 
 Warning: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d
 ==DONE==
diff --git a/tests/dateformat_format.phpt b/tests/dateformat_format.phpt
@@ -1,11 +1,13 @@
 --TEST--
-datefmt_format_code() (5.3+)
+datefmt_format_code() (5.3+, ICU < 50)
 --SKIPIF--
 <?php
 	if (!extension_loaded('intl'))
 		die('skip');
 	if(!defined('PHP_VERSION_ID') || PHP_VERSION_ID<50300)
 		die("skip PHP5.3+ only");
+	if (version_compare(INTL_ICU_VERSION, '50', '>='))
+		die('skip for ICU < 50');
 --FILE--
 <?php