chore: leftover gambit references on the backend (#3894)

* chore: leftover gambit references on the backend * chore: namespace
flarum · Sep 26, 2023 · 3769340 · 3769340
1 parent 1a01c97
commit 3769340
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 27 deletions.
diff --git a/extensions/nicknames/extend.php b/extensions/nicknames/extend.php
@@ -52,7 +52,7 @@
         ->configure(AddNicknameValidation::class),
 
     (new Extend\SimpleFlarumSearch(UserSearcher::class))
-        ->setFullTextFilter(NicknameFullTextGambit::class),
+        ->setFullTextFilter(NicknameFullTextFilter::class),
 
     (new Extend\Policy())
         ->modelPolicy(User::class, UserPolicy::class),

diff --git a/.../nicknames/src/NicknameFullTextGambit.php → .../nicknames/src/NicknameFullTextFilter.php b/.../nicknames/src/NicknameFullTextGambit.php → .../nicknames/src/NicknameFullTextFilter.php
@@ -14,7 +14,7 @@
 use Flarum\User\UserRepository;
 use Illuminate\Database\Eloquent\Builder;
 
-class NicknameFullTextGambit extends AbstractFulltextFilter
+class NicknameFullTextFilter extends AbstractFulltextFilter
 {
     public function __construct(
         protected UserRepository $users

diff --git a/extensions/sticky/src/PinStickiedDiscussionsToTop.php b/extensions/sticky/src/PinStickiedDiscussionsToTop.php
@@ -11,7 +11,7 @@
 
 use Flarum\Search\SearchCriteria;
 use Flarum\Search\SearchState;
-use Flarum\Tags\Filter\TagFilter;
+use Flarum\Tags\Search\Filter\TagFilter;
 
 class PinStickiedDiscussionsToTop
 {

diff --git a/extensions/tags/extend.php b/extensions/tags/extend.php
@@ -24,13 +24,13 @@
 use Flarum\Tags\Api\Serializer\TagSerializer;
 use Flarum\Tags\Content;
 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\Search\Gambit\FulltextGambit;
+use Flarum\Tags\Search\Filter\PostTagFilter;
+use Flarum\Tags\Search\Filter\TagFilter;
+use Flarum\Tags\Search\FulltextFilter;
+use Flarum\Tags\Search\HideHiddenTagsFromAllDiscussionsPage;
 use Flarum\Tags\Search\TagSearcher;
 use Flarum\Tags\Tag;
 use Flarum\Tags\Utf8SlugDriver;
@@ -142,7 +142,7 @@
         ->addSearchMutator(HideHiddenTagsFromAllDiscussionsPage::class),
 
     (new Extend\SimpleFlarumSearch(TagSearcher::class))
-        ->setFullTextFilter(FullTextGambit::class),
+        ->setFullTextFilter(FulltextFilter::class),
 
     (new Extend\ModelUrl(Tag::class))
         ->addSlugDriver('default', Utf8SlugDriver::class),

diff --git a/extensions/tags/src/Filter/PostTagFilter.php → .../tags/src/Search/Filter/PostTagFilter.php b/extensions/tags/src/Filter/PostTagFilter.php → .../tags/src/Search/Filter/PostTagFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Tags\Filter;
+namespace Flarum\Tags\Search\Filter;
 
 use Flarum\Search\FilterInterface;
 use Flarum\Search\SearchState;

diff --git a/extensions/tags/src/Filter/TagFilter.php → ...ions/tags/src/Search/Filter/TagFilter.php b/extensions/tags/src/Filter/TagFilter.php → ...ions/tags/src/Search/Filter/TagFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Tags\Filter;
+namespace Flarum\Tags\Search\Filter;
 
 use Flarum\Http\SlugManager;
 use Flarum\Search\FilterInterface;

diff --git a/...tags/src/Search/Gambit/FulltextGambit.php → ...nsions/tags/src/Search/FulltextFilter.php b/...tags/src/Search/Gambit/FulltextGambit.php → ...nsions/tags/src/Search/FulltextFilter.php
@@ -7,14 +7,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Tags\Search\Gambit;
+namespace Flarum\Tags\Search;
 
 use Flarum\Search\AbstractFulltextFilter;
 use Flarum\Search\SearchState;
 use Flarum\Tags\TagRepository;
 use Illuminate\Database\Eloquent\Builder;
 
-class FulltextGambit extends AbstractFulltextFilter
+class FulltextFilter extends AbstractFulltextFilter
 {
     public function __construct(
         protected TagRepository $tags

diff --git a/.../HideHiddenTagsFromAllDiscussionsPage.php → .../HideHiddenTagsFromAllDiscussionsPage.php b/.../HideHiddenTagsFromAllDiscussionsPage.php → .../HideHiddenTagsFromAllDiscussionsPage.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Tags\Filter;
+namespace Flarum\Tags\Search;
 
 use Flarum\Search\SearchCriteria;
 use Flarum\Search\SearchState;

diff --git a/...re/src/Discussion/Filter/AuthorFilter.php → ...Discussion/Search/Filter/AuthorFilter.php b/...re/src/Discussion/Filter/AuthorFilter.php → ...Discussion/Search/Filter/AuthorFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Discussion\Filter;
+namespace Flarum\Discussion\Search\Filter;
 
 use Flarum\Search\FilterInterface;
 use Flarum\Search\SearchState;

diff --git a/...e/src/Discussion/Filter/CreatedFilter.php → ...iscussion/Search/Filter/CreatedFilter.php b/...e/src/Discussion/Filter/CreatedFilter.php → ...iscussion/Search/Filter/CreatedFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Discussion\Filter;
+namespace Flarum\Discussion\Search\Filter;
 
 use Flarum\Search\FilterInterface;
 use Flarum\Search\SearchState;

diff --git a/...re/src/Discussion/Filter/HiddenFilter.php → ...Discussion/Search/Filter/HiddenFilter.php b/...re/src/Discussion/Filter/HiddenFilter.php → ...Discussion/Search/Filter/HiddenFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Discussion\Filter;
+namespace Flarum\Discussion\Search\Filter;
 
 use Flarum\Search\FilterInterface;
 use Flarum\Search\SearchState;

diff --git a/...re/src/Discussion/Filter/UnreadFilter.php → ...Discussion/Search/Filter/UnreadFilter.php b/...re/src/Discussion/Filter/UnreadFilter.php → ...Discussion/Search/Filter/UnreadFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Discussion\Filter;
+namespace Flarum\Discussion\Search\Filter;
 
 use Flarum\Discussion\DiscussionRepository;
 use Flarum\Search\FilterInterface;

diff --git a/...scussion/Search/Gambit/FulltextGambit.php → .../src/Discussion/Search/FulltextFilter.php b/...scussion/Search/Gambit/FulltextGambit.php → .../src/Discussion/Search/FulltextFilter.php
@@ -7,15 +7,15 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\Discussion\Search\Gambit;
+namespace Flarum\Discussion\Search;
 
 use Flarum\Discussion\Discussion;
 use Flarum\Post\Post;
 use Flarum\Search\AbstractFulltextFilter;
 use Flarum\Search\SearchState;
 use Illuminate\Database\Query\Expression;
 
-class FulltextGambit extends AbstractFulltextFilter
+class FulltextFilter extends AbstractFulltextFilter
 {
     public function search(SearchState $state, string $query): void
     {

diff --git a/framework/core/src/Search/SearchServiceProvider.php b/framework/core/src/Search/SearchServiceProvider.php
@@ -9,9 +9,9 @@
 
 namespace Flarum\Search;
 
-use Flarum\Discussion\Filter as DiscussionFilter;
 use Flarum\Discussion\Search\DiscussionSearcher;
-use Flarum\Discussion\Search\Gambit\FulltextGambit as DiscussionFulltextFilter;
+use Flarum\Discussion\Search\Filter as DiscussionFilter;
+use Flarum\Discussion\Search\FulltextFilter as DiscussionFulltextFilter;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\ContainerUtil;
 use Flarum\Group\Filter as GroupFilter;
@@ -20,8 +20,8 @@
 use Flarum\Http\Filter as HttpFilter;
 use Flarum\Post\Filter as PostFilter;
 use Flarum\Post\Filter\PostSearcher;
-use Flarum\User\Filter as UserFilter;
-use Flarum\User\Search\Gambit\FulltextGambit as UserFulltextFilter;
+use Flarum\User\Search\Filter as UserFilter;
+use Flarum\User\Search\FulltextFilter as UserFulltextFilter;
 use Flarum\User\Search\UserSearcher;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\Arr;

diff --git a/...work/core/src/User/Filter/EmailFilter.php → ...re/src/User/Search/Filter/EmailFilter.php b/...work/core/src/User/Filter/EmailFilter.php → ...re/src/User/Search/Filter/EmailFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\User\Filter;
+namespace Flarum\User\Search\Filter;
 
 use Flarum\Search\FilterInterface;
 use Flarum\Search\SearchState;

diff --git a/...work/core/src/User/Filter/GroupFilter.php → ...re/src/User/Search/Filter/GroupFilter.php b/...work/core/src/User/Filter/GroupFilter.php → ...re/src/User/Search/Filter/GroupFilter.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\User\Filter;
+namespace Flarum\User\Search\Filter;
 
 use Flarum\Group\Group;
 use Flarum\Search\FilterInterface;

diff --git a/...src/User/Search/Gambit/FulltextGambit.php → ...k/core/src/User/Search/FulltextFilter.php b/...src/User/Search/Gambit/FulltextGambit.php → ...k/core/src/User/Search/FulltextFilter.php
@@ -7,15 +7,15 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\User\Search\Gambit;
+namespace Flarum\User\Search;
 
 use Flarum\Search\AbstractFulltextFilter;
 use Flarum\Search\SearchState;
 use Flarum\User\User;
 use Flarum\User\UserRepository;
 use Illuminate\Database\Eloquent\Builder;
 
-class FulltextGambit extends AbstractFulltextFilter
+class FulltextFilter extends AbstractFulltextFilter
 {
     public function __construct(
         protected UserRepository $users