Extract new Flarum\User namespace

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)
     {

src/Core/Command/CreateGroup.php

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

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)
     {

src/Core/Command/DeleteAvatar.php

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

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)
     {

src/Core/Command/DeleteDiscussion.php

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

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;

src/Core/Command/DeleteGroup.php

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

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;

src/Core/Command/DeletePost.php

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

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)
     {

src/Core/Command/DeleteUser.php

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

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();

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)

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)
     {

src/Core/Command/EditGroup.php

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

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;

src/Core/Command/EditPost.php

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

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)
     {

src/Core/Command/EditUser.php

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

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);

src/Core/Command/PostReply.php

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

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)
     {

src/Core/Command/ReadAllNotifications.php

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

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)
     {

src/Core/Command/ReadDiscussion.php

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

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)
     {

src/Core/Command/ReadNotification.php

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

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)
     {

src/Core/Command/RegisterUser.php

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

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')));

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)

src/Core/Command/StartDiscussion.php

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

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

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)
     {