Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ext/standard: Validate scandir() sorting_order parameter
  • Loading branch information
arshidkv12 committed Feb 12, 2026
commit 90414b707bfea5d1993168a4bc3d7abb2701267d
2 changes: 1 addition & 1 deletion ext/standard/tests/dir/scandir_invalid_flag.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ OK
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
2 changes: 1 addition & 1 deletion ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDIN
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
26 changes: 6 additions & 20 deletions ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ mkdir($dir);
$ints = array (PHP_INT_MAX, -PHP_INT_MAX, 0);

foreach($ints as $sorting_order) {
try {
var_dump( scandir($dir, $sorting_order) );
} catch (ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
}

delete_files($dir, 2, "私はガラスを食べられますfile");
Expand All @@ -39,26 +43,8 @@ rmdir($dir);
?>
--EXPECT--
*** Testing scandir() : usage variations ***
array(4) {
[0]=>
string(45) "私はガラスを食べられますfile2.tmp"
[1]=>
string(45) "私はガラスを食べられますfile1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
array(4) {
[0]=>
string(45) "私はガラスを食べられますfile2.tmp"
[1]=>
string(45) "私はガラスを食べられますfile1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
array(4) {
[0]=>
string(1) "."
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/dir/scandir_variation9.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ array(4) {
string(9) "file1.tmp"
[3]=>
string(9) "file2.tmp"
}
}
Loading