Throw ValueError when a wrong flag value is provided to the second argument of scandir()

Author: alexandre-daubois

UPGRADING

@@ -134,6 +134,8 @@ PHP 8.6 UPGRADE NOTES
 - Standard:
   . pathinfo() now raises a ValueError when an invalid $flag argument
     value is passed.
+  . scandir() now raises a ValueError when an invalid $sorting_order
+    argument value is passed.
 
 - Zip:
   . ZipArchive::extractTo now raises a TypeError for the

ext/standard/dir.c

@@ -591,7 +591,7 @@ PHP_FUNCTION(scandir)
 	} else if (flags == PHP_SCANDIR_SORT_DESCENDING) {
 		n = php_stream_scandir(dirn, &namelist, context, (void *) php_stream_dirent_alphasortr);
 	} else {
-		zend_argument_value_error(2, "must be one of the SCANDIR_SORT_ASCENDING, SCANDIR_SORT_DESCENDING and SCANDIR_SORT_NONE constants");
+		zend_argument_value_error(2, "must be one of the SCANDIR_SORT_ASCENDING, SCANDIR_SORT_DESCENDING, or SCANDIR_SORT_NONE constants");
 		RETURN_THROWS();
     }
 

ext/standard/tests/dir/scandir_invalid_flag.phpt

@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECT--
-scandir(): Argument #2 ($sorting_order) must be one of the SCANDIR_SORT_ASCENDING, SCANDIR_SORT_DESCENDING and SCANDIR_SORT_NONE constants
+scandir(): Argument #2 ($sorting_order) must be one of the SCANDIR_SORT_ASCENDING, SCANDIR_SORT_DESCENDING, or SCANDIR_SORT_NONE constants