ext/spl: Fix default argument handling for named parameters in SplFileObject::fgetcsv()

Author: arshidkv12

ext/spl/spl_directory.c

@@ -2257,7 +2257,7 @@ PHP_METHOD(SplFileObject, fgetcsv)
 	size_t d_len = 0, e_len = 0;
 	zend_string *escape_str = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!S!", &delim, &d_len, &enclo, &e_len, &escape_str) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ssS", &delim, &d_len, &enclo, &e_len, &escape_str) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -2268,14 +2268,18 @@ PHP_METHOD(SplFileObject, fgetcsv)
 			zend_argument_value_error(1, "must be a single character");
 			RETURN_THROWS();
 		}
-		delimiter = delim[0];
+		if(delimiter == ',') {
+			delimiter = delim[0];
+		}
 	}
 	if (enclo) {
 		if (e_len != 1) {
 			zend_argument_value_error(2, "must be a single character");
 			RETURN_THROWS();
 		}
-		enclosure = enclo[0];
+		if(enclosure == '"') {
+			enclosure = enclo[0];
+		}
 	}
 	int escape_char = spl_csv_enclosure_param_handling(escape_str, intern, 3);
 	if (escape_char == PHP_CSV_ESCAPE_ERROR) {

ext/spl/spl_directory.stub.php

@@ -245,8 +245,8 @@ public function fgets(): string {}
     public function fread(int $length): string|false {}
 
     /** @tentative-return-type */
-    public function fgetcsv(?string $separator = null, ?string $enclosure = null, ?string $escape = null): array|false {}
-
+    public function fgetcsv(string $separator = ",", string $enclosure = "\"", string $escape = "\\"): array|false {}
+    
     /** @tentative-return-type */
     public function fputcsv(array $fields, string $separator = ",", string $enclosure = "\"", string $escape = "\\", string $eol = "\n"): int|false {}
 

ext/spl/spl_directory_arginfo.h

@@ -69,9 +69,9 @@ array(3) {
 Test 2:
 array(2) {
   [0]=>
-  string(1) "a"
+  string(3) "a,b"
   [1]=>
-  string(3) "b;c"
+  string(1) "c"
 }
 Test 3:
 array(2) {
@@ -91,14 +91,14 @@ array(2) {
 }
 Test 5:
 string(9) "separator"
-bool(true)
-NULL
+bool(false)
+string(1) ","
 string(9) "enclosure"
-bool(true)
-NULL
+bool(false)
+string(1) """
 string(6) "escape"
-bool(true)
-NULL
+bool(false)
+string(1) "\"
 Test 6:
 
 Deprecated: SplFileObject::setCsvControl(): the $escape parameter must be provided as its default value will change in %s on line %d