Fix 1055 (#1076)

* Fix #1055 : Make hlookup require ordered list only if asking for not exact match * Added test for #1055
PHPOffice · Jul 14, 2019 · 7505638 · 7505638
1 parent 42fc71f
commit 7505638
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -794,8 +794,10 @@ public static function HLOOKUP($lookup_value, $lookup_array, $index_number, $not
             $lookupLower = StringHelper::strToLower($lookup_value);
             $rowDataLower = StringHelper::strToLower($rowData);
 
-            if (($bothNumeric && $rowData > $lookup_value) ||
-                ($bothNotNumeric && $rowDataLower > $lookupLower)) {
+            if ($not_exact_match && (
+                ($bothNumeric && $rowData > $lookup_value) ||
+                ($bothNotNumeric && $rowDataLower > $lookupLower)
+                )) {
                 break;
             }
 

diff --git a/tests/data/Calculation/LookupRef/HLOOKUP.php b/tests/data/Calculation/LookupRef/HLOOKUP.php
@@ -284,5 +284,15 @@
         ],
         2,
         false
-    ]
+    ],
+    [
+        2,
+        'B',
+        [
+            ['Selection column', 'C', 'B', 'A'],
+            ['Value to retrieve', 3, 2, 1]
+        ],
+        2,
+        false
+    ],
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -284,5 +284,15 @@ @@
             ],
 ,
             false
-        ]
+        ],
+        [
+,
+            'B',
+            [
+                ['Selection column', 'C', 'B', 'A'],
+                ['Value to retrieve', 3, 2, 1]
+            ],
+,
+            false
+        ],
     ];