From ed7171ce15bf838bccb326fef800b62956b7a1cb Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Tue, 26 Sep 2023 11:44:16 +0000
Subject: [PATCH] Apply fixes from StyleCI

---
 extensions/lock/extend.php                               | 3 +--
 extensions/sticky/src/PinStickiedDiscussionsToTop.php    | 2 +-
 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 -
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/lock/extend.php b/extensions/lock/extend.php
index e2cc6035c36..6d0ab38a0b5 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/sticky/src/PinStickiedDiscussionsToTop.php b/extensions/sticky/src/PinStickiedDiscussionsToTop.php
index cab01586a86..48666976b6f 100755
--- a/extensions/sticky/src/PinStickiedDiscussionsToTop.php
+++ b/extensions/sticky/src/PinStickiedDiscussionsToTop.php
@@ -9,8 +9,8 @@
 
 namespace Flarum\Sticky;
 
-use Flarum\Search\SearchState;
 use Flarum\Query\QueryCriteria;
+use Flarum\Search\SearchState;
 use Flarum\Tags\Filter\TagFilter;
 
 class PinStickiedDiscussionsToTop
diff --git a/extensions/subscriptions/extend.php b/extensions/subscriptions/extend.php
index fa775356dee..36942714ef7 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 cb82bc71286..c119b986101 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 f5445e6858c..56366455731 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 835684c1241..b1b6f07a858 100644
--- a/framework/core/src/Search/AbstractFulltextFilter.php
+++ b/framework/core/src/Search/AbstractFulltextFilter.php
@@ -1,8 +1,13 @@
 <?php
 
-namespace Flarum\Search;
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
 
-use Flarum\Search\FilterInterface;
+namespace Flarum\Search;
 
 abstract class AbstractFulltextFilter implements FilterInterface
 {
diff --git a/framework/core/src/Search/SearchServiceProvider.php b/framework/core/src/Search/SearchServiceProvider.php
index c344a491906..295d9e7acd2 100644
--- a/framework/core/src/Search/SearchServiceProvider.php
+++ b/framework/core/src/Search/SearchServiceProvider.php
@@ -16,8 +16,8 @@
 use Flarum\Foundation\ContainerUtil;
 use Flarum\Group\Filter as GroupFilter;
 use Flarum\Group\Filter\GroupSearcher;
-use Flarum\Http\Filter as HttpFilter;
 use Flarum\Http\Filter\AccessTokenSearcher;
+use Flarum\Http\Filter as HttpFilter;
 use Flarum\Post\Filter as PostFilter;
 use Flarum\Post\Filter\PostSearcher;
 use Flarum\User\Filter as UserFilter;
diff --git a/framework/core/src/User/Search/UserSearcher.php b/framework/core/src/User/Search/UserSearcher.php
index c6b27bbcad8..14aca36fe21 100644
--- a/framework/core/src/User/Search/UserSearcher.php
+++ b/framework/core/src/User/Search/UserSearcher.php
@@ -13,7 +13,6 @@
 use Flarum\Search\FilterManager;
 use Flarum\User\User;
 use Flarum\User\UserRepository;
-use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Builder;
 
 class UserSearcher extends AbstractSearcher