Merge pull request wp-cli#5991 from jrfnl/feature/php-8.4-fix-csv-deprecation

Author: swissspidy

php/WP_CLI/Iterators/CSV.php

@@ -38,7 +38,7 @@ public function __construct( $filename, $delimiter = ',' ) {
 	public function rewind() {
 		rewind( $this->file_pointer );
 
-		$this->columns = fgetcsv( $this->file_pointer, self::ROW_SIZE, $this->delimiter );
+		$this->columns = fgetcsv( $this->file_pointer, self::ROW_SIZE, $this->delimiter, '"', '\\' );
 
 		$this->current_index = -1;
 		$this->next();
@@ -59,7 +59,7 @@ public function next() {
 		$this->current_element = false;
 
 		while ( true ) {
-			$row = fgetcsv( $this->file_pointer, self::ROW_SIZE, $this->delimiter );
+			$row = fgetcsv( $this->file_pointer, self::ROW_SIZE, $this->delimiter, '"', '\\' );
 
 			if ( false === $row ) {
 				break;

php/utils.php

@@ -379,15 +379,15 @@ function format_items( $format, $items, $fields ) {
  */
 function write_csv( $fd, $rows, $headers = [] ) {
 	if ( ! empty( $headers ) ) {
-		fputcsv( $fd, $headers );
+		fputcsv( $fd, $headers, ',', '"', '\\' );
 	}
 
 	foreach ( $rows as $row ) {
 		if ( ! empty( $headers ) ) {
 			$row = pick_fields( $row, $headers );
 		}
 
-		fputcsv( $fd, array_values( $row ) );
+		fputcsv( $fd, array_values( $row ), ',', '"', '\\' );
 	}
 }
 

tests/WP_CLI/Iterators/CSVTest.php

@@ -93,7 +93,7 @@ private function create_csv_file( $data, $delimiter = ',' ) {
 		$fp = fopen( $filename, 'wb' );
 
 		foreach ( $data as $row ) {
-			fputcsv( $fp, $row, $delimiter );
+			fputcsv( $fp, $row, $delimiter, '"', '\\' );
 		}
 
 		fclose( $fp );