Making sure the mapper works on column index only

thephpleague · Sep 30, 2023 · 81ee34e · 81ee34e
1 parent bf2b1ac
commit 81ee34e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/ResultSet.php b/src/ResultSet.php
@@ -177,12 +177,12 @@ public function getRecords(array $headerMapper = []): Iterator
     protected function combineHeader(array $headerMapper): Iterator
     {
         return match (true) {
-            $headerMapper === $this->header,
-            [] === $headerMapper => $this->records,
+            $headerMapper === $this->header, [] === $headerMapper => $this->records,
             default => new MapIterator($this->records, function (array $record) use ($headerMapper): array {
                 $assocRecord = [];
+                $row = array_values($record);
                 foreach ($headerMapper as $offset => $headerName) {
-                    $assocRecord[$headerName] = $record[$offset] ?? null;
+                    $assocRecord[$headerName] = $row[$offset] ?? null;
                 }
 
                 return $assocRecord;

diff --git a/src/ResultSetTest.php b/src/ResultSetTest.php
@@ -423,4 +423,40 @@ public function testHeaderMapperOnResultSet(): void
             'does not exists' => null,
         ], [...$results][0]);
     }
+
+    public function testHeaderMapperOnResultSetAlwaysUsesTheColumnOffset(): void
+    {
+        $csv = <<<CSV
+firstname,lastname,e-mail
+john,doe,john.doe@example.com
+jane,doe,jane.doe@example.com
+CSV;
+        $reader = Reader::createFromString($csv)
+            ->setHeaderOffset(0);
+
+        $resultSet = Statement::create()->process($reader);
+
+        self::assertSame(
+            ['nom de famille' => 'doe', 'prenom' => 'john', 'e-mail' => 'john.doe@example.com'],
+            [...$resultSet->getRecords([1 => 'nom de famille', 0 => 'prenom', 2 => 'e-mail'])][0]
+        );
+    }
+
+    public function testHeaderMapperOnResultSetAlwaysIgnoreTheColumnName(): void
+    {
+        $csv = <<<CSV
+firstname,lastname,e-mail
+john,doe,john.doe@example.com
+jane,doe,jane.doe@example.com
+CSV;
+        $reader = Reader::createFromString($csv)
+            ->setHeaderOffset(0);
+
+        $resultSet = Statement::create()->process($reader);
+
+        self::assertSame(
+            ['nom de famille' => null, 'prenom' => null, 'e-mail' => null],
+            [...$resultSet->getRecords(['lastname' => 'nom de famille', 'firstname' => 'prenom', 'e-mail' => 'e-mail'])][0]
+        );
+    }
 }