More Tweaks

Author: oleibman

src/PhpSpreadsheet/Reader/Gnumeric.php

@@ -517,7 +517,7 @@ private function processDefinedNames(?SimpleXMLElement $gnmXML): void
                     continue;
                 }
 
-                $value = str_replace("\\'", "'", $value);
+                $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/Xlsx/ApostropheTest.php

@@ -19,15 +19,16 @@ public function testApostropheInSheetName(): void
                 Calculation::RETURN_ARRAY_AS_ARRAY
             );
         $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('sheet1');
         $sheet->getCell('A1')->setValue(1);
         $sheet->getCell('A2')->setValue(2);
         $sheet->getCell('A3')->setValue(3);
         $sheet->getCell('A4')->setValue(4);
         $spreadsheet->addNamedRange(new NamedRange('sheet14cells', $sheet, '$A$1:$A$4'));
         $sheet->getCell('C1')
             ->setValue('=sheet14cells*sheet14cells');
-        $sheet->getCell('E1')->setValue('=ANCHORARRAY(C1)');
-        $sheet->getCell('G1')->setValue('=SINGLE(C1)');
+        $sheet->getCell('E1')->setValue('=ANCHORARRAY(sheet1!C1)');
+        $sheet->getCell('G1')->setValue('=SINGLE(sheet1!C1:C4)');
 
         $sheet1 = $spreadsheet->createSheet();
         $sheet1->setTitle("Apo'strophe");
@@ -38,8 +39,8 @@ public function testApostropheInSheetName(): void
         $spreadsheet->addNamedRange(new NamedRange('sheet24cells', $sheet1, '$A$1:$A$4'));
         $sheet1->getCell('C1')
             ->setValue('=sheet24cells*sheet24cells');
-        $sheet1->getCell('E1')->setValue('=ANCHORARRAY(C1)');
-        $sheet1->getCell('G1')->setValue('=SINGLE(C1)');
+        $sheet1->getCell('E1')->setValue("=ANCHORARRAY('Apo''strophe'!C1)");
+        $sheet1->getCell('G1')->setValue("=SINGLE('Apo''strophe'!C1:C4)");
 
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
         $spreadsheet->disconnectWorksheets();
@@ -48,11 +49,17 @@ public function testApostropheInSheetName(): void
                 Calculation::RETURN_ARRAY_AS_ARRAY
             );
         $rsheet = $reloadedSpreadsheet->getSheet(0);
+        // make sure results aren't from cache
+        $rsheet->getCell('E1')->setCalculatedValue(-1);
+        $rsheet->getCell('G1')->setCalculatedValue(-1);
         self::assertSame([[1], [4], [9], [16]], $rsheet->getCell('C1')->getCalculatedValue());
         self::assertSame([[1], [4], [9], [16]], $rsheet->getCell('E1')->getCalculatedValue());
         self::assertSame(1, $rsheet->getCell('G1')->getCalculatedValue());
 
         $rsheet1 = $reloadedSpreadsheet->getSheet(1);
+        // make sure results aren't from cache
+        $rsheet1->getCell('E1')->setCalculatedValue(-1);
+        $rsheet1->getCell('G1')->setCalculatedValue(-1);
         self::assertSame([[4], [9], [16], [25]], $rsheet1->getCell('C1')->getCalculatedValue());
         self::assertSame([[4], [9], [16], [25]], $rsheet1->getCell('E1')->getCalculatedValue());
         self::assertSame(4, $rsheet1->getCell('G1')->getCalculatedValue());