Merge branch '6.4' into 7.1

* 6.4:
  fix merge
  pass CSV escape characters explicitly
  move setting deprecation session options into a legacy group test

Author: xabbuh

Profiler/FileProfilerStorage.php

@@ -55,7 +55,7 @@ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?i
 
         $result = [];
         while (\count($result) < $limit && $line = $this->readLineFromFile($file)) {
-            $values = str_getcsv($line);
+            $values = str_getcsv($line, ',', '"', '\\');
 
             if (7 > \count($values)) {
                 // skip invalid lines
@@ -186,7 +186,7 @@ public function write(Profile $profile): bool
                 $profile->getParentToken(),
                 $profile->getStatusCode(),
                 $profile->getVirtualType() ?? 'request',
-            ]);
+            ], ',', '"', '\\');
             fclose($file);
 
             if (1 === mt_rand(1, 10)) {
@@ -324,7 +324,7 @@ private function removeExpiredProfiles(): void
         }
 
         while ($line = fgets($handle)) {
-            $values = str_getcsv($line);
+            $values = str_getcsv($line, ',', '"', '\\');
 
             if (7 > \count($values)) {
                 // skip invalid lines

Tests/Profiler/FileProfilerStorageTest.php

@@ -343,12 +343,12 @@ public function testMultiRowIndexFile()
 
         $handle = fopen($this->tmpDir.'/index.csv', 'r');
         for ($i = 0; $i < $iteration; ++$i) {
-            $row = fgetcsv($handle);
+            $row = fgetcsv($handle, null, ',', '"', '\\');
             $this->assertEquals('token'.$i, $row[0]);
             $this->assertEquals('127.0.0.'.$i, $row[1]);
             $this->assertEquals('http://foo.bar/'.$i, $row[3]);
         }
-        $this->assertFalse(fgetcsv($handle));
+        $this->assertFalse(fgetcsv($handle, null, ',', '"', '\\'));
     }
 
     /**