Escape double quotes in worksheet names for column range and row range references

Author: MarkBaker

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -4203,7 +4203,7 @@ private function internalParseFormula($formula, ?Cell $cell = null)
                         $expectingOperator = false;
                     }
                     $stack->push('Brace', '(');
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $val, $matches)) {
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $val, $matches)) {
                     //    Watch for this case-change when modifying to allow cell references in different worksheets...
                     //    Should only be applied to the actual cell column, not the worksheet name
                     //    If the last entry on the stack was a : operator, then we have a cell range reference
@@ -4326,6 +4326,8 @@ private function internalParseFormula($formula, ?Cell $cell = null)
                         $val = $rowRangeReference[1];
                         $length = strlen($rowRangeReference[1]);
                         $stackItemType = 'Row Reference';
+                        // unescape any apostrophes or double quotes in worksheet name
+                        $val = str_replace(["''", '""'], ["'", '"'], $val);
                         $column = 'A';
                         if (($testPrevOp !== null && $testPrevOp['value'] === ':') && $pCellParent !== null) {
                             $column = $pCellParent->getHighestDataColumn($val);
@@ -4338,6 +4340,8 @@ private function internalParseFormula($formula, ?Cell $cell = null)
                         $val = $columnRangeReference[1];
                         $length = strlen($val);
                         $stackItemType = 'Column Reference';
+                        // unescape any apostrophes or double quotes in worksheet name
+                        $val = str_replace(["''", '""'], ["'", '"'], $val);
                         $row = '1';
                         if (($testPrevOp !== null && $testPrevOp['value'] === ':') && $pCellParent !== null) {
                             $row = $pCellParent->getHighestDataRow($val);

tests/PhpSpreadsheetTests/Calculation/ParseFormulaTest.php

@@ -176,8 +176,8 @@ public function providerBinaryOperations(): array
             ],
             'Combined Cell Reference and Column Range with quote' => [
                 [
-                    ['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1", 'reference' => "'Mark''s sheet1'!A1"],
-                    ['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1048576", 'reference' => "'Mark''s sheet1'!A1048576"],
+                    ['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
+                    ['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1048576", 'reference' => "'Mark's sheet1'!A1048576"],
                     ['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
                     ['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
                     ['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
@@ -213,8 +213,8 @@ public function providerBinaryOperations(): array
             'Combined Column Range and Cell Reference with quote' => [
                 [
                     ['type' => 'Cell Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
-                    ['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1", 'reference' => "'Mark''s sheet1'!A1"],
-                    ['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1048576", 'reference' => "'Mark''s sheet1'!A1048576"],
+                    ['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
+                    ['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1048576", 'reference' => "'Mark's sheet1'!A1048576"],
                     ['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
                     ['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
                     ['type' => 'Function', 'value' => 'MIN(', 'reference' => null],