diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-14 13:59:39 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-14 13:59:39 +0200 |
| commit | 2a46f3ee91a9d551202ecc9e3ad8b0f71ba4dafd (patch) | |
| tree | 4323cbd305ae449b96e295355269b9ca8907c2aa | |
| parent | ef56b2c977cac5e47e0ba4960b8305078ded87be (diff) | |
| parent | a1b46fc15260ffeedbf67f4c08e5eda151667f38 (diff) | |
| download | php-git-2a46f3ee91a9d551202ecc9e3ad8b0f71ba4dafd.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 f804891a13..9935c646be 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 a768c2397b..a308e7b9d1 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 /* |