Make CSV deprecation less annoying to deal with (#15569)

UPGRADING

@@ -581,11 +581,11 @@ PHP 8.4 UPGRADE NOTES
 - SPL:
   . The SplFixedArray::__wakeup() method has been deprecated as it implements
     __serialize() and __unserialize() which need to be overwritten instead.
-  . Passing a non-empty string for the $enclosure parameter of:
+  . Using the default value for $escape parameter of:
     - SplFileObject::setCsvControl()
     - SplFileObject::fputcsv()
     - SplFileObject::fgetcsv()
-    is now deprecated.
+    is now deprecated. It must be passed explicitly either positionally or via named arguments.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_4#deprecate_proprietary_csv_escaping_mechanism
 
 - Standard:
@@ -595,11 +595,11 @@ PHP 8.4 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/raising_zero_to_power_of_negative_number
   . Unserializing strings using the uppercase 'S' tag is deprecated.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_4#unserialize_s_s_tag
-  . Passing a non-empty string for the $enclosure parameter of:
+  . Using the default value for $escape parameter of:
     - fputcsv()
     - fgetcsv()
     - str_getcsv()
-    is now deprecated.
+    is now deprecated. It must be passed explicitly either positionally or via named arguments.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_4#deprecate_proprietary_csv_escaping_mechanism
 
 - XML:

ext/phar/tests/phar_oo_008.phpt

@@ -33,7 +33,7 @@ class MyCSVFile extends SplFileObject
 {
     function current(): array|false
     {
-        return parent::fgetcsv(',', '"');
+        return parent::fgetcsv(',', '"', escape: '');
     }
 }
 
@@ -44,14 +44,14 @@ $v = $phar['a.csv'];
 echo "===3===\n";
 while(!$v->eof())
 {
-    echo $v->key() . "=>" . join('|', $v->fgetcsv()) . "\n";
+    echo $v->key() . "=>" . join('|', $v->fgetcsv(escape: '')) . "\n";
 }
 
 echo "===4===\n";
 $v->rewind();
 while(!$v->eof())
 {
-    $l = $v->fgetcsv();
+    $l = $v->fgetcsv(escape: '');
     echo $v->key() . "=>" . join('|', $l) . "\n";
 }
 
@@ -66,7 +66,7 @@ class MyCSVFile2 extends SplFileObject
     function getCurrentLine(): string
     {
         echo __METHOD__ . "\n";
-        return implode('|', parent::fgetcsv(',', '"'));
+        return implode('|', parent::fgetcsv(',', '"', escape: ''));
     }
 }
 

ext/spl/spl_directory.c

@@ -365,6 +365,7 @@ static zend_result spl_filesystem_file_open(spl_filesystem_object *intern, bool
 	intern->u.file.delimiter = ',';
 	intern->u.file.enclosure = '"';
 	intern->u.file.escape = (unsigned char) '\\';
+	intern->u.file.is_escape_default = true;
 
 	intern->u.file.func_getCurr = zend_hash_str_find_ptr(&intern->std.ce->function_table, "getcurrentline", sizeof("getcurrentline") - 1);
 
@@ -2273,16 +2274,33 @@ PHP_METHOD(SplFileObject, getChildren)
 	/* return NULL */
 } /* }}} */
 
+static int spl_csv_enclosure_param_handling(const zend_string* escape_str, const spl_filesystem_object *intern, uint32_t arg_num)
+{
+	if (escape_str == NULL) {
+		if (intern->u.file.is_escape_default) {
+			php_error_docref(NULL, E_DEPRECATED, "the $escape parameter must be provided,"
+				" as its default value will change,"
+				" either explicitly or via SplFileObject::setCsvControl()");
+			if (UNEXPECTED(EG(exception))) {
+				return PHP_CSV_ESCAPE_ERROR;
+			}
+		}
+		return intern->u.file.escape;
+	} else {
+		return php_csv_handle_escape_argument(escape_str, arg_num);
+	}
+}
+
 /* {{{ Return current line as CSV */
 PHP_METHOD(SplFileObject, fgetcsv)
 {
 	spl_filesystem_object *intern = spl_filesystem_from_obj(Z_OBJ_P(ZEND_THIS));
 	char delimiter = intern->u.file.delimiter, enclosure = intern->u.file.enclosure;
-	int escape = intern->u.file.escape;
+	char *delim = NULL, *enclo = NULL;
-	char *delim = NULL, *enclo = NULL, *esc = NULL;
+	size_t d_len = 0, e_len = 0;
-	size_t d_len = 0, e_len = 0, esc_len = 0;
+	zend_string *escape_str = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sss", &delim, &d_len, &enclo, &e_len, &esc, &esc_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ssS", &delim, &d_len, &enclo, &e_len, &escape_str) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -2302,23 +2320,12 @@ PHP_METHOD(SplFileObject, fgetcsv)
 		}
 		enclosure = enclo[0];
 	}
-	if (esc) {
+	int escape_char = spl_csv_enclosure_param_handling(escape_str, intern, 3);
-		if (esc_len > 1) {
+	if (escape_char == PHP_CSV_ESCAPE_ERROR) {
-			zend_argument_value_error(3, "must be empty or a single character");
 		RETURN_THROWS();
 	}
-		if (esc_len == 0) {
-			escape = PHP_CSV_NO_ESCAPE;
-		} else {
-			php_error_docref(NULL, E_DEPRECATED, "Passing a non-empty string to the $escape parameter is deprecated since 8.4");
-			if (UNEXPECTED(EG(exception))) {
-				RETURN_THROWS();
-			}
-			escape = (unsigned char) esc[0];
-		}
-	}
 
-	if (spl_filesystem_file_read_csv(intern, delimiter, enclosure, escape, return_value, true) == FAILURE) {
+	if (spl_filesystem_file_read_csv(intern, delimiter, enclosure, escape_char, return_value, true) == FAILURE) {
 		RETURN_FALSE;
 	}
 }
@@ -2329,14 +2336,14 @@ PHP_METHOD(SplFileObject, fputcsv)
 {
 	spl_filesystem_object *intern = spl_filesystem_from_obj(Z_OBJ_P(ZEND_THIS));
 	char delimiter = intern->u.file.delimiter, enclosure = intern->u.file.enclosure;
-	int escape = intern->u.file.escape;
+	char *delim = NULL, *enclo = NULL;
-	char *delim = NULL, *enclo = NULL, *esc = NULL;
+	size_t d_len = 0, e_len = 0;
-	size_t d_len = 0, e_len = 0, esc_len = 0;
 	zend_long ret;
 	zval *fields = NULL;
+	zend_string *escape_str = NULL;
 	zend_string *eol = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|sssS", &fields, &delim, &d_len, &enclo, &e_len, &esc, &esc_len, &eol) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|ssSS", &fields, &delim, &d_len, &enclo, &e_len, &escape_str, &eol) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -2354,23 +2361,12 @@ PHP_METHOD(SplFileObject, fputcsv)
 		}
 		enclosure = enclo[0];
 	}
