Skip to content

[HttpKernel] pass CSV escape characters explicitly #58266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2024
Merged

[HttpKernel] pass CSV escape characters explicitly #58266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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
Expand Down Expand Up @@ -187,7 +187,7 @@ public function write(Profile $profile): bool
$profile->getTime(),
$profile->getParentToken(),
$profile->getStatusCode(),
]);
], ',', '"', '\\');
fclose($file);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,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, ',', '"', '\\'));
}

public function testReadLineFromFile()
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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);
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Resources/bin/sync-iban-formats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private function readPropertiesFromRegistry(array $properties): array
array_shift($lines);

foreach ($lines as $line) {
$columns = str_getcsv($line, "\t");
$columns = str_getcsv($line, "\t", '"', '\\');
$propertyLabel = array_shift($columns);

if (!isset($properties[$propertyLabel])) {
Expand Down
Loading