More unit tests

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

@@ -2,8 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Filter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PHPUnit\Framework\TestCase;
 
 class FilterTest extends TestCase
@@ -15,7 +17,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);
@@ -52,6 +54,50 @@ public function testFilterEmpty(): void
         self::assertSame($expectedResult, $result);
     }
 
+    public function testFilterWithAndLogic(): void
+    {
+        $expectedResult = [
+            ['East', 'Tom', 'Apple', 6830],
+            ['East', 'Fritz', 'Banana', 6274],
+        ];
+
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->sampleDataForRow(), null, 'C3', true);
+
+        // East AND >6,000
+        $formula = '=FILTER(C3:F18,(C3:C18="East")*(F3:F18>6000))';
+        $worksheet->setCellValue('H1', $formula, true, 'H1:K2');
+        $result = $worksheet->getCell('H1')->getCalculatedValue(true);
+
+        self::assertSame($expectedResult, $result);
+    }
+
+    public function testFilterWithOrLogic(): void
+    {
+        $expectedResult = [
+            ['East', 'Tom', 'Apple', 6830],
+            ['East', 'Fritz', 'Apple', 4394],
+            ['West', 'Sravan', 'Grape', 7195],
+            ['East', 'Tom', 'Banana', 4213],
+            ['North', 'Amy', 'Grape', 6420],
+            ['East', 'Fritz', 'Banana', 6274],
+            ['North', 'Xi', 'Grape', 7580],
+            ['South', 'Hector', 'Apple', 8144],
+        ];
+
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->sampleDataForRow(), null, 'C3', true);
+
+        // East OR >6,000
+        $formula = '=FILTER(C3:F18,(C3:C18="East")+(F3:F18>6000))';
+        $worksheet->setCellValue('H1', $formula, true, 'H1:K8');
+        $result = $worksheet->getCell('H1')->getCalculatedValue(true);
+
+        self::assertSame($expectedResult, $result);
+    }
+
     protected function sampleDataForRow(): array
     {
         return [
@@ -70,7 +116,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],
         ];
     }