com php-src: clone dateformat_calendars_variant3.phpt for ICU 54.1: ext/intl/tests/dateformat_ca lendars_variant2.phpt
ext/intl/tests/dateformat_calen dars_variant3.phpt
| From: | Anatol Belski | Date: | Thu, 20 Nov 2014 10:49:39 +0000 |
| Subject: | com php-src: clone dateformat_calendars_variant3.phpt for ICU 54.1: ext/intl/tests/dateformat_ca lendars_variant2.phpt ext/intl/tests/dateformat_calen dars_variant3.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83181@lists.php.net to get a copy of this message | ||
Commit: b61dba5e1deb5e586cf2be27f0cf0bb126fb5ccd
Author: Anatol Belski <ab@php.net> Thu, 20 Nov 2014 11:49:39 +0100
Parents: 8ca69ff641513ef3e3475b63dbedb21b6e1ae0a4
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b61dba5e1deb5e586cf2be27f0cf0bb126fb5ccd
Log:
clone dateformat_calendars_variant3.phpt for ICU 54.1
Changed paths:
M ext/intl/tests/dateformat_calendars_variant2.phpt
A ext/intl/tests/dateformat_calendars_variant3.phpt
Diff:
diff --git a/ext/intl/tests/dateformat_calendars_variant2.phpt
b/ext/intl/tests/dateformat_calendars_variant2.phpt
index 61cdea8..b3b1701 100644
--- a/ext/intl/tests/dateformat_calendars_variant2.phpt
+++ b/ext/intl/tests/dateformat_calendars_variant2.phpt
@@ -6,6 +6,7 @@ date.timezone=Atlantic/Azores
<?php
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU
>= 51.2'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '54.1') >= 0) die('skip for ICU
< 54.1'); ?>
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_calendars_variant3.phpt
b/ext/intl/tests/dateformat_calendars_variant3.phpt
new file mode 100644
index 0000000..36a67e6
--- /dev/null
+++ b/ext/intl/tests/dateformat_calendars_variant3.phpt
@@ -0,0 +1,45 @@
+--TEST--
+IntlDateFormatter, calendars and time zone
+--INI--
+date.timezone=Atlantic/Azores
+--SKIPIF--
+<?php
+if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU
>= 54.1'); ?>
+--FILE--
+<?php
+ini_set("intl.error_level", E_WARNING);
+
+$fmt1 = new IntlDateFormatter('en_US',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ IntlDateFormatter::TRADITIONAL);
+$fmt2 = new IntlDateFormatter('en_US',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ IntlDateFormatter::GREGORIAN);
+$fmt3 = new IntlDateFormatter('en_US@calendar=hebrew',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ IntlDateFormatter::TRADITIONAL);
+var_dump($fmt1->format(strtotime('2012-01-01 00:00:00 +0000')));
+var_dump($fmt2->format(strtotime('2012-01-01 00:00:00 +0000')));
+var_dump($fmt3->format(strtotime('2012-01-01 00:00:00 +0000')));
+
+new IntlDateFormatter('en_US@calendar=hebrew',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ -1);
+?>
+==DONE==
+--EXPECTF--
+string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
+string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
+string(44) "Sunday, 6 Tevet 5772 at 5: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
%sdateformat_calendars_variant%d.php on line %d
+==DONE==