fix colLetterRange()

aVadim483 · Oct 26, 2023 · 1978c15 · 1978c15
1 parent 13869cd
commit 1978c15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/FastExcelHelper/Helper.php b/src/FastExcelHelper/Helper.php
@@ -166,7 +166,11 @@ public static function colLetterRange($colKeys, ?int $baseNum = 0): array
                     return $columns;
                 }
                 else {
-                    $columns = $colKeys;
+                    $res = [];
+                    foreach ($colKeys as $col) {
+                        $res[] = self::colLetterRange($col);
+                    }
+                    $columns = array_merge(...$res);
                 }
                 return $columns;
             }

diff --git a/tests/FastExcelHelperTest.php b/tests/FastExcelHelperTest.php
@@ -61,6 +61,7 @@ public function testExcelHelper()
         $this->assertEquals(['', 'A', 'B'], Helper::colLetterRange([0, 1, 2], 1));
         $this->assertEquals(['B', 'E', 'F'], Helper::colLetterRange('B, E, F'));
         $this->assertEquals(['B', 'C', 'D', 'E', 'F'], Helper::colLetterRange('B-E, F'));
+        $this->assertEquals(['B', 'C', 'D', 'E', 'F'], Helper::colLetterRange(['B-E', 'F']));
         $this->assertEquals(['B', 'C', 'D', 'E'], Helper::colLetterRange('B1-E8'));
         $this->assertEquals(['B:E'], Helper::colLetterRange('B1:E8'));
         $this->assertEquals(['B:E'], Helper::colLetterRange('$B1:E$8'));