Bugfix #1858; Additional unit tests

PHPOffice · Feb 19, 2021 · 5878ecf · 5878ecf
1 parent c14110a
commit 5878ecf
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1197,7 +1197,8 @@ public function getCell($pCoordinate, $createIfNotExists = true)
         ) {
             $namedRange = $this->validateNamedRange($pCoordinate, true);
             if ($namedRange !== null) {
-                $cellCoordinate = str_replace('$', '', $namedRange->getValue());
+                $cellCoordinate = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
+                $cellCoordinate = str_replace('$', '', $cellCoordinate);
 
                 return $namedRange->getWorksheet()->getCell($cellCoordinate, $createIfNotExists);
             }
@@ -1296,8 +1297,12 @@ public function cellExists($pCoordinate)
             (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $pCoordinate, $matches))
         ) {
             $namedRange = $this->validateNamedRange($pCoordinate, true);
+            if ($namedRange !== null) {
+                $cellCoordinate = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
+                $cellCoordinate = str_replace('$', '', $cellCoordinate);
 
-            return ($namedRange !== null) ? $namedRange->getWorksheet()->cellExists($pCoordinate) : false;
+                return $namedRange->getWorksheet()->cellExists($cellCoordinate);
+            }
         }
 
         // Uppercase coordinate
@@ -2589,7 +2594,8 @@ public function namedRangeToArray(string $definedName, $nullValue = null, $calcu
     {
         $namedRange = $this->validateNamedRange($definedName);
         $workSheet = $namedRange->getWorksheet();
-        $cellRange = str_replace('$', '', $namedRange->getValue());
+        $cellRange = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
+        $cellRange = str_replace('$', '', $cellRange);
 
         return $workSheet->rangeToArray($cellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
     }

diff --git a/tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php b/tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PHPUnit\Framework\TestCase;
+
+class WorksheetNamedRangesTest extends TestCase
+{
+    protected $spreadsheet;
+
+    public function setUp(): void
+    {
+        $reader = new Xlsx();
+        $this->spreadsheet = $reader->load('tests/data/Worksheet/namedRangeTest.xlsx');
+    }
+
+    public function testCellExists()
+    {
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $cellExists = $worksheet->cellExists('GREETING');
+        self::assertTrue($cellExists);
+    }
+
+    public function testGetCell()
+    {
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $cell = $worksheet->getCell('GREETING');
+        self::assertSame('Hello', $cell->getValue());
+    }
+
+    public function testNamedRangeToArray()
+    {
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $rangeData = $worksheet->namedRangeToArray('Range1');
+        self::assertSame([[1, 2, 3]], $rangeData);
+    }
+}