diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-07 10:42:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-07 10:42:13 -0700 |
| commit | 41448bff7cd00623f7b43e9aff0a443e7731e93b (patch) | |
| tree | a3fd93537aee2a365e5d4293544d22a30a5afc9d | |
| parent | 31b395ac688d4d68de38c4efbc3c00fa9245c4eb (diff) | |
| parent | 551696363332942d26209368f441f6f152be4769 (diff) | |
| download | php-git-41448bff7cd00623f7b43e9aff0a443e7731e93b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
create locales and re-add test
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | ext/intl/tests/bug67052.phpt | 25 | ||||
| -rw-r--r-- | travis/de | 2 |
3 files changed, 33 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 8de7ee852d..2125e8d3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/ext/intl/tests/bug67052.phpt b/ext/intl/tests/bug67052.phpt new file mode 100644 index 0000000000..c8363b9c7a --- /dev/null +++ b/ext/intl/tests/bug67052.phpt @@ -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 + diff --git a/travis/de b/travis/de new file mode 100644 index 0000000000..ae49d969ee --- /dev/null +++ b/travis/de @@ -0,0 +1,2 @@ +de_DE.UTF-8 UTF-8 +de_DE ISO-8859-1 |