mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-24 18:21:33 +02:00
Code Issues Releases Wiki Activity

Make filter mutator API consistent with search mutator API.

Browse Source 
This is inline with the docblock for the Filter extender, and is much more sensible.
This commit is contained in:
Alexander Skvortsov
2021-03-11 23:12:49 -05:00
parent 4e126708e9
commit db0d8e89c7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Filter/AbstractFilterer.php
View File

@@ -77,7 +77,7 @@ abstract class AbstractFilterer
// END DEPRECATED BC LAYER // END DEPRECATED BC LAYER
foreach ($this->filterMutators as $mutator) { 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 // Execute the filter query and retrieve the results. We get one more

8
tests/integration/extenders/FilterTest.php
View File

@@ -84,8 +84,8 @@ class FilterTest extends TestCase
*/ */
public function filter_mutator_has_effect_if_added() public function filter_mutator_has_effect_if_added()
{ {
$this->extend((new Extend\Filter(DiscussionFilterer::class))->addFilterMutator(function ($query, $actor, $filters, $sort) { $this->extend((new Extend\Filter(DiscussionFilterer::class))->addFilterMutator(function ($filterState, $criteria) {
$query->getQuery()->whereRaw('1=0'); $filterState->getQuery()->whereRaw('1=0');
})); }));
$this->prepDb(); $this->prepDb();
@@ -127,8 +127,8 @@ class NoResultFilter implements FilterInterface
class CustomFilterMutator class CustomFilterMutator
{ {
public function __invoke($query, $actor, $filters, $sort) public function __invoke($filterState, $criteria)
{ {
$query->getQuery()->whereRaw('1=0'); $filterState->getQuery()->whereRaw('1=0');
} }
} }