php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 13:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  Fixed bug #70484 selectordinal doesn't work with named parameters
  fix version macro to check
This commit is contained in:
Anatol Belski
2016-04-11 15:02:27 +02:00
parent 21e82289ed 28b6f66a77
commit f644d6cc3d
3 changed files with 102 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/intl/dateformat/dateformat_create.cpp
View File

@@ -36,7 +36,7 @@ extern "C" {
#include "dateformat_helpers.h"
#include "zend_exceptions.h"
#if U_ICU_VERSION_MINOR_NUM < 50
#if U_ICU_VERSION_MAJOR_NUM < 50
#define UDAT_PATTERN 0
#endif

4
ext/intl/msgformat/msgformat_helpers.cpp
View File

@@ -264,6 +264,10 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo,
type = Formattable::kDouble;
} else if (argType == UMSGPAT_ARG_TYPE_SELECT) {
type = Formattable::kString;
#if U_ICU_VERSION_MAJOR_NUM >= 50
} else if (argType == UMSGPAT_ARG_TYPE_SELECTORDINAL) {
type = Formattable::kDouble;
#endif
} else {
type = Formattable::kString;
}

97
ext/intl/tests/msgfmt_bug70484.phpt Normal file
View File

@@ -0,0 +1,97 @@
--TEST--
Bug #70484 selectordinal doesn't work with named parameters
--SKIPIF--
<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
if (version_compare(INTL_ICU_VERSION, '5.0') < 0)
die('skip for ICU 5.0+');
--FILE--
<?php
$locale = array("de", "fr", "en", "ru",);
$data = array(42, 42.42, 2147483643, 2147483643.12345, 5);
foreach ($locale as $lc) {
echo "$lc string key\n";
$m = new MessageFormatter($lc, "{n, selectordinal, =5 {five} zero {#-zero} one {#-one} two {#-two} few {#-few} many {#-many} other {#-other}}");
foreach ($data as $i) {
var_dump($m->format(array("n" => $i)));
if ($m->getErrorCode()) {
echo "$lc $i ", $m->getErrorMessage();
}
}
echo "\n";
echo "$lc numeric key\n";
$m = new MessageFormatter($lc, "{0, selectordinal, =5 {five} zero {#-zero} one {#-one} two {#-two} few {#-few} many {#-many} other {#-other}}");
foreach ($data as $i) {
var_dump($m->format(array($i)));
if ($m->getErrorCode()) {
echo "$lc $i ", $m->getErrorMessage();
}
}
echo "\n";
}
?>
==DONE==
--EXPECT--
de string key
string(8) "42-other"
string(11) "42,42-other"
string(19) "2.147.483.643-other"
string(23) "2.147.483.643,123-other"
string(4) "five"
de numeric key
string(8) "42-other"
string(11) "42,42-other"
string(19) "2.147.483.643-other"
string(23) "2.147.483.643,123-other"
string(4) "five"
fr string key
string(8) "42-other"
string(11) "42,42-other"
string(22) "2 147 483 643-other"
string(26) "2 147 483 643,123-other"
string(4) "five"
fr numeric key
string(8) "42-other"
string(11) "42,42-other"
string(22) "2 147 483 643-other"
string(26) "2 147 483 643,123-other"
string(4) "five"
en string key
string(6) "42-two"
string(11) "42.42-other"
string(17) "2,147,483,643-few"
string(23) "2,147,483,643.123-other"
string(4) "five"
en numeric key
string(6) "42-two"
string(11) "42.42-other"
string(17) "2,147,483,643-few"
string(23) "2,147,483,643.123-other"
string(4) "five"
ru string key
string(8) "42-other"
string(11) "42,42-other"
string(22) "2 147 483 643-other"
string(26) "2 147 483 643,123-other"
string(4) "five"
ru numeric key
string(8) "42-other"
string(11) "42,42-other"
string(22) "2 147 483 643-other"
string(26) "2 147 483 643,123-other"
string(4) "five"
==DONE==