mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 08:11:27 +02:00
Code Issues Releases Wiki Activity

Fix namespaces

Browse Source
This commit is contained in:
Franz Liedke
2017-06-24 15:04:46 +02:00
parent f725d897e8
commit 4562da2cc2
11 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Api/Controller/ListUsersController.php
View File

@@ -14,7 +14,7 @@ namespace Flarum\Api\Controller;
use Flarum\Api\UrlGenerator; use Flarum\Api\UrlGenerator;
use Flarum\User\Exception\PermissionDeniedException; use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Search\SearchCriteria; use Flarum\Search\SearchCriteria;
use Flarum\Core\User\Search\UserSearcher; use Flarum\User\Search\UserSearcher;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document; use Tobscure\JsonApi\Document;

4
framework/core/src/Event/ConfigureUserSearch.php
View File

@@ -12,12 +12,12 @@
namespace Flarum\Event; namespace Flarum\Event;
use Flarum\Search\SearchCriteria; use Flarum\Search\SearchCriteria;
use Flarum\Core\User\Search\UserSearch; use Flarum\User\Search\UserSearch;
class ConfigureUserSearch class ConfigureUserSearch
{ {
/** /**
* @var \Flarum\Core\User\Search\UserSearch * @var \Flarum\User\Search\UserSearch
*/ */
public $search; public $search;

2
framework/core/src/Post/Post.php
View File

@@ -11,11 +11,11 @@
namespace Flarum\Post; namespace Flarum\Post;
use Flarum\Core\User;
use Flarum\Foundation\EventGeneratorTrait; use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\ScopeVisibilityTrait; use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Database\AbstractModel; use Flarum\Database\AbstractModel;
use Flarum\Post\Event\Deleted; use Flarum\Post\Event\Deleted;
use Flarum\User\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
/** /**

8
framework/core/src/Search/SearchServiceProvider.php
View File

@@ -37,14 +37,14 @@ class SearchServiceProvider extends AbstractServiceProvider
public function registerUserGambits() public function registerUserGambits()
{ {
$this->app->when('Flarum\Core\User\Search\UserSearcher') $this->app->when('Flarum\User\Search\UserSearcher')
->needs('Flarum\Search\GambitManager') ->needs('Flarum\Search\GambitManager')
->give(function (Container $app) { ->give(function (Container $app) {
$gambits = new GambitManager($app); $gambits = new GambitManager($app);
$gambits->setFulltextGambit('Flarum\Core\User\Search\Gambit\FulltextGambit'); $gambits->setFulltextGambit('Flarum\User\Search\Gambit\FulltextGambit');
$gambits->add('Flarum\Core\User\Search\Gambit\EmailGambit'); $gambits->add('Flarum\User\Search\Gambit\EmailGambit');
$gambits->add('Flarum\Core\User\Search\Gambit\GroupGambit'); $gambits->add('Flarum\User\Search\Gambit\GroupGambit');
$app->make('events')->fire( $app->make('events')->fire(
new ConfigureUserGambits($gambits) new ConfigureUserGambits($gambits)

2
framework/core/src/User/EmailToken.php
View File

@@ -64,7 +64,7 @@ class EmailToken extends AbstractModel
*/ */
public function user() public function user()
{ {
return $this->belongsTo('Flarum\Core\User'); return $this->belongsTo('Flarum\User');
} }
/** /**

2
framework/core/src/User/PasswordToken.php
View File

@@ -59,6 +59,6 @@ class PasswordToken extends AbstractModel
*/ */
public function user() public function user()
{ {
return $this->belongsTo('Flarum\Core\User'); return $this->belongsTo('Flarum\User');
} }
} }

6
framework/core/src/User/Search/Gambit/EmailGambit.php
View File

