Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: leftover gambit references on the backend #3894

Merged
merged 4 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/nicknames/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extensions/sticky/src/PinStickiedDiscussionsToTop.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
10 changes: 5 additions & 5 deletions extensions/tags/extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions framework/core/src/Search/SearchServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down