From 05324a0195810f518dd3b2420fc0b77a00c29e49 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 12 Oct 2023 18:09:48 +0000
Subject: [PATCH] Apply fixes from StyleCI

---
 .../src/Api/Controller/ListTagsController.php   |  1 -
 framework/core/src/Api/ApiServiceProvider.php   |  2 +-
 framework/core/src/Extend/SearchDriver.php      |  2 +-
 framework/core/src/Extend/SearchIndex.php       |  8 +++++++-
 framework/core/src/Search/AbstractDriver.php    |  7 +++++++
 .../src/Search/Database/AbstractSearcher.php    |  2 --
 .../Search/Database/DatabaseSearchDriver.php    |  7 +++++++
 framework/core/src/Search/IndexerInterface.php  | 17 ++++++++++++-----
 framework/core/src/Search/Job/IndexJob.php      |  7 +++++++
 .../core/src/Search/Listener/ModelObserver.php  |  7 +++++++
 framework/core/src/Search/SearchManager.php     |  7 +++++++
 .../core/src/Search/SearchServiceProvider.php   |  2 +-
 framework/core/src/Search/SearchState.php       |  9 ++++++++-
 framework/core/src/Search/SearcherInterface.php | 11 +++++++++--
 .../extenders/SimpleFlarumSearchTest.php        |  4 ----
 15 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/extensions/tags/src/Api/Controller/ListTagsController.php b/extensions/tags/src/Api/Controller/ListTagsController.php
index 0715ebcbfc..2f23267a6a 100644
--- a/extensions/tags/src/Api/Controller/ListTagsController.php
+++ b/extensions/tags/src/Api/Controller/ListTagsController.php
@@ -15,7 +15,6 @@
 use Flarum\Search\SearchCriteria;
 use Flarum\Search\SearchManager;
 use Flarum\Tags\Api\Serializer\TagSerializer;
-use Flarum\Tags\Search\TagSearcher;
 use Flarum\Tags\Tag;
 use Flarum\Tags\TagRepository;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/framework/core/src/Api/ApiServiceProvider.php b/framework/core/src/Api/ApiServiceProvider.php
