mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 10:16:09 +02:00
Code Issues Releases Wiki Activity

Query Namespace (#2645)

Browse Source 
Move shared classes in search and filter namespaces to a new query namespace
This commit is contained in:
Alexander Skvortsov
2021-03-02 09:57:40 -05:00
committed by GitHub
parent e37fdef709
commit a9526917b8
29 changed files with 328 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Controller/ListDiscussionsController.php
View File

@@ -14,7 +14,7 @@ use Flarum\Discussion\Discussion;
use Flarum\Discussion\Filter\DiscussionFilterer;
use Flarum\Discussion\Search\DiscussionSearcher;
use Flarum\Http\UrlGenerator;
use Flarum\Search\SearchCriteria;
use Flarum\Query\QueryCriteria;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;
@@ -93,7 +93,7 @@ class ListDiscussionsController extends AbstractListController
$offset = $this->extractOffset($request);
$include = array_merge($this->extractInclude($request), ['state']);
$criteria = new SearchCriteria($actor, $filters, $sort);
$criteria = new QueryCriteria($actor, $filters, $sort);
if (array_key_exists('q', $filters)) {
$results = $this->searcher->search($criteria, $limit, $offset);
} else {

4
src/Api/Controller/ListPostsController.php
View File

@@ -13,7 +13,7 @@ use Flarum\Api\Serializer\PostSerializer;
use Flarum\Http\UrlGenerator;
use Flarum\Post\Filter\PostFilterer;
use Flarum\Post\PostRepository;
use Flarum\Search\SearchCriteria;
use Flarum\Query\QueryCriteria;
use Illuminate\Support\Arr;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;
@@ -83,7 +83,7 @@ class ListPostsController extends AbstractListController
$offset = $this->extractOffset($request);
$include = $this->extractInclude($request);
$results = $this->filterer->filter(new SearchCriteria($actor, $filters, $sort), $limit, $offset);
$results = $this->filterer->filter(new QueryCriteria($actor, $filters, $sort), $limit, $offset);
$document->addPaginationLinks(
$this->url->to('api')->route('posts.index'),

4
src/Api/Controller/ListUsersController.php
View File

@@ -11,7 +11,7 @@ namespace Flarum\Api\Controller;
use Flarum\Api\Serializer\UserSerializer;
use Flarum\Http\UrlGenerator;
use Flarum\Search\SearchCriteria;
use Flarum\Query\QueryCriteria;
use Flarum\User\Filter\UserFilterer;
use Flarum\User\Search\UserSearcher;
use Psr\Http\Message\ServerRequestInterface;
@@ -83,7 +83,7 @@ class ListUsersController extends AbstractListController
$offset = $this->extractOffset($request);
$include = $this->extractInclude($request);
$criteria = new SearchCriteria($actor, $filters, $sort);
$criteria = new QueryCriteria($actor, $filters, $sort);
if (array_key_exists('q', $filters)) {
$results = $this->searcher->search($criteria, $limit, $offset);
} else {