mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-13 07:54:25 +02:00
Code Issues Releases Wiki Activity

Remove deprecated code from beta 16 (#2705)

Browse Source
This commit is contained in:
Alexander Skvortsov
2021-03-19 14:13:50 -04:00
committed by GitHub
parent 374189d48e
commit 908d087e00
40 changed files with 59 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Filter/AbstractFilterer.php
View File

@@ -9,8 +9,6 @@
namespace Flarum\Filter;
use Flarum\Event\ConfigurePostsQuery;
use Flarum\Post\Filter\PostFilterer;
use Flarum\Query\ApplyQueryParametersTrait;
use Flarum\Query\QueryCriteria;
use Flarum\Query\QueryResults;
@@ -71,12 +69,6 @@ abstract class AbstractFilterer
$this->applyOffset($filterState, $offset);
$this->applyLimit($filterState, $limit + 1);
// DEPRECATED BC LAYER, REMOVE BETA 17
if (static::class === PostFilterer::class) {
event(new ConfigurePostsQuery($query, $criteria->query));
}
// END DEPRECATED BC LAYER
foreach ($this->filterMutators as $mutator) {
$mutator($filterState, $criteria);
}

19
src/Filter/FilterServiceProvider.php
View File

@@ -28,7 +28,7 @@ class FilterServiceProvider extends AbstractServiceProvider
*/
public function register()
{
$this->app->singleton('flarum.filter.filters', function () {
$this->container->singleton('flarum.filter.filters', function () {
return [
DiscussionFilterer::class => [
DiscussionQuery\AuthorFilterGambit::class,
@@ -45,13 +45,12 @@ class FilterServiceProvider extends AbstractServiceProvider
PostFilter\DiscussionFilter::class,
PostFilter\IdFilter::class,
PostFilter\NumberFilter::class,
PostFilter\TypeFilter::class,
PostFilter\UserFilter::class,
PostFilter\TypeFilter::class
],
];
});
$this->app->singleton('flarum.filter.filter_mutators', function () {
$this->container->singleton('flarum.filter.filter_mutators', function () {
return [];
});
}
@@ -61,30 +60,30 @@ class FilterServiceProvider extends AbstractServiceProvider
// We can resolve the filter mutators in the when->needs->give callback,
// but we need to resolve at least one regardless so we know which
// filterers we need to register filters for.
$filters = $this->app->make('flarum.filter.filters');
$filters = $this->container->make('flarum.filter.filters');
foreach ($filters as $filterer => $filterClasses) {
$this->app
$this->container
->when($filterer)
->needs('$filters')
->give(function () use ($filterClasses) {
$compiled = [];
foreach ($filterClasses as $filterClass) {
$filter = $this->app->make($filterClass);
$filter = $this->container->make($filterClass);
$compiled[$filter->getFilterKey()][] = $filter;
}
return $compiled;
});
$this->app
$this->container
->when($filterer)
->needs('$filterMutators')
->give(function () use ($filterer) {
return array_map(function ($filterMutatorClass) {
return ContainerUtil::wrapCallback($filterMutatorClass, $this->app);
}, Arr::get($this->app->make('flarum.filter.filter_mutators'), $filterer, []));
return ContainerUtil::wrapCallback($filterMutatorClass, $this->container);
}, Arr::get($this->container->make('flarum.filter.filter_mutators'), $filterer, []));
});
}
}