Merge branch 'master' into TextFunctions-ArrayToText

Author: MarkBaker

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
+- cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
 
 ## 1.24.1 - 2022-07-18
 

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -1265,7 +1265,7 @@ private function getWorksheetAndCoordinate(string $coordinate): array
             }
         } elseif (
             !preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $coordinate) &&
-            preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $coordinate)
+            preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/iu', $coordinate)
         ) {
             // Named range?
             $namedRange = $this->validateNamedRange($coordinate, true);

tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php

@@ -29,6 +29,15 @@ public function testCellExists(): void
         self::assertTrue($cellExists);
     }
 
+    public function testCellExistsUtf8(): void
+    {
+        $namedCell = 'Χαιρετισμός';
+
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $cellExists = $worksheet->cellExists($namedCell);
+        self::assertTrue($cellExists);
+    }
+
     public function testCellNotExists(): void
     {
         $namedCell = 'GOODBYE';
@@ -67,6 +76,15 @@ public function testGetCell(): void
         self::assertSame('Hello', $cell->getValue());
     }
 
+    public function testGetCellUtf8(): void
+    {
+        $namedCell = 'Χαιρετισμός';
+
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $cell = $worksheet->getCell($namedCell);
+        self::assertSame('नमस्ते', $cell->getValue());
+    }
+
     public function testGetCellNotExists(): void
     {
         $namedCell = 'GOODBYE';