Exact match in VLOOKUP now returns first match (it was inconsistent with

spreadsheet software before)

Author: frantzmiccoli

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Improve XLSX parsing speed if no readFilter is applied - [#772](https://github.com/PHPOffice/PhpSpreadsheet/issues/772)
 - Fix column names if read filter calls in XLSX reader skip columns - [#777](https://github.com/PHPOffice/PhpSpreadsheet/pull/777)
+- Fix VLOOKUP with exact matches
 
 ## [1.5.2] - 2018-11-25
 

src/PhpSpreadsheet/Calculation/LookupRef.php

@@ -709,23 +709,32 @@ public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not
 
         $rowNumber = $rowValue = false;
         foreach ($lookup_array as $rowKey => $rowData) {
+            // break if we have passed possible keys
             if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
                 (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)))) {
                 break;
             }
             // remember the last key, but only if datatypes match
             if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn])) ||
                 (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]))) {
-                $rowNumber = $rowKey;
-                $rowValue = $rowData[$firstColumn];
+                if ($not_exact_match) {
+                    $rowNumber = $rowKey;
+                    $rowValue = $rowData[$firstColumn];
+
+                    continue;
+                } elseif ((strtolower($rowData[$firstColumn]) == strtolower($lookup_value))
+                    // Spreadsheets software returns first exact match,
+                    // we have sorted and we might have broken key orders
+                    // we want the first one (by its initial index)
+                    && (($rowNumber == false) || ($rowKey < $rowNumber))
+                ) {
+                    $rowNumber = $rowKey;
+                    $rowValue = $rowData[$firstColumn];
+                }
             }
         }
 
         if ($rowNumber !== false) {
-            if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
-                //    if an exact match is required, we have what we need to return an appropriate response
-                return Functions::NA();
-            }
             //    otherwise return the appropriate value
             return $lookup_array[$rowNumber][$returnColumn];
         }

tests/data/Calculation/LookupRef/VLOOKUP.php

@@ -291,4 +291,25 @@
         2,
         true,
     ],
+    [
+        5,
+        'x',
+        [
+            [
+                'Selection column',
+                'Value to retrieve',
+            ],
+            ['0', 1],
+            ['0', 2],
+            ['0', 3],
+            ['0', 4],
+            ['x', 5],
+            ['x', 6],
+            ['x', 7],
+            ['x', 8],
+            ['x', 9],
+        ],
+        2,
+        false
+    ]
 ];