Support empty extra columns in CSV conversion (#12)

codappix · Nov 9, 2023 · 77a7d13 · 77a7d13
1 parent 8a83c50
commit 77a7d13
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.4.1 - 2023-11-09
+
+### Added
+
+- Support empty columns in CSV conversion.
+
 ## v1.4.0 - 2023-11-07
 
 ### Added

diff --git a/Classes/Converter/Csv.php b/Classes/Converter/Csv.php
@@ -71,20 +71,20 @@ private function buildContent(SplFileObject $incomingFile): string
                 break;
             }
 
-            if (is_array($line) && count($line) === 1 && is_string($line[0])) {
+            if (is_array($line) && count(array_filter($line)) === 1 && is_string($line[0])) {
                 // Line is a new table, introducing also new columns o next row
                 $tableName = $line[0];
                 $columns = [];
                 continue;
             }
 
             if ($columns === [] && is_array($line)) {
-                $columns = array_slice($line, 1);
+                $columns = array_filter($line);
                 continue;
             }
 
             if (is_array($line)) {
-                $values = array_slice($line, 1);
+                $values = array_slice($line, 1, count($columns));
                 $phpArray[$tableName][] = array_combine($columns, $values);
             }
         }

diff --git a/Tests/Functional/Converter/CsvTest.php b/Tests/Functional/Converter/CsvTest.php
@@ -99,6 +99,10 @@ public static function possibleCsvFiles(): array
                 'incomingCsvFile' => __DIR__ . '/Fixtures/Csv/RecordsInDifferentTablesIncoming.csv',
                 'expectedResultFile' => __DIR__ . '/Fixtures/Csv/RecordsInDifferentTablesAssert.php',
             ],
+            'Extra columns' => [
+                'incomingCsvFile' => __DIR__ . '/Fixtures/Csv/ExtraColumnsIncoming.csv',
+                'expectedResultFile' => __DIR__ . '/Fixtures/Csv/ExtraColumnsAssert.php',
+            ],
         ];
     }
 }
diff --git a/Tests/Functional/Converter/Fixtures/Csv/ExtraColumnsAssert.php b/Tests/Functional/Converter/Fixtures/Csv/ExtraColumnsAssert.php
@@ -0,0 +1,14 @@
+<?php
+
+return array (
+  'pages' => 
+  array (
+    0 => 
+    array (
+      'uid' => '1',
+      'pid' => '0',
+      'title' => 'Page with uid 1 below 0',
+      'deleted' => '0',
+    ),
+  ),
+);
diff --git a/Tests/Functional/Converter/Fixtures/Csv/ExtraColumnsIncoming.csv b/Tests/Functional/Converter/Fixtures/Csv/ExtraColumnsIncoming.csv
@@ -0,0 +1,3 @@
+pages,,,,,,,,
+,uid,pid,title,deleted,,,,
+,1,0,Page with uid 1 below 0,0,,,,