index 91a481ced6..5d1e28b192 100644
--- a/framework/core/src/Api/ApiServiceProvider.php
+++ b/framework/core/src/Api/ApiServiceProvider.php
@@ -56,7 +56,7 @@ public function register(): void
         $this->container->singleton('flarum.api.middleware', function () {
             return [
                 HttpMiddleware\InjectActorReference::class,
-//                'flarum.api.error_handler',
+                //                'flarum.api.error_handler',
                 HttpMiddleware\ParseJsonBody::class,
                 Middleware\FakeHttpMethods::class,
                 HttpMiddleware\StartSession::class,
diff --git a/framework/core/src/Extend/SearchDriver.php b/framework/core/src/Extend/SearchDriver.php
index 114fefe870..e18808bc7a 100644
--- a/framework/core/src/Extend/SearchDriver.php
+++ b/framework/core/src/Extend/SearchDriver.php
@@ -13,9 +13,9 @@
 use Flarum\Search\AbstractDriver;
 use Flarum\Search\AbstractFulltextFilter;
 use Flarum\Search\Database\AbstractSearcher;
-use Flarum\Search\SearchState;
 use Flarum\Search\Filter\FilterInterface;
 use Flarum\Search\SearchCriteria;
+use Flarum\Search\SearchState;
 use Illuminate\Contracts\Container\Container;
 
 class SearchDriver implements ExtenderInterface
diff --git a/framework/core/src/Extend/SearchIndex.php b/framework/core/src/Extend/SearchIndex.php
index 5f42be1cf1..277ad55f8b 100644
--- a/framework/core/src/Extend/SearchIndex.php
+++ b/framework/core/src/Extend/SearchIndex.php
@@ -1,8 +1,14 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Extend;
 
-use Flarum\Extend\ExtenderInterface;
 use Flarum\Extension\Extension;
 use Illuminate\Contracts\Container\Container;
 
diff --git a/framework/core/src/Search/AbstractDriver.php b/framework/core/src/Search/AbstractDriver.php
index 983778b42d..19dc23250a 100644
--- a/framework/core/src/Search/AbstractDriver.php
+++ b/framework/core/src/Search/AbstractDriver.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search;
 
 use Flarum\Database\AbstractModel;
diff --git a/framework/core/src/Search/Database/AbstractSearcher.php b/framework/core/src/Search/Database/AbstractSearcher.php
index a6df983511..1f29681b47 100644
--- a/framework/core/src/Search/Database/AbstractSearcher.php
+++ b/framework/core/src/Search/Database/AbstractSearcher.php
@@ -10,12 +10,10 @@
 namespace Flarum\Search\Database;
 
 use Flarum\Search\Filter\FilterManager;
-use Flarum\Search\IndexerInterface;
 use Flarum\Search\SearchCriteria;
 use Flarum\Search\SearcherInterface;
 use Flarum\Search\SearchResults;
 use Flarum\User\User;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
 
 abstract class AbstractSearcher implements SearcherInterface
diff --git a/framework/core/src/Search/Database/DatabaseSearchDriver.php b/framework/core/src/Search/Database/DatabaseSearchDriver.php
index 8f2bb85df6..c3c27f5a29 100644
--- a/framework/core/src/Search/Database/DatabaseSearchDriver.php
+++ b/framework/core/src/Search/Database/DatabaseSearchDriver.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search\Database;
 
 use Flarum\Search\AbstractDriver;
diff --git a/framework/core/src/Search/IndexerInterface.php b/framework/core/src/Search/IndexerInterface.php
index cf75406dfa..6d229ef820 100644
--- a/framework/core/src/Search/IndexerInterface.php
+++ b/framework/core/src/Search/IndexerInterface.php
@@ -1,30 +1,37 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search;
 
 use Flarum\Database\AbstractModel;
 
 interface IndexerInterface
 {
-    static function index(): string;
+    public static function index(): string;
 
     /**
      * @param AbstractModel[] $models
      */
-    function save(array $models): void;
+    public function save(array $models): void;
 
     /**
      * @param AbstractModel[] $models
      */
-    function delete(array $models): void;
+    public function delete(array $models): void;
 
     /**
      * Build the index from scratch.
      */
-    function build(): void;
+    public function build(): void;
 
     /**
      * Flush the index.
      */
-    function flush(): void;
+    public function flush(): void;
 }
diff --git a/framework/core/src/Search/Job/IndexJob.php b/framework/core/src/Search/Job/IndexJob.php
index b83a086217..f3e706ea3a 100644
--- a/framework/core/src/Search/Job/IndexJob.php
+++ b/framework/core/src/Search/Job/IndexJob.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search\Job;
 
 use Flarum\Database\AbstractModel;
diff --git a/framework/core/src/Search/Listener/ModelObserver.php b/framework/core/src/Search/Listener/ModelObserver.php
index 046ecc7d7d..525b1f3f1e 100644
--- a/framework/core/src/Search/Listener/ModelObserver.php
+++ b/framework/core/src/Search/Listener/ModelObserver.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search\Listener;
 
 use Flarum\Database\AbstractModel;
diff --git a/framework/core/src/Search/SearchManager.php b/framework/core/src/Search/SearchManager.php
index 18061105df..484d7953bd 100644
--- a/framework/core/src/Search/SearchManager.php
+++ b/framework/core/src/Search/SearchManager.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search;
 
 use Flarum\Database\AbstractModel;
diff --git a/framework/core/src/Search/SearchServiceProvider.php b/framework/core/src/Search/SearchServiceProvider.php
index 1f983be025..1d2b543754 100644
--- a/framework/core/src/Search/SearchServiceProvider.php
+++ b/framework/core/src/Search/SearchServiceProvider.php
@@ -19,8 +19,8 @@
 use Flarum\Group\Filter\GroupSearcher;
 use Flarum\Group\Group;
 use Flarum\Http\AccessToken;
-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\Post\Post;
diff --git a/framework/core/src/Search/SearchState.php b/framework/core/src/Search/SearchState.php
index 5c5c6e3796..a505f980d5 100644
--- a/framework/core/src/Search/SearchState.php
+++ b/framework/core/src/Search/SearchState.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search;
 
 use Closure;
@@ -13,7 +20,7 @@ class SearchState
      */
     protected array $activeFilters = [];
 
-    public final function __construct(
+    final public function __construct(
         protected User $actor,
         /**
          * Whether this is a fulltext search or just filtering.
diff --git a/framework/core/src/Search/SearcherInterface.php b/framework/core/src/Search/SearcherInterface.php
index e8f525759a..832d5f5bba 100644
--- a/framework/core/src/Search/SearcherInterface.php
+++ b/framework/core/src/Search/SearcherInterface.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Search;
 
 use Flarum\User\User;
@@ -7,7 +14,7 @@
 
 interface SearcherInterface
 {
-    function getQuery(User $actor): Builder;
+    public function getQuery(User $actor): Builder;
 
-    function search(SearchCriteria $criteria): SearchResults;
+    public function search(SearchCriteria $criteria): SearchResults;
 }
diff --git a/framework/core/tests/integration/extenders/SimpleFlarumSearchTest.php b/framework/core/tests/integration/extenders/SimpleFlarumSearchTest.php
index 1908f99a0b..28c706ac87 100644
--- a/framework/core/tests/integration/extenders/SimpleFlarumSearchTest.php
+++ b/framework/core/tests/integration/extenders/SimpleFlarumSearchTest.php
@@ -13,9 +13,7 @@
 use Flarum\Discussion\Discussion;
 use Flarum\Discussion\Search\DiscussionSearcher;
 use Flarum\Extend;
-use Flarum\Group\Group;
 use Flarum\Search\AbstractFulltextFilter;
-use Flarum\Search\Database\AbstractSearcher;
 use Flarum\Search\Database\DatabaseSearchDriver;
 use Flarum\Search\Database\DatabaseSearchState;
 use Flarum\Search\Filter\FilterInterface;
@@ -25,8 +23,6 @@
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Database\Eloquent\Builder;
 
 class SimpleFlarumSearchTest extends TestCase
 {