ENGCOM-2053: [Backport] Handle empty or incorrect lines in a language CSV #15287

Stanislav Idolov · web-flow · commit c7b70a42ad43 · 2018-06-19T21:49:26.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv b/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
@@ -1,2 +1,3 @@
 four and 75/100,4.75
-four and 5/10,4.50
+four and 5/10,4.50
+
diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
@@ -193,7 +193,9 @@ private function readPackCsv($vendor, $package)
             foreach ($foundCsvFiles as $foundCsvFile) {
                 $file = $directoryRead->openFile($foundCsvFile);
                 while (($row = $file->readCsv()) !== false) {
-                    $result[$row[0]] = $row[1];
+                    if (is_array($row) && count($row) > 1) {
+                        $result[$row[0]] = $row[1];
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,9 @@ private function readPackCsv($vendor, $package)`
`193`	`193`	`foreach ($foundCsvFiles as $foundCsvFile) {`
`194`	`194`	`$file = $directoryRead->openFile($foundCsvFile);`
`195`	`195`	`while (($row = $file->readCsv()) !== false) {`
`196`		`- $result[$row[0]] = $row[1];`
	`196`	`+ if (is_array($row) && count($row) > 1) {`
	`197`	`+ $result[$row[0]] = $row[1];`
	`198`	`+ }`
`197`	`199`	`}`
`198`	`200`	`}`
`199`	`201`	`}`