Skip to content

Commit 23e207c

Browse files
author
MarkBaker
committed
Adjust calc engine identification of quoted worksheet names to fix bug with multiple quoted worksheets in formula
1 parent adf4531 commit 23e207c

File tree

2 files changed

+55
-7
lines changed

2 files changed

+55
-7
lines changed

‎src/PhpSpreadsheet/Calculation/Calculation.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ class Calculation
3333
// Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
3434
const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
3535
// Cell reference (cell or range of cells, with or without a sheet reference)
36-
const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'\')+?\')|(\"(?:[^\"]|\"\")+?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
36+
const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
3737
// Cell reference (with or without a sheet reference) ensuring absolute/relative
38-
const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'\')+?\')|(\"(?:[^\"]|\"\")+?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
39-
const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'\')+?\')|(\".(?:[^\"]|\"\")?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
40-
const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'\')+?\')|(\"(?:[^\"]|\"\")+?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
38+
const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
39+
const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\".(?:[^\"]|\"[^!])?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
40+
const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
4141
// Cell reference (with or without a sheet reference) ensuring absolute/relative
4242
// Cell ranges ensuring absolute/relative
4343
const CALCULATION_REGEXP_COLUMNRANGE_RELATIVE = '(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
4444
const CALCULATION_REGEXP_ROWRANGE_RELATIVE = '(\$?\d{1,7}):(\$?\d{1,7})';
4545
// Defined Names: Named Range of cells, or Named Formulae
46-
const CALCULATION_REGEXP_DEFINEDNAME = '((([^\s,!&%^\/\*\+<>=-]*)|(\'(?:[^\']|\'\')+?\')|(\"(?:[^\"]|\"\")+?\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
46+
const CALCULATION_REGEXP_DEFINEDNAME = '((([^\s,!&%^\/\*\+<>=-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
4747
// Error
4848
const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
4949

‎tests/PhpSpreadsheetTests/Calculation/ParseFormulaTest.php‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,34 @@ public function providerBinaryOperations(): array
170170
['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
171171
['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
172172
['type' => 'Cell Reference', 'value' => "'sheet1'!A1", 'reference' => "'sheet1'!A1"],
173-
['type' => 'Binary Operator', 'value' => '+','reference' => null],
173+
['type' => 'Binary Operator', 'value' => '+', 'reference' => null],
174174
],
175175
"=MIN('sheet1'!A:A) + 'sheet1'!A1",
176176
],
177+
'Combined Cell Reference and Column Range with quote' => [
178+
[
179+
['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1", 'reference' => "'Mark''s sheet1'!A1"],
180+
['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1048576", 'reference' => "'Mark''s sheet1'!A1048576"],
181+
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
182+
['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
183+
['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
184+
['type' => 'Cell Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
185+
['type' => 'Binary Operator', 'value' => '+', 'reference' => null],
186+
],
187+
"=MIN('Mark''s sheet1'!A:A) + 'Mark''s sheet1'!A1",
188+
],
189+
'Combined Cell Reference and Column Range with unescaped quote' => [
190+
[
191+
['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
192+
['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1048576", 'reference' => "'Mark's sheet1'!A1048576"],
193+
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
194+
['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
195+
['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
196+
['type' => 'Cell Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
197+
['type' => 'Binary Operator', 'value' => '+', 'reference' => null],
198+
],
199+
"=MIN('Mark's sheet1'!A:A) + 'Mark's sheet1'!A1",
200+
],
177201
'Combined Column Range and Cell Reference' => [
178202
[
179203
['type' => 'Cell Reference', 'value' => "'sheet1'!A1", 'reference' => "'sheet1'!A1"],
@@ -182,10 +206,34 @@ public function providerBinaryOperations(): array
182206
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
183207
['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
184208
['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
185-
['type' => 'Binary Operator', 'value' => '+','reference' => null],
209+
['type' => 'Binary Operator', 'value' => '+', 'reference' => null],
186210
],
187211
"='sheet1'!A1 + MIN('sheet1'!A:A)",
188212
],
213+
'Combined Column Range and Cell Reference with quote' => [
214+
[
215+
['type' => 'Cell Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
216+
['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1", 'reference' => "'Mark''s sheet1'!A1"],
217+
['type' => 'Column Reference', 'value' => "'Mark''s sheet1'!A1048576", 'reference' => "'Mark''s sheet1'!A1048576"],
218+
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
219+
['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
220+
['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
221+
['type' => 'Binary Operator', 'value' => '+', 'reference' => null],
222+
],
223+
"='Mark''s sheet1'!A1 + MIN('Mark''s sheet1'!A:A)",
224+
],
225+
'Combined Column Range and Cell Reference with unescaped quote' => [
226+
[
227+
['type' => 'Cell Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
228+
['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1", 'reference' => "'Mark's sheet1'!A1"],
229+
['type' => 'Column Reference', 'value' => "'Mark's sheet1'!A1048576", 'reference' => "'Mark's sheet1'!A1048576"],
230+
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
231+
['type' => 'Operand Count for Function MIN()', 'value' => 1, 'reference' => null],
232+
['type' => 'Function', 'value' => 'MIN(', 'reference' => null],
233+
['type' => 'Binary Operator', 'value' => '+', 'reference' => null],
234+
],
235+
"='Mark's sheet1'!A1 + MIN('Mark's sheet1'!A:A)",
236+
],
189237
'Range with Defined Names' => [
190238
[
191239
['type' => 'Defined Name', 'value' => 'GROUP1', 'reference' => 'GROUP1'],

0 commit comments

Comments
 (0)