diff --git a/src/Api/Controller/ListDiscussionsController.php b/src/Api/Controller/ListDiscussionsController.php index a030c185bb..ab7a3d3c50 100644 --- a/src/Api/Controller/ListDiscussionsController.php +++ b/src/Api/Controller/ListDiscussionsController.php @@ -16,7 +16,6 @@ use Flarum\Filter\Filterer; use Flarum\Http\UrlGenerator; use Flarum\Search\SearchCriteria; -use Illuminate\Support\Arr; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; diff --git a/src/Api/Controller/ListUsersController.php b/src/Api/Controller/ListUsersController.php index 4fe4cd3c60..ff09cfb358 100644 --- a/src/Api/Controller/ListUsersController.php +++ b/src/Api/Controller/ListUsersController.php @@ -15,7 +15,6 @@ use Flarum\Search\SearchCriteria; use Flarum\User\Search\UserSearcher; use Flarum\User\UserRepository; -use Illuminate\Support\Arr; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; diff --git a/src/Discussion/Filter/AuthorFilter.php b/src/Discussion/Filter/AuthorFilter.php index 9fea602dcf..762b781cc3 100644 --- a/src/Discussion/Filter/AuthorFilter.php +++ b/src/Discussion/Filter/AuthorFilter.php @@ -44,6 +44,5 @@ public function filter(WrappedFilter $wrappedFilter, string $filterValue, bool $ } $wrappedFilter->getQuery()->whereIn('discussions.user_id', $ids, 'and', $negate); - } } diff --git a/src/Discussion/Filter/CreatedFilter.php b/src/Discussion/Filter/CreatedFilter.php index fb207644e7..d56268a528 100644 --- a/src/Discussion/Filter/CreatedFilter.php +++ b/src/Discussion/Filter/CreatedFilter.php @@ -34,6 +34,5 @@ public function filter(WrappedFilter $wrappedFilter, string $filterValue, bool $ } else { $wrappedFilter->getQuery()->whereBetween('created_at', [$matches[1], $matches[3]], 'and', $negate); } - } } diff --git a/src/Discussion/Filter/UnreadFilter.php b/src/Discussion/Filter/UnreadFilter.php index ec192c6893..4986bd160a 100644 --- a/src/Discussion/Filter/UnreadFilter.php +++ b/src/Discussion/Filter/UnreadFilter.php @@ -33,7 +33,6 @@ public function __construct(DiscussionRepository $discussions) $this->discussions = $discussions; } - public function filter(WrappedFilter $wrappedFilter, string $filterValue, bool $negate) { $actor = $wrappedFilter->getActor(); @@ -42,7 +41,7 @@ public function filter(WrappedFilter $wrappedFilter, string $filterValue, bool $ $readIds = $this->discussions->getReadIds($actor); $wrappedFilter->getQuery()->where(function ($query) use ($readIds, $negate, $actor) { - if (!$negate) { + if (! $negate) { $query->whereNotIn('id', $readIds)->where('last_posted_at', '>', $actor->marked_all_as_read_at ?: 0); } else { $query->whereIn('id', $readIds)->orWhere('last_posted_at', '<=', $actor->marked_all_as_read_at ?: 0); diff --git a/src/Filter/FilterServiceProvider.php b/src/Filter/FilterServiceProvider.php index 5f22ed522b..6aff4e485b 100644 --- a/src/Filter/FilterServiceProvider.php +++ b/src/Filter/FilterServiceProvider.php @@ -14,7 +14,6 @@ use Flarum\Discussion\Filter\CreatedFilter; use Flarum\Discussion\Filter\HiddenFilter; use Flarum\Discussion\Filter\UnreadFilter; -use Flarum\Filter\Filterer; use Flarum\Foundation\AbstractServiceProvider; use Flarum\User\Filter\EmailFilter; use Flarum\User\Filter\GroupFilter; @@ -29,7 +28,7 @@ class FilterServiceProvider extends AbstractServiceProvider */ public function register() { - $this->app->singleton('flarum.filter.filters', function() { + $this->app->singleton('flarum.filter.filters', function () { return [ Discussion::class => [ AuthorFilter::class, diff --git a/src/User/Filter/EmailFilter.php b/src/User/Filter/EmailFilter.php index 9fe8128f72..7d2e81692c 100644 --- a/src/User/Filter/EmailFilter.php +++ b/src/User/Filter/EmailFilter.php @@ -21,7 +21,7 @@ public function getFilterKey(): string public function filter(WrappedFilter $wrappedFilter, string $filterValue, bool $negate) { - if (!$wrappedFilter->getActor()->hasPermission('user.edit')) { + if (! $wrappedFilter->getActor()->hasPermission('user.edit')) { return; } diff --git a/tests/integration/api/discussions/ListTest.php b/tests/integration/api/discussions/ListTest.php index 11ec4f2fcf..3010788c49 100644 --- a/tests/integration/api/discussions/ListTest.php +++ b/tests/integration/api/discussions/ListTest.php @@ -10,8 +10,6 @@ namespace Flarum\Tests\integration\api\discussions; use Carbon\Carbon; -use Flarum\Discussion\Discussion; -use Flarum\Discussion\UserState; use Flarum\Tests\integration\RetrievesAuthorizedUsers; use Flarum\Tests\integration\TestCase; use Flarum\User\User; @@ -280,7 +278,7 @@ public function hidden_filter_works() public function hidden_filter_works_negated() { $response = $this->send( - $this->request('GET','/api/discussions', ['authenticatedAs' => 1]) + $this->request('GET', '/api/discussions', ['authenticatedAs' => 1]) ->withQueryParams([ 'filter' => ['-hidden' => ''], 'include' => 'mostRelevantPost',