More Tests

Author: oleibman

src/PhpSpreadsheet/Calculation/LookupRef/Offset.php

@@ -103,7 +103,7 @@ private static function extractWorksheet(?string $cellAddress, Cell $cell): arra
 
         $sheetName = '';
         if (str_contains($cellAddress, '!')) {
-            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true, true);
         }
 
         $worksheet = ($sheetName !== '')

src/PhpSpreadsheet/Reader/Gnumeric.php

@@ -517,6 +517,7 @@ private function processDefinedNames(?SimpleXMLElement $gnmXML): void
                     continue;
                 }
 
+                $value = str_replace("\\'", "'", $value);
                 [$worksheetName] = Worksheet::extractSheetTitle($value, true, true);
                 $worksheet = $this->spreadsheet->getSheetByName($worksheetName);
                 // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet

tests/PhpSpreadsheetTests/Reader/Gnumeric/DefinedNameTest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+class DefinedNameTest extends TestCase
+{
+    public static function fileProvider(): array
+    {
+        return [
+            ['tests/data/Reader/Gnumeric/apostrophe3a.gnumeric', 'Sheet1'],
+            ['tests/data/Reader/Gnumeric/apostrophe3b.gnumeric', 'Apo\'strophe'],
+        ];
+    }
+
+    #[DataProvider('fileProvider')]
+    public function testDefinedName(string $filename, string $sheetName): void
+    {
+        $reader = new Gnumeric();
+        $spreadsheet = $reader->load($filename);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame($sheetName, $sheet->getTitle());
+        self::assertSame('=sheet1first', $sheet->getCell('C1')->getValue());
+        self::assertSame(1, $sheet->getCell('C1')->getCalculatedValue());
+        $spreadsheet->disconnectWorksheets();
+    }
+}