summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-05-07 21:18:00 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-05-07 21:18:49 +0200
commitd38f819647ac0dd9b16c43ce399aa65256a46d0f (patch)
treecdad84e437d2c926306afc9ca10b14cd3c2bd97a
parent9af2f0fa78d6255193b8bffcf30f68fe9389c20e (diff)
downloadphp-git-d38f819647ac0dd9b16c43ce399aa65256a46d0f.tar.gz
Fix test file encoding
The mb_http_input_pass.phpt was intended to use the same encoding as mb_http_input.phpt, not UTF-8.
-rw-r--r--ext/mbstring/tests/mb_http_input.phpt5
-rw-r--r--ext/mbstring/tests/mb_http_input_pass.phpt13
2 files changed, 10 insertions, 8 deletions
diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
index aa65097597..a81969ffff 100644
--- a/ext/mbstring/tests/mb_http_input.phpt
+++ b/ext/mbstring/tests/mb_http_input.phpt
@@ -18,11 +18,12 @@ echo $_POST['a']."\n";
echo $_GET['b']."\n";
// Get encoding
-$enc = mb_http_input('P');
-var_dump($enc);
+var_dump(mb_http_input('P'));
+var_dump(mb_http_input('G'));
?>
--EXPECT--
ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
string(10) "ISO-8859-1"
+string(10) "ISO-8859-1"
diff --git a/ext/mbstring/tests/mb_http_input_pass.phpt b/ext/mbstring/tests/mb_http_input_pass.phpt
index 1c9cb93cd7..ffca4498d7 100644
--- a/ext/mbstring/tests/mb_http_input_pass.phpt
+++ b/ext/mbstring/tests/mb_http_input_pass.phpt
@@ -5,9 +5,9 @@ mb_http_input() with pass encoding
extension_loaded('mbstring') or die('skip mbstring not available');
?>
--POST--
-a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
--GET--
-b=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+b=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
--INI--
mbstring.encoding_translation=1
input_encoding=pass
@@ -18,11 +18,12 @@ echo $_POST['a']."\n";
echo $_GET['b']."\n";
// Get encoding
-$enc = mb_http_input('P');
-var_dump($enc);
+var_dump(mb_http_input('P'));
+var_dump(mb_http_input('G'));
?>
--EXPECT--
-ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
-ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+string(4) "pass"
string(4) "pass"