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

fixed container bindings use of container (#2807)

Browse Source
This commit is contained in:
Daniël Klabbers
2021-04-29 21:33:51 +02:00
committed by GitHub
parent 40b47de9e1
commit fcb5778705
23 changed files with 246 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Filter/FilterServiceProvider.php
View File

@@ -17,6 +17,7 @@ use Flarum\Post\Filter as PostFilter;
use Flarum\Post\Filter\PostFilterer;
use Flarum\User\Filter\UserFilterer;
use Flarum\User\Query as UserQuery;
use Illuminate\Contracts\Container\Container;
use Illuminate\Support\Arr;
class FilterServiceProvider extends AbstractServiceProvider
@@ -55,7 +56,7 @@ class FilterServiceProvider extends AbstractServiceProvider
});
}
public function boot()
public function boot(Container $container)
{
// 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
@@ -63,7 +64,7 @@ class FilterServiceProvider extends AbstractServiceProvider
$filters = $this->container->make('flarum.filter.filters');
foreach ($filters as $filterer => $filterClasses) {
$this->container
$container
->when($filterer)
->needs('$filters')
->give(function () use ($filterClasses) {
@@ -77,13 +78,13 @@ class FilterServiceProvider extends AbstractServiceProvider
return $compiled;
});
$this->container
$container
->when($filterer)
->needs('$filterMutators')
->give(function () use ($filterer) {
->give(function () use ($container, $filterer) {
return array_map(function ($filterMutatorClass) {
return ContainerUtil::wrapCallback($filterMutatorClass, $this->container);
}, Arr::get($this->container->make('flarum.filter.filter_mutators'), $filterer, []));
}, Arr::get($container->make('flarum.filter.filter_mutators'), $filterer, []));
});
}
}