summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2015-02-03 18:20:18 +0900
committerYasuo Ohgaki <yohgaki@php.net>2015-02-03 18:52:46 +0900
commit436ba1c4886024278337a8fe446c05a0629e4215 (patch)
tree1fc26782b952a800c0ae47e8537df06e887d2f3e /tests
parent36f73412c12c1271bf686ba7309aee4169c2dc71 (diff)
downloadphp-git-436ba1c4886024278337a8fe446c05a0629e4215.tar.gz
Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.
Diffstat (limited to 'tests')
-rw-r--r--tests/basic/bug67988.phpt27
-rw-r--r--tests/basic/encoding.phpt14
2 files changed, 34 insertions, 7 deletions
diff --git a/tests/basic/bug67988.phpt b/tests/basic/bug67988.phpt
new file mode 100644
index 0000000000..e1d8e5d7d4
--- /dev/null
+++ b/tests/basic/bug67988.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #67988 (htmlspecialchars() does not respect default_charset specified by ini_set)
+--INI--
+default_charset=UTF-8
+--FILE--
+<?php
+ini_set('default_charset', 'cp1252');
+
+var_dump(ini_get('default_charset'));
+var_dump(ini_get('internal_encoding'));
+var_dump(ini_get('input_encoding'));
+var_dump(ini_get('output_encoding'));
+
+var_dump(htmlentities("\xA3", ENT_HTML5));
+var_dump(htmlentities("\xA3", ENT_HTML5, 'cp1252'));
+
+var_dump(bin2hex(html_entity_decode("&pound;", ENT_HTML5)));
+var_dump(bin2hex(html_entity_decode("&pound;", ENT_HTML5, 'cp1252')));
+--EXPECT--
+string(6) "cp1252"
+string(0) ""
+string(0) ""
+string(0) ""
+string(7) "&pound;"
+string(7) "&pound;"
+string(2) "a3"
+string(2) "a3"
diff --git a/tests/basic/encoding.phpt b/tests/basic/encoding.phpt
index b2ee5f3ca2..c513cbfa79 100644
--- a/tests/basic/encoding.phpt
+++ b/tests/basic/encoding.phpt
@@ -14,14 +14,14 @@ var_dump(ini_get('input_encoding'));
var_dump(ini_get('internal_encoding'));
var_dump(ini_get('output_encoding'));
-var_dump(ini_set('input_encoding', 'ISO-8859-1'));
-var_dump(ini_set('internal_encoding', 'ISO-8859-1'));
-var_dump(ini_set('output_encoding', 'ISO-8859-1'));
+var_dump(ini_set('input_encoding', 'EUC-JP'));
+var_dump(ini_set('internal_encoding', 'EUC-JP'));
+var_dump(ini_set('output_encoding', 'EUC-JP'));
var_dump(ini_get('input_encoding'));
var_dump(ini_get('internal_encoding'));
var_dump(ini_get('output_encoding'));
---EXPECTF--
+--EXPECT--
string(5) "UTF-8"
string(0) ""
string(0) ""
@@ -34,6 +34,6 @@ string(0) ""
string(0) ""
string(0) ""
string(0) ""
-string(10) "ISO-8859-1"
-string(10) "ISO-8859-1"
-string(10) "ISO-8859-1" \ No newline at end of file
+string(6) "EUC-JP"
+string(6) "EUC-JP"
+string(6) "EUC-JP"