also add empty cols if assoc is false

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

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/src/Xlsx/Native.php b/src/Xlsx/Native.php
@@ -98,6 +98,11 @@ public function readFile(
                     continue;
                 }
                 $rowData = array_combine($headers, $rowData);
+            } else {
+                // Assume the first row indicates how many cells we want
+                if ($totalColumns === null) {
+                    $totalColumns = count($rowData);
+                }
             }
             yield $rowData;
         }

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