Skip to content

Commit a6d32b9

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed YAML files missing quotes when a string starts with @ [VarDumper] Fix anonymous class dumping [Routing] mark internal classes [Translation][Csv file] remove unnecessary statements, for better readability. [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2 parents ea5e879 + 6ccd928 commit a6d32b9

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

Loader/CsvFileLoader.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,8 @@ protected function loadResource($resource)
4141
$file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
4242

4343
foreach ($file as $data) {
44-
if (substr($data[0], 0, 1) === '#') {
45-
continue;
46-
}
47-
48-
if (!isset($data[1])) {
49-
continue;
50-
}
51-
52-
if (count($data) == 2) {
44+
if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === count($data)) {
5345
$messages[$data[0]] = $data[1];
54-
} else {
55-
continue;
5646
}
5747
}
5848

0 commit comments

Comments
 (0)