@@ -9,12 +9,12 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Flarum\Core\User\Search\Gambit; namespace Flarum\User\Search\Gambit;
use Flarum\User\UserRepository;
use Flarum\Search\AbstractRegexGambit; use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch; use Flarum\Search\AbstractSearch;
use Flarum\Core\User\Search\UserSearch; use Flarum\User\Search\UserSearch;
use Flarum\User\UserRepository;
use LogicException; use LogicException;
class EmailGambit extends AbstractRegexGambit class EmailGambit extends AbstractRegexGambit

4
framework/core/src/User/Search/Gambit/FulltextGambit.php
View File

@@ -9,11 +9,11 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Flarum\Core\User\Search\Gambit; namespace Flarum\User\Search\Gambit;
use Flarum\User\UserRepository;
use Flarum\Search\AbstractSearch; use Flarum\Search\AbstractSearch;
use Flarum\Search\GambitInterface; use Flarum\Search\GambitInterface;
use Flarum\User\UserRepository;
class FulltextGambit implements GambitInterface class FulltextGambit implements GambitInterface
{ {

4
framework/core/src/User/Search/Gambit/GroupGambit.php
View File

@@ -9,12 +9,12 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Flarum\Core\User\Search\Gambit; namespace Flarum\User\Search\Gambit;
use Flarum\Group\GroupRepository; use Flarum\Group\GroupRepository;
use Flarum\Search\AbstractRegexGambit; use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch; use Flarum\Search\AbstractSearch;
use Flarum\Core\User\Search\UserSearch; use Flarum\User\Search\UserSearch;
use LogicException; use LogicException;
class GroupGambit extends AbstractRegexGambit class GroupGambit extends AbstractRegexGambit

2
framework/core/src/User/Search/UserSearch.php
View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Flarum\Core\User\Search; namespace Flarum\User\Search;
use Flarum\Search\AbstractSearch; use Flarum\Search\AbstractSearch;

15
framework/core/src/User/Search/UserSearcher.php
View File

@@ -9,9 +9,8 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Flarum\Core\User\Search; namespace Flarum\User\Search;
use Flarum\Core\User\Search\UserSearch;
use Flarum\User\UserRepository; use Flarum\User\UserRepository;
use Flarum\Search\ApplySearchParametersTrait; use Flarum\Search\ApplySearchParametersTrait;
use Flarum\Search\GambitManager; use Flarum\Search\GambitManager;
@@ -28,7 +27,7 @@ class UserSearcher
use ApplySearchParametersTrait; use ApplySearchParametersTrait;
/** /**
* @var \Flarum\Search\GambitManager * @var GambitManager
*/ */
protected $gambits; protected $gambits;
@@ -38,10 +37,10 @@ class UserSearcher
protected $users; protected $users;
/** /**
* @param \Flarum\Search\GambitManager $gambits * @param GambitManager $gambits
* @param \Flarum\User\UserRepository $users * @param \Flarum\User\UserRepository $users
*/ */
public function __construct(\Flarum\Search\GambitManager $gambits, UserRepository $users) public function __construct(GambitManager $gambits, UserRepository $users)
{ {
$this->gambits = $gambits; $this->gambits = $gambits;
$this->users = $users; $this->users = $users;
@@ -52,9 +51,9 @@ class UserSearcher
* @param int|null $limit * @param int|null $limit
* @param int $offset * @param int $offset
* @param array $load An array of relationships to load on the results. * @param array $load An array of relationships to load on the results.
* @return \Flarum\Search\SearchResults * @return SearchResults
*/ */
public function search(\Flarum\Search\SearchCriteria $criteria, $limit = null, $offset = 0, array $load = []) public function search(SearchCriteria $criteria, $limit = null, $offset = 0, array $load = [])
{ {
$actor = $criteria->actor; $actor = $criteria->actor;
@@ -83,6 +82,6 @@ class UserSearcher
$users->load($load); $users->load($load);
return new \Flarum\Search\SearchResults($users, $areMoreResults); return new SearchResults($users, $areMoreResults);
} }
} }