Fixing bug in ExcelExtractor skipping first row when no headers needed

Author: stloyd

src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/ExcelExtractor.php

@@ -52,10 +52,6 @@ public function extract(FlowContext $context) : \Generator
         // Offset must be a positive number
         $offset = $this->offset ?? 1;
 
-        if (!$this->withHeader) {
-            $offset++;
-        }
-
         foreach ($context->streams()->list($this->path, $this->filter()) as $stream) {
             foreach ($this->extractRows($stream, $headers, $offset) as $row) {
                 // Ensure $row is an array before passing to array_to_rows

src/adapter/etl-adapter-excel/tests/Flow/ETL/Adapter/Excel/Tests/Integration/ExcelExtractorTest.php

@@ -113,7 +113,7 @@ public function test_extract_excel_file_with_offset_without_header(string $fixtu
             ->fetch()
             ->toArray();
 
-        self::assertCount(6, $rows);
+        self::assertCount(7, $rows);
 
         foreach ($rows as $row) {
             self::assertSame(['e00', 'e01', 'e02'], \array_keys($row));
@@ -166,7 +166,7 @@ public function test_extract_excel_file_without_header(string $fixtureName) : vo
             ->fetch()
             ->toArray();
 
-        self::assertCount(10, $rows);
+        self::assertCount(11, $rows);
 
         foreach ($rows as $row) {
             self::assertSame(['e00', 'e01', 'e02'], \array_keys($row));

src/adapter/etl-adapter-excel/tests/Flow/ETL/Adapter/Excel/Tests/Integration/ExcelLoaderTest.php

@@ -380,7 +380,7 @@ public function test_round_trip_without_header(ExcelWriter $writer, string $exte
             ->run();
 
         $rows = df()
-            ->read(from_excel($outputPath))
+            ->read(from_excel($outputPath)->withHeader(false))
             ->fetch()
             ->toArray();