diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-14 14:01:00 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-14 14:01:00 +0200 |
commit | 6e21932521dfa20ef49fe5a19e40e032fcbc00f5 (patch) | |
tree | ba3a1de1c84bf814790c44e853bedaf5941049b0 | |
parent | f00bcfbb7dfe759ffab5abd05e3171fdeeb2f02e (diff) | |
parent | 2a46f3ee91a9d551202ecc9e3ad8b0f71ba4dafd (diff) | |
download | php-git-6e21932521dfa20ef49fe5a19e40e032fcbc00f5.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test cases
-rw-r--r-- | ext/standard/tests/file/windows_mb_path/test_big5_0.phpt | 2 | ||||
-rw-r--r-- | ext/standard/tests/file/windows_mb_path/test_big5_2.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index 90af1c2ffc..794c1a2f7b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -13,7 +13,7 @@ skip_if_wrong_cp(950, "ansi"); --CONFLICTS-- file_big5 --INI-- -defalut_charset=big5 +default_charset=big5 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index a16df7b00a..d7652615de 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -13,7 +13,7 @@ skip_if_wrong_cp(950, "ansi"); --CONFLICTS-- file_big5 --INI-- -defalut_charset=cp950 +default_charset=cp950 --FILE-- <?php /* |