alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix 1055 (#1076) 

* Fix #1055 : Make hlookup require ordered list only if asking for not exact match

* Added test for #1055
This commit is contained in:
Juluan 2019-07-14 12:56:17 +02:00 committed by Mark Baker
parent 42fc71f314
commit 7505638dc8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PhpSpreadsheet/Calculation/LookupRef.php
View File

@ -794,8 +794,10 @@ class LookupRef
$lookupLower = StringHelper::strToLower($lookup_value); $lookupLower = StringHelper::strToLower($lookup_value);
$rowDataLower = StringHelper::strToLower($rowData); $rowDataLower = StringHelper::strToLower($rowData);
if (($bothNumeric && $rowData > $lookup_value) || if ($not_exact_match && (
($bothNotNumeric && $rowDataLower > $lookupLower)) { ($bothNumeric && $rowData > $lookup_value) ||
($bothNotNumeric && $rowDataLower > $lookupLower)
)) {
break; break;
} }

12
tests/data/Calculation/LookupRef/HLOOKUP.php
View File

@ -284,5 +284,15 @@ return [
], ],
2, 2,
false false
] ],
[
2,
'B',
[
['Selection column', 'C', 'B', 'A'],
['Value to retrieve', 3, 2, 1]
],
2,
false
],
]; ];