Skip to content

Commit 0286ea0

Browse files
committed
ext/standard: Validate scandir() sorting_order parameter
1 parent 08b58e0 commit 0286ea0

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

ext/standard/tests/dir/scandir_basic-win32-mb.phpt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ var_dump(scandir($directory));
2828
echo "\n-- scandir() with all arguments --\n";
2929
$sorting_order = SCANDIR_SORT_DESCENDING;
3030
$context = stream_context_create();
31-
var_dump(scandir($directory, $sorting_order, $context));
31+
try {
32+
var_dump(scandir($directory, $sorting_order, $context));
33+
} catch (ValueError $e) {
34+
echo $e->getMessage();
35+
}
3236

3337
delete_files($directory, 3, "私はガラスを食べられますfile");
3438
?>
@@ -55,15 +59,4 @@ array(5) {
5559
}
5660

5761
-- scandir() with all arguments --
58-
array(5) {
59-
[0]=>
60-
string(45) "私はガラスを食べられますfile3.tmp"
61-
[1]=>
62-
string(45) "私はガラスを食べられますfile2.tmp"
63-
[2]=>
64-
string(45) "私はガラスを食べられますfile1.tmp"
65-
[3]=>
66-
string(2) ".."
67-
[4]=>
68-
string(1) "."
69-
}
62+
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE

ext/standard/tests/dir/scandir_variation10-win32-mb.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - different sorting constants
33
--SKIPIF--
44
<?php
55
if (substr(PHP_OS, 0, 3) != 'WIN') {
6-
// die("skip Valid only on Windows");
6+
die("skip Valid only on Windows");
77
}
88
?>
99
--FILE--

0 commit comments

Comments
 (0)