Merge pull request #2713 from PHPOffice/Filter-return-result-array-indexes

Bugfix to returned column indexes for FILTER() by row

Author: MarkBaker

src/PhpSpreadsheet/Calculation/LookupRef/Filter.php

@@ -29,7 +29,7 @@ public static function filter($lookupArray, $matchArray, $ifEmpty = null)
             return $ifEmpty ?? ExcelError::CALC();
         }
 
-        return array_values($result);
+        return array_values(array_map('array_values', $result));
     }
 
     private static function enumerateArrayKeys(array $sortArray): array

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

@@ -15,7 +15,7 @@ public function testFilterByRow(): void
             ['East', 'Tom', 'Apple', 6830],
             ['East', 'Fritz', 'Apple', 4394],
             ['South', 'Sal', 'Apple', 1310],
-            ['South', 'Hector', 'Apple', 98144],
+            ['South', 'Hector', 'Apple', 8144],
         ];
         $result = Filter::filter($this->sampleDataForRow(), $criteria);
         self::assertSame($expectedResult, $result);
@@ -70,7 +70,7 @@ protected function sampleDataForRow(): array
             ['East', 'Fritz', 'Banana', 6274],
             ['West', 'Sravan', 'Pear', 4894],
             ['North', 'Xi', 'Grape', 7580],
-            ['South', 'Hector', 'Apple', 98144],
+            ['South', 'Hector', 'Apple', 8144],
         ];
     }