add as many missing column as necessary

lekoala · Jan 24, 2025 · 48e99ad · 48e99ad
1 parent f994881
commit 48e99ad
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/Xlsx/Native.php b/src/Xlsx/Native.php
@@ -83,7 +83,7 @@ public function readFile(
             }
 
             // expand missing columns at the end
-            if ($totalColumns && $col < $totalColumns) {
+            while ($totalColumns && $col < $totalColumns) {
                 $rowData[] = null;
                 $col++;
             }

diff --git a/tests/SpreadCompatXlsxTest.php b/tests/SpreadCompatXlsxTest.php
@@ -298,5 +298,40 @@ public function testNativeDontSkipEmptyCols()
                 'col4' => null,
             ]
         ], $arr);
+
+        $Native = new Native();
+        $Native->assoc = true;
+        $data = $Native->readFile(__DIR__ . '/data/empty-col-2.xlsx');
+
+        $arr = iterator_to_array($data);
+        $this->assertEquals([
+            [
+                'col1' => "v1",
+                'col2' => "v2",
+                'col3' => null,
+                'col4' => "v4",
+                'col5' => null,
+                'col6' => null,
+                'col7' => null,
+            ],
+            [
+                'col1' => "v1",
+                'col2' => null,
+                'col3' => null,
+                'col4' => "v4",
+                'col5' => null,
+                'col6' => null,
+                'col7' => null,
+            ],
+            [
+                'col1' => null,
+                'col2' => "v2",
+                'col3' => "v3",
+                'col4' => null,
+                'col5' => null,
+                'col6' => null,
+                'col7' => null,
+            ]
+        ], $arr);
     }
 }
diff --git a/tests/data/empty-col-2.xlsx b/tests/data/empty-col-2.xlsx