From 9ec77fcd62163c51332a396941dd38a17fc265eb Mon Sep 17 00:00:00 2001 From: Mantas Date: Wed, 10 Apr 2024 12:50:14 +0300 Subject: [PATCH] Fix exception --- src/Code/Converters/CsvConverter.php | 5 +---- tests/formats/CsvTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Code/Converters/CsvConverter.php b/src/Code/Converters/CsvConverter.php index 808389f..d82ce58 100644 --- 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 index c359d24..1529eeb 100644 --- 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)); + } } \ No newline at end of file