From f2aa804753371df8cc14410129d902c8a0735d22 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Fri, 13 Nov 2020 07:56:37 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- src/Api/Controller/ListDiscussionsController.php | 1 - src/Extend/Filter.php | 4 +--- src/Filter/Filterer.php | 6 +++--- src/Http/RequestUtil.php | 3 ++- tests/integration/extenders/FilterTest.php | 3 --- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Api/Controller/ListDiscussionsController.php b/src/Api/Controller/ListDiscussionsController.php index 574c32362..335a62c4f 100644 --- a/src/Api/Controller/ListDiscussionsController.php +++ b/src/Api/Controller/ListDiscussionsController.php @@ -81,7 +81,6 @@ class ListDiscussionsController extends AbstractListController { $actor = $request->getAttribute('actor'); - $filters = $this->extractFilter($request); $sort = $this->extractSort($request); $query = $this->discussions->query(); diff --git a/src/Extend/Filter.php b/src/Extend/Filter.php index 65c3156ab..50f040d3d 100644 --- a/src/Extend/Filter.php +++ b/src/Extend/Filter.php @@ -11,7 +11,6 @@ namespace Flarum\Extend; use Flarum\Extension\Extension; use Flarum\Filter\Filterer; -use Flarum\Filter\FilterInterface; use Flarum\Foundation\ContainerUtil; use Illuminate\Contracts\Container\Container; @@ -30,7 +29,7 @@ class Filter implements ExtenderInterface } /** - * Add a filter to run when the resource is filtered + * Add a filter to run when the resource is filtered. * * @param string $filterClass: The ::class attribute of the filter you are adding. */ @@ -53,7 +52,6 @@ class Filter implements ExtenderInterface public function extend(Container $container, Extension $extension = null) { - foreach ($this->filters as $filter) { Filterer::addFilter($this->resource, $container->make($filter)); } diff --git a/src/Filter/Filterer.php b/src/Filter/Filterer.php index 0d77efca3..cf67227c7 100644 --- a/src/Filter/Filterer.php +++ b/src/Filter/Filterer.php @@ -23,11 +23,11 @@ class Filterer public static function addFilter($resource, FilterInterface $filter) { - if (!array_key_exists($resource, static::$filters)) { + if (! array_key_exists($resource, static::$filters)) { static::$filters[$resource] = []; } - if (!array_key_exists($filter->getKey(), static::$filters[$resource])) { + if (! array_key_exists($filter->getKey(), static::$filters[$resource])) { static::$filters[$resource][$filter->getKey()] = []; } @@ -36,7 +36,7 @@ class Filterer public static function addFilterMutator($resource, $mutator) { - if (!array_key_exists($resource, static::$filterMutators)) { + if (! array_key_exists($resource, static::$filterMutators)) { static::$filterMutators[$resource] = []; } diff --git a/src/Http/RequestUtil.php b/src/Http/RequestUtil.php index c1055c84e..05e19761b 100644 --- a/src/Http/RequestUtil.php +++ b/src/Http/RequestUtil.php @@ -15,7 +15,8 @@ use Psr\Http\Message\ServerRequestInterface as Request; class RequestUtil { - public static function getActor(Request $request): User { + public static function getActor(Request $request): User + { return $request->getAttribute('actor'); } diff --git a/tests/integration/extenders/FilterTest.php b/tests/integration/extenders/FilterTest.php index 5ac67ba7d..8293e0eb3 100644 --- a/tests/integration/extenders/FilterTest.php +++ b/tests/integration/extenders/FilterTest.php @@ -11,14 +11,11 @@ namespace Flarum\Tests\integration\extenders; use Carbon\Carbon; use Flarum\Discussion\Discussion; -use Flarum\Discussion\Search\DiscussionSearcher; use Flarum\Extend; use Flarum\Filter\FilterInterface; use Flarum\Filter\WrappedFilter; -use Flarum\Search\AbstractSearch; use Flarum\Tests\integration\RetrievesAuthorizedUsers; use Flarum\Tests\integration\TestCase; -use Flarum\User\User; class FilterTest extends TestCase {