From c81c603bb13cfde509b13a5dbb93c01bcb31a929 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Tue, 26 Sep 2023 12:03:14 +0000 Subject: [PATCH] Apply fixes from StyleCI --- extensions/lock/extend.php | 3 +-- extensions/subscriptions/extend.php | 2 +- extensions/tags/extend.php | 2 +- .../core/src/Discussion/Search/DiscussionSearcher.php | 1 - framework/core/src/Search/AbstractFulltextFilter.php | 9 +++++++-- framework/core/src/Search/SearchServiceProvider.php | 2 +- framework/core/src/User/Search/UserSearcher.php | 1 - 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/extensions/lock/extend.php b/extensions/lock/extend.php index e2cc6035c3..6d0ab38a0b 100644 --- a/extensions/lock/extend.php +++ b/extensions/lock/extend.php @@ -11,16 +11,15 @@ use Flarum\Api\Serializer\DiscussionSerializer; use Flarum\Discussion\Discussion; use Flarum\Discussion\Event\Saving; -use Flarum\Discussion\Filter\DiscussionFilterer; use Flarum\Discussion\Search\DiscussionSearcher; use Flarum\Extend; use Flarum\Lock\Access; use Flarum\Lock\Event\DiscussionWasLocked; use Flarum\Lock\Event\DiscussionWasUnlocked; +use Flarum\Lock\Filter\LockedFilter; use Flarum\Lock\Listener; use Flarum\Lock\Notification\DiscussionLockedBlueprint; use Flarum\Lock\Post\DiscussionLockedPost; -use Flarum\Lock\Filter\LockedFilter; return [ (new Extend\Frontend('forum')) diff --git a/extensions/subscriptions/extend.php b/extensions/subscriptions/extend.php index fa775356de..36942714ef 100644 --- a/extensions/subscriptions/extend.php +++ b/extensions/subscriptions/extend.php @@ -19,11 +19,11 @@ use Flarum\Post\Event\Hidden; use Flarum\Post\Event\Posted; use Flarum\Post\Event\Restored; +use Flarum\Subscriptions\Filter\SubscriptionFilter; use Flarum\Subscriptions\HideIgnoredFromAllDiscussionsPage; use Flarum\Subscriptions\Listener; use Flarum\Subscriptions\Notification\FilterVisiblePostsBeforeSending; use Flarum\Subscriptions\Notification\NewPostBlueprint; -use Flarum\Subscriptions\Filter\SubscriptionFilter; use Flarum\User\User; return [ diff --git a/extensions/tags/extend.php b/extensions/tags/extend.php index cb82bc7128..c119b98610 100644 --- a/extensions/tags/extend.php +++ b/extensions/tags/extend.php @@ -26,10 +26,10 @@ use Flarum\Tags\Event\DiscussionWasTagged; use Flarum\Tags\Filter\HideHiddenTagsFromAllDiscussionsPage; use Flarum\Tags\Filter\PostTagFilter; +use Flarum\Tags\Filter\TagFilter; use Flarum\Tags\Listener; use Flarum\Tags\LoadForumTagsRelationship; use Flarum\Tags\Post\DiscussionTaggedPost; -use Flarum\Tags\Filter\TagFilter; use Flarum\Tags\Search\Gambit\FulltextGambit; use Flarum\Tags\Search\TagSearcher; use Flarum\Tags\Tag; diff --git a/framework/core/src/Discussion/Search/DiscussionSearcher.php b/framework/core/src/Discussion/Search/DiscussionSearcher.php index f5445e6858..5636645573 100644 --- a/framework/core/src/Discussion/Search/DiscussionSearcher.php +++ b/framework/core/src/Discussion/Search/DiscussionSearcher.php @@ -13,7 +13,6 @@ use Flarum\Search\AbstractSearcher; use Flarum\Search\FilterManager; use Flarum\User\User; -use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Database\Eloquent\Builder; class DiscussionSearcher extends AbstractSearcher diff --git a/framework/core/src/Search/AbstractFulltextFilter.php b/framework/core/src/Search/AbstractFulltextFilter.php index 835684c124..b1b6f07a85 100644 --- a/framework/core/src/Search/AbstractFulltextFilter.php +++ b/framework/core/src/Search/AbstractFulltextFilter.php @@ -1,8 +1,13 @@