Skip to content

Commit 89fe907

Browse files
committed
ext/standard/tests/general_functions: Fix tests and remove ZPP tests
1 parent bab7b04 commit 89fe907

8 files changed

+13
-308
lines changed

ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt

Lines changed: 0 additions & 107 deletions
This file was deleted.

ext/standard/tests/general_functions/escapeshellarg_variation1.phpt

Lines changed: 0 additions & 106 deletions
This file was deleted.

ext/standard/tests/general_functions/get_cfg_var_variation2.phpt

Lines changed: 0 additions & 35 deletions
This file was deleted.

ext/standard/tests/general_functions/ini_get_all.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var_dump(ini_get_all("pcre"));
1717
var_dump(ini_get_all("pcre", false));
1818
var_dump(ini_get_all("reflection", false));
1919

20-
var_dump(ini_get_all("", ""));
20+
var_dump(ini_get_all("", false));
2121

2222
echo "Done\n";
2323
?>

ext/standard/tests/general_functions/parse_ini_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ini_file = __DIR__."/parse_ini_basic.data";
1414

1515
define('TEST_CONSTANT', 'this_is_test_constant');
1616

17-
var_dump(parse_ini_file($ini_file, 1));
17+
var_dump(parse_ini_file($ini_file, true));
1818

1919
echo "Done.\n";
2020
?>

ext/standard/tests/general_functions/parse_ini_booleans.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parse_ini_file() boolean operators
55

66
$ini_file = __DIR__."/parse_ini_booleans.data";
77

8-
var_dump(parse_ini_file($ini_file, 1));
8+
var_dump(parse_ini_file($ini_file, true));
99

1010
echo "Done.\n";
1111

ext/standard/tests/general_functions/proc_nice_variation2.phpt

Lines changed: 0 additions & 37 deletions
This file was deleted.

ext/standard/tests/general_functions/uniqid_basic.phpt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,16 @@ echo "\n\n";
1313
echo "uniqid() with a prefix\n";
1414

1515
// Use a fixed prefix so we can ensure length of o/p id is fixed
16-
$prefix = array (
17-
99999,
18-
"99999",
19-
10.5e2,
20-
true,
21-
false
22-
);
23-
24-
for ($i = 0; $i < count($prefix); $i++) {
25-
var_dump(uniqid($prefix[$i]));
26-
var_dump(uniqid($prefix[$i], true));
27-
var_dump(uniqid($prefix[$i], false));
16+
$prefixes = [
17+
99999,
18+
"99999",
19+
10.5e2,
20+
];
21+
22+
foreach ($prefixes as $prefix) {
23+
var_dump(uniqid($prefix));
24+
var_dump(uniqid($prefix, true));
25+
var_dump(uniqid($prefix, false));
2826
echo "\n";
2927
}
3028

@@ -50,11 +48,3 @@ string(18) "99999%s"
5048
string(17) "1050%s"
5149
string(27) "1050%s.%s"
5250
string(17) "1050%s"
53-
54-
string(14) "1%s"
55-
string(24) "1%s.%s"
56-
string(14) "1%s"
57-
58-
string(13) "%s"
59-
string(23) "%s.%s"
60-
string(13) "%s"

0 commit comments

Comments
 (0)