Merge branch 'PHP-5.6'

* PHP-5.6:
  create locales and re-add test
This commit is contained in:
Stanislav Malyshev 2014-07-07 10:42:36 -07:00
commit 888fb3323e
3 changed files with 33 additions and 0 deletions

View File

@ -8,6 +8,9 @@ notifications:
email:
on_failure: change
cache:
- apt
env:
global:
- MYSQL_TEST_HOST=127.0.0.1
@ -24,6 +27,9 @@ env:
before_install:
- sudo apt-get update -qq
- sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
- sudo cp ./travis/de /var/lib/locales/supported.d/de
- sudo dpkg-reconfigure locales
before_script:
# Compile PHP
- ./travis/compile.sh

View File

@ -0,0 +1,25 @@
--TEST--
Bug #67052 - NumberFormatter::parse() resets LC_NUMERIC setting
--SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
--FILE--
<?php
function ut_main()
{
setlocale(LC_ALL, 'de_DE');
$fmt = new NumberFormatter( 'sl_SI.UTF-8', NumberFormatter::DECIMAL);
$num = "1.234.567,891";
$res_str = $fmt->parse($num)."\n";
$res_str .= setlocale(LC_NUMERIC, 0);
return $res_str;
}
include_once( 'ut_common.inc' );
ut_run();
?>
--EXPECT--
1234567,891
de_DE

2
travis/de Normal file
View File

@ -0,0 +1,2 @@
de_DE.UTF-8 UTF-8
de_DE ISO-8859-1