-	if (esc) {
+	int escape_char = spl_csv_enclosure_param_handling(escape_str, intern, 4);
-		if (esc_len > 1) {
+	if (escape_char == PHP_CSV_ESCAPE_ERROR) {
-			zend_argument_value_error(4, "must be empty or a single character");
 		RETURN_THROWS();
 	}
-		if (esc_len == 0) {
-			escape = PHP_CSV_NO_ESCAPE;
-		} else {
-			php_error_docref(NULL, E_DEPRECATED, "Passing a non-empty string to the $escape parameter is deprecated since 8.4");
-			if (UNEXPECTED(EG(exception))) {
-				RETURN_THROWS();
-			}
-			escape = (unsigned char) esc[0];
-		}
-	}
 
-	ret = php_fputcsv(intern->u.file.stream, fields, delimiter, enclosure, escape, eol);
+	ret = php_fputcsv(intern->u.file.stream, fields, delimiter, enclosure, escape_char, eol);
 	if (ret < 0) {
 		RETURN_FALSE;
 	}
@@ -2383,11 +2379,11 @@ PHP_METHOD(SplFileObject, setCsvControl)
 {
 	spl_filesystem_object *intern = spl_filesystem_from_obj(Z_OBJ_P(ZEND_THIS));
 	char delimiter = ',', enclosure = '"';
-	int escape = (unsigned char) '\\';
+	char *delim = NULL, *enclo = NULL;
-	char *delim = NULL, *enclo = NULL, *esc = NULL;
+	size_t d_len = 0, e_len = 0;
-	size_t d_len = 0, e_len = 0, esc_len = 0;
+	zend_string *escape_str = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sss", &delim, &d_len, &enclo, &e_len, &esc, &esc_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ssS", &delim, &d_len, &enclo, &e_len, &escape_str) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -2405,25 +2401,17 @@ PHP_METHOD(SplFileObject, setCsvControl)
 		}
 		enclosure = enclo[0];
 	}
-	if (esc) {
+	int escape_char = php_csv_handle_escape_argument(escape_str, 3);
-		if (esc_len > 1) {
+	if (escape_char == PHP_CSV_ESCAPE_ERROR) {
-			zend_argument_value_error(3, "must be empty or a single character");
 		RETURN_THROWS();
 	}
-		if (esc_len == 0) {
+	if (escape_str != NULL) {
-			escape = PHP_CSV_NO_ESCAPE;
+		intern->u.file.is_escape_default = false;
-		} else {
-			php_error_docref(NULL, E_DEPRECATED, "Passing a non-empty string to the $escape parameter is deprecated since 8.4");
-			if (UNEXPECTED(EG(exception))) {
-				RETURN_THROWS();
-			}
-			escape = (unsigned char) esc[0];
-		}
 	}
 
 	intern->u.file.delimiter = delimiter;
 	intern->u.file.enclosure = enclosure;
-	intern->u.file.escape    = escape;
+	intern->u.file.escape    = escape_char;
 }
 /* }}} */
 

ext/spl/spl_directory.h

@@ -82,6 +82,7 @@ struct _spl_filesystem_object {
 			char               delimiter;
 			char               enclosure;
 			int                escape;
+			bool               is_escape_default;
 		} file;
 	} u;
 	zend_object        std;

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_basic.phpt

@@ -3,15 +3,20 @@ SplFileObject::fgetcsv default path
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv1.csv', 'w+');
-fputcsv($fp, array(
+fputcsv(
+    $fp,
+    [
         'field1',
         'field2',
         'field3',
-    5
+        5,
-));
+    ],
+    escape: '',
+);
 fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv1.csv');
+$fo->setCsvControl(escape: '');
 var_dump($fo->fgetcsv());
 ?>
 --CLEAN--

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_delimiter_basic.phpt

@@ -1,17 +1,23 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimiter
+SplFileObject::fgetcsv with alternative separator
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv2.csv', 'w+');
-fputcsv($fp, array(
+fputcsv(
+    $fp,
+    [
         'field1',
         'field2',
         'field3',
-    5
+        5,
-), '|');
+    ],
+    separator: '|',
+    escape: '',
+);
 fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv2.csv');
+$fo->setCsvControl(escape: '');
 var_dump($fo->fgetcsv('|'));
 ?>
 --CLEAN--

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_delimiter_error.phpt

@@ -1,17 +1,22 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimiter
+SplFileObject::fgetcsv() delimiter error
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv3.csv', 'w+');
-fputcsv($fp, array(
+fputcsv(
+    $fp,
+    [
         'field1',
         'field2',
         'field3',
-    5
+        5,
-), '|');
+    ],
+    escape: '',
+);
 fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv3.csv');
+$fo->setCsvControl(escape: '');
 try {
     var_dump($fo->fgetcsv('invalid'));
 } catch (ValueError $e) {

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_enclosure_basic.phpt

@@ -1,18 +1,24 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimiter
+SplFileObject::fgetcsv with alternative enclosure
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv4.csv', 'w+');
-fputcsv($fp, array(
+fputcsv(
+    $fp,
+    [
         'field1',
         'field2',
         'field3',
-    5
+        5,
-), ',', '"');
+    ],
+    enclosure: '"',
+    escape: '',
+);
 fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv4.csv');
-var_dump($fo->fgetcsv(',', '"'));
+$fo->setCsvControl(escape: '');
+var_dump($fo->fgetcsv(enclosure: '"'));
 ?>
 --CLEAN--
 <?php

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_enclosure_error.phpt

@@ -1,19 +1,24 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimiter
+SplFileObject::fgetcsv() enclosure error
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv5.csv', 'w+');
-fputcsv($fp, array(
+fputcsv(
+    $fp,
+    [
         'field1',
         'field2',
         'field3',
-    5
+        5,
-), ',', '"');
+    ],
+    escape: '',
+);
 fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv5.csv');
+$fo->setCsvControl(escape: '');
 try {
-    var_dump($fo->fgetcsv(',', 'invalid'));
+    var_dump($fo->fgetcsv(enclosure: 'invalid'));
 } catch (ValueError $e) {
     echo $e->getMessage(), "\n";
 }

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_basic.phpt

@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimiter
+SplFileObject::fgetcsv with alternative escape
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv6.csv', 'w+');
@@ -14,7 +14,6 @@ var_dump($fo->fgetcsv(',', '"', '"'));
 unlink('SplFileObject__fgetcsv6.csv');
 ?>
 --EXPECTF--
-Deprecated: SplFileObject::fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array(3) {
   [0]=>
   string(3) "aaa"

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_default.phpt

@@ -13,7 +13,8 @@ var_dump($fo->fgetcsv());
 <?php
 unlink('SplFileObject__fgetcsv7.csv');
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: SplFileObject::fgetcsv(): the $escape parameter must be provided, as its default value will change, either explicitly or via SplFileObject::setCsvControl() in %s on line %d
 array(3) {
   [0]=>
   string(4) "aa\""

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_error.phpt

@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimiter
+SplFileObject::fgetcsv() escape error
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv8.csv', 'w+');

ext/spl/tests/SplFileObject/SplFileObject_fputcsv.phpt

@@ -4,6 +4,8 @@ SplFileObject::fputcsv(): functionality tests
 <?php
 $file = __DIR__ . '/SplFileObject_fputcsv.csv';
 $fo = new SplFileObject($file, 'w');
+// Suppress deprecation notice
+$fo->setCsvControl(escape: '\\');
 
 $list = array (
   0 => 'aaa,bbb',
@@ -42,7 +44,7 @@ echo '$list = ';var_export($res);echo ";\n";
 
 $fp = fopen($file, "r");
 $res = array();
-while($l=fgetcsv($fp))
+while($l=fgetcsv($fp, escape: '\\'))
 {
     $res[] = join(',',$l);
 }

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_002.phpt

@@ -3,6 +3,7 @@ SplFileObject::fputcsv(): Checking data after calling the function
 --FILE--
 <?php
 $fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv1.csv', 'w');
+$fo->setCsvControl(escape: '');
 
 $data = array(1, 2, 'foo', 'haha', array(4, 5, 6), 1.3, null);
 

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation1.phpt

@@ -42,6 +42,7 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '');
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation10.phpt

@@ -36,6 +36,8 @@ foreach ($fields as $field) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $csv_field = $field;
 
     // write to a file in csv format

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation11.phpt

@@ -42,6 +42,8 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation12.phpt

@@ -43,6 +43,8 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation5.phpt

@@ -42,6 +42,8 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation6.phpt

@@ -45,6 +45,8 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation7.phpt

@@ -45,6 +45,8 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation8.phpt

@@ -45,6 +45,8 @@ foreach ($csv_lists as $csv_list) {
     } else {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
+    $fo->setCsvControl(escape: '\\');
+
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];

ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_variation001.phpt

@@ -23,7 +23,8 @@ foreach ($s as $row) {
 <?php
 unlink('csv_control_data_variation001.csv');
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: SplFileObject::setCsvControl(): the $escape parameter must be provided as its default value will change in %s on line %d
 groene appelen : 10
 gele bananen : 20
 rode kersen : 30

ext/spl/tests/SplFileObject/bug46569.phpt

@@ -3,6 +3,7 @@ Bug #46569 (SplFileObject: fgetcsv after seek returns wrong line)
 --FILE--
 <?php
 $file = new SplFileObject(__DIR__ . '/bug46569.csv');
+$file->setCsvControl(escape: "");
 $file->seek(1);
 print_r($file->fgetcsv());
 ?>

ext/spl/tests/SplFileObject/bug75917.phpt

@@ -8,6 +8,7 @@ $expected = [
 ];
 
 $tmp = new SplTempFileObject();
+$tmp->setCsvControl(escape: "");
 foreach ($expected as $row) {
     $tmp->fputcsv($row);
 }

ext/spl/tests/SplFileObject/bug77024.phpt

@@ -4,6 +4,7 @@ Bug #77024 SplFileObject::__toString() may return array
 <?php
 
 $file = new SplTempFileObject;
+$file->setCsvControl(escape: "");
 $file->fputcsv(['foo', 'bar', 'baz']);
 $file->rewind();
 $file->setFlags(SplFileObject::READ_CSV);

ext/spl/tests/SplFileObject/bug78976.phpt

@@ -3,6 +3,7 @@ Bug #78976 (SplFileObject::fputcsv returns -1 on failure)
 --FILE--
 <?php
 $file = new SplFileObject('php://memory', 'r');
+$file->setCsvControl(escape: "");
 var_dump($file->fputcsv(['foo', 'bar']));
 ?>
 --EXPECT--

ext/spl/tests/SplFileObject/fgetcsv_blank_file.phpt

@@ -3,9 +3,8 @@ SplFileObject: fgetcsv() on a blank line
 --FILE--
 <?php
 
-$file_path = __DIR__ . '/SplFileObject_fgetcsv_empty.csv';
-$file = new SplFileObject($file_path, 'w');
 $file = new SplTempFileObject();
+$file->setCsvControl(escape: "");
 
 // write to file
 $file->fwrite("");
@@ -18,11 +17,6 @@ $file->setFlags(SplFileObject::SKIP_EMPTY);
 $file->rewind();
 var_dump($file->fgetcsv());
 ?>
---CLEAN--
-<?php
-$file_path = __DIR__ . '/SplFileObject_fgetcsv_empty.csv';
-unlink($file_path);
-?>
 --EXPECT--
 array(1) {
   [0]=>

ext/spl/tests/bug69181.phpt

@@ -12,6 +12,7 @@ CSV;
 file_put_contents($filename, $csv);
 
 $file = new SplFileObject($filename);
+$file->setCsvControl(escape: "");
 $file->setFlags(SplFileObject::SKIP_EMPTY | SplFileObject::DROP_NEW_LINE | SplFileObject::READ_CSV);
 var_dump(iterator_to_array($file));
 

ext/standard/file.c

@@ -1677,6 +1677,28 @@ quit_loop:
 }
 /* }}} */
 
+PHPAPI int php_csv_handle_escape_argument(const zend_string *escape_str, uint32_t arg_num)
+{
+	if (escape_str != NULL) {
+		if (ZSTR_LEN(escape_str) > 1) {
+			zend_argument_value_error(arg_num, "must be empty or a single character");
+			return PHP_CSV_ESCAPE_ERROR;
+		}
+		if (ZSTR_LEN(escape_str) < 1) {
+			return PHP_CSV_NO_ESCAPE;
+		} else {
+			/* use first character from string */
+			return (unsigned char) ZSTR_VAL(escape_str)[0];
+		}
+	} else {
+		php_error_docref(NULL, E_DEPRECATED, "the $escape parameter must be provided as its default value will change");
+		if (UNEXPECTED(EG(exception))) {
+			return PHP_CSV_ESCAPE_ERROR;
+		}
+		return (unsigned char) '\\';
+	}
+}
+
 #define FPUTCSV_FLD_CHK(c) memchr(ZSTR_VAL(field_str), c, ZSTR_LEN(field_str))
 
 /* {{{ Format line as CSV and write to file pointer */
@@ -1684,12 +1706,12 @@ PHP_FUNCTION(fputcsv)
 {
 	char delimiter = ',';					/* allow this to be set as parameter */
 	char enclosure = '"';					/* allow this to be set as parameter */
-	int escape_char = (unsigned char) '\\';	/* allow this to be set as parameter */
 	php_stream *stream;
 	zval *fp = NULL, *fields = NULL;
 	ssize_t ret;
-	char *delimiter_str = NULL, *enclosure_str = NULL, *escape_str = NULL;
+	char *delimiter_str = NULL, *enclosure_str = NULL;
-	size_t delimiter_str_len = 0, enclosure_str_len = 0, escape_str_len = 0;
+	zend_string *escape_str = NULL;
+	size_t delimiter_str_len = 0, enclosure_str_len = 0;
 	zend_string *eol_str = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(2, 6)
@@ -1698,7 +1720,7 @@ PHP_FUNCTION(fputcsv)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STRING(delimiter_str, delimiter_str_len)
 		Z_PARAM_STRING(enclosure_str, enclosure_str_len)
-		Z_PARAM_STRING(escape_str, escape_str_len)
+		Z_PARAM_STR(escape_str)
 		Z_PARAM_STR_OR_NULL(eol_str)
 	ZEND_PARSE_PARAMETERS_END();
 
@@ -1722,22 +1744,10 @@ PHP_FUNCTION(fputcsv)
 		enclosure = *enclosure_str;
 	}
 
-	if (escape_str != NULL) {
+	int escape_char = php_csv_handle_escape_argument(escape_str, 5);
-		if (escape_str_len > 1) {
+	if (escape_char == PHP_CSV_ESCAPE_ERROR) {
-			zend_argument_value_error(5, "must be empty or a single character");
 		RETURN_THROWS();
 	}
-		if (escape_str_len < 1) {
-			escape_char = PHP_CSV_NO_ESCAPE;
-		} else {
-			php_error_docref(NULL, E_DEPRECATED, "Passing a non-empty string to the $escape parameter is deprecated since 8.4");
-			if (UNEXPECTED(EG(exception))) {
-				RETURN_THROWS();
-			}
-			/* use first character from string */
-			escape_char = (unsigned char) *escape_str;
-		}
-	}
 
 	PHP_STREAM_FROM_ZVAL(stream, fp);
 
@@ -1819,22 +1829,19 @@ PHP_FUNCTION(fgetcsv)
 {
 	char delimiter = ',';	/* allow this to be set as parameter */
 	char enclosure = '"';	/* allow this to be set as parameter */
-	int escape = (unsigned char) '\\';
 
 	zend_long len = 0;
 	size_t buf_len;
 	char *buf;
 	php_stream *stream;
 
-	{
 	zval *fd;
 	bool len_is_null = 1;
 	char *delimiter_str = NULL;
 	size_t delimiter_str_len = 0;
 	char *enclosure_str = NULL;
 	size_t enclosure_str_len = 0;
-		char *escape_str = NULL;
+	zend_string *escape_str = NULL;
-		size_t escape_str_len = 0;
 
 	ZEND_PARSE_PARAMETERS_START(1, 5)
 		Z_PARAM_RESOURCE(fd)
@@ -1842,7 +1849,7 @@ PHP_FUNCTION(fgetcsv)
 		Z_PARAM_LONG_OR_NULL(len, len_is_null)
 		Z_PARAM_STRING(delimiter_str, delimiter_str_len)
 		Z_PARAM_STRING(enclosure_str, enclosure_str_len)
-			Z_PARAM_STRING(escape_str, escape_str_len)
+		Z_PARAM_STR(escape_str)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (delimiter_str != NULL) {
@@ -1866,23 +1873,11 @@ PHP_FUNCTION(fgetcsv)
 		enclosure = enclosure_str[0];
 	}
 
-		if (escape_str != NULL) {
+	int escape_char = php_csv_handle_escape_argument(escape_str, 5);
-			if (escape_str_len > 1) {
+	if (escape_char == PHP_CSV_ESCAPE_ERROR) {
-				zend_argument_value_error(5, "must be empty or a single character");
 		RETURN_THROWS();
 	}
 
-			if (escape_str_len < 1) {
-				escape = PHP_CSV_NO_ESCAPE;
-			} else {
-				php_error_docref(NULL, E_DEPRECATED, "Passing a non-empty string to the $escape parameter is deprecated since 8.4");
-				if (UNEXPECTED(EG(exception))) {
-					RETURN_THROWS();
-				}
-				escape = (unsigned char) escape_str[0];
-			}
-		}
-
 	if (len_is_null || len == 0) {
 		len = -1;
 	} else if (len < 0 || len > (ZEND_LONG_MAX - 1)) {
@@ -1891,7 +1886,6 @@ PHP_FUNCTION(fgetcsv)
 	}
 
 	PHP_STREAM_FROM_ZVAL(stream, fd);
-	}
 
 	if (len < 0) {
 		if ((buf = php_stream_get_line(stream, NULL, 0, &buf_len)) == NULL) {
@@ -1905,7 +1899,7 @@ PHP_FUNCTION(fgetcsv)
 		}
 	}
 
-	HashTable *values = php_fgetcsv(stream, delimiter, enclosure, escape, buf_len, buf);
+	HashTable *values = php_fgetcsv(stream, delimiter, enclosure, escape_char, buf_len, buf);
 	if (values == NULL) {
 		values = php_bc_fgetcsv_empty_line();
 	}

ext/standard/file.h

@@ -47,7 +47,10 @@ PHPAPI void php_flock_common(php_stream *stream, zend_long operation, uint32_t o
 	zval *wouldblock, zval *return_value);
 
 #define PHP_CSV_NO_ESCAPE EOF
+#define PHP_CSV_ESCAPE_ERROR -500
+
 PHPAPI HashTable *php_bc_fgetcsv_empty_line(void);
+PHPAPI int php_csv_handle_escape_argument(const zend_string *escape_str, uint32_t arg_num);
 PHPAPI HashTable *php_fgetcsv(php_stream *stream, char delimiter, char enclosure, int escape_char, size_t buf_len, char *buf);
 PHPAPI ssize_t php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, int escape_char, zend_string *eol_str);
 

ext/standard/string.c

@@ -5416,16 +5416,16 @@ PHP_FUNCTION(str_getcsv)
 {
 	zend_string *str;
 	char delimiter = ',', enclosure = '"';
-	int escape = (unsigned char) '\\';
+	char *delimiter_str = NULL, *enclosure_str = NULL;
-	char *delimiter_str = NULL, *enclosure_str = NULL, *escape_str = NULL;
+	size_t delimiter_str_len = 0, enclosure_str_len = 0;
-	size_t delimiter_str_len = 0, enclosure_str_len = 0, escape_str_len = 0;
+	zend_string *escape_str = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 4)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STRING(delimiter_str, delimiter_str_len)
 		Z_PARAM_STRING(enclosure_str, enclosure_str_len)
-		Z_PARAM_STRING(escape_str, escape_str_len)
+		Z_PARAM_STR(escape_str)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (delimiter_str != NULL) {
@@ -5445,24 +5445,13 @@ PHP_FUNCTION(str_getcsv)
 		/* use first character from string */
 		enclosure = enclosure_str[0];
 	}
-	if (escape_str != NULL) {
+
-		if (escape_str_len > 1) {
+	int escape_char = php_csv_handle_escape_argument(escape_str, 4);
-			zend_argument_value_error(4, "must be empty or a single character");
+	if (escape_char == PHP_CSV_ESCAPE_ERROR) {
 		RETURN_THROWS();
 	}
 
-		if (escape_str_len < 1) {
+	HashTable *values = php_fgetcsv(NULL, delimiter, enclosure, escape_char, ZSTR_LEN(str), ZSTR_VAL(str));
-			escape = PHP_CSV_NO_ESCAPE;
-		} else {
-			php_error_docref(NULL, E_DEPRECATED, "Passing a non-empty string to the $escape parameter is deprecated since 8.4");
-			if (UNEXPECTED(EG(exception))) {
-				RETURN_THROWS();
-			}
-			escape = (unsigned char) escape_str[0];
-		}
-	}
-
-	HashTable *values = php_fgetcsv(NULL, delimiter, enclosure, escape, ZSTR_LEN(str), ZSTR_VAL(str));
 	if (values == NULL) {
 		values = php_bc_fgetcsv_empty_line();
 	}

ext/standard/tests/file/bug12556.phpt

@@ -3,7 +3,7 @@ Bug #12556 (fgetcsv() ignores lengths when quotes not closed)
 --FILE--
 <?php
 $fp = fopen(__DIR__."/test.csv", "r");
-while($line = fgetcsv($fp, 24)) {
+while($line = fgetcsv($fp, 24, escape: "\\")) {
     $line = str_replace("\x0d\x0a", "\x0a", $line);
     var_dump($line);
 }

ext/standard/tests/file/bug22382.phpt

@@ -3,7 +3,7 @@ Bug #22382 (fgetcsv() does not handle escaped quotes correctly)
 --FILE--
 <?php
 $fp = fopen(__DIR__."/test2.csv", "r");
-while(($line = fgetcsv($fp, 1024))) {
+while(($line = fgetcsv($fp, 1024, escape: "\\"))) {
     var_dump($line);
 }
 fclose($fp);

ext/standard/tests/file/bug26003.phpt

@@ -3,7 +3,7 @@ Bug #26003 (fgetcsv() is not binary-safe)
 --FILE--
 <?php
 $fp = fopen(__DIR__.'/test3.csv', 'r');
-var_dump(fgetcsv($fp, 4096));
+var_dump(fgetcsv($fp, 4096, escape: "\\"));
 ?>
 --EXPECTF--
 array(2) {

ext/standard/tests/file/bug39538.phpt

@@ -2,38 +2,53 @@
 Bug #39538 (fgetcsv can't handle starting newlines and trailing odd number of backslashes)
 --FILE--
 <?php
-$content = array("\"\nthis is an test\", \"next data\", \"p\narsed\"","\"\r\nthis is an test\", \"next data\", \"p\r\narsed\"","\"\n\rthis is an test\", \"next data\", \"p\n\rarsed\"");
 
 $file = __DIR__ . "/bug39538.csv";
+
+$line = "\"\nthis is a test\", \"next data\", \"p\narsed\"";
+$expectation = [
+    "\nthis is a test",
+    "next data",
+    "p\narsed",
+];
+
+file_put_contents($file, $line);
+$parsed_content = fgetcsv(fopen($file, "r"), filesize($file), escape: "\\");
+var_dump($parsed_content === $expectation);
+
 @unlink($file);
-foreach ($content as $v) {
+
-    file_put_contents($file, $v);
+$line = "\"\r\nthis is a test\", \"next data\", \"p\r\narsed\"";
-    print_r (fgetcsv(fopen($file, "r"), filesize($file)));
+$expectation = [
-}
+    "\r\nthis is a test",
+    "next data",
+    "p\r\narsed",
+];
+
+file_put_contents($file, $line);
+$parsed_content = fgetcsv(fopen($file, "r"), filesize($file), escape: "\\");
+var_dump($parsed_content === $expectation);
+
+@unlink($file);
+
+$line = "\"\n\rthis is a test\", \"next data\", \"p\n\rarsed\"";
+$expectation = [
+    "\n\rthis is a test",
+    "next data",
+    "p\n\rarsed",
+];
+
+file_put_contents($file, $line);
+$parsed_content = fgetcsv(fopen($file, "r"), filesize($file), escape: "\\");
+var_dump($parsed_content === $expectation);
+
+?>
+--CLEAN--
+<?php
+$file = __DIR__ . "/bug39538.csv";
 @unlink($file);
 ?>
 --EXPECT--
-Array
+bool(true)
-(
+bool(true)
-    [0] => 
+bool(true)
-this is an test
-    [1] => next data
-    [2] => p
-arsed
-)
-Array
-(
-    [0] => 
-this is an test
-    [1] => next data
-    [2] => p
-arsed
-)
-Array
-(
-    [0] => 
-
this is an test
-    [1] => next data
-    [2] => p
-
arsed
-)

ext/standard/tests/file/bug40501.phpt

@@ -11,7 +11,6 @@ fclose($h);
 var_dump($data);
 ?>
 --EXPECTF--
-Deprecated: fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array(2) {
   [0]=>
   string(%d) "this element contains the delimiter, and ends with an odd number of

ext/standard/tests/file/bug53848.phpt

@@ -6,7 +6,7 @@ $file = __DIR__ . "/bug53848.csv";
 @unlink($file);
 file_put_contents($file, "a,b\n  c,  d");
 $fp = fopen($file, "r");
-while ($l = fgetcsv($fp)) var_dump($l);
+while ($l = fgetcsv($fp, escape: "\\")) var_dump($l);
 fclose($fp);
 @unlink($file);
 ?>

ext/standard/tests/file/bug66588.phpt

@@ -9,13 +9,13 @@ and neither should return FALSE.
 $s = fopen("php://memory", "w+");
 fwrite($s, "\",bar");
 rewind($s);
-var_dump(fgetcsv($s));
+var_dump(fgetcsv($s, escape: "\\"));
 fclose($s);
 
 $s = fopen("php://memory", "w+");
 fwrite($s, "\",bar\n");
 rewind($s);
-var_dump(fgetcsv($s));
+var_dump(fgetcsv($s, escape: "\\"));
 fclose($s);
 ?>
 --EXPECT--

ext/standard/tests/file/bug72330.phpt

@@ -18,7 +18,6 @@ $fields = str_getcsv($string, ';', '"', "#");
 var_dump($fields);
 ?>
 --EXPECTF--
-Deprecated: str_getcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array(2) {
   [0]=>
   string(11) "first #с؀"

ext/standard/tests/file/fgetcsv.phpt

@@ -34,7 +34,7 @@ various fgetcsv() functionality tests
         fwrite($fp, $v);
         fclose($fp);
 
-        var_dump(fgetcsv(fopen($file, "r"), 1024));
+        var_dump(fgetcsv(fopen($file, "r"), 1024, escape: "\\"));
     }
     @unlink($file);
 ?>

ext/standard/tests/file/fgetcsv_default_escape_deprecation.phpt

@@ -0,0 +1,27 @@
+--TEST--
+fgetcsv(): Deprecation if using default escape arg
+--FILE--
+<?php
+$line = "test1,test2";
+
+$file = __DIR__ . '/fgetcsv_default_escape_deprecation.csv';
+
+$fp = fopen($file, "w");
+fwrite($fp, $line);
+fclose($fp);
+
+var_dump(fgetcsv(fopen($file, "r"), 1024));
+?>
+--CLEAN--
+<?php
+$file = __DIR__ . '/fgetcsv_default_escape_deprecation.csv';
+@unlink($file);
+?>
+--EXPECTF--
+Deprecated: fgetcsv(): the $escape parameter must be provided as its default value will change in %s on line %d
+array(2) {
+  [0]=>
+  string(5) "test1"
+  [1]=>
+  string(5) "test2"
+}

ext/standard/tests/file/fgetcsv_error_conditions.phpt

@@ -12,38 +12,38 @@ $enclosure = '"';
 
 echo 'fgetcsv() with negative length' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, -10) );
+    var_dump( fgetcsv($file_handle, -10, escape: "\\") );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 try {
-    var_dump( fgetcsv($file_handle, -10, $delimiter) );
+    var_dump( fgetcsv($file_handle, -10, $delimiter, escape: "\\") );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 try {
-    var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure) );
+    var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure, escape: "\\") );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
 echo 'fgetcsv() with delimiter as empty string' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, $length, '', $enclosure) );
+    var_dump( fgetcsv($file_handle, $length, '', $enclosure, escape: "\\") );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
 echo 'fgetcsv() with enclosure as empty string' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, $length, $delimiter, '') );
+    var_dump( fgetcsv($file_handle, $length, $delimiter, '', escape: "\\") );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
 echo 'fgetcsv() with delimiter & enclosure as empty string' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, $length, '', '') );
+    var_dump( fgetcsv($file_handle, $length, '', '', escape: "\\") );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }

ext/standard/tests/file/fgetcsv_tab_delimiter.phpt

@@ -2,9 +2,10 @@
 fgetcsv() with tab delimited fields (BUG #8258)
 --FILE--
 <?php
-chdir(__DIR__);
+
-$fp=fopen("004.data","r");
+$file = __DIR__ . '/fgetcsv_tab_delimiter.data';
-while($a=fgetcsv($fp,100,"\t")) {
+$fp = fopen($file,"r");
+while ($a = fgetcsv($fp, 100, "\t", escape: '')) {
     echo join(",",$a)."\n";
 }
 fclose($fp);

ext/standard/tests/file/fgetcsv_variation1.phpt

@@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) {
     // call fgetcsv() to parse csv fields
 
     // use the right delimiter and enclosure with max length
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) );
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation10.phpt

@@ -67,11 +67,11 @@ foreach ($csv_lists as $csv_list) {
 
     // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) );
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle) ); // with default args
+    var_dump( fgetcsv($file_handle, escape: "\\") ); // with default args
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation11.phpt

@@ -71,7 +71,7 @@ foreach ($csv_lists as $csv_list) {
     // use different delimiter but same enclosure char
     fseek($file_handle, 0, SEEK_SET);
     $enc = "+";
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc) );
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation13.phpt

@@ -45,7 +45,7 @@ $loop_counter = 1;
 
     // read the line which is without csv fields, provide delimiter and see the working of fgetcsv
     $fp_pos = ftell($file_handle);
-    var_dump( fgetcsv($file_handle) );
+    var_dump( fgetcsv($file_handle, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation14.phpt

@@ -46,12 +46,12 @@ $loop_counter = 1;
 
     // read the next line which is a blank line to see the working of fgetcsv
     $fp_pos = ftell($file_handle);
-    var_dump( fgetcsv($file_handle, 1024) );
+    var_dump( fgetcsv($file_handle, 1024, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
     // read again to struck EOF
-    var_dump( fgetcsv($file_handle, 1024) );
+    var_dump( fgetcsv($file_handle, 1024, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation15.phpt

@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
 
     // call fgetcsv() to parse csv fields
 
-    var_dump( fgetcsv($file_handle, 1024, $delimiter) );
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation16.phpt

@@ -65,7 +65,7 @@ foreach ($csv_lists as $csv_list) {
 
     // use length as 0
     fseek($file_handle, 0, SEEK_SET);
-    var_dump( fgetcsv($file_handle, 0, $delimiter) );
+    var_dump( fgetcsv($file_handle, 0, $delimiter, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation17.phpt

@@ -65,13 +65,13 @@ foreach ($csv_lists as $csv_list) {
 
     // use length as less than the actual size of the line
     fseek($file_handle, 0, SEEK_SET);
-    var_dump( fgetcsv($file_handle, 9, $delimiter) );
+    var_dump( fgetcsv($file_handle, 9, $delimiter, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
 
     // read rest of the line
-    var_dump( fgetcsv($file_handle, 1024, $delimiter) );
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation18.phpt

@@ -70,7 +70,7 @@ foreach ($csv_lists as $csv_list) {
     // use different delimiter than existing in file
     fseek($file_handle, 0, SEEK_SET);
     $del = "+";
-    var_dump( fgetcsv($file_handle, 1024, $del) );
+    var_dump( fgetcsv($file_handle, 1024, $del, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation19.phpt

@@ -68,7 +68,7 @@ foreach ($csv_lists as $csv_list) {
     fseek($file_handle, 0, SEEK_SET);
     $del = "++";
     try {
-        var_dump( fgetcsv($file_handle, 1024, $del) );
+        var_dump( fgetcsv($file_handle, 1024, $del, escape: "\\") );
     } catch (ValueError $e) {
         echo $e->getMessage(), "\n";
     }

ext/standard/tests/file/fgetcsv_variation2.phpt

@@ -69,7 +69,7 @@ foreach ($csv_lists as $csv_list) {
 
     // use length as 0
     fseek($file_handle, 0, SEEK_SET);
-    var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure) );
+    var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation20.phpt

@@ -48,7 +48,7 @@ $loop_counter = 1;
 
     // read the line which is without csv fields, provide delimiter and see the working of fgetcsv
     $fp_pos = ftell($file_handle);
-    var_dump( fgetcsv($file_handle, 1024) );
+    var_dump( fgetcsv($file_handle, 1024, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation21.phpt

@@ -48,7 +48,7 @@ $loop_counter = 1;
 
     // read the line which is a blank line to see the working of fgetcsv
     $fp_pos = ftell($file_handle);
-    var_dump( fgetcsv($file_handle, 1024, '+') );
+    var_dump( fgetcsv($file_handle, 1024, '+', escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation22.phpt

@@ -66,7 +66,7 @@ foreach ($csv_lists as $csv_list) {
 
     // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, escape: "\\") ); // with length, delimiter
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation23.phpt

@@ -16,13 +16,13 @@ if (!$fp) {
   echo "Error: failed to create file $filename!\n";
   exit();
 }
-var_dump( fgetcsv($fp) );
+var_dump( fgetcsv($fp, escape: "\\") );
 var_dump( ftell($fp) );
-var_dump( fgetcsv($fp, 1024) );
+var_dump( fgetcsv($fp, 1024, escape: "\\") );
 var_dump( ftell($fp) );
-var_dump( fgetcsv($fp, 1024, "+" ) );
+var_dump( fgetcsv($fp, 1024, "+", escape: "\\" ) );
 var_dump( ftell($fp) );
-var_dump( fgetcsv($fp, 1024, "+", "%") );
+var_dump( fgetcsv($fp, 1024, "+", "%", escape: "\\") );
 var_dump( ftell($fp) );
 
 // close and delete the file

ext/standard/tests/file/fgetcsv_variation29.phpt

@@ -67,7 +67,7 @@ foreach ($csv_lists as $csv_list) {
 
     // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle) );
+    var_dump( fgetcsv($file_handle, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation30.phpt

@@ -66,7 +66,7 @@ foreach ($csv_lists as $csv_list) {
 
     // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle, 1024) );
+    var_dump( fgetcsv($file_handle, 1024, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation31.phpt

@@ -68,7 +68,7 @@ foreach ($csv_lists as $csv_list) {
     // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
     $enc = 'z';
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc, escape: "\\" ) ); // with length, delimiter
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation33.phpt

@@ -9,7 +9,7 @@ EOS;
 $stream = fopen('php://memory', 'w+');
 fwrite($stream, $contents);
 rewind($stream);
-while (($data = fgetcsv($stream)) !== false) {
+while (($data = fgetcsv($stream, escape: "\\")) !== false) {
     var_dump($data);
 }
 fclose($stream);

ext/standard/tests/file/fgetcsv_variation6.phpt

@@ -71,12 +71,12 @@ foreach ($csv_lists as $csv_list) {
 
     // use length as less than the actual size of the line
     fseek($file_handle, 0, SEEK_SET);
-    var_dump( fgetcsv($file_handle, 9, $delimiter, $enclosure) );
+    var_dump( fgetcsv($file_handle, 9, $delimiter, $enclosure, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
     // read rest of the line
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) );
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation7.phpt

@@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) {
 
     // use only default arguments
     fseek($file_handle, 0, SEEK_SET);
-    var_dump( fgetcsv($file_handle) );
+    var_dump( fgetcsv($file_handle, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation8.phpt

@@ -74,7 +74,7 @@ foreach ($csv_lists as $csv_list) {
     fseek($file_handle, 0, SEEK_SET);
     $del = "+";
     $enc = "%";
-    var_dump( fgetcsv($file_handle, 1024, $del, $enc) );
+    var_dump( fgetcsv($file_handle, 1024, $del, $enc, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fgetcsv_variation9.phpt

@@ -76,7 +76,7 @@ foreach ($csv_lists as $csv_list) {
     // use different delimiter but same enclosure char
     fseek($file_handle, 0, SEEK_SET);
     $del = "+";
-    var_dump( fgetcsv($file_handle, 1024, $del, $enclosure) );
+    var_dump( fgetcsv($file_handle, 1024, $del, $enclosure, escape: "\\") );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv.phpt

@@ -31,7 +31,7 @@ $file = __DIR__ . '/fputcsv.csv';
 
 $fp = fopen($file, "w");
 foreach ($list as $v) {
-    fputcsv($fp, explode(',', $v));
+    fputcsv($fp, explode(',', $v), escape: "\\");
 }
 fclose($fp);
 
@@ -44,7 +44,7 @@ echo '$list = ';var_export($res);echo ";\n";
 
 $fp = fopen($file, "r");
 $res = array();
-while($l=fgetcsv($fp))
+while($l=fgetcsv($fp, escape: "\\"))
 {
     $res[] = join(',',$l);
 }

ext/standard/tests/file/fputcsv_002.phpt

@@ -9,7 +9,7 @@ $data = array(1, 2, 'foo', 'haha', array(4, 5, 6), 1.3, null);
 
 $fp = fopen($file, 'w');
 
-fputcsv($fp, $data);
+fputcsv($fp, $data, escape: "\\");
 
 var_dump($data);
 

ext/standard/tests/file/fputcsv_default_escape_deprecation.phpt

@@ -0,0 +1,27 @@
+--TEST--
+fputcsv(): Deprecation if using default escape arg
+--FILE--
+<?php
+$line = "test1,test2";
+
+$file = __DIR__ . '/fputcsv_default_escape_deprecation.csv';
+
+$data = ["test1", "test2"];
+
+$fp = fopen($file, 'w');
+
+fputcsv($fp, $data);
+unset($fp);
+
+var_dump(file_get_contents($file));
+
+?>
+--CLEAN--
+<?php
+$file = __DIR__ . '/fputcsv_default_escape_deprecation.csv';
+@unlink($file);
+?>
+--EXPECTF--
+Deprecated: fputcsv(): the $escape parameter must be provided as its default value will change in %s on line %d
+string(12) "test1,test2
+"

ext/standard/tests/file/fputcsv_variation1.phpt

@@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
 
-    var_dump( fputcsv($file_handle, $csv_field, $delimiter, $enclosure) );
+    var_dump( fputcsv($file_handle, $csv_field, $delimiter, $enclosure, escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv_variation10.phpt

@@ -42,7 +42,7 @@ foreach ($fields as $field) {
     $csv_field = $field;
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field) );
+    var_dump( fputcsv($file_handle, $csv_field, escape: "\\") );
 
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );

ext/standard/tests/file/fputcsv_variation11.phpt

@@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field, $delimiter) );
+    var_dump( fputcsv($file_handle, $csv_field, $delimiter, escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv_variation12.phpt

@@ -51,7 +51,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field, '+') );
+    var_dump( fputcsv($file_handle, $csv_field, '+', escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv_variation13.phpt

@@ -52,7 +52,7 @@ foreach ($csv_lists as $csv_list) {
 
     // write to a file in csv format
     try {
-      var_dump( fputcsv($file_handle, $csv_field, '+', '%%') );
+      var_dump( fputcsv($file_handle, $csv_field, '+', '%%', escape: "\\") );
     } catch (ValueError $e) {
       echo $e->getMessage(), "\n";
     }

ext/standard/tests/file/fputcsv_variation18.phpt

@@ -42,29 +42,12 @@ $file = __DIR__ . '/fputcsv_variation18.csv';
 @unlink($file);
 ?>
 --EXPECTF--
-Deprecated: fputcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fputcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fputcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fputcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 $list = array (
   0 => 'aaa,"""/"bbb",ccc',
   1 => '"aaa""/"a""","""bbb"""',
   2 => '"""/"""","""aaa"""',
   3 => '"""/"""""",aaa',
 );
-
-Deprecated: fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
-
-Deprecated: fgetcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 $list = array (
   0 => 'aaa,"/"bbb,ccc',
   1 => 'aaa"/"a","bbb"',

ext/standard/tests/file/fputcsv_variation5.phpt

@@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field) );
+    var_dump( fputcsv($file_handle, $csv_field, escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv_variation6.phpt

@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field, '+', '%') );
+    var_dump( fputcsv($file_handle, $csv_field, '+', '%', escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv_variation7.phpt

@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field, '+', $enclosure) );
+    var_dump( fputcsv($file_handle, $csv_field, '+', $enclosure, escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/fputcsv_variation8.phpt

@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $csv_field = $csv_list[2];
 
     // write to a file in csv format
-    var_dump( fputcsv($file_handle, $csv_field, $delimiter, '+') );
+    var_dump( fputcsv($file_handle, $csv_field, $delimiter, '+', escape: "\\") );
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );

ext/standard/tests/file/gh15653.phpt

@@ -7,12 +7,12 @@ touch($filename);
 $fp = fopen ($filename, "r");
 
 try {
-	fgetcsv($fp, PHP_INT_MAX);
+	fgetcsv($fp, PHP_INT_MAX, escape: '');
 } catch (\ValueError $e) {
 	echo $e->getMessage() . PHP_EOL;
 }
 
-fgetcsv($fp, PHP_INT_MAX-1);
+fgetcsv($fp, PHP_INT_MAX-1,  escape: '');
 --CLEAN--
 <?php
 @unlink(__DIR__ . "/gh15653.tmp");

ext/standard/tests/strings/bug55674.phpt

@@ -2,10 +2,10 @@
 Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records)
 --FILE--
 <?php
-var_dump(str_getcsv("0\t\t\"2\"\n", "\t"));
+var_dump(str_getcsv("0\t\t\"2\"\n", "\t", escape: ''));
-var_dump(str_getcsv("0\t \t'2'\n", "\t", "'"));
+var_dump(str_getcsv("0\t \t'2'\n", "\t", "'", escape: ''));
-var_dump(str_getcsv(",,,,"));
+var_dump(str_getcsv(",,,,", escape: ''));
-var_dump(str_getcsv(" \t  \t\t\t ", "\t"));
+var_dump(str_getcsv(" \t  \t\t\t ", "\t", escape: ''));
 ?>
 --EXPECT--
 array(3) {

ext/standard/tests/strings/bug65947.phpt

@@ -5,7 +5,7 @@ Bug #65947 (basename is no more working after fgetcsv in certain situation)
 $filename = 'test.toto';
 // é in ISO-8859-1
 $csv = base64_decode('6Q==');
-$adata = str_getcsv($csv,";");
+$adata = str_getcsv($csv,";", escape: '');
 $b2 = basename($filename);
 if ($filename != $b2)
     print "BUG";

ext/standard/tests/strings/gh11982.phpt

@@ -2,9 +2,9 @@
 GH-11982 (str_getcsv returns null byte for unterminated quoted string)
 --FILE--
 <?php
-var_dump(str_getcsv('"'));
+var_dump(str_getcsv('"', escape: ''));
-var_dump(str_getcsv('"field","'));
+var_dump(str_getcsv('"field","', escape: ''));
-var_dump(str_getcsv('"","a'));
+var_dump(str_getcsv('"","a', escape: ''));
 ?>
 --EXPECT--
 array(1) {

ext/standard/tests/strings/gh12151.phpt

@@ -3,14 +3,13 @@ GH-12151 (str_getcsv ending with escape zero segfualt)
 --FILE--
 <?php
 var_export(str_getcsv("y",",","y","\000"));
+echo "\n";
 var_export(str_getcsv("\0yy","y","y","\0"));
 ?>
---EXPECTF--
+--EXPECT--
-Deprecated: str_getcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array (
   0 => '' . "\0" . '',
 )
-Deprecated: str_getcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array (
   0 => '' . "\0" . '',
   1 => '' . "\0" . '',

ext/standard/tests/strings/oss_fuzz_57392.phpt

@@ -6,6 +6,7 @@ var_dump(str_getcsv(
     "aaaaaaaaaaaa\0  ",
     "\0",
     "\0",
+    escape: '',
 ));
 ?>
 --EXPECT--

ext/standard/tests/strings/str_getcsv_001.phpt

@@ -4,13 +4,13 @@ str_getcsv(): Testing using various arguments
 <?php
 
 // string input[, string delimiter[, string enclosure[, string escape]]]
-var_dump(str_getcsv('"f", "o", ""'));
+var_dump(str_getcsv('"f", "o", ""', escape: ''));
 print "-----\n";
-var_dump(str_getcsv('foo||bar', '|'));
+var_dump(str_getcsv('foo||bar', '|', escape: ''));
 print "-----\n";
-var_dump(str_getcsv('foo|bar', '|'));
+var_dump(str_getcsv('foo|bar', '|', escape: ''));
 print "-----\n";
-var_dump(str_getcsv('|foo|-|bar|', '-', '|'));
+var_dump(str_getcsv('|foo|-|bar|', '-', '|', escape: ''));
 print "-----\n";
 var_dump(str_getcsv('|f.|.|bar|.|-|-.|', '.', '|', '-'));
 print "-----\n";
@@ -18,9 +18,9 @@ var_dump(str_getcsv('.foo..bar.', '.', '.', '.'));
 print "-----\n";
 var_dump(str_getcsv('.foo  . .  bar  .', ' ', '.', ''));
 print "-----\n";
-var_dump(str_getcsv('" "" "', ' '));
+var_dump(str_getcsv('" "" "', ' ', escape: ''));
 print "-----\n";
-var_dump(str_getcsv(''));
+var_dump(str_getcsv('', escape: ''));
 print "-----\n";
 
 ?>
@@ -57,8 +57,6 @@ array(2) {
   string(3) "bar"
 }
 -----
-
-Deprecated: str_getcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array(3) {
   [0]=>
   string(2) "f."
@@ -68,8 +66,6 @@ array(3) {
   string(4) "-|-."
 }
 -----
-
-Deprecated: str_getcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array(1) {
   [0]=>
   string(7) "foo.bar"