diff --git a/src/Api/Client.php b/src/Api/Client.php index b99be47e6..774f0dadc 100644 --- a/src/Api/Client.php +++ b/src/Api/Client.php @@ -12,9 +12,9 @@ namespace Flarum\Api; use Exception; -use Flarum\Core\User; use Flarum\Foundation\Application; use Flarum\Http\Controller\ControllerInterface; +use Flarum\User\User; use InvalidArgumentException; use Zend\Diactoros\ServerRequestFactory; diff --git a/src/Api/Controller/ForgotPasswordController.php b/src/Api/Controller/ForgotPasswordController.php index 72c7ee759..5516c6d47 100644 --- a/src/Api/Controller/ForgotPasswordController.php +++ b/src/Api/Controller/ForgotPasswordController.php @@ -12,7 +12,7 @@ namespace Flarum\Api\Controller; use Flarum\Core\Command\RequestPasswordReset; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Flarum\Http\Controller\ControllerInterface; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +21,7 @@ use Zend\Diactoros\Response\EmptyResponse; class ForgotPasswordController implements ControllerInterface { /** - * @var \Flarum\Core\Repository\UserRepository + * @var \Flarum\User\UserRepository */ protected $users; @@ -31,7 +31,7 @@ class ForgotPasswordController implements ControllerInterface protected $bus; /** - * @param \Flarum\Core\Repository\UserRepository $users + * @param \Flarum\User\UserRepository $users * @param Dispatcher $bus */ public function __construct(UserRepository $users, Dispatcher $bus) diff --git a/src/Api/Controller/ListNotificationsController.php b/src/Api/Controller/ListNotificationsController.php index dd7303efa..c1681d645 100644 --- a/src/Api/Controller/ListNotificationsController.php +++ b/src/Api/Controller/ListNotificationsController.php @@ -12,7 +12,7 @@ namespace Flarum\Api\Controller; use Flarum\Core\Discussion; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Repository\NotificationRepository; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; diff --git a/src/Api/Controller/ListUsersController.php b/src/Api/Controller/ListUsersController.php index eb42a97db..7d1f6526f 100644 --- a/src/Api/Controller/ListUsersController.php +++ b/src/Api/Controller/ListUsersController.php @@ -12,9 +12,9 @@ namespace Flarum\Api\Controller; use Flarum\Api\UrlGenerator; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Search\SearchCriteria; -use Flarum\Core\Search\User\UserSearcher; +use Flarum\Core\User\Search\UserSearcher; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; diff --git a/src/Api/Controller/SendConfirmationEmailController.php b/src/Api/Controller/SendConfirmationEmailController.php index 3f870f160..02c22b020 100644 --- a/src/Api/Controller/SendConfirmationEmailController.php +++ b/src/Api/Controller/SendConfirmationEmailController.php @@ -12,8 +12,8 @@ namespace Flarum\Api\Controller; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\EmailToken; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\EmailToken; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Forum\UrlGenerator; use Flarum\Http\Controller\ControllerInterface; use Flarum\Settings\SettingsRepositoryInterface; diff --git a/src/Api/Controller/ShowDiscussionController.php b/src/Api/Controller/ShowDiscussionController.php index 58417fae4..d3417ff8c 100644 --- a/src/Api/Controller/ShowDiscussionController.php +++ b/src/Api/Controller/ShowDiscussionController.php @@ -14,7 +14,7 @@ namespace Flarum\Api\Controller; use Flarum\Core\Discussion; use Flarum\Core\Repository\DiscussionRepository; use Flarum\Core\Repository\PostRepository; -use Flarum\Core\User; +use Flarum\User\User; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; diff --git a/src/Api/Controller/ShowUserController.php b/src/Api/Controller/ShowUserController.php index 2879a3c8b..f61d3a1b6 100644 --- a/src/Api/Controller/ShowUserController.php +++ b/src/Api/Controller/ShowUserController.php @@ -11,7 +11,7 @@ namespace Flarum\Api\Controller; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; @@ -28,12 +28,12 @@ class ShowUserController extends AbstractShowController public $include = ['groups']; /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; /** - * @param UserRepository $users + * @param \Flarum\User\UserRepository $users */ public function __construct(UserRepository $users) { diff --git a/src/Api/Controller/TokenController.php b/src/Api/Controller/TokenController.php index e5f1c445c..376e48747 100644 --- a/src/Api/Controller/TokenController.php +++ b/src/Api/Controller/TokenController.php @@ -11,8 +11,8 @@ namespace Flarum\Api\Controller; -use Flarum\Core\Exception\PermissionDeniedException; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\Exception\PermissionDeniedException; +use Flarum\User\UserRepository; use Flarum\Http\AccessToken; use Flarum\Http\Controller\ControllerInterface; use Illuminate\Contracts\Bus\Dispatcher as BusDispatcher; @@ -23,7 +23,7 @@ use Zend\Diactoros\Response\JsonResponse; class TokenController implements ControllerInterface { /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; diff --git a/src/Api/Controller/UpdateUserController.php b/src/Api/Controller/UpdateUserController.php index 78c009012..818e4d941 100644 --- a/src/Api/Controller/UpdateUserController.php +++ b/src/Api/Controller/UpdateUserController.php @@ -12,7 +12,7 @@ namespace Flarum\Api\Controller; use Flarum\Core\Command\EditUser; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; diff --git a/src/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandler.php b/src/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandler.php index 7c2465dce..541b620f7 100644 --- a/src/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandler.php +++ b/src/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Api\ExceptionHandler; use Exception; -use Flarum\Core\Exception\InvalidConfirmationTokenException; +use Flarum\User\Exception\InvalidConfirmationTokenException; use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface; use Tobscure\JsonApi\Exception\Handler\ResponseBag; diff --git a/src/Api/ExceptionHandler/PermissionDeniedExceptionHandler.php b/src/Api/ExceptionHandler/PermissionDeniedExceptionHandler.php index 059c9369d..a4b4f9d53 100644 --- a/src/Api/ExceptionHandler/PermissionDeniedExceptionHandler.php +++ b/src/Api/ExceptionHandler/PermissionDeniedExceptionHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Api\ExceptionHandler; use Exception; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface; use Tobscure\JsonApi\Exception\Handler\ResponseBag; diff --git a/src/Api/Serializer/AbstractSerializer.php b/src/Api/Serializer/AbstractSerializer.php index 3f7b245e2..a11c9e28a 100644 --- a/src/Api/Serializer/AbstractSerializer.php +++ b/src/Api/Serializer/AbstractSerializer.php @@ -13,9 +13,9 @@ namespace Flarum\Api\Serializer; use Closure; use DateTime; -use Flarum\Core\User; use Flarum\Event\GetApiRelationship; use Flarum\Event\PrepareApiAttributes; +use Flarum\User\User; use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Events\Dispatcher; use InvalidArgumentException; diff --git a/src/Api/Serializer/BasicUserSerializer.php b/src/Api/Serializer/BasicUserSerializer.php index 1d854c330..91348e471 100644 --- a/src/Api/Serializer/BasicUserSerializer.php +++ b/src/Api/Serializer/BasicUserSerializer.php @@ -11,7 +11,7 @@ namespace Flarum\Api\Serializer; -use Flarum\Core\User; +use Flarum\User\User; use InvalidArgumentException; class BasicUserSerializer extends AbstractSerializer diff --git a/src/Api/Serializer/DiscussionSerializer.php b/src/Api/Serializer/DiscussionSerializer.php index e26f8929b..96704df22 100644 --- a/src/Api/Serializer/DiscussionSerializer.php +++ b/src/Api/Serializer/DiscussionSerializer.php @@ -11,18 +11,18 @@ namespace Flarum\Api\Serializer; -use Flarum\Core\Access\Gate; +use Flarum\User\Gate; use Flarum\Core\Discussion; class DiscussionSerializer extends BasicDiscussionSerializer { /** - * @var Gate + * @var \Flarum\User\Gate */ protected $gate; /** - * @param \Flarum\Core\Access\Gate $gate + * @param \Flarum\User\Gate $gate */ public function __construct(Gate $gate) { diff --git a/src/Api/Serializer/PostSerializer.php b/src/Api/Serializer/PostSerializer.php index bb584dd3e..e385b3533 100644 --- a/src/Api/Serializer/PostSerializer.php +++ b/src/Api/Serializer/PostSerializer.php @@ -11,18 +11,18 @@ namespace Flarum\Api\Serializer; -use Flarum\Core\Access\Gate; +use Flarum\User\Gate; use Flarum\Core\Post\CommentPost; class PostSerializer extends BasicPostSerializer { /** - * @var \Flarum\Core\Access\Gate + * @var \Flarum\User\Gate */ protected $gate; /** - * @param \Flarum\Core\Access\Gate $gate + * @param \Flarum\User\Gate $gate */ public function __construct(Gate $gate) { diff --git a/src/Api/Serializer/UserSerializer.php b/src/Api/Serializer/UserSerializer.php index 7bf6f62b2..b39801843 100644 --- a/src/Api/Serializer/UserSerializer.php +++ b/src/Api/Serializer/UserSerializer.php @@ -11,12 +11,12 @@ namespace Flarum\Api\Serializer; -use Flarum\Core\Access\Gate; +use Flarum\User\Gate; class UserSerializer extends BasicUserSerializer { /** - * @var Gate + * @var \Flarum\User\Gate */ protected $gate; diff --git a/src/Core/Access/AssertPermissionTrait.php b/src/Core/Access/AssertPermissionTrait.php index cb2d9aff3..647ca9fac 100644 --- a/src/Core/Access/AssertPermissionTrait.php +++ b/src/Core/Access/AssertPermissionTrait.php @@ -11,8 +11,8 @@ namespace Flarum\Core\Access; -use Flarum\Core\Exception\PermissionDeniedException; -use Flarum\Core\User; +use Flarum\User\Exception\PermissionDeniedException; +use Flarum\User\User; trait AssertPermissionTrait { @@ -40,7 +40,7 @@ trait AssertPermissionTrait /** * @param User $actor - * @throws PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ protected function assertGuest(User $actor) { diff --git a/src/Core/Access/DiscussionPolicy.php b/src/Core/Access/DiscussionPolicy.php index 3abefa824..50f00a387 100644 --- a/src/Core/Access/DiscussionPolicy.php +++ b/src/Core/Access/DiscussionPolicy.php @@ -13,10 +13,12 @@ namespace Flarum\Core\Access; use Carbon\Carbon; use Flarum\Core\Discussion; -use Flarum\Core\User; use Flarum\Event\ScopeHiddenDiscussionVisibility; use Flarum\Event\ScopePrivateDiscussionVisibility; use Flarum\Settings\SettingsRepositoryInterface; +use Flarum\User\AbstractPolicy; +use Flarum\User\Gate; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Database\Eloquent\Builder; diff --git a/src/Core/Access/GroupPolicy.php b/src/Core/Access/GroupPolicy.php index 097077335..ff9861a07 100644 --- a/src/Core/Access/GroupPolicy.php +++ b/src/Core/Access/GroupPolicy.php @@ -12,7 +12,8 @@ namespace Flarum\Core\Access; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\AbstractPolicy; +use Flarum\User\User; class GroupPolicy extends AbstractPolicy { diff --git a/src/Core/Access/PostPolicy.php b/src/Core/Access/PostPolicy.php index afc0addb5..9e6f5829b 100644 --- a/src/Core/Access/PostPolicy.php +++ b/src/Core/Access/PostPolicy.php @@ -13,10 +13,11 @@ namespace Flarum\Core\Access; use Carbon\Carbon; use Flarum\Core\Post; -use Flarum\Core\User; use Flarum\Event\ScopePostVisibility; use Flarum\Event\ScopePrivatePostVisibility; use Flarum\Settings\SettingsRepositoryInterface; +use Flarum\User\AbstractPolicy; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; class PostPolicy extends AbstractPolicy diff --git a/src/Core/Command/ConfirmEmailHandler.php b/src/Core/Command/ConfirmEmailHandler.php index 5ee4d5190..f8415792d 100644 --- a/src/Core/Command/ConfirmEmailHandler.php +++ b/src/Core/Command/ConfirmEmailHandler.php @@ -11,8 +11,8 @@ namespace Flarum\Core\Command; -use Flarum\Core\EmailToken; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\EmailToken; +use Flarum\User\UserRepository; use Flarum\Core\Support\DispatchEventsTrait; use Illuminate\Contracts\Events\Dispatcher; @@ -21,12 +21,12 @@ class ConfirmEmailHandler use DispatchEventsTrait; /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; /** - * @param UserRepository $users + * @param \Flarum\User\UserRepository $users */ public function __construct(Dispatcher $events, UserRepository $users) { @@ -36,7 +36,7 @@ class ConfirmEmailHandler /** * @param ConfirmEmail $command - * @return \Flarum\Core\User + * @return \Flarum\User\User */ public function handle(ConfirmEmail $command) { diff --git a/src/Core/Command/CreateGroup.php b/src/Core/Command/CreateGroup.php index 9ed912ce7..e67eefea6 100644 --- a/src/Core/Command/CreateGroup.php +++ b/src/Core/Command/CreateGroup.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class CreateGroup { diff --git a/src/Core/Command/CreateGroupHandler.php b/src/Core/Command/CreateGroupHandler.php index fce5fd598..54d8c3d8c 100644 --- a/src/Core/Command/CreateGroupHandler.php +++ b/src/Core/Command/CreateGroupHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Group; use Flarum\Core\Support\DispatchEventsTrait; use Flarum\Core\Validator\GroupValidator; @@ -42,7 +42,7 @@ class CreateGroupHandler /** * @param CreateGroup $command * @return Group - * @throws PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(CreateGroup $command) { diff --git a/src/Core/Command/DeleteAvatar.php b/src/Core/Command/DeleteAvatar.php index 9503d00e5..a8f757c14 100644 --- a/src/Core/Command/DeleteAvatar.php +++ b/src/Core/Command/DeleteAvatar.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class DeleteAvatar { diff --git a/src/Core/Command/DeleteAvatarHandler.php b/src/Core/Command/DeleteAvatarHandler.php index 8efd972c7..aabbe4ddc 100644 --- a/src/Core/Command/DeleteAvatarHandler.php +++ b/src/Core/Command/DeleteAvatarHandler.php @@ -12,8 +12,8 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\Exception\PermissionDeniedException; +use Flarum\User\UserRepository; use Flarum\Core\Support\DispatchEventsTrait; use Flarum\Event\AvatarWillBeDeleted; use Illuminate\Contracts\Events\Dispatcher; @@ -48,8 +48,8 @@ class DeleteAvatarHandler /** * @param DeleteAvatar $command - * @return \Flarum\Core\User - * @throws PermissionDeniedException + * @return \Flarum\User\User + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(DeleteAvatar $command) { diff --git a/src/Core/Command/DeleteDiscussion.php b/src/Core/Command/DeleteDiscussion.php index 550ae5e17..3c4d1219b 100644 --- a/src/Core/Command/DeleteDiscussion.php +++ b/src/Core/Command/DeleteDiscussion.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class DeleteDiscussion { diff --git a/src/Core/Command/DeleteDiscussionHandler.php b/src/Core/Command/DeleteDiscussionHandler.php index 5f383f60d..a02e4609b 100644 --- a/src/Core/Command/DeleteDiscussionHandler.php +++ b/src/Core/Command/DeleteDiscussionHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Repository\DiscussionRepository; use Flarum\Core\Support\DispatchEventsTrait; use Flarum\Event\DiscussionWillBeDeleted; diff --git a/src/Core/Command/DeleteGroup.php b/src/Core/Command/DeleteGroup.php index 2f9c6a574..b57bc7c33 100644 --- a/src/Core/Command/DeleteGroup.php +++ b/src/Core/Command/DeleteGroup.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class DeleteGroup { diff --git a/src/Core/Command/DeleteGroupHandler.php b/src/Core/Command/DeleteGroupHandler.php index 7592eb97b..ed849a5be 100644 --- a/src/Core/Command/DeleteGroupHandler.php +++ b/src/Core/Command/DeleteGroupHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Repository\GroupRepository; use Flarum\Core\Support\DispatchEventsTrait; use Flarum\Event\GroupWillBeDeleted; diff --git a/src/Core/Command/DeletePost.php b/src/Core/Command/DeletePost.php index 3e363e245..e2c2e897b 100644 --- a/src/Core/Command/DeletePost.php +++ b/src/Core/Command/DeletePost.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class DeletePost { diff --git a/src/Core/Command/DeletePostHandler.php b/src/Core/Command/DeletePostHandler.php index a5010cf6d..e7697e622 100644 --- a/src/Core/Command/DeletePostHandler.php +++ b/src/Core/Command/DeletePostHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Repository\PostRepository; use Flarum\Core\Support\DispatchEventsTrait; use Flarum\Event\PostWillBeDeleted; @@ -41,7 +41,7 @@ class DeletePostHandler /** * @param DeletePost $command * @return \Flarum\Core\Post - * @throws PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(DeletePost $command) { diff --git a/src/Core/Command/DeleteUser.php b/src/Core/Command/DeleteUser.php index 16cd44cf9..2aa0f3edb 100644 --- a/src/Core/Command/DeleteUser.php +++ b/src/Core/Command/DeleteUser.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class DeleteUser { diff --git a/src/Core/Command/DeleteUserHandler.php b/src/Core/Command/DeleteUserHandler.php index a4058465d..e4503a53d 100644 --- a/src/Core/Command/DeleteUserHandler.php +++ b/src/Core/Command/DeleteUserHandler.php @@ -12,10 +12,10 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\Exception\PermissionDeniedException; +use Flarum\User\UserRepository; use Flarum\Core\Support\DispatchEventsTrait; -use Flarum\Event\UserWillBeDeleted; +use Flarum\User\Event\Deleting; use Illuminate\Contracts\Events\Dispatcher; class DeleteUserHandler @@ -40,7 +40,7 @@ class DeleteUserHandler /** * @param DeleteUser $command - * @return \Flarum\Core\User + * @return \Flarum\User\User * @throws PermissionDeniedException */ public function handle(DeleteUser $command) @@ -51,7 +51,7 @@ class DeleteUserHandler $this->assertCan($actor, 'delete', $user); $this->events->fire( - new UserWillBeDeleted($user, $actor, $command->data) + new Deleting($user, $actor, $command->data) ); $user->delete(); diff --git a/src/Core/Command/EditDiscussion.php b/src/Core/Command/EditDiscussion.php index 23cb5e707..4ae77a276 100644 --- a/src/Core/Command/EditDiscussion.php +++ b/src/Core/Command/EditDiscussion.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class EditDiscussion { @@ -25,7 +25,7 @@ class EditDiscussion /** * The user performing the action. * - * @var \Flarum\Core\User + * @var \Flarum\User\User */ public $actor; @@ -38,7 +38,7 @@ class EditDiscussion /** * @param int $discussionId The ID of the discussion to edit. - * @param \Flarum\Core\User $actor The user performing the action. + * @param \Flarum\User\User $actor The user performing the action. * @param array $data The attributes to update on the discussion. */ public function __construct($discussionId, User $actor, array $data) diff --git a/src/Core/Command/EditDiscussionHandler.php b/src/Core/Command/EditDiscussionHandler.php index 151f66d4f..b8866bf1f 100644 --- a/src/Core/Command/EditDiscussionHandler.php +++ b/src/Core/Command/EditDiscussionHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Repository\DiscussionRepository; use Flarum\Core\Support\DispatchEventsTrait; use Flarum\Core\Validator\DiscussionValidator; @@ -49,7 +49,7 @@ class EditDiscussionHandler /** * @param EditDiscussion $command * @return \Flarum\Core\Discussion - * @throws PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(EditDiscussion $command) { diff --git a/src/Core/Command/EditGroup.php b/src/Core/Command/EditGroup.php index 233843a8c..f05dc26cd 100644 --- a/src/Core/Command/EditGroup.php +++ b/src/Core/Command/EditGroup.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class EditGroup { diff --git a/src/Core/Command/EditGroupHandler.php b/src/Core/Command/EditGroupHandler.php index 0f2ad59af..6d1d8ad4f 100644 --- a/src/Core/Command/EditGroupHandler.php +++ b/src/Core/Command/EditGroupHandler.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Group; use Flarum\Core\Repository\GroupRepository; use Flarum\Core\Support\DispatchEventsTrait; diff --git a/src/Core/Command/EditPost.php b/src/Core/Command/EditPost.php index 6a576a130..25390c890 100644 --- a/src/Core/Command/EditPost.php +++ b/src/Core/Command/EditPost.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class EditPost { diff --git a/src/Core/Command/EditPostHandler.php b/src/Core/Command/EditPostHandler.php index f49e4443a..32e607b5b 100644 --- a/src/Core/Command/EditPostHandler.php +++ b/src/Core/Command/EditPostHandler.php @@ -49,7 +49,7 @@ class EditPostHandler /** * @param EditPost $command * @return \Flarum\Core\Post - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(EditPost $command) { diff --git a/src/Core/Command/EditUser.php b/src/Core/Command/EditUser.php index 200fad5cb..fa758483f 100644 --- a/src/Core/Command/EditUser.php +++ b/src/Core/Command/EditUser.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class EditUser { diff --git a/src/Core/Command/EditUserHandler.php b/src/Core/Command/EditUserHandler.php index d42acdfc9..4ba4a4bff 100644 --- a/src/Core/Command/EditUserHandler.php +++ b/src/Core/Command/EditUserHandler.php @@ -12,12 +12,12 @@ namespace Flarum\Core\Command; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Flarum\Core\Support\DispatchEventsTrait; -use Flarum\Core\User; -use Flarum\Core\Validator\UserValidator; -use Flarum\Event\UserGroupsWereChanged; -use Flarum\Event\UserWillBeSaved; +use Flarum\User\User; +use Flarum\User\UserValidator; +use Flarum\User\Event\GroupsChanged; +use Flarum\User\Event\Saving; use Illuminate\Contracts\Events\Dispatcher; class EditUserHandler @@ -26,7 +26,7 @@ class EditUserHandler use AssertPermissionTrait; /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; @@ -37,7 +37,7 @@ class EditUserHandler /** * @param Dispatcher $events - * @param UserRepository $users + * @param \Flarum\User\UserRepository $users * @param UserValidator $validator */ public function __construct(Dispatcher $events, UserRepository $users, UserValidator $validator) @@ -50,7 +50,7 @@ class EditUserHandler /** * @param EditUser $command * @return User - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(EditUser $command) { @@ -127,7 +127,7 @@ class EditUserHandler } $user->raise( - new UserGroupsWereChanged($user, $user->groups()->get()->all()) + new GroupsChanged($user, $user->groups()->get()->all()) ); $user->afterSave(function (User $user) use ($newGroupIds) { @@ -136,7 +136,7 @@ class EditUserHandler } $this->events->fire( - new UserWillBeSaved($user, $actor, $data) + new Saving($user, $actor, $data) ); $this->validator->setUser($user); diff --git a/src/Core/Command/PostReply.php b/src/Core/Command/PostReply.php index a9518f00e..4877b3045 100644 --- a/src/Core/Command/PostReply.php +++ b/src/Core/Command/PostReply.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class PostReply { diff --git a/src/Core/Command/PostReplyHandler.php b/src/Core/Command/PostReplyHandler.php index fb84877a9..06837011b 100644 --- a/src/Core/Command/PostReplyHandler.php +++ b/src/Core/Command/PostReplyHandler.php @@ -62,7 +62,7 @@ class PostReplyHandler /** * @param PostReply $command * @return CommentPost - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(PostReply $command) { diff --git a/src/Core/Command/ReadAllNotifications.php b/src/Core/Command/ReadAllNotifications.php index bbf6b2252..d231153ce 100644 --- a/src/Core/Command/ReadAllNotifications.php +++ b/src/Core/Command/ReadAllNotifications.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class ReadAllNotifications { diff --git a/src/Core/Command/ReadAllNotificationsHandler.php b/src/Core/Command/ReadAllNotificationsHandler.php index 56f04f217..023568f9b 100644 --- a/src/Core/Command/ReadAllNotificationsHandler.php +++ b/src/Core/Command/ReadAllNotificationsHandler.php @@ -33,7 +33,7 @@ class ReadAllNotificationsHandler /** * @param ReadAllNotifications $command - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(ReadAllNotifications $command) { diff --git a/src/Core/Command/ReadDiscussion.php b/src/Core/Command/ReadDiscussion.php index 00bb1a1db..4a0c8ebd4 100644 --- a/src/Core/Command/ReadDiscussion.php +++ b/src/Core/Command/ReadDiscussion.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class ReadDiscussion { diff --git a/src/Core/Command/ReadDiscussionHandler.php b/src/Core/Command/ReadDiscussionHandler.php index ed7a2d21b..9630100a1 100644 --- a/src/Core/Command/ReadDiscussionHandler.php +++ b/src/Core/Command/ReadDiscussionHandler.php @@ -40,7 +40,7 @@ class ReadDiscussionHandler /** * @param ReadDiscussion $command * @return \Flarum\Core\DiscussionState - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(ReadDiscussion $command) { diff --git a/src/Core/Command/ReadNotification.php b/src/Core/Command/ReadNotification.php index bbeddee96..f525299b7 100644 --- a/src/Core/Command/ReadNotification.php +++ b/src/Core/Command/ReadNotification.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class ReadNotification { diff --git a/src/Core/Command/ReadNotificationHandler.php b/src/Core/Command/ReadNotificationHandler.php index 7adbf6039..b7da93198 100644 --- a/src/Core/Command/ReadNotificationHandler.php +++ b/src/Core/Command/ReadNotificationHandler.php @@ -21,7 +21,7 @@ class ReadNotificationHandler /** * @param ReadNotification $command * @return \Flarum\Core\Notification - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(ReadNotification $command) { diff --git a/src/Core/Command/RegisterUser.php b/src/Core/Command/RegisterUser.php index 57230324f..1d9a32b70 100644 --- a/src/Core/Command/RegisterUser.php +++ b/src/Core/Command/RegisterUser.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class RegisterUser { diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php index c7daf38fa..2e3a1b158 100644 --- a/src/Core/Command/RegisterUserHandler.php +++ b/src/Core/Command/RegisterUserHandler.php @@ -13,12 +13,12 @@ namespace Flarum\Core\Command; use Exception; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\AuthToken; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\AuthToken; +use Flarum\User\Exception\PermissionDeniedException; use Flarum\Core\Support\DispatchEventsTrait; -use Flarum\Core\User; -use Flarum\Core\Validator\UserValidator; -use Flarum\Event\UserWillBeSaved; +use Flarum\User\User; +use Flarum\User\UserValidator; +use Flarum\User\Event\Saving; use Flarum\Foundation\Application; use Flarum\Settings\SettingsRepositoryInterface; use Illuminate\Contracts\Events\Dispatcher; @@ -83,7 +83,7 @@ class RegisterUserHandler * @param RegisterUser $command * @throws PermissionDeniedException if signup is closed and the actor is * not an administrator. - * @throws \Flarum\Core\Exception\InvalidConfirmationTokenException if an + * @throws \Flarum\User\Exception\InvalidConfirmationTokenException if an * email confirmation token is provided but is invalid. * @return User */ @@ -131,7 +131,7 @@ class RegisterUserHandler } $this->events->fire( - new UserWillBeSaved($user, $actor, $data) + new Saving($user, $actor, $data) ); $this->validator->assertValid(array_merge($user->getAttributes(), compact('password'))); diff --git a/src/Core/Command/RequestPasswordResetHandler.php b/src/Core/Command/RequestPasswordResetHandler.php index fb484fbda..4647bc004 100644 --- a/src/Core/Command/RequestPasswordResetHandler.php +++ b/src/Core/Command/RequestPasswordResetHandler.php @@ -12,8 +12,8 @@ namespace Flarum\Core\Command; use Flarum\Core; -use Flarum\Core\PasswordToken; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\PasswordToken; +use Flarum\User\UserRepository; use Flarum\Forum\UrlGenerator; use Flarum\Settings\SettingsRepositoryInterface; use Illuminate\Contracts\Mail\Mailer; @@ -56,7 +56,7 @@ class RequestPasswordResetHandler protected $validatorFactory; /** - * @param UserRepository $users + * @param \Flarum\User\UserRepository $users * @param SettingsRepositoryInterface $settings * @param Mailer $mailer * @param UrlGenerator $url @@ -81,7 +81,7 @@ class RequestPasswordResetHandler /** * @param RequestPasswordReset $command - * @return \Flarum\Core\User + * @return \Flarum\User\User * @throws ModelNotFoundException */ public function handle(RequestPasswordReset $command) diff --git a/src/Core/Command/StartDiscussion.php b/src/Core/Command/StartDiscussion.php index 1840f9c0c..9bc0cab10 100644 --- a/src/Core/Command/StartDiscussion.php +++ b/src/Core/Command/StartDiscussion.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; class StartDiscussion { diff --git a/src/Core/Command/UploadAvatar.php b/src/Core/Command/UploadAvatar.php index 988ecc26d..ac34220e5 100644 --- a/src/Core/Command/UploadAvatar.php +++ b/src/Core/Command/UploadAvatar.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Command; -use Flarum\Core\User; +use Flarum\User\User; use Psr\Http\Message\UploadedFileInterface; class UploadAvatar diff --git a/src/Core/Command/UploadAvatarHandler.php b/src/Core/Command/UploadAvatarHandler.php index de451a074..61fa05601 100644 --- a/src/Core/Command/UploadAvatarHandler.php +++ b/src/Core/Command/UploadAvatarHandler.php @@ -13,9 +13,9 @@ namespace Flarum\Core\Command; use Exception; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Flarum\Core\Support\DispatchEventsTrait; -use Flarum\Core\Validator\AvatarValidator; +use Flarum\User\AvatarValidator; use Flarum\Event\AvatarWillBeSaved; use Flarum\Foundation\Application; use Illuminate\Contracts\Events\Dispatcher; @@ -33,7 +33,7 @@ class UploadAvatarHandler use AssertPermissionTrait; /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; @@ -48,7 +48,7 @@ class UploadAvatarHandler protected $app; /** - * @var AvatarValidator + * @var \Flarum\User\AvatarValidator */ protected $validator; @@ -57,7 +57,7 @@ class UploadAvatarHandler * @param UserRepository $users * @param FilesystemInterface $uploadDir * @param Application $app - * @param AvatarValidator $validator + * @param \Flarum\User\AvatarValidator $validator */ public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir, Application $app, AvatarValidator $validator) { @@ -70,8 +70,8 @@ class UploadAvatarHandler /** * @param UploadAvatar $command - * @return \Flarum\Core\User - * @throws \Flarum\Core\Exception\PermissionDeniedException + * @return \Flarum\User\User + * @throws \Flarum\User\Exception\PermissionDeniedException */ public function handle(UploadAvatar $command) { diff --git a/src/Core/CoreServiceProvider.php b/src/Core/CoreServiceProvider.php index 551cdcfda..d697aba1c 100644 --- a/src/Core/CoreServiceProvider.php +++ b/src/Core/CoreServiceProvider.php @@ -11,12 +11,13 @@ namespace Flarum\Core; -use Flarum\Core\Access\Gate; use Flarum\Core\Post\CommentPost; use Flarum\Event\ConfigurePostTypes; use Flarum\Event\ConfigureUserPreferences; use Flarum\Event\GetPermission; use Flarum\Foundation\AbstractServiceProvider; +use Flarum\User\Gate; +use Flarum\User\User; use Illuminate\Contracts\Container\Container; use RuntimeException; @@ -34,7 +35,7 @@ class CoreServiceProvider extends AbstractServiceProvider }); $this->app->alias('flarum.gate', 'Illuminate\Contracts\Auth\Access\Gate'); - $this->app->alias('flarum.gate', 'Flarum\Core\Access\Gate'); + $this->app->alias('flarum.gate', 'Flarum\User\Gate'); $this->registerAvatarsFilesystem(); @@ -106,15 +107,15 @@ class CoreServiceProvider extends AbstractServiceProvider $events->subscribe('Flarum\Core\Listener\SelfDemotionGuard'); $events->subscribe('Flarum\Core\Listener\DiscussionMetadataUpdater'); - $events->subscribe('Flarum\Core\Listener\UserMetadataUpdater'); + $events->subscribe('Flarum\User\UserMetadataUpdater'); $events->subscribe('Flarum\Core\Listener\ExtensionValidator'); - $events->subscribe('Flarum\Core\Listener\EmailConfirmationMailer'); + $events->subscribe('Flarum\User\EmailConfirmationMailer'); $events->subscribe('Flarum\Core\Listener\DiscussionRenamedNotifier'); $events->subscribe('Flarum\Core\Access\DiscussionPolicy'); $events->subscribe('Flarum\Core\Access\GroupPolicy'); $events->subscribe('Flarum\Core\Access\PostPolicy'); - $events->subscribe('Flarum\Core\Access\UserPolicy'); + $events->subscribe('Flarum\User\UserPolicy'); $events->listen(ConfigureUserPreferences::class, [$this, 'configureUserPreferences']); } diff --git a/src/Core/Discussion.php b/src/Core/Discussion.php index 2d510ede5..39c97bf6d 100644 --- a/src/Core/Discussion.php +++ b/src/Core/Discussion.php @@ -22,6 +22,8 @@ use Flarum\Event\DiscussionWasRestored; use Flarum\Event\DiscussionWasStarted; use Flarum\Event\PostWasDeleted; use Flarum\Event\ScopePostVisibility; +use Flarum\User\Guest; +use Flarum\User\User; use Flarum\Util\Str; /** @@ -363,7 +365,7 @@ class Discussion extends AbstractModel */ public function startUser() { - return $this->belongsTo('Flarum\Core\User', 'start_user_id'); + return $this->belongsTo('Flarum\User\User', 'start_user_id'); } /** @@ -383,7 +385,7 @@ class Discussion extends AbstractModel */ public function lastUser() { - return $this->belongsTo('Flarum\Core\User', 'last_user_id'); + return $this->belongsTo('Flarum\User\User', 'last_user_id'); } /** @@ -393,7 +395,7 @@ class Discussion extends AbstractModel */ public function readers() { - return $this->belongsToMany('Flarum\Core\User', 'users_discussions'); + return $this->belongsToMany('Flarum\User\User', 'users_discussions'); } /** diff --git a/src/Core/DiscussionState.php b/src/Core/DiscussionState.php index 2208a8ff4..e32e120b4 100644 --- a/src/Core/DiscussionState.php +++ b/src/Core/DiscussionState.php @@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Builder; * @property \Carbon\Carbon|null $read_time * @property int|null $read_number * @property Discussion $discussion - * @property \Flarum\Core\User $user + * @property \Flarum\User\User $user */ class DiscussionState extends AbstractModel { @@ -80,7 +80,7 @@ class DiscussionState extends AbstractModel */ public function user() { - return $this->belongsTo('Flarum\Core\User', 'user_id'); + return $this->belongsTo('Flarum\User\User', 'user_id'); } /** diff --git a/src/Core/Group.php b/src/Core/Group.php index db081ffe5..eb05daa5c 100755 --- a/src/Core/Group.php +++ b/src/Core/Group.php @@ -120,7 +120,7 @@ class Group extends AbstractModel */ public function users() { - return $this->belongsToMany('Flarum\Core\User', 'users_groups'); + return $this->belongsToMany('Flarum\User\User', 'users_groups'); } /** diff --git a/src/Core/Notification.php b/src/Core/Notification.php index 78b2dbf98..0d429998b 100644 --- a/src/Core/Notification.php +++ b/src/Core/Notification.php @@ -36,8 +36,8 @@ use Flarum\Database\AbstractModel; * @property \Carbon\Carbon $time * @property bool $is_read * @property bool $is_deleted - * @property \Flarum\Core\User|null $user - * @property \Flarum\Core\User|null $sender + * @property \Flarum\User\User|null $user + * @property \Flarum\User\User|null $sender * @property \Flarum\Database\AbstractModel|null $subject */ class Notification extends AbstractModel @@ -113,7 +113,7 @@ class Notification extends AbstractModel */ public function user() { - return $this->belongsTo('Flarum\Core\User', 'user_id'); + return $this->belongsTo('Flarum\User\User', 'user_id'); } /** @@ -123,7 +123,7 @@ class Notification extends AbstractModel */ public function sender() { - return $this->belongsTo('Flarum\Core\User', 'sender_id'); + return $this->belongsTo('Flarum\User\User', 'sender_id'); } /** diff --git a/src/Core/Notification/BlueprintInterface.php b/src/Core/Notification/BlueprintInterface.php index 93f33f8c4..67bcc31ff 100644 --- a/src/Core/Notification/BlueprintInterface.php +++ b/src/Core/Notification/BlueprintInterface.php @@ -21,7 +21,7 @@ interface BlueprintInterface /** * Get the user that sent the notification. * - * @return \Flarum\Core\User|null + * @return \Flarum\User\User|null */ public function getSender(); diff --git a/src/Core/Notification/NotificationMailer.php b/src/Core/Notification/NotificationMailer.php index 691e3e7d6..327f0252e 100644 --- a/src/Core/Notification/NotificationMailer.php +++ b/src/Core/Notification/NotificationMailer.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Notification; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Contracts\Mail\Mailer; use Illuminate\Mail\Message; diff --git a/src/Core/Notification/NotificationServiceProvider.php b/src/Core/Notification/NotificationServiceProvider.php index 54a9b0dd1..d8cf09474 100644 --- a/src/Core/Notification/NotificationServiceProvider.php +++ b/src/Core/Notification/NotificationServiceProvider.php @@ -12,9 +12,9 @@ namespace Flarum\Core\Notification; use Flarum\Core\Notification; -use Flarum\Core\User; use Flarum\Event\ConfigureNotificationTypes; use Flarum\Foundation\AbstractServiceProvider; +use Flarum\User\User; use ReflectionClass; class NotificationServiceProvider extends AbstractServiceProvider diff --git a/src/Core/Notification/NotificationSyncer.php b/src/Core/Notification/NotificationSyncer.php index 5b56ad9d5..aab276b5b 100644 --- a/src/Core/Notification/NotificationSyncer.php +++ b/src/Core/Notification/NotificationSyncer.php @@ -14,8 +14,8 @@ namespace Flarum\Core\Notification; use Carbon\Carbon; use Flarum\Core\Notification; use Flarum\Core\Repository\NotificationRepository; -use Flarum\Core\User; use Flarum\Event\NotificationWillBeSent; +use Flarum\User\User; /** * The Notification Syncer commits notification blueprints to the database, and diff --git a/src/Core/Post.php b/src/Core/Post.php index 6d4ad5620..f85563965 100755 --- a/src/Core/Post.php +++ b/src/Core/Post.php @@ -139,7 +139,7 @@ class Post extends AbstractModel */ public function user() { - return $this->belongsTo('Flarum\Core\User', 'user_id'); + return $this->belongsTo('Flarum\User\User', 'user_id'); } /** @@ -149,7 +149,7 @@ class Post extends AbstractModel */ public function editUser() { - return $this->belongsTo('Flarum\Core\User', 'edit_user_id'); + return $this->belongsTo('Flarum\User\User', 'edit_user_id'); } /** @@ -159,7 +159,7 @@ class Post extends AbstractModel */ public function hideUser() { - return $this->belongsTo('Flarum\Core\User', 'hide_user_id'); + return $this->belongsTo('Flarum\User\User', 'hide_user_id'); } /** diff --git a/src/Core/Post/CommentPost.php b/src/Core/Post/CommentPost.php index 492088552..a8016cbb2 100755 --- a/src/Core/Post/CommentPost.php +++ b/src/Core/Post/CommentPost.php @@ -12,12 +12,12 @@ namespace Flarum\Core\Post; use Flarum\Core\Post; -use Flarum\Core\User; use Flarum\Event\PostWasHidden; use Flarum\Event\PostWasPosted; use Flarum\Event\PostWasRestored; use Flarum\Event\PostWasRevised; use Flarum\Formatter\Formatter; +use Flarum\User\User; /** * A standard comment in a discussion. diff --git a/src/Core/Post/Floodgate.php b/src/Core/Post/Floodgate.php index ff735cb5a..a62811fb1 100644 --- a/src/Core/Post/Floodgate.php +++ b/src/Core/Post/Floodgate.php @@ -14,7 +14,7 @@ namespace Flarum\Core\Post; use DateTime; use Flarum\Core\Exception\FloodingException; use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\User\User; class Floodgate { diff --git a/src/Core/Repository/DiscussionRepository.php b/src/Core/Repository/DiscussionRepository.php index f76af650e..add4f2b30 100644 --- a/src/Core/Repository/DiscussionRepository.php +++ b/src/Core/Repository/DiscussionRepository.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Repository; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Query\Expression; diff --git a/src/Core/Repository/GroupRepository.php b/src/Core/Repository/GroupRepository.php index 658c3739b..f6cfe3d82 100644 --- a/src/Core/Repository/GroupRepository.php +++ b/src/Core/Repository/GroupRepository.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Repository; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; class GroupRepository diff --git a/src/Core/Repository/NotificationRepository.php b/src/Core/Repository/NotificationRepository.php index 3d1e5f6a0..1b9fe63fb 100644 --- a/src/Core/Repository/NotificationRepository.php +++ b/src/Core/Repository/NotificationRepository.php @@ -12,7 +12,7 @@ namespace Flarum\Core\Repository; use Flarum\Core\Notification; -use Flarum\Core\User; +use Flarum\User\User; class NotificationRepository { diff --git a/src/Core/Repository/PostRepository.php b/src/Core/Repository/PostRepository.php index 7ce6b0906..df296e358 100644 --- a/src/Core/Repository/PostRepository.php +++ b/src/Core/Repository/PostRepository.php @@ -13,8 +13,8 @@ namespace Flarum\Core\Repository; use Flarum\Core\Discussion; use Flarum\Core\Post; -use Flarum\Core\User; use Flarum\Event\ScopePostVisibility; +use Flarum\User\User; use Illuminate\Database\Eloquent\ModelNotFoundException; class PostRepository @@ -34,7 +34,7 @@ class PostRepository * user, or throw an exception. * * @param int $id - * @param \Flarum\Core\User $actor + * @param \Flarum\User\User $actor * @return \Flarum\Core\Post * * @throws \Illuminate\Database\Eloquent\ModelNotFoundException @@ -55,7 +55,7 @@ class PostRepository * are visible to a certain user, and/or using other criteria. * * @param array $where - * @param \Flarum\Core\User|null $actor + * @param \Flarum\User\User|null $actor * @param array $sort * @param int $count * @param int $start @@ -81,7 +81,7 @@ class PostRepository * certain user. * * @param array $ids - * @param \Flarum\Core\User|null $actor + * @param \Flarum\User\User|null $actor * @return \Illuminate\Database\Eloquent\Collection */ public function findByIds(array $ids, User $actor = null) @@ -122,7 +122,7 @@ class PostRepository * * @param int $discussionId * @param int $number - * @param \Flarum\Core\User|null $actor + * @param \Flarum\User\User|null $actor * @return int */ public function getIndexForNumber($discussionId, $number, User $actor = null) diff --git a/src/Core/Search/AbstractSearch.php b/src/Core/Search/AbstractSearch.php index 581afdf95..c4f54250d 100644 --- a/src/Core/Search/AbstractSearch.php +++ b/src/Core/Search/AbstractSearch.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Search; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Query\Builder; /** diff --git a/src/Core/Search/Discussion/Gambit/AuthorGambit.php b/src/Core/Search/Discussion/Gambit/AuthorGambit.php index 914fb6684..d1336efec 100644 --- a/src/Core/Search/Discussion/Gambit/AuthorGambit.php +++ b/src/Core/Search/Discussion/Gambit/AuthorGambit.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Search\Discussion\Gambit; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Flarum\Core\Search\AbstractRegexGambit; use Flarum\Core\Search\AbstractSearch; use Flarum\Core\Search\Discussion\DiscussionSearch; @@ -25,12 +25,12 @@ class AuthorGambit extends AbstractRegexGambit protected $pattern = 'author:(.+)'; /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; /** - * @param \Flarum\Core\Repository\UserRepository $users + * @param \Flarum\User\UserRepository $users */ public function __construct(UserRepository $users) { diff --git a/src/Core/Search/SearchCriteria.php b/src/Core/Search/SearchCriteria.php index 2bacfb2c3..567155d8b 100644 --- a/src/Core/Search/SearchCriteria.php +++ b/src/Core/Search/SearchCriteria.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Search; -use Flarum\Core\User; +use Flarum\User\User; /** * Represents the criteria that will determine the entire result set of a diff --git a/src/Core/Search/SearchServiceProvider.php b/src/Core/Search/SearchServiceProvider.php index 3f5a80065..82172abb4 100644 --- a/src/Core/Search/SearchServiceProvider.php +++ b/src/Core/Search/SearchServiceProvider.php @@ -37,14 +37,14 @@ class SearchServiceProvider extends AbstractServiceProvider public function registerUserGambits() { - $this->app->when('Flarum\Core\Search\User\UserSearcher') + $this->app->when('Flarum\Core\User\Search\UserSearcher') ->needs('Flarum\Core\Search\GambitManager') ->give(function (Container $app) { $gambits = new GambitManager($app); - $gambits->setFulltextGambit('Flarum\Core\Search\User\Gambit\FulltextGambit'); - $gambits->add('Flarum\Core\Search\User\Gambit\EmailGambit'); - $gambits->add('Flarum\Core\Search\User\Gambit\GroupGambit'); + $gambits->setFulltextGambit('Flarum\Core\User\Search\Gambit\FulltextGambit'); + $gambits->add('Flarum\Core\User\Search\Gambit\EmailGambit'); + $gambits->add('Flarum\Core\User\Search\Gambit\GroupGambit'); $app->make('events')->fire( new ConfigureUserGambits($gambits) diff --git a/src/Core/Support/DispatchEventsTrait.php b/src/Core/Support/DispatchEventsTrait.php index 39266d1bc..c145a8c3d 100644 --- a/src/Core/Support/DispatchEventsTrait.php +++ b/src/Core/Support/DispatchEventsTrait.php @@ -11,7 +11,7 @@ namespace Flarum\Core\Support; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; trait DispatchEventsTrait diff --git a/src/Database/ScopeVisibilityTrait.php b/src/Database/ScopeVisibilityTrait.php index 0cfe43fc3..276f6a39d 100644 --- a/src/Database/ScopeVisibilityTrait.php +++ b/src/Database/ScopeVisibilityTrait.php @@ -11,7 +11,7 @@ namespace Flarum\Database; -use Flarum\Core\User; +use Flarum\User\User; use Flarum\Event\ScopeModelVisibility; use Illuminate\Database\Eloquent\Builder; diff --git a/src/Event/AvatarWillBeDeleted.php b/src/Event/AvatarWillBeDeleted.php index 9828fa674..df862684a 100644 --- a/src/Event/AvatarWillBeDeleted.php +++ b/src/Event/AvatarWillBeDeleted.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; class AvatarWillBeDeleted { diff --git a/src/Event/AvatarWillBeSaved.php b/src/Event/AvatarWillBeSaved.php index f4e52bb65..3737bb350 100644 --- a/src/Event/AvatarWillBeSaved.php +++ b/src/Event/AvatarWillBeSaved.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; class AvatarWillBeSaved { diff --git a/src/Event/CheckUserPassword.php b/src/Event/CheckUserPassword.php index ee86252c6..fa9ef2277 100644 --- a/src/Event/CheckUserPassword.php +++ b/src/Event/CheckUserPassword.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; class CheckUserPassword { diff --git a/src/Event/ConfigureUserPreferences.php b/src/Event/ConfigureUserPreferences.php index dbc18cdb1..db9e9d0c8 100644 --- a/src/Event/ConfigureUserPreferences.php +++ b/src/Event/ConfigureUserPreferences.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; class ConfigureUserPreferences { diff --git a/src/Event/ConfigureUserSearch.php b/src/Event/ConfigureUserSearch.php index fec2e6820..d32670705 100644 --- a/src/Event/ConfigureUserSearch.php +++ b/src/Event/ConfigureUserSearch.php @@ -12,12 +12,12 @@ namespace Flarum\Event; use Flarum\Core\Search\SearchCriteria; -use Flarum\Core\Search\User\UserSearch; +use Flarum\Core\User\Search\UserSearch; class ConfigureUserSearch { /** - * @var UserSearch + * @var \Flarum\Core\User\Search\UserSearch */ public $search; diff --git a/src/Event/DiscussionWasDeleted.php b/src/Event/DiscussionWasDeleted.php index 62dee388c..f57193918 100644 --- a/src/Event/DiscussionWasDeleted.php +++ b/src/Event/DiscussionWasDeleted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWasDeleted { diff --git a/src/Event/DiscussionWasHidden.php b/src/Event/DiscussionWasHidden.php index bcd6cc93b..b99b3e03b 100644 --- a/src/Event/DiscussionWasHidden.php +++ b/src/Event/DiscussionWasHidden.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWasHidden { diff --git a/src/Event/DiscussionWasRenamed.php b/src/Event/DiscussionWasRenamed.php index c17656396..7d71a20ed 100644 --- a/src/Event/DiscussionWasRenamed.php +++ b/src/Event/DiscussionWasRenamed.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWasRenamed { diff --git a/src/Event/DiscussionWasRestored.php b/src/Event/DiscussionWasRestored.php index b9ead6384..22135b6ee 100644 --- a/src/Event/DiscussionWasRestored.php +++ b/src/Event/DiscussionWasRestored.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWasRestored { diff --git a/src/Event/DiscussionWasStarted.php b/src/Event/DiscussionWasStarted.php index 7a83e9f6f..b35ed7851 100644 --- a/src/Event/DiscussionWasStarted.php +++ b/src/Event/DiscussionWasStarted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWasStarted { diff --git a/src/Event/DiscussionWillBeDeleted.php b/src/Event/DiscussionWillBeDeleted.php index 6508d1591..d70e399fe 100644 --- a/src/Event/DiscussionWillBeDeleted.php +++ b/src/Event/DiscussionWillBeDeleted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWillBeDeleted { diff --git a/src/Event/DiscussionWillBeSaved.php b/src/Event/DiscussionWillBeSaved.php index 6a1d31f36..3d15ff4cc 100644 --- a/src/Event/DiscussionWillBeSaved.php +++ b/src/Event/DiscussionWillBeSaved.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; class DiscussionWillBeSaved { diff --git a/src/Event/GetPermission.php b/src/Event/GetPermission.php index 78c93c83e..e18cb7ee8 100644 --- a/src/Event/GetPermission.php +++ b/src/Event/GetPermission.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; class GetPermission { diff --git a/src/Event/GroupWasCreated.php b/src/Event/GroupWasCreated.php index a4e5f7536..2e4962809 100644 --- a/src/Event/GroupWasCreated.php +++ b/src/Event/GroupWasCreated.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\User; class GroupWasCreated { diff --git a/src/Event/GroupWasDeleted.php b/src/Event/GroupWasDeleted.php index 21600c175..1d2290b7b 100644 --- a/src/Event/GroupWasDeleted.php +++ b/src/Event/GroupWasDeleted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\User; class GroupWasDeleted { diff --git a/src/Event/GroupWasRenamed.php b/src/Event/GroupWasRenamed.php index 30034f2be..ded05ce98 100644 --- a/src/Event/GroupWasRenamed.php +++ b/src/Event/GroupWasRenamed.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\User; class GroupWasRenamed { diff --git a/src/Event/GroupWillBeDeleted.php b/src/Event/GroupWillBeDeleted.php index 3b8955a83..ac0d5b406 100644 --- a/src/Event/GroupWillBeDeleted.php +++ b/src/Event/GroupWillBeDeleted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\User; class GroupWillBeDeleted { diff --git a/src/Event/GroupWillBeSaved.php b/src/Event/GroupWillBeSaved.php index 51df92592..feeaac887 100644 --- a/src/Event/GroupWillBeSaved.php +++ b/src/Event/GroupWillBeSaved.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Group; -use Flarum\Core\User; +use Flarum\User\User; class GroupWillBeSaved { diff --git a/src/Event/NotificationWillBeSent.php b/src/Event/NotificationWillBeSent.php index fc428ae40..12a90ea9d 100644 --- a/src/Event/NotificationWillBeSent.php +++ b/src/Event/NotificationWillBeSent.php @@ -31,7 +31,7 @@ class NotificationWillBeSent /** * @param BlueprintInterface $blueprint - * @param \Flarum\Core\User[] $users + * @param \Flarum\User\User[] $users */ public function __construct(BlueprintInterface $blueprint, array &$users) { diff --git a/src/Event/PostWasDeleted.php b/src/Event/PostWasDeleted.php index 994ef0915..c98fdb373 100644 --- a/src/Event/PostWasDeleted.php +++ b/src/Event/PostWasDeleted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\User\User; class PostWasDeleted { diff --git a/src/Event/PostWasHidden.php b/src/Event/PostWasHidden.php index 4c7841c90..e41a6a7b3 100644 --- a/src/Event/PostWasHidden.php +++ b/src/Event/PostWasHidden.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post\CommentPost; -use Flarum\Core\User; +use Flarum\User\User; class PostWasHidden { diff --git a/src/Event/PostWasPosted.php b/src/Event/PostWasPosted.php index 5b944778a..e59bcc0dc 100644 --- a/src/Event/PostWasPosted.php +++ b/src/Event/PostWasPosted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\User\User; class PostWasPosted { diff --git a/src/Event/PostWasRestored.php b/src/Event/PostWasRestored.php index bfc9fc801..581a6b601 100644 --- a/src/Event/PostWasRestored.php +++ b/src/Event/PostWasRestored.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post\CommentPost; -use Flarum\Core\User; +use Flarum\User\User; class PostWasRestored { diff --git a/src/Event/PostWasRevised.php b/src/Event/PostWasRevised.php index cbffc9322..ddfd2afa0 100644 --- a/src/Event/PostWasRevised.php +++ b/src/Event/PostWasRevised.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post\CommentPost; -use Flarum\Core\User; +use Flarum\User\User; class PostWasRevised { diff --git a/src/Event/PostWillBeDeleted.php b/src/Event/PostWillBeDeleted.php index f2875a54f..d5b32cae6 100644 --- a/src/Event/PostWillBeDeleted.php +++ b/src/Event/PostWillBeDeleted.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\User\User; class PostWillBeDeleted { diff --git a/src/Event/PostWillBeSaved.php b/src/Event/PostWillBeSaved.php index 0dfb282c7..fb1736ab0 100644 --- a/src/Event/PostWillBeSaved.php +++ b/src/Event/PostWillBeSaved.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\User\User; class PostWillBeSaved { diff --git a/src/Event/PrepareApiAttributes.php b/src/Event/PrepareApiAttributes.php index 533bef507..c97ad794e 100644 --- a/src/Event/PrepareApiAttributes.php +++ b/src/Event/PrepareApiAttributes.php @@ -44,7 +44,7 @@ class PrepareApiAttributes public $attributes; /** - * @var \Flarum\Core\User + * @var \Flarum\User\User */ public $actor; diff --git a/src/Event/PrepareApiData.php b/src/Event/PrepareApiData.php index c39f0894f..6d9b8f547 100644 --- a/src/Event/PrepareApiData.php +++ b/src/Event/PrepareApiData.php @@ -38,7 +38,7 @@ class PrepareApiData public $document; /** - * @var \Flarum\Core\User + * @var \Flarum\User\User */ public $actor; diff --git a/src/Event/PrepareUserGroups.php b/src/Event/PrepareUserGroups.php index d7e2ee868..fa03eb66a 100644 --- a/src/Event/PrepareUserGroups.php +++ b/src/Event/PrepareUserGroups.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; /** * The `PrepareUserGroups` event. diff --git a/src/Event/ScopeHiddenDiscussionVisibility.php b/src/Event/ScopeHiddenDiscussionVisibility.php index 28235061e..411b89be6 100644 --- a/src/Event/ScopeHiddenDiscussionVisibility.php +++ b/src/Event/ScopeHiddenDiscussionVisibility.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; /** diff --git a/src/Event/ScopeModelVisibility.php b/src/Event/ScopeModelVisibility.php index ecf79e7d2..9eb5de654 100644 --- a/src/Event/ScopeModelVisibility.php +++ b/src/Event/ScopeModelVisibility.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; diff --git a/src/Event/ScopePostVisibility.php b/src/Event/ScopePostVisibility.php index a83ea20b1..16c488903 100644 --- a/src/Event/ScopePostVisibility.php +++ b/src/Event/ScopePostVisibility.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; /** diff --git a/src/Event/ScopePrivateDiscussionVisibility.php b/src/Event/ScopePrivateDiscussionVisibility.php index 2e6782b9f..c0b2758fc 100644 --- a/src/Event/ScopePrivateDiscussionVisibility.php +++ b/src/Event/ScopePrivateDiscussionVisibility.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; /** diff --git a/src/Event/ScopePrivatePostVisibility.php b/src/Event/ScopePrivatePostVisibility.php index bd67deb06..1339e5f27 100644 --- a/src/Event/ScopePrivatePostVisibility.php +++ b/src/Event/ScopePrivatePostVisibility.php @@ -12,7 +12,7 @@ namespace Flarum\Event; use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\User\User; use Illuminate\Database\Eloquent\Builder; /** diff --git a/src/Event/UserEmailWasChanged.php b/src/Event/UserEmailWasChanged.php deleted file mode 100644 index 91117b840..000000000 --- a/src/Event/UserEmailWasChanged.php +++ /dev/null @@ -1,37 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\Event; - -use Flarum\Core\User; - -class UserEmailWasChanged -{ - /** - * @var User - */ - public $user; - - /** - * @var User - */ - public $actor; - - /** - * @param User $user - * @param User $actor - */ - public function __construct(User $user, User $actor = null) - { - $this->user = $user; - $this->actor = $actor; - } -} diff --git a/src/Event/UserPasswordWasChanged.php b/src/Event/UserPasswordWasChanged.php deleted file mode 100644 index 0798c3f58..000000000 --- a/src/Event/UserPasswordWasChanged.php +++ /dev/null @@ -1,37 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\Event; - -use Flarum\Core\User; - -class UserPasswordWasChanged -{ - /** - * @var User - */ - public $user; - - /** - * @var User - */ - public $actor; - - /** - * @param User $user - * @param User $actor - */ - public function __construct(User $user, User $actor = null) - { - $this->user = $user; - $this->actor = $actor; - } -} diff --git a/src/Forum/AuthenticationResponseFactory.php b/src/Forum/AuthenticationResponseFactory.php index 17cc1497f..90efc1771 100644 --- a/src/Forum/AuthenticationResponseFactory.php +++ b/src/Forum/AuthenticationResponseFactory.php @@ -11,10 +11,10 @@ namespace Flarum\Forum; -use Flarum\Core\AuthToken; -use Flarum\Core\User; use Flarum\Http\Rememberer; use Flarum\Http\SessionAuthenticator; +use Flarum\User\AuthToken; +use Flarum\User\User; use Psr\Http\Message\ServerRequestInterface as Request; use Zend\Diactoros\Response\HtmlResponse; diff --git a/src/Forum/Controller/AuthorizedWebAppController.php b/src/Forum/Controller/AuthorizedWebAppController.php index 05a5baf96..7f1a4890c 100644 --- a/src/Forum/Controller/AuthorizedWebAppController.php +++ b/src/Forum/Controller/AuthorizedWebAppController.php @@ -11,7 +11,7 @@ namespace Flarum\Forum\Controller; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Psr\Http\Message\ServerRequestInterface as Request; class AuthorizedWebAppController extends FrontendController diff --git a/src/Forum/Controller/ConfirmEmailController.php b/src/Forum/Controller/ConfirmEmailController.php index 64727c693..0284674ed 100644 --- a/src/Forum/Controller/ConfirmEmailController.php +++ b/src/Forum/Controller/ConfirmEmailController.php @@ -12,7 +12,7 @@ namespace Flarum\Forum\Controller; use Flarum\Core\Command\ConfirmEmail; -use Flarum\Core\Exception\InvalidConfirmationTokenException; +use Flarum\User\Exception\InvalidConfirmationTokenException; use Flarum\Foundation\Application; use Flarum\Http\Controller\ControllerInterface; use Flarum\Http\SessionAuthenticator; diff --git a/src/Forum/Controller/DiscussionController.php b/src/Forum/Controller/DiscussionController.php index f12b1092e..4b60ecc84 100644 --- a/src/Forum/Controller/DiscussionController.php +++ b/src/Forum/Controller/DiscussionController.php @@ -12,10 +12,10 @@ namespace Flarum\Forum\Controller; use Flarum\Api\Client; -use Flarum\Core\User; use Flarum\Forum\UrlGenerator; use Flarum\Forum\Frontend; use Flarum\Http\Exception\RouteNotFoundException; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; use Psr\Http\Message\ServerRequestInterface as Request; diff --git a/src/Forum/Controller/IndexController.php b/src/Forum/Controller/IndexController.php index 8deeb7867..278710aab 100644 --- a/src/Forum/Controller/IndexController.php +++ b/src/Forum/Controller/IndexController.php @@ -12,7 +12,7 @@ namespace Flarum\Forum\Controller; use Flarum\Api\Client as ApiClient; -use Flarum\Core\User; +use Flarum\User\User; use Flarum\Forum\Frontend; use Illuminate\Contracts\Events\Dispatcher; use Psr\Http\Message\ServerRequestInterface as Request; diff --git a/src/Forum/Controller/LogInController.php b/src/Forum/Controller/LogInController.php index f131150f9..5cabd47dd 100644 --- a/src/Forum/Controller/LogInController.php +++ b/src/Forum/Controller/LogInController.php @@ -13,8 +13,8 @@ namespace Flarum\Forum\Controller; use Flarum\Api\Client; use Flarum\Api\Controller\TokenController; -use Flarum\Core\Repository\UserRepository; -use Flarum\Event\UserLoggedIn; +use Flarum\User\UserRepository; +use Flarum\User\Event\LoggedIn; use Flarum\Http\AccessToken; use Flarum\Http\Controller\ControllerInterface; use Flarum\Http\Rememberer; @@ -26,7 +26,7 @@ use Zend\Diactoros\Response\JsonResponse; class LogInController implements ControllerInterface { /** - * @var \Flarum\Core\Repository\UserRepository + * @var \Flarum\User\UserRepository */ protected $users; @@ -46,7 +46,7 @@ class LogInController implements ControllerInterface protected $rememberer; /** - * @param \Flarum\Core\Repository\UserRepository $users + * @param \Flarum\User\UserRepository $users * @param Client $apiClient * @param SessionAuthenticator $authenticator * @param Rememberer $rememberer @@ -79,7 +79,7 @@ class LogInController implements ControllerInterface $token = AccessToken::find($data->token); - event(new UserLoggedIn($this->users->findOrFail($data->userId), $token)); + event(new LoggedIn($this->users->findOrFail($data->userId), $token)); $response = $this->rememberer->remember($response, $token, ! array_get($body, 'remember')); } diff --git a/src/Forum/Controller/LogOutController.php b/src/Forum/Controller/LogOutController.php index 1aef40efb..c83601268 100644 --- a/src/Forum/Controller/LogOutController.php +++ b/src/Forum/Controller/LogOutController.php @@ -12,7 +12,7 @@ namespace Flarum\Forum\Controller; use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Event\UserLoggedOut; +use Flarum\User\Event\LoggedOut; use Flarum\Foundation\Application; use Flarum\Http\Controller\ControllerInterface; use Flarum\Http\Exception\TokenMismatchException; @@ -85,7 +85,7 @@ class LogOutController implements ControllerInterface $actor->accessTokens()->delete(); - $this->events->fire(new UserLoggedOut($actor)); + $this->events->fire(new LoggedOut($actor)); return $this->rememberer->forget($response); } diff --git a/src/Forum/Controller/ResetPasswordController.php b/src/Forum/Controller/ResetPasswordController.php index 42a47b288..36e313a2e 100644 --- a/src/Forum/Controller/ResetPasswordController.php +++ b/src/Forum/Controller/ResetPasswordController.php @@ -12,8 +12,8 @@ namespace Flarum\Forum\Controller; use DateTime; -use Flarum\Core\Exception\InvalidConfirmationTokenException; -use Flarum\Core\PasswordToken; +use Flarum\User\Exception\InvalidConfirmationTokenException; +use Flarum\User\PasswordToken; use Flarum\Http\Controller\AbstractHtmlController; use Illuminate\Contracts\View\Factory; use Psr\Http\Message\ServerRequestInterface as Request; @@ -43,7 +43,7 @@ class ResetPasswordController extends AbstractHtmlController /** * @param Request $request * @return \Illuminate\Contracts\View\View - * @throws InvalidConfirmationTokenException + * @throws \Flarum\User\Exception\InvalidConfirmationTokenException */ public function render(Request $request) { diff --git a/src/Forum/Controller/SavePasswordController.php b/src/Forum/Controller/SavePasswordController.php index 0b36f9779..20623cf8f 100644 --- a/src/Forum/Controller/SavePasswordController.php +++ b/src/Forum/Controller/SavePasswordController.php @@ -11,8 +11,8 @@ namespace Flarum\Forum\Controller; -use Flarum\Core\PasswordToken; -use Flarum\Core\Validator\UserValidator; +use Flarum\User\PasswordToken; +use Flarum\User\UserValidator; use Flarum\Forum\UrlGenerator; use Flarum\Http\Controller\ControllerInterface; use Flarum\Http\SessionAuthenticator; @@ -29,7 +29,7 @@ class SavePasswordController implements ControllerInterface protected $url; /** - * @var UserValidator + * @var \Flarum\User\UserValidator */ protected $validator; diff --git a/src/Http/AbstractServer.php b/src/Http/AbstractServer.php index ae676755a..de6f923c2 100644 --- a/src/Http/AbstractServer.php +++ b/src/Http/AbstractServer.php @@ -11,9 +11,9 @@ namespace Flarum\Http; -use Flarum\Core\AuthToken; -use Flarum\Core\EmailToken; -use Flarum\Core\PasswordToken; +use Flarum\User\AuthToken; +use Flarum\User\EmailToken; +use Flarum\User\PasswordToken; use Flarum\Foundation\AbstractServer as BaseAbstractServer; use Flarum\Foundation\Application; use Psr\Http\Message\ResponseInterface; diff --git a/src/Http/AccessToken.php b/src/Http/AccessToken.php index 45557f3c8..dad24ae3b 100644 --- a/src/Http/AccessToken.php +++ b/src/Http/AccessToken.php @@ -18,7 +18,7 @@ use Flarum\Database\AbstractModel; * @property int $user_id * @property int $last_activity * @property int $lifetime - * @property \Flarum\Core\User|null $user + * @property \Flarum\User\User|null $user */ class AccessToken extends AbstractModel { @@ -67,6 +67,6 @@ class AccessToken extends AbstractModel */ public function user() { - return $this->belongsTo('Flarum\Core\User'); + return $this->belongsTo('Flarum\User\User'); } } diff --git a/src/Http/Middleware/AuthenticateWithHeader.php b/src/Http/Middleware/AuthenticateWithHeader.php index 9b34b11dc..c13313754 100644 --- a/src/Http/Middleware/AuthenticateWithHeader.php +++ b/src/Http/Middleware/AuthenticateWithHeader.php @@ -12,7 +12,7 @@ namespace Flarum\Http\Middleware; use Flarum\Api\ApiKey; -use Flarum\Core\User; +use Flarum\User\User; use Flarum\Http\AccessToken; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; diff --git a/src/Http/Middleware/AuthenticateWithSession.php b/src/Http/Middleware/AuthenticateWithSession.php index d4d0ac624..e9aee0698 100644 --- a/src/Http/Middleware/AuthenticateWithSession.php +++ b/src/Http/Middleware/AuthenticateWithSession.php @@ -11,8 +11,8 @@ namespace Flarum\Http\Middleware; -use Flarum\Core\Guest; -use Flarum\Core\User; +use Flarum\User\Guest; +use Flarum\User\User; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Symfony\Component\HttpFoundation\Session\SessionInterface; diff --git a/src/Install/Console/InstallCommand.php b/src/Install/Console/InstallCommand.php index 1a7317830..acf67997d 100644 --- a/src/Install/Console/InstallCommand.php +++ b/src/Install/Console/InstallCommand.php @@ -15,7 +15,7 @@ use Exception; use Flarum\Console\AbstractCommand; use Flarum\Core\Group; use Flarum\Core\Permission; -use Flarum\Core\User; +use Flarum\User\User; use Flarum\Database\AbstractModel; use Illuminate\Contracts\Foundation\Application; use Illuminate\Filesystem\Filesystem; diff --git a/src/Core/Access/AbstractPolicy.php b/src/User/AbstractPolicy.php similarity index 98% rename from src/Core/Access/AbstractPolicy.php rename to src/User/AbstractPolicy.php index d9b8f457f..745b6642b 100644 --- a/src/Core/Access/AbstractPolicy.php +++ b/src/User/AbstractPolicy.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Access; +namespace Flarum\User; use Flarum\Event\GetPermission; use Flarum\Event\ScopeModelVisibility; diff --git a/src/Core/AuthToken.php b/src/User/AuthToken.php similarity index 92% rename from src/Core/AuthToken.php rename to src/User/AuthToken.php index 57dd83c28..dd785b72a 100644 --- a/src/Core/AuthToken.php +++ b/src/User/AuthToken.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Flarum\Core; +namespace Flarum\User; use DateTime; -use Flarum\Core\Exception\InvalidConfirmationTokenException; +use Flarum\User\Exception\InvalidConfirmationTokenException; use Flarum\Database\AbstractModel; /** @@ -82,7 +82,7 @@ class AuthToken extends AbstractModel * @param \Illuminate\Database\Eloquent\Builder $query * @param string $id * - * @throws InvalidConfirmationTokenException + * @throws \Flarum\User\Exception\InvalidConfirmationTokenException * * @return static */ diff --git a/src/Core/Validator/AvatarValidator.php b/src/User/AvatarValidator.php similarity index 86% rename from src/Core/Validator/AvatarValidator.php rename to src/User/AvatarValidator.php index 4546cfed0..b4adcb321 100644 --- a/src/Core/Validator/AvatarValidator.php +++ b/src/User/AvatarValidator.php @@ -9,7 +9,9 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Validator; +namespace Flarum\User; + +use Flarum\Core\Validator\AbstractValidator; class AvatarValidator extends AbstractValidator { diff --git a/src/Core/Listener/EmailConfirmationMailer.php b/src/User/EmailConfirmationMailer.php similarity index 82% rename from src/Core/Listener/EmailConfirmationMailer.php rename to src/User/EmailConfirmationMailer.php index 295d45d7c..b02c3f037 100755 --- a/src/Core/Listener/EmailConfirmationMailer.php +++ b/src/User/EmailConfirmationMailer.php @@ -9,13 +9,10 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Listener; +namespace Flarum\User; -use Flarum\Core; -use Flarum\Core\EmailToken; -use Flarum\Core\User; -use Flarum\Event\UserEmailChangeWasRequested; -use Flarum\Event\UserWasRegistered; +use Flarum\User\Event\EmailChangeRequested; +use Flarum\User\Event\Registered; use Flarum\Forum\UrlGenerator; use Flarum\Settings\SettingsRepositoryInterface; use Illuminate\Contracts\Events\Dispatcher; @@ -64,14 +61,14 @@ class EmailConfirmationMailer */ public function subscribe(Dispatcher $events) { - $events->listen(UserWasRegistered::class, [$this, 'whenUserWasRegistered']); - $events->listen(UserEmailChangeWasRequested::class, [$this, 'whenUserEmailChangeWasRequested']); + $events->listen(Registered::class, [$this, 'whenUserWasRegistered']); + $events->listen(EmailChangeRequested::class, [$this, 'whenUserEmailChangeWasRequested']); } /** - * @param \Flarum\Event\UserWasRegistered $event + * @param \Flarum\User\Event\Registered $event */ - public function whenUserWasRegistered(UserWasRegistered $event) + public function whenUserWasRegistered(Registered $event) { $user = $event->user; @@ -90,9 +87,9 @@ class EmailConfirmationMailer } /** - * @param \Flarum\Event\UserEmailChangeWasRequested $event + * @param \Flarum\User\Event\EmailChangeRequested $event */ - public function whenUserEmailChangeWasRequested(UserEmailChangeWasRequested $event) + public function whenUserEmailChangeWasRequested(EmailChangeRequested $event) { $email = $event->email; $data = $this->getEmailData($event->user, $email); diff --git a/src/Core/EmailToken.php b/src/User/EmailToken.php similarity index 95% rename from src/Core/EmailToken.php rename to src/User/EmailToken.php index 257d62211..e0383f2ff 100644 --- a/src/Core/EmailToken.php +++ b/src/User/EmailToken.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Flarum\Core; +namespace Flarum\User; use DateTime; -use Flarum\Core\Exception\InvalidConfirmationTokenException; +use Flarum\User\Exception\InvalidConfirmationTokenException; use Flarum\Database\AbstractModel; /** diff --git a/src/Event/UserWasDeleted.php b/src/User/Event/Activated.php similarity index 88% rename from src/Event/UserWasDeleted.php rename to src/User/Event/Activated.php index 5f041b284..d4ad87dff 100644 --- a/src/Event/UserWasDeleted.php +++ b/src/User/Event/Activated.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserWasDeleted +class Activated { /** * @var User diff --git a/src/User/Event/AvatarChanged.php b/src/User/Event/AvatarChanged.php new file mode 100644 index 000000000..1754d0538 --- /dev/null +++ b/src/User/Event/AvatarChanged.php @@ -0,0 +1,37 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flarum\User\Event; + +use Flarum\User\User; + +class AvatarChanged +{ + /** + * @var User + */ + public $user; + + /** + * @var User + */ + public $actor; + + /** + * @param User $user + * @param User $actor + */ + public function __construct(User $user, User $actor = null) + { + $this->user = $user; + $this->actor = $actor; + } +} diff --git a/src/Event/UserWasActivated.php b/src/User/Event/BioChanged.php similarity index 88% rename from src/Event/UserWasActivated.php rename to src/User/Event/BioChanged.php index 2245caed4..2751516f6 100644 --- a/src/Event/UserWasActivated.php +++ b/src/User/Event/BioChanged.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserWasActivated +class BioChanged { /** * @var User diff --git a/src/Event/UserWasRenamed.php b/src/User/Event/Deleted.php similarity index 88% rename from src/Event/UserWasRenamed.php rename to src/User/Event/Deleted.php index 671e64080..0b3a574ef 100644 --- a/src/Event/UserWasRenamed.php +++ b/src/User/Event/Deleted.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserWasRenamed +class Deleted { /** * @var User diff --git a/src/Event/UserWillBeDeleted.php b/src/User/Event/Deleting.php similarity index 92% rename from src/Event/UserWillBeDeleted.php rename to src/User/Event/Deleting.php index 5ecc8685a..1ff7766f5 100644 --- a/src/Event/UserWillBeDeleted.php +++ b/src/User/Event/Deleting.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserWillBeDeleted +class Deleting { /** * The user who will be deleted. diff --git a/src/Event/UserEmailChangeWasRequested.php b/src/User/Event/EmailChangeRequested.php similarity index 89% rename from src/Event/UserEmailChangeWasRequested.php rename to src/User/Event/EmailChangeRequested.php index 1b4498699..0a237c1c6 100644 --- a/src/Event/UserEmailChangeWasRequested.php +++ b/src/User/Event/EmailChangeRequested.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserEmailChangeWasRequested +class EmailChangeRequested { /** * The user who requested the email change. diff --git a/src/Event/UserBioWasChanged.php b/src/User/Event/EmailChanged.php similarity index 88% rename from src/Event/UserBioWasChanged.php rename to src/User/Event/EmailChanged.php index dfde182b0..fa1bf7759 100644 --- a/src/Event/UserBioWasChanged.php +++ b/src/User/Event/EmailChanged.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserBioWasChanged +class EmailChanged { /** * @var User diff --git a/src/Event/UserGroupsWereChanged.php b/src/User/Event/GroupsChanged.php similarity index 91% rename from src/Event/UserGroupsWereChanged.php rename to src/User/Event/GroupsChanged.php index 91822f158..feb6484d7 100644 --- a/src/Event/UserGroupsWereChanged.php +++ b/src/User/Event/GroupsChanged.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserGroupsWereChanged +class GroupsChanged { /** * The user whose groups were changed. diff --git a/src/Event/UserLoggedIn.php b/src/User/Event/LoggedIn.php similarity index 86% rename from src/Event/UserLoggedIn.php rename to src/User/Event/LoggedIn.php index 175994a71..32d17b695 100644 --- a/src/Event/UserLoggedIn.php +++ b/src/User/Event/LoggedIn.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; use Flarum\Http\AccessToken; -class UserLoggedIn +class LoggedIn { public $user; diff --git a/src/Event/UserLoggedOut.php b/src/User/Event/LoggedOut.php similarity index 83% rename from src/Event/UserLoggedOut.php rename to src/User/Event/LoggedOut.php index 9e4680c16..103026983 100644 --- a/src/Event/UserLoggedOut.php +++ b/src/User/Event/LoggedOut.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserLoggedOut +class LoggedOut { public $user; diff --git a/src/Event/UserAvatarWasChanged.php b/src/User/Event/PasswordChanged.php similarity index 88% rename from src/Event/UserAvatarWasChanged.php rename to src/User/Event/PasswordChanged.php index a328bdd00..855348676 100644 --- a/src/Event/UserAvatarWasChanged.php +++ b/src/User/Event/PasswordChanged.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserAvatarWasChanged +class PasswordChanged { /** * @var User diff --git a/src/Event/UserWasRegistered.php b/src/User/Event/Registered.php similarity index 88% rename from src/Event/UserWasRegistered.php rename to src/User/Event/Registered.php index 2cc82ce5b..5deedfc5d 100644 --- a/src/Event/UserWasRegistered.php +++ b/src/User/Event/Registered.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserWasRegistered +class Registered { /** * @var User diff --git a/src/User/Event/Renamed.php b/src/User/Event/Renamed.php new file mode 100644 index 000000000..1e453d64a --- /dev/null +++ b/src/User/Event/Renamed.php @@ -0,0 +1,37 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flarum\User\Event; + +use Flarum\User\User; + +class Renamed +{ + /** + * @var User + */ + public $user; + + /** + * @var User + */ + public $actor; + + /** + * @param User $user + * @param User $actor + */ + public function __construct(User $user, User $actor = null) + { + $this->user = $user; + $this->actor = $actor; + } +} diff --git a/src/Event/UserWillBeSaved.php b/src/User/Event/Saving.php similarity index 93% rename from src/Event/UserWillBeSaved.php rename to src/User/Event/Saving.php index 5b0d39b80..b8f09f371 100644 --- a/src/Event/UserWillBeSaved.php +++ b/src/User/Event/Saving.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; -use Flarum\Core\User; +use Flarum\User\User; -class UserWillBeSaved +class Saving { /** * The user that will be saved. diff --git a/src/Core/Exception/InvalidConfirmationTokenException.php b/src/User/Exception/InvalidConfirmationTokenException.php similarity index 90% rename from src/Core/Exception/InvalidConfirmationTokenException.php rename to src/User/Exception/InvalidConfirmationTokenException.php index c3bb44091..c8e9240b2 100644 --- a/src/Core/Exception/InvalidConfirmationTokenException.php +++ b/src/User/Exception/InvalidConfirmationTokenException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Exception; +namespace Flarum\User\Exception; use Exception; diff --git a/src/Core/Exception/PermissionDeniedException.php b/src/User/Exception/PermissionDeniedException.php similarity index 93% rename from src/Core/Exception/PermissionDeniedException.php rename to src/User/Exception/PermissionDeniedException.php index a80289fdc..1bbeb766c 100644 --- a/src/Core/Exception/PermissionDeniedException.php +++ b/src/User/Exception/PermissionDeniedException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Exception; +namespace Flarum\User\Exception; use Exception; diff --git a/src/Core/Access/Gate.php b/src/User/Gate.php similarity index 99% rename from src/Core/Access/Gate.php rename to src/User/Gate.php index f6eba5078..9a9e91a27 100644 --- a/src/Core/Access/Gate.php +++ b/src/User/Gate.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Access; +namespace Flarum\User; use Illuminate\Contracts\Auth\Access\Gate as GateContract; use Illuminate\Contracts\Container\Container; diff --git a/src/Core/Guest.php b/src/User/Guest.php similarity index 94% rename from src/Core/Guest.php rename to src/User/Guest.php index 0fbf00748..e62b8c695 100755 --- a/src/Core/Guest.php +++ b/src/User/Guest.php @@ -9,7 +9,9 @@ * file that was distributed with this source code. */ -namespace Flarum\Core; +namespace Flarum\User; + +use Flarum\Core\Group; class Guest extends User { diff --git a/src/Core/PasswordToken.php b/src/User/PasswordToken.php similarity index 98% rename from src/Core/PasswordToken.php rename to src/User/PasswordToken.php index 5d08e3867..190d1d27a 100644 --- a/src/Core/PasswordToken.php +++ b/src/User/PasswordToken.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core; +namespace Flarum\User; use Flarum\Database\AbstractModel; diff --git a/src/Core/Search/User/Gambit/EmailGambit.php b/src/User/Search/Gambit/EmailGambit.php similarity index 85% rename from src/Core/Search/User/Gambit/EmailGambit.php rename to src/User/Search/Gambit/EmailGambit.php index 8d14fd921..11b0b793a 100644 --- a/src/Core/Search/User/Gambit/EmailGambit.php +++ b/src/User/Search/Gambit/EmailGambit.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Search\User\Gambit; +namespace Flarum\Core\User\Search\Gambit; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Flarum\Core\Search\AbstractRegexGambit; use Flarum\Core\Search\AbstractSearch; -use Flarum\Core\Search\User\UserSearch; +use Flarum\Core\User\Search\UserSearch; use LogicException; class EmailGambit extends AbstractRegexGambit @@ -25,12 +25,12 @@ class EmailGambit extends AbstractRegexGambit protected $pattern = 'email:(.+)'; /** - * @var UserRepository + * @var \Flarum\User\UserRepository */ protected $users; /** - * @param \Flarum\Core\Repository\UserRepository $users + * @param \Flarum\User\UserRepository $users */ public function __construct(UserRepository $users) { diff --git a/src/Core/Search/User/Gambit/FulltextGambit.php b/src/User/Search/Gambit/FulltextGambit.php similarity index 87% rename from src/Core/Search/User/Gambit/FulltextGambit.php rename to src/User/Search/Gambit/FulltextGambit.php index 2f7c4c4c3..c8349d740 100644 --- a/src/Core/Search/User/Gambit/FulltextGambit.php +++ b/src/User/Search/Gambit/FulltextGambit.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Search\User\Gambit; +namespace Flarum\Core\User\Search\Gambit; -use Flarum\Core\Repository\UserRepository; +use Flarum\User\UserRepository; use Flarum\Core\Search\AbstractSearch; use Flarum\Core\Search\GambitInterface; @@ -23,7 +23,7 @@ class FulltextGambit implements GambitInterface protected $users; /** - * @param UserRepository $users + * @param \Flarum\User\UserRepository $users */ public function __construct(UserRepository $users) { diff --git a/src/Core/Search/User/Gambit/GroupGambit.php b/src/User/Search/Gambit/GroupGambit.php similarity index 95% rename from src/Core/Search/User/Gambit/GroupGambit.php rename to src/User/Search/Gambit/GroupGambit.php index 4f020904d..abe1ad984 100644 --- a/src/Core/Search/User/Gambit/GroupGambit.php +++ b/src/User/Search/Gambit/GroupGambit.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Search\User\Gambit; +namespace Flarum\Core\User\Search\Gambit; use Flarum\Core\Repository\GroupRepository; use Flarum\Core\Search\AbstractRegexGambit; use Flarum\Core\Search\AbstractSearch; -use Flarum\Core\Search\User\UserSearch; +use Flarum\Core\User\Search\UserSearch; use LogicException; class GroupGambit extends AbstractRegexGambit diff --git a/src/Core/Search/User/UserSearch.php b/src/User/Search/UserSearch.php similarity index 89% rename from src/Core/Search/User/UserSearch.php rename to src/User/Search/UserSearch.php index dc3554499..9223dbd04 100644 --- a/src/Core/Search/User/UserSearch.php +++ b/src/User/Search/UserSearch.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Search\User; +namespace Flarum\Core\User\Search; use Flarum\Core\Search\AbstractSearch; diff --git a/src/Core/Search/User/UserSearcher.php b/src/User/Search/UserSearcher.php similarity index 93% rename from src/Core/Search/User/UserSearcher.php rename to src/User/Search/UserSearcher.php index 855726dfd..0043deb1d 100644 --- a/src/Core/Search/User/UserSearcher.php +++ b/src/User/Search/UserSearcher.php @@ -9,9 +9,10 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Search\User; +namespace Flarum\Core\User\Search; -use Flarum\Core\Repository\UserRepository; +use Flarum\Core\User\Search\UserSearch; +use Flarum\User\UserRepository; use Flarum\Core\Search\ApplySearchParametersTrait; use Flarum\Core\Search\GambitManager; use Flarum\Core\Search\SearchCriteria; @@ -38,7 +39,7 @@ class UserSearcher /** * @param GambitManager $gambits - * @param UserRepository $users + * @param \Flarum\User\UserRepository $users */ public function __construct(GambitManager $gambits, UserRepository $users) { diff --git a/src/Core/User.php b/src/User/User.php similarity index 94% rename from src/Core/User.php rename to src/User/User.php index fd175c998..9e4917fc5 100755 --- a/src/Core/User.php +++ b/src/User/User.php @@ -9,10 +9,13 @@ * file that was distributed with this source code. */ -namespace Flarum\Core; +namespace Flarum\User; use DomainException; -use Flarum\Core\Access\Gate; +use Flarum\User\Gate; +use Flarum\Core\Group; +use Flarum\Core\Notification; +use Flarum\Core\Permission; use Flarum\Core\Support\EventGeneratorTrait; use Flarum\Database\ScopeVisibilityTrait; use Flarum\Database\AbstractModel; @@ -20,15 +23,15 @@ use Flarum\Event\CheckUserPassword; use Flarum\Event\ConfigureUserPreferences; use Flarum\Event\PostWasDeleted; use Flarum\Event\PrepareUserGroups; -use Flarum\Event\UserAvatarWasChanged; -use Flarum\Event\UserBioWasChanged; -use Flarum\Event\UserEmailChangeWasRequested; -use Flarum\Event\UserEmailWasChanged; -use Flarum\Event\UserPasswordWasChanged; -use Flarum\Event\UserWasActivated; -use Flarum\Event\UserWasDeleted; -use Flarum\Event\UserWasRegistered; -use Flarum\Event\UserWasRenamed; +use Flarum\User\Event\AvatarChanged; +use Flarum\User\Event\BioChanged; +use Flarum\User\Event\EmailChangeRequested; +use Flarum\User\Event\EmailChanged; +use Flarum\User\Event\PasswordChanged; +use Flarum\User\Event\Activated; +use Flarum\User\Event\Deleted; +use Flarum\User\Event\Registered; +use Flarum\User\Event\Renamed; use Flarum\Foundation\Application; use Illuminate\Contracts\Hashing\Hasher; use Symfony\Component\HttpFoundation\Session\SessionInterface; @@ -125,7 +128,7 @@ class User extends AbstractModel }); static::deleted(function (User $user) { - $user->raise(new UserWasDeleted($user)); + $user->raise(new Deleted($user)); // Delete all of the posts by the user. Before we delete them // in a big batch query, we will loop through them and raise a @@ -166,7 +169,7 @@ class User extends AbstractModel $user->password = $password; $user->join_time = time(); - $user->raise(new UserWasRegistered($user)); + $user->raise(new Registered($user)); return $user; } @@ -198,7 +201,7 @@ class User extends AbstractModel if ($username !== $this->username) { $this->username = $username; - $this->raise(new UserWasRenamed($this)); + $this->raise(new Renamed($this)); } return $this; @@ -215,7 +218,7 @@ class User extends AbstractModel if ($email !== $this->email) { $this->email = $email; - $this->raise(new UserEmailWasChanged($this)); + $this->raise(new EmailChanged($this)); } return $this; @@ -230,7 +233,7 @@ class User extends AbstractModel public function requestEmailChange($email) { if ($email !== $this->email) { - $this->raise(new UserEmailChangeWasRequested($this, $email)); + $this->raise(new EmailChangeRequested($this, $email)); } return $this; @@ -246,7 +249,7 @@ class User extends AbstractModel { $this->password = $password; - $this->raise(new UserPasswordWasChanged($this)); + $this->raise(new PasswordChanged($this)); return $this; } @@ -271,7 +274,7 @@ class User extends AbstractModel { $this->bio = $bio; - $this->raise(new UserBioWasChanged($this)); + $this->raise(new BioChanged($this)); return $this; } @@ -310,7 +313,7 @@ class User extends AbstractModel { $this->avatar_path = $path; - $this->raise(new UserAvatarWasChanged($this)); + $this->raise(new AvatarChanged($this)); return $this; } @@ -367,7 +370,7 @@ class User extends AbstractModel if ($this->is_activated !== true) { $this->is_activated = true; - $this->raise(new UserWasActivated($this)); + $this->raise(new Activated($this)); } return $this; diff --git a/src/Core/Listener/UserMetadataUpdater.php b/src/User/UserMetadataUpdater.php similarity index 97% rename from src/Core/Listener/UserMetadataUpdater.php rename to src/User/UserMetadataUpdater.php index 2e85c2d5c..3d5e9ad5b 100755 --- a/src/Core/Listener/UserMetadataUpdater.php +++ b/src/User/UserMetadataUpdater.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Listener; +namespace Flarum\User; use Flarum\Core\Discussion; use Flarum\Core\Post; @@ -69,7 +69,7 @@ class UserMetadataUpdater } /** - * @param \Flarum\Events\DiscussionWasStarted $event + * @param \Flarum\Event\DiscussionWasStarted $event */ public function whenDiscussionWasStarted(DiscussionWasStarted $event) { diff --git a/src/Core/Access/UserPolicy.php b/src/User/UserPolicy.php similarity index 94% rename from src/Core/Access/UserPolicy.php rename to src/User/UserPolicy.php index 24b95e25a..3a52fcaf0 100644 --- a/src/Core/Access/UserPolicy.php +++ b/src/User/UserPolicy.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Access; +namespace Flarum\User; -use Flarum\Core\User; +use Flarum\User\AbstractPolicy; use Illuminate\Database\Eloquent\Builder; class UserPolicy extends AbstractPolicy diff --git a/src/Core/Repository/UserRepository.php b/src/User/UserRepository.php similarity index 98% rename from src/Core/Repository/UserRepository.php rename to src/User/UserRepository.php index a350f9f10..bea76c55d 100644 --- a/src/Core/Repository/UserRepository.php +++ b/src/User/UserRepository.php @@ -9,9 +9,8 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Repository; +namespace Flarum\User; -use Flarum\Core\User; use Illuminate\Database\Eloquent\Builder; class UserRepository diff --git a/src/Core/Validator/UserValidator.php b/src/User/UserValidator.php similarity index 95% rename from src/Core/Validator/UserValidator.php rename to src/User/UserValidator.php index f58d9d42b..79d0a08c1 100644 --- a/src/Core/Validator/UserValidator.php +++ b/src/User/UserValidator.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Validator; +namespace Flarum\User; -use Flarum\Core\User; +use Flarum\Core\Validator\AbstractValidator; class UserValidator extends AbstractValidator { diff --git a/tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php b/tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php index 6591fff1f..19b918d2c 100644 --- a/tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php +++ b/tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php @@ -13,7 +13,7 @@ namespace Tests\Flarum\Api\Handler; use Exception; use Flarum\Api\ExceptionHandler\InvalidConfirmationTokenExceptionHandler; -use Flarum\Core\Exception\InvalidConfirmationTokenException; +use Flarum\User\Exception\InvalidConfirmationTokenException; use Tests\Test\TestCase; class InvalidConfirmationTokenExceptionHandlerTest extends TestCase diff --git a/tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php b/tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php index 10d52b19f..0494f6240 100644 --- a/tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php +++ b/tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php @@ -13,7 +13,7 @@ namespace Tests\Flarum\Api\Handler; use Exception; use Flarum\Api\ExceptionHandler\PermissionDeniedExceptionHandler; -use Flarum\Core\Exception\PermissionDeniedException; +use Flarum\User\Exception\PermissionDeniedException; use Tests\Test\TestCase; class PermissionDeniedExceptionHandlerTest extends TestCase