fix empty columns being ignored in native xlsx

bin/bench-read.php

@@ -59,7 +59,7 @@
 
 
 foreach ($times as $format => $dataFormat) {
-    echo "Results for $format" . PHP_EOL;
+    echo "Results for $format" . PHP_EOL . PHP_EOL;
 
     $results = [];
     foreach ($dataFormat as $class => $times) {

bin/bench-write.php

@@ -67,7 +67,7 @@
 }
 
 foreach ($times as $format => $dataFormat) {
-    echo "Results for $format" . PHP_EOL;
+    echo "Results for $format" . PHP_EOL . PHP_EOL;
 
     $results = [];
     foreach ($dataFormat as $class => $times) {

src/SpreadCompat.php

@@ -9,7 +9,6 @@
 use LeKoala\SpreadCompat\Common\ZipUtils;
 use RuntimeException;
 use ZipArchive;
-use SimpleXMLElement;
 
 /**
  * This class provides a static facade for adapters

src/Xlsx/Native.php

@@ -45,33 +45,60 @@ public function readFile(
             throw new Exception("No data");
         }
 
+        $columns = iterator_to_array(SpreadCompat::excelColumnRange());
+        $totalColumns = null;
+
         // Process data
         $wsXml = new SimpleXMLElement($wsData);
         $headers = null;
         foreach ($wsXml->sheetData->children() as $row) {
-            $r = [];
+            $rowData = [];
+
+            $col = 0;
+
+            // blank cells are excluded from xml
             foreach ($row->children() as $c) {
-                $t = (string)$c->attributes()->t;
+                $attrs = $c->attributes();
+
+                $t = (string)$attrs->t;
+                $r = (string)$attrs->r; // cell position, eg A2
                 $v = (string)$c->v;
 
                 // it's a shared string
                 if ($t === 's' && $ssXml) {
-                    $v = $ssXml->si[(int)$c->v]->t ?? '';
+                    $v = (string)$ssXml->si[(int)$c->v]->t ?? '';
                 }
 
-                $r[] = $v;
+                // add as many null values as missing columns
+                $colLetter = preg_replace('/\d/', '', $r);
+                $cellIndex = array_search($colLetter, $columns);
+                while ($cellIndex > $col) {
+                    $rowData[] = null;
+                    $col++;
+                }
+
+                $rowData[] = $v;
+                $col++;
+            }
+
+            // expand missing columns at the end
+            if ($totalColumns && $col < $totalColumns) {
+                $rowData[] = null;
+                $col++;
             }
-            if (empty($r) || $r[0] === "") {
+
+            if (empty($rowData) || $rowData[0] === "") {
                 continue;
             }
             if ($this->assoc) {
                 if ($headers === null) {
-                    $headers = $r;
+                    $headers = $rowData;
+                    $totalColumns = count($headers);
                     continue;
                 }
-                $r = array_combine($headers, $r);
+                $rowData = array_combine($headers, $rowData);
             }
-            yield $r;
+            yield $rowData;
         }
     }
 

tests/SpreadCompatXlsxTest.php

@@ -269,4 +269,34 @@ public function testNativeCanWriteXlsx()
         $this->assertStringContainsString('[Content_Types].xml', $string);
         $this->assertNotEquals($string, $string2);
     }
+
+    public function testNativeDontSkipEmptyCols()
+    {
+
+        $Native = new Native();
+        $Native->assoc = true;
+        $data = $Native->readFile(__DIR__ . '/data/empty-col.xlsx');
+
+        $arr = iterator_to_array($data);
+        $this->assertEquals([
+            [
+                'col1' => "v1",
+                'col2' => "v2",
+                'col3' => null,
+                'col4' => "v4",
+            ],
+            [
+                'col1' => "v1",
+                'col2' => null,
+                'col3' => null,
+                'col4' => "v4",
+            ],
+            [
+                'col1' => null,
+                'col2' => "v2",
+                'col3' => "v3",
+                'col4' => null,
+            ]
+        ], $arr);
+    }
 }