Merge pull request #4967 from DIReports/fix/vlookup-column-range-empty-end-column

Fix VLOOKUP #N/A with whole-column ranges when the end column contains no data

Author: oleibman

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -1544,7 +1544,7 @@ private function internalParseFormula(string $formula, ?Cell $cell = null): bool
                             } elseif (ctype_alpha($val) && strlen($val) <= 3) {
                                 //    Column range
                                 $stackItemType = 'Column Reference';
-                                $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow($val) : AddressRange::MAX_ROW; //    Max 1,048,576 rows for Excel2007
+                                $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow() : AddressRange::MAX_ROW; //    Max 1,048,576 rows for Excel2007
                                 $val = "{$rangeWS2}{$val}{$endRowColRef}";
                             }
                             $stackItemReference = $val;

tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/VLookupTest.php

@@ -6,6 +6,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class VLookupTest extends AllSetupTeardown
@@ -91,4 +92,55 @@ public function testIssue1402(): void
         $worksheet->setCellValue('B5', '=VLOOKUP(A5,$A$1:$B$3,2,0)');
         self::assertSame('Numeric result', $worksheet->getCell('B5')->getCalculatedValue());
     }
+
+    /**
+     * VLOOKUP with a whole-column range where the end column contains no data.
+     * getHighestDataRow() on the empty end column returned 1, producing an
+     * inverted range (e.g. A4:F1) that caused a #N/A result.
+     *
+     * @see https://github.com/PHPOffice/PhpSpreadsheet/pull/4967
+     */
+    #[DataProvider('providerVlookupWholeColumnRange')]
+    public function testVlookupWholeColumnRange(string $formula, string $expectedResult): void
+    {
+        $spreadsheet = $this->getSpreadsheet();
+
+        // Lookup sheet: col A = keys, col C = values; cols B, D, E, F are empty
+        $lookupSheet = new Worksheet($spreadsheet, 'Sheet2');
+        $spreadsheet->addSheet($lookupSheet, 0);
+        $lookupSheet->fromArray([
+            [1234, null, 'row1'],
+            [2345, null, 'row2'],
+            [3456, null, 'row3'],
+            [4567, null, 'row4'],
+        ], null, 'A1');
+
+        // Formula sheet: C1 holds the lookup value
+        $formulaSheet = new Worksheet($spreadsheet, 'Sheet1');
+        $spreadsheet->addSheet($formulaSheet, 1);
+        $formulaSheet->setCellValue('C1', 3456);
+        $formulaSheet->setCellValue('A1', $formula);
+        $spreadsheet->setActiveSheetIndexByName('Sheet1');
+
+        $result = $formulaSheet->getCell('A1')->getCalculatedValue();
+        self::assertSame($expectedResult, $result);
+    }
+
+    public static function providerVlookupWholeColumnRange(): array
+    {
+        return [
+            'VLOOKUP with absolute whole-column range across sheets' => [
+                '=VLOOKUP($C1,Sheet2!$A:$F,3,FALSE)',
+                'row3',
+            ],
+            'VLOOKUP with relative whole-column range across sheets' => [
+                '=VLOOKUP($C1,Sheet2!A:F,3,FALSE)',
+                'row3',
+            ],
+            'VLOOKUP with mixed whole-column range across sheets' => [
+                '=VLOOKUP($C1,Sheet2!A:$F,3,FALSE)',
+                'row3',
+            ],
+        ];
+    }
 }