Extract new Flarum\User namespace

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;
 

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)

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;

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;
 

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;

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;
 

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

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;
 

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;

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;
 

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;
 

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;

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

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

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

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;