Extract new Flarum\User namespace

framework/core/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;
 

framework/core/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)

framework/core/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;

framework/core/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;
 

framework/core/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;

framework/core/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;
 

framework/core/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)
     {

framework/core/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;
 

framework/core/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;

framework/core/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;
 

framework/core/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;
 

framework/core/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;

framework/core/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

framework/core/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)
     {

framework/core/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)
     {

framework/core/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;
 

framework/core/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)
     {

framework/core/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;
 

framework/core/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
 {

framework/core/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

framework/core/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)
     {

framework/core/src/Core/Command/CreateGroup.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class CreateGroup
 {

framework/core/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)
     {

framework/core/src/Core/Command/DeleteAvatar.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class DeleteAvatar
 {

framework/core/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)
     {

framework/core/src/Core/Command/DeleteDiscussion.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class DeleteDiscussion
 {

framework/core/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;

framework/core/src/Core/Command/DeleteGroup.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class DeleteGroup
 {

framework/core/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;

framework/core/src/Core/Command/DeletePost.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class DeletePost
 {

framework/core/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)
     {

framework/core/src/Core/Command/DeleteUser.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class DeleteUser
 {

framework/core/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();

framework/core/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)

framework/core/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)
     {

framework/core/src/Core/Command/EditGroup.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class EditGroup
 {

framework/core/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;

framework/core/src/Core/Command/EditPost.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class EditPost
 {

framework/core/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)
     {

framework/core/src/Core/Command/EditUser.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class EditUser
 {

framework/core/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);

framework/core/src/Core/Command/PostReply.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class PostReply
 {

framework/core/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)
     {

framework/core/src/Core/Command/ReadAllNotifications.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class ReadAllNotifications
 {

framework/core/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)
     {

framework/core/src/Core/Command/ReadDiscussion.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class ReadDiscussion
 {

framework/core/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)
     {

framework/core/src/Core/Command/ReadNotification.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class ReadNotification
 {

framework/core/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)
     {

framework/core/src/Core/Command/RegisterUser.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class RegisterUser
 {

framework/core/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')));

framework/core/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)

framework/core/src/Core/Command/StartDiscussion.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class StartDiscussion
 {

framework/core/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

framework/core/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)
     {

framework/core/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']);
     }

framework/core/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');
     }
 
     /**

framework/core/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');
     }
 
     /**

framework/core/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');
     }
 
     /**

framework/core/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');
     }
 
     /**

framework/core/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();
 

framework/core/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;
 

framework/core/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

framework/core/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

framework/core/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');
     }
 
     /**

framework/core/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.

framework/core/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
 {

framework/core/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;
 

framework/core/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

framework/core/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
 {

framework/core/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)

framework/core/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;
 
 /**

framework/core/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)
     {

framework/core/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

framework/core/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)

framework/core/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

framework/core/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;
 

framework/core/src/Event/AvatarWillBeDeleted.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Event;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class AvatarWillBeDeleted
 {

framework/core/src/Event/AvatarWillBeSaved.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Event;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class AvatarWillBeSaved
 {

framework/core/src/Event/CheckUserPassword.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Event;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class CheckUserPassword
 {

framework/core/src/Event/ConfigureUserPreferences.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Event;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class ConfigureUserPreferences
 {

framework/core/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;
 

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/src/Event/GetPermission.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Event;
 
-use Flarum\Core\User;
+use Flarum\User\User;
 
 class GetPermission
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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)
     {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {

framework/core/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
 {