Fixed numeric mapping

dpiquet · Feb 15, 2018 · 2a18d7a · 2a18d7a
1 parent bb487ed
commit 2a18d7a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/Tests/MappedRow/MappedRowTest.php b/Tests/MappedRow/MappedRowTest.php
@@ -23,16 +23,27 @@ public function testinvalidKey($key, $cols, $row)
 
     public function invalidKeyDataProvider()
     {
-        $cols = ['a', 'c'];
+        $cols = [
+            'a' => 0,
+            'c' => 1,
+        ];
         $mockRow = $this->createMock(Row::class);
         $mockRow
             ->method('getCellIterator')
             ->willReturn(new \ArrayIterator([$this->generateMockCell('a'), $this->generateMockCell('b')]))
         ;
         yield ['invalidCellKey', $cols, $mockRow];
 
-        $cols = [455, 377];
-        yield ['invalidCellKey', $cols, $mockRow];
+        $numericCols = [
+            455 => 1,
+            377 => 0,
+        ];
+        $numericMockRow = $this->createMock(Row::class);
+        $numericMockRow
+            ->method('getCellIterator')
+            ->willReturn(new \ArrayIterator([$this->generateMockCell(4), $this->generateMockCell(5)]))
+        ;
+        yield ['invalidCellKey', $numericCols, $numericMockRow];
     }
 
     /**

diff --git a/Tests/SpreadSheetMappingTest.php b/Tests/SpreadSheetMappingTest.php
@@ -11,9 +11,13 @@
 class SpreadSheetMappingTest extends TestCase
 {
 
-    public function testBasicIntegration()
+    /**
+     * @param string $filename
+     * @dataProvider basicIntegrationFilenameProvider
+     */
+    public function testBasicIntegration($filename)
     {
-        $workbook = IOFactory::load('Tests/testData/simpleok.xlsx');
+        $workbook = IOFactory::load($filename);
         $worksheet = $workbook->getSheet(0);
 
         $mapping = new Mapping();
@@ -31,6 +35,15 @@ public function testBasicIntegration()
         }
     }
 
+    /**
+     * @return \Generator|string[]
+     */
+    public function basicIntegrationFilenameProvider()
+    {
+        yield ['Tests/testData/simpleok.xlsx'];
+        yield ['Tests/testData/gaps.xlsx'];
+    }
+
     public function testOnlyColumns()
     {
         $workbook = IOFactory::load('Tests/testData/simpleok.xlsx');

diff --git a/Tests/testData/gaps.xlsx b/Tests/testData/gaps.xlsx
diff --git a/src/MappedRow/MappedRow.php b/src/MappedRow/MappedRow.php
@@ -2,8 +2,6 @@
 
 namespace Dpiquet\SpreadsheetMapping\MappedRow;
 
-
-use Dpiquet\Mapping\Mapping;
 use Dpiquet\SpreadsheetMapping\MappedRow\Exception\InvalidKeyException;
 use Dpiquet\SpreadsheetMapping\MappedRow\Exception\MissingValueException;
 use PhpOffice\PhpSpreadsheet\Worksheet\Row;
@@ -47,7 +45,7 @@ public function __construct(array $map, Row $row)
      * @throws MissingValueException
      */
     public function get($key) {
-        if (!in_array($key, $this->map)) {
+        if (!array_key_exists($key, $this->map)) {
             throw new InvalidKeyException($key);
         }