Fix exception

mantas-done · Apr 10, 2024 · 9ec77fc · 9ec77fc
1 parent 87ae0a9
commit 9ec77fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Code/Converters/CsvConverter.php b/src/Code/Converters/CsvConverter.php
@@ -178,10 +178,7 @@ private static function csvToArray($content)
 
         $csv2 = [];
         foreach ($csv as $row) {
-             if ($row[0] == '' && !isset($row[1])) { // empty line
-                continue;
-            }
-            if (trim($row[0]) === '' && trim($row[1]) === '') {
+            if ($row[0] == '' && (!isset($row[1]) || trim($row[1]) === '')) { // empty line
                 continue;
             }
             $csv2[] = $row;

diff --git a/tests/formats/CsvTest.php b/tests/formats/CsvTest.php
@@ -217,4 +217,12 @@ public function testDifferentElementCountShouldntBeInterpretedAsCsv()
         $converter = Helpers::getConverterByFileContent($csv);
         $this->assertTrue(get_class($converter) !== CsvConverter::class, get_class($converter));
     }
+    public function testShouldntThrowException()
+    {
+        $csv = '1,a
+' . ' ' . '
+2,b';
+        $converter = Helpers::getConverterByFileContent($csv);
+        $this->assertTrue(get_class($converter) !== CsvConverter::class, get_class($converter));
+    }
 }