summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-07-07 09:35:37 -0700
committerStanislav Malyshev <stas@php.net>2014-07-07 10:34:43 -0700
commit551696363332942d26209368f441f6f152be4769 (patch)
tree66178b23a5b2c5b9ed17bced36a3b8e4091a501e
parent0e1599afe0c6aa89c725f31a88d484c901f16359 (diff)
downloadphp-git-551696363332942d26209368f441f6f152be4769.tar.gz
create locales and re-add test
-rw-r--r--.travis.yml7
-rw-r--r--ext/intl/tests/bug67052.phpt25
-rw-r--r--travis/de2
3 files changed, 34 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b49434cc8..b2ed607cac 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
@@ -21,6 +24,10 @@ env:
- ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
+before_install:
+ - 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