From db0d8e89c75394c40661df2b4b07e8ede7c9cf13 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Thu, 11 Mar 2021 23:12:49 -0500 Subject: [PATCH] Make filter mutator API consistent with search mutator API. This is inline with the docblock for the Filter extender, and is much more sensible. --- src/Filter/AbstractFilterer.php | 2 +- tests/integration/extenders/FilterTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Filter/AbstractFilterer.php b/src/Filter/AbstractFilterer.php index c36f4a92e..736568901 100644 --- a/src/Filter/AbstractFilterer.php +++ b/src/Filter/AbstractFilterer.php @@ -77,7 +77,7 @@ abstract class AbstractFilterer // END DEPRECATED BC LAYER foreach ($this->filterMutators as $mutator) { - $mutator($query, $actor, $criteria->query, $criteria->sort); + $mutator($filterState, $criteria); } // Execute the filter query and retrieve the results. We get one more diff --git a/tests/integration/extenders/FilterTest.php b/tests/integration/extenders/FilterTest.php index e6ec34fb5..07f94e873 100644 --- a/tests/integration/extenders/FilterTest.php +++ b/tests/integration/extenders/FilterTest.php @@ -84,8 +84,8 @@ class FilterTest extends TestCase */ public function filter_mutator_has_effect_if_added() { - $this->extend((new Extend\Filter(DiscussionFilterer::class))->addFilterMutator(function ($query, $actor, $filters, $sort) { - $query->getQuery()->whereRaw('1=0'); + $this->extend((new Extend\Filter(DiscussionFilterer::class))->addFilterMutator(function ($filterState, $criteria) { + $filterState->getQuery()->whereRaw('1=0'); })); $this->prepDb(); @@ -127,8 +127,8 @@ class NoResultFilter implements FilterInterface class CustomFilterMutator { - public function __invoke($query, $actor, $filters, $sort) + public function __invoke($filterState, $criteria) { - $query->getQuery()->whereRaw('1=0'); + $filterState->getQuery()->whereRaw('1=0'); } }