com php-src: split msgfmt_format_intlcalendar_variant*. phpt for ICU 54.1: ext/intl/tests/msgfmt_fo rmat_intlcalendar_variant2.phpt
ext/intl/tests/msgfmt _format_intlcalendar_variant3.phpt ext/intl/tests/m sgfmt_format_intlcalendar_variant4.phpt

From: Date: Thu, 20 Nov 2014 12:26:23 +0000
Subject: com php-src: split msgfmt_format_intlcalendar_variant*. phpt for ICU 54.1: ext/intl/tests/msgfmt_fo rmat_intlcalendar_variant2.phpt
ext/intl/tests/msgfmt _format_intlcalendar_variant3.phpt ext/intl/tests/m sgfmt_format_intlcalendar_variant4.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83170@lists.php.net to get a copy of this message
Commit: 6c3768b15410ca2b70a4c2ba31d2a7f0d7c53ad3 Author: Anatol Belski <ab@php.net> Thu, 20 Nov 2014 13:26:23 +0100 Parents: 65ca28b463436ccc9e92581dc93d44c9563cafd0 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6c3768b15410ca2b70a4c2ba31d2a7f0d7c53ad3 Log: split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1 Changed paths: M ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt A ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt A ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt Diff: diff --git a/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt b/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt index f2d16b8..55dd0e4 100644 --- a/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt +++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt @@ -3,7 +3,7 @@ MessageFormat accepts IntlCalendar args --SKIPIF-- <?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, '51.2') || version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU >= 51.2 and < 52.1'); ?> --FILE-- <?php ini_set("intl.error_level", E_WARNING); diff --git a/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt b/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt new file mode 100644 index 0000000..766c508 --- /dev/null +++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt @@ -0,0 +1,31 @@ +--TEST-- +MessageFormat accepts IntlCalendar args +--SKIPIF-- +<?php +if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> +<?php if (version_compare(INTL_ICU_VERSION, '52.1') < 0) die('skip for ICU >= 52.1'); ?> +<?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); +//ini_set("intl.default_locale", "nl"); +ini_set('date.timezone', 'Europe/Lisbon'); + +$cal = new IntlGregorianCalendar(2012,04,17,17,35,36); + +$msgf = new MessageFormatter('pt_PT', '{0,date,full} {0,time,h:m:s a V}'); +echo $msgf->format(array($cal)), "\n"; + +//NOT FIXED: +/*$msgf = new MessageFormatter('en_US', +'{1, select, date {{0,date,full}} other {{0,time,h:m:s a V}}}'); + +echo "msgf2: ", $msgf->format(array($time, 'date')), " ", + $msgf->format(array($time, 'time')), "\n"; +*/ + +?> +==DONE== +--EXPECT-- +quinta-feira, 17 de Maio de 2012 5:35:36 da tarde ptlis +==DONE== diff --git a/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt b/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt new file mode 100644 index 0000000..8f778b9 --- /dev/null +++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt @@ -0,0 +1,30 @@ +--TEST-- +MessageFormat accepts IntlCalendar args +--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); +//ini_set("intl.default_locale", "nl"); +ini_set('date.timezone', 'Europe/Lisbon'); + +$cal = new IntlGregorianCalendar(2012,04,17,17,35,36); + +$msgf = new MessageFormatter('pt_PT', '{0,date,full} {0,time,h:m:s a V}'); +echo $msgf->format(array($cal)), "\n"; + +//NOT FIXED: +/*$msgf = new MessageFormatter('en_US', +'{1, select, date {{0,date,full}} other {{0,time,h:m:s a V}}}'); + +echo "msgf2: ", $msgf->format(array($time, 'date')), " ", + $msgf->format(array($time, 'time')), "\n"; +*/ + +?> +==DONE== +--EXPECT-- +quinta-feira, 17 de maio de 2012 5:35:36 da tarde ptlis +==DONE==

« previous php.cvs (#83170) next »