From 2ab582a707997a590f718d996d8b449bfbbeb20f Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Thu, 24 Mar 2022 22:12:08 +0100 Subject: [PATCH] Bugfix to returned column indexes for FILTER() by row --- src/PhpSpreadsheet/Calculation/LookupRef/Filter.php | 2 +- .../Calculation/Functions/LookupRef/FilterTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php b/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php index 6d201531..74fa8321 100644 --- a/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php +++ b/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php @@ -29,7 +29,7 @@ class Filter return $ifEmpty ?? ExcelError::CALC(); } - return array_values($result); + return array_values(array_map('array_values', $result)); } private static function enumerateArrayKeys(array $sortArray): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FilterTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FilterTest.php index 710a42e0..5a584c46 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FilterTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FilterTest.php @@ -15,7 +15,7 @@ class FilterTest extends TestCase ['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 @@ class FilterTest extends TestCase ['East', 'Fritz', 'Banana', 6274], ['West', 'Sravan', 'Pear', 4894], ['North', 'Xi', 'Grape', 7580], - ['South', 'Hector', 'Apple', 98144], + ['South', 'Hector', 'Apple', 8144], ]; }