Query Namespace (#2645)

Move shared classes in search and filter namespaces to a new query namespace

src/User/Event/Searching.php

@@ -9,7 +9,7 @@
 
 namespace Flarum\User\Event;
 
-use Flarum\Search\SearchCriteria;
+use Flarum\Query\QueryCriteria;
 use Flarum\Search\SearchState;
 
 /**
@@ -23,15 +23,15 @@ class Searching
     public $search;
 
     /**
-     * @var SearchCriteria
+     * @var QueryCriteria
      */
     public $criteria;
 
     /**
      * @param SearchState $search
-     * @param SearchCriteria $criteria
+     * @param QueryCriteria $criteria
      */
-    public function __construct(SearchState $search, SearchCriteria $criteria)
+    public function __construct(SearchState $search, QueryCriteria $criteria)
     {
         $this->search = $search;
         $this->criteria = $criteria;

src/User/Query/EmailFilterGambit.php

@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\User\Filter;
+namespace Flarum\User\Query;
 
 use Flarum\Filter\FilterInterface;
 use Flarum\Filter\FilterState;

src/User/Query/GroupFilterGambit.php

@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\User\Filter;
+namespace Flarum\User\Query;
 
 use Flarum\Filter\FilterInterface;
 use Flarum\Filter\FilterState;

src/User/Search/UserSearcher.php

@@ -9,9 +9,9 @@
 
 namespace Flarum\User\Search;
 
+use Flarum\Query\QueryCriteria;
 use Flarum\Search\AbstractSearcher;
 use Flarum\Search\GambitManager;
-use Flarum\Search\SearchCriteria;
 use Flarum\Search\SearchState;
 use Flarum\User\Event\Searching;
 use Flarum\User\User;
@@ -19,10 +19,6 @@ use Flarum\User\UserRepository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Builder;
 
-/**
- * Takes a UserSearchCriteria object, performs a search using gambits,
- * and spits out a UserSearchResults object.
- */
 class UserSearcher extends AbstractSearcher
 {
     /**
@@ -57,7 +53,7 @@ class UserSearcher extends AbstractSearcher
     /**
      * @deprecated along with the Searching event, remove in Beta 17.
      */
-    protected function mutateSearch(SearchState $search, SearchCriteria $criteria)
+    protected function mutateSearch(SearchState $search, QueryCriteria $criteria)
     {
         parent::mutateSearch($search, $criteria);