Merge pull request #1 from kasko/named-range

Fix for 3 Issues Involving ReadXlsx and NamedRange (PHPOffice#1742)
kasko · Jan 4, 2023 · 4ddc63d · 4ddc63d
2 parents a8e8068 + 56385b3
commit 4ddc63d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -1277,7 +1277,7 @@ public function load($pFilename)
                                     }
 
                                     // Valid range?
-                                    if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
+                                    if ($extractedRange == '') {
                                         continue;
                                     }
 
@@ -1347,7 +1347,7 @@ public function load($pFilename)
                                 $extractedRange = (string) $definedName;
 
                                 // Valid range?
-                                if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
+                                if ($extractedRange == '') {
                                     continue;
                                 }
 
@@ -1395,6 +1395,9 @@ public function load($pFilename)
                                         $locatedSheet = $excel->getSheetByName($extractedSheetName);
                                     }
 
+                                    if ($locatedSheet === null && !DefinedName::testIfFormula($definedRange)) {
+                                        $definedRange = '#REF!';
+                                    }
                                     $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $locatedSheet, $definedRange, false));
                                 }
                             }

diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamedRangeTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamedRangeTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PHPUnit\Framework\TestCase;
+
+class NamedRangeTest extends TestCase
+{
+    public static function testBug1686b(): void
+    {
+        $xlsxFile = 'tests/data/Reader/XLSX/bug1686b.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($xlsxFile);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertEquals(2.1, $sheet->getCell('A1')->getCalculatedValue());
+        self::assertEquals('#REF!', $sheet->getCell('A2')->getCalculatedValue());
+        self::assertEquals('#REF!', $sheet->getCell('A3')->getCalculatedValue());
+        self::assertEquals('#NAME?', $sheet->getCell('A4')->getCalculatedValue());
+        self::assertEquals('#REF!', $sheet->getCell('A5')->getCalculatedValue());
+    }
+}
diff --git a/tests/data/Reader/XLSX/bug1686b.xlsx b/tests/data/Reader/XLSX/bug1686b.xlsx