Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit 235535e3f84f · 2024-09-16T08:30:38.000+02:00
* 6.4:
  fix merge
  pass CSV escape characters explicitly
  move setting deprecation session options into a legacy group test
diff --git a/Dumper/CsvFileDumper.php b/Dumper/CsvFileDumper.php
@@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra
         $handle = fopen('php://memory', 'r+');
 
         foreach ($messages->all($domain) as $source => $target) {
-            fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure);
+            fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure, '\\');
         }
 
         rewind($handle);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra`
`28`	`28`	`$handle = fopen('php://memory', 'r+');`
`29`	`29`
`30`	`30`	`foreach ($messages->all($domain) as $source => $target) {`
`31`		`- fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure);`
	`31`	`+ fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure, '\\');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`rewind($handle);`