Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accommodating Slash with preg_quote - Text Functions #3582

Merged
merged 3 commits into from
May 27, 2023
Merged

Accommodating Slash with preg_quote - Text Functions #3582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0f8e11
Accomodating Slash with preg_quote - Text Functions
oleibman May 24, 2023
e616a2f
Merge branch 'master' into pr3513a
oleibman May 24, 2023
f635530
Merge branch 'master' into pr3513a
oleibman May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/PhpSpreadsheet/Calculation/TextData/Extract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ private static function buildDelimiter($delimiter): string
$delimiter = Functions::flattenArray($delimiter);
$quotedDelimiters = array_map(
function ($delimiter) {
return preg_quote($delimiter ?? '');
return preg_quote($delimiter ?? '', '/');
},
$delimiter
);
Expand All @@ -270,7 +270,7 @@ function ($delimiter) {
return '(' . $delimiters . ')';
}

return '(' . preg_quote($delimiter ?? '') . ')';
return '(' . preg_quote($delimiter ?? '', '/') . ')';
}

private static function matchFlags(int $matchMode): string
Expand Down
2 changes: 1 addition & 1 deletion src/PhpSpreadsheet/Calculation/TextData/Format.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public static function NUMBERVALUE($value = '', $decimalSeparator = null, $group
}

if (!is_numeric($value)) {
$decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator) . '/', $value, $matches, PREG_OFFSET_CAPTURE);
$decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator, '/') . '/', $value, $matches, PREG_OFFSET_CAPTURE);
if ($decimalPositions > 1) {
return ExcelError::VALUE();
}
Expand Down
4 changes: 2 additions & 2 deletions src/PhpSpreadsheet/Calculation/TextData/Text.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ private static function buildDelimiter($delimiter): string
if (is_array($delimiter) && count($valueSet) > 1) {
$quotedDelimiters = array_map(
function ($delimiter) {
return preg_quote($delimiter ?? '');
return preg_quote($delimiter ?? '', '/');
},
$valueSet
);
Expand All @@ -202,7 +202,7 @@ function ($delimiter) {
return '(' . $delimiters . ')';
}

return '(' . preg_quote(/** @scrutinizer ignore-type */ Functions::flattenSingleValue($delimiter)) . ')';
return '(' . preg_quote(/** @scrutinizer ignore-type */ Functions::flattenSingleValue($delimiter), '/') . ')';
}

private static function matchFlags(bool $matchMode): string
Expand Down
2 changes: 2 additions & 0 deletions tests/data/Calculation/TextData/NUMBERVALUE.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
],
'no arguments' => ['exception'],
'boolean argument' => ['#VALUE!', true],
'slash as group separator' => [1234567.1, '1/234/567.1', '.', '/'],
'slash as decimal separator' => [1234567.1, '1,234,567/1', '/', ','],
'issue 3574 null string treated as 0' => [0, '', ',', ' '],
'issue 3574 one or more spaces treated as 0' => [0, ' ', ',', ' '],
'issue 3574 non-blank numeric string okay' => [2, ' 2 ', ',', ' '],
Expand Down
7 changes: 7 additions & 0 deletions tests/data/Calculation/TextData/TEXTAFTER.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,11 @@
1,
],
],
'slash delimiter' => [
'about/that',
[
'How/about/that',
'/',
],
],
];
7 changes: 7 additions & 0 deletions tests/data/Calculation/TextData/TEXTBEFORE.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,11 @@
1,
],
],
'slash delimiter' => [
'How',
[
'How/about/that',
'/',
],
],
];
16 changes: 16 additions & 0 deletions tests/data/Calculation/TextData/TEXTSPLIT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,20 @@
'',
],
],
'slash as column delimiter' => [
[['Hello', 'World']],
[
'Hello/World',
'/',
'',
],
],
'slash as row delimiter' => [
[['ho', 'w'], ['about', '#N/A'], ['t', 'hat']],
[
'ho.w/about/t.hat',
'.',
'/',
],
],
];