bug #57828 [Translation] Fix CSV escape char in CsvFileLoader on PHP >= 7.4 (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit 31e3abf49503 · 2024-07-26T14:16:21.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Translation] Fix CSV escape char in `CsvFileLoader` on PHP >= 7.4 | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Related to #57827. This check has already been done in other places like: https://github.com/symfony/symfony/blob/4a176ceb4b67d1f17cdfb88ecc0946e47a807f65/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php#L310 Commits ------- 0507c22 [Translation] Fix CSV escape char in `CsvFileLoader` on PHP >= 7.4
diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -22,7 +22,7 @@ class CsvFileLoader extends FileLoader
 {
     private $delimiter = ';';
     private $enclosure = '"';
-    private $escape = '\\';
+    private $escape = '';
 
     /**
      * {@inheritdoc}
@@ -38,7 +38,7 @@ protected function loadResource(string $resource)
         }
 
         $file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::SKIP_EMPTY);
-        $file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
+        $file->setCsvControl($this->delimiter, $this->enclosure, '' === $this->escape && \PHP_VERSION_ID < 70400 ? '\\' : $this->escape);
 
         foreach ($file as $data) {
             if (false === $data) {
@@ -56,10 +56,10 @@ protected function loadResource(string $resource)
     /**
      * Sets the delimiter, enclosure, and escape character for CSV.
      */
-    public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\')
+    public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '')
     {
         $this->delimiter = $delimiter;
         $this->enclosure = $enclosure;
-        $this->escape = $escape;
+        $this->escape = '' === $escape && \PHP_VERSION_ID < 70400 ? '\\' : $escape;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class CsvFileLoader extends FileLoader`
`22`	`22`	`{`
`23`	`23`	`private $delimiter = ';';`
`24`	`24`	`private $enclosure = '"';`
`25`		`- private $escape = '\\';`
	`25`	`+ private $escape = '';`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`@@ -38,7 +38,7 @@ protected function loadResource(string $resource)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`$file->setFlags(\SplFileObject::READ_CSV \| \SplFileObject::SKIP_EMPTY);`
`41`		`- $file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);`
	`41`	`+ $file->setCsvControl($this->delimiter, $this->enclosure, '' === $this->escape && \PHP_VERSION_ID < 70400 ? '\\' : $this->escape);`
`42`	`42`
`43`	`43`	`foreach ($file as $data) {`
`44`	`44`	`if (false === $data) {`
`@@ -56,10 +56,10 @@ protected function loadResource(string $resource)`
`56`	`56`	`/**`
`57`	`57`	`* Sets the delimiter, enclosure, and escape character for CSV.`
`58`	`58`	`*/`
`59`		`- public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\')`
	`59`	`+ public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '')`
`60`	`60`	`{`
`61`	`61`	`$this->delimiter = $delimiter;`
`62`	`62`	`$this->enclosure = $enclosure;`
`63`		`- $this->escape = $escape;`
	`63`	`+ $this->escape = '' === $escape && \PHP_VERSION_ID < 70400 ? '\\' : $escape;`
`64`	`64`	`}`
`65`	`65`	`}`