ext/standard: Validate scandir() sorting_order parameter

Author: arshidkv12

ext/standard/dir.c

@@ -537,10 +537,8 @@ PHP_FUNCTION(scandir)
 		Z_PARAM_RESOURCE_OR_NULL(zcontext)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (flags != PHP_SCANDIR_SORT_ASCENDING &&
-			flags != PHP_SCANDIR_SORT_DESCENDING &&
-			flags != PHP_SCANDIR_SORT_NONE) {
-		zend_argument_value_error(2, "must be one of SCANDIR_SORT_ASCENDING, SCANDIR_SORT_DESCENDING, or SCANDIR_SORT_NONE");
+	if (flags != PHP_SCANDIR_SORT_ASCENDING && flags != PHP_SCANDIR_SORT_NONE) {
+		zend_argument_value_error(2, "must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE");
 		RETURN_THROWS();
 	}
 

ext/standard/tests/dir/scandir_invalid_flag.phpt

@@ -7,7 +7,6 @@ echo "== Valid flags ==\n";
 
 $valid_flags = [
     SCANDIR_SORT_ASCENDING,
-    SCANDIR_SORT_DESCENDING,
     SCANDIR_SORT_NONE,
 ];
 
@@ -23,9 +22,8 @@ $invalid_flags = [-1, 3, 999, PHP_INT_MAX];
 foreach ($invalid_flags as $flag) {
     try {
         scandir(__DIR__, $flag);
-        echo "FAIL\n";
     } catch (ValueError $e) {
-        echo "OK\n";
+        echo $e->getMessage() . PHP_EOL;
     }
 }
 
@@ -34,9 +32,8 @@ foreach ($invalid_flags as $flag) {
 == Valid flags ==
 OK
 OK
-OK
 == Invalid flags ==
-OK
-OK
-OK
-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

ext/standard/tests/dir/scandir_variation9.phpt

@@ -21,7 +21,11 @@ mkdir($dir);
 $ints = array (PHP_INT_MAX, -PHP_INT_MAX, 0);
 
 foreach($ints as $sorting_order) {
-    var_dump( scandir($dir, $sorting_order) );
+  try {
+     var_dump( scandir($dir, $sorting_order) );
+  } catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+  }
 }
 
 delete_files($dir, 2);
@@ -31,28 +35,10 @@ delete_files($dir, 2);
 $dir = __DIR__ . '/scandir_variation9';
 rmdir($dir);
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing scandir() : usage variations ***
-array(4) {
-  [0]=>
-  string(9) "file2.tmp"
-  [1]=>
-  string(9) "file1.tmp"
-  [2]=>
-  string(2) ".."
-  [3]=>
-  string(1) "."
-}
-array(4) {
-  [0]=>
-  string(9) "file2.tmp"
-  [1]=>
-  string(9) "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) "."
@@ -62,4 +48,4 @@ array(4) {
   string(9) "file1.tmp"
   [3]=>
   string(9) "file2.tmp"
-}
+}