reordering and removing unused imports

src/Core/Access/Gate.php

@@ -2,9 +2,9 @@
 
 namespace Flarum\Core\Access;
 
-use InvalidArgumentException;
-use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Auth\Access\Gate as GateContract;
+use Illuminate\Contracts\Container\Container;
+use InvalidArgumentException;
 
 /**
  * @author Taylor Otwell

src/Core/AuthToken.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Core;
 
-use Flarum\Database\AbstractModel;
-use Flarum\Core\Exception\InvalidConfirmationTokenException;
 use DateTime;
+use Flarum\Core\Exception\InvalidConfirmationTokenException;
+use Flarum\Database\AbstractModel;
 
 /**
  * @todo document database columns with @property

src/Core/Command/CreateGroupHandler.php

@@ -13,9 +13,9 @@ namespace Flarum\Core\Command;
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Group;
+use Flarum\Core\Support\DispatchEventsTrait;
 use Flarum\Core\Validator\GroupValidator;
 use Flarum\Event\GroupWillBeSaved;
-use Flarum\Core\Support\DispatchEventsTrait;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class CreateGroupHandler

src/Core/Command/DeleteAvatarHandler.php

@@ -12,9 +12,9 @@ namespace Flarum\Core\Command;
 
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Exception\PermissionDeniedException;
-use Flarum\Event\AvatarWillBeDeleted;
 use Flarum\Core\Repository\UserRepository;
 use Flarum\Core\Support\DispatchEventsTrait;
+use Flarum\Event\AvatarWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
 use League\Flysystem\FilesystemInterface;
 

src/Core/Command/DeleteGroup.php

@@ -10,7 +10,6 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Group;
 use Flarum\Core\User;
 
 class DeleteGroup

src/Core/Command/DeleteGroupHandler.php

@@ -13,8 +13,8 @@ namespace Flarum\Core\Command;
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Repository\GroupRepository;
-use Flarum\Event\GroupWillBeDeleted;
 use Flarum\Core\Support\DispatchEventsTrait;
+use Flarum\Event\GroupWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteGroupHandler

src/Core/Command/DeletePostHandler.php

@@ -13,8 +13,8 @@ namespace Flarum\Core\Command;
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Repository\PostRepository;
-use Flarum\Event\PostWillBeDeleted;
 use Flarum\Core\Support\DispatchEventsTrait;
+use Flarum\Event\PostWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class DeletePostHandler

src/Core/Command/DeleteUserHandler.php

@@ -13,8 +13,8 @@ namespace Flarum\Core\Command;
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Repository\UserRepository;
-use Flarum\Event\UserWillBeDeleted;
 use Flarum\Core\Support\DispatchEventsTrait;
+use Flarum\Event\UserWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteUserHandler

src/Core/Command/EditGroup.php

@@ -10,7 +10,6 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Group;
 use Flarum\Core\User;
 
 class EditGroup

src/Core/Command/EditGroupHandler.php

@@ -14,9 +14,9 @@ use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Group;
 use Flarum\Core\Repository\GroupRepository;
+use Flarum\Core\Support\DispatchEventsTrait;
 use Flarum\Core\Validator\GroupValidator;
 use Flarum\Event\GroupWillBeSaved;
-use Flarum\Core\Support\DispatchEventsTrait;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class EditGroupHandler

src/Core/Command/EditPostHandler.php

@@ -11,11 +11,11 @@
 namespace Flarum\Core\Command;
 
 use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\Core\Post\CommentPost;
 use Flarum\Core\Repository\PostRepository;
+use Flarum\Core\Support\DispatchEventsTrait;
 use Flarum\Core\Validator\PostValidator;
 use Flarum\Event\PostWillBeSaved;
-use Flarum\Core\Support\DispatchEventsTrait;
-use Flarum\Core\Post\CommentPost;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class EditPostHandler

src/Core/Command/EditUserHandler.php

@@ -11,12 +11,12 @@
 namespace Flarum\Core\Command;
 
 use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\Core\User;
 use Flarum\Core\Repository\UserRepository;
-use Flarum\Core\Validator\UserValidator;
-use Flarum\Event\UserWillBeSaved;
-use Flarum\Event\UserGroupsWereChanged;
 use Flarum\Core\Support\DispatchEventsTrait;
+use Flarum\Core\User;
+use Flarum\Core\Validator\UserValidator;
+use Flarum\Event\UserGroupsWereChanged;
+use Flarum\Event\UserWillBeSaved;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class EditUserHandler

src/Core/Command/PostReplyHandler.php

@@ -12,12 +12,12 @@ namespace Flarum\Core\Command;
 
 use DateTime;
 use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\Core\Notification\NotificationSyncer;
+use Flarum\Core\Post\CommentPost;
+use Flarum\Core\Repository\DiscussionRepository;
+use Flarum\Core\Support\DispatchEventsTrait;
 use Flarum\Core\Validator\PostValidator;
 use Flarum\Event\PostWillBeSaved;
-use Flarum\Core\Repository\DiscussionRepository;
-use Flarum\Core\Post\CommentPost;
-use Flarum\Core\Support\DispatchEventsTrait;
-use Flarum\Core\Notification\NotificationSyncer;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class PostReplyHandler

src/Core/Command/RegisterUserHandler.php

@@ -12,19 +12,18 @@ namespace Flarum\Core\Command;
 
 use Exception;
 use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\Core\User;
 use Flarum\Core\AuthToken;
+use Flarum\Core\Exception\PermissionDeniedException;
+use Flarum\Core\Support\DispatchEventsTrait;
+use Flarum\Core\User;
 use Flarum\Core\Validator\UserValidator;
 use Flarum\Event\UserWillBeSaved;
-use Flarum\Core\Support\DispatchEventsTrait;
 use Flarum\Foundation\Application;
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\Core\Exception\PermissionDeniedException;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Support\Str;
-use Illuminate\Validation\Validator;
 use Intervention\Image\ImageManager;
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;

src/Core/DiscussionState.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Core;
 
-use Flarum\Event\DiscussionWasRead;
-use Flarum\Database\AbstractModel;
 use Flarum\Core\Support\EventGeneratorTrait;
+use Flarum\Database\AbstractModel;
+use Flarum\Event\DiscussionWasRead;
 use Illuminate\Database\Eloquent\Builder;
 
 /**

src/Core/EmailToken.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Core;
 
-use Flarum\Database\AbstractModel;
-use Flarum\Core\Exception\InvalidConfirmationTokenException;
 use DateTime;
+use Flarum\Core\Exception\InvalidConfirmationTokenException;
+use Flarum\Database\AbstractModel;
 
 /**
  * @todo document database columns with @property

src/Core/Guest.php

@@ -10,8 +10,6 @@
 
 namespace Flarum\Core;
 
-use Flarum\Core\Group;
-
 class Guest extends User
 {
     /**

src/Core/Post.php

@@ -12,13 +12,12 @@ namespace Flarum\Core;
 
 use DomainException;
 use Flarum\Core\Post\RegisteredTypesScope;
-use Flarum\Event\PostWasDeleted;
-use Flarum\Database\AbstractModel;
-use Flarum\Core\User;
+use Flarum\Core\Support\EventGeneratorTrait;
 use Flarum\Core\Support\Locked;
 use Flarum\Core\Support\ScopeVisibilityTrait;
-use Flarum\Core\Support\EventGeneratorTrait;
 use Flarum\Core\Support\ValidateBeforeSaveTrait;
+use Flarum\Database\AbstractModel;
+use Flarum\Event\PostWasDeleted;
 use Illuminate\Database\Eloquent\Builder;
 
 /**

src/Core/Post/CommentPost.php

@@ -10,14 +10,13 @@
 
 namespace Flarum\Core\Post;
 
-use DomainException;
 use Flarum\Core\Post;
-use Flarum\Formatter\Formatter;
-use Flarum\Event\PostWasPosted;
-use Flarum\Event\PostWasRevised;
-use Flarum\Event\PostWasHidden;
-use Flarum\Event\PostWasRestored;
 use Flarum\Core\User;
+use Flarum\Event\PostWasHidden;
+use Flarum\Event\PostWasPosted;
+use Flarum\Event\PostWasRestored;
+use Flarum\Event\PostWasRevised;
+use Flarum\Formatter\Formatter;
 
 /**
  * A standard comment in a discussion.

src/Core/Post/RegisteredTypesScope.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Core\Post;
 
-use Illuminate\Database\Eloquent\ScopeInterface;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\ScopeInterface;
 
 class RegisteredTypesScope implements ScopeInterface
 {

src/Core/User.php

@@ -11,26 +11,26 @@
 namespace Flarum\Core;
 
 use DomainException;
-use Flarum\Core\Access\Gate;
-use Flarum\Foundation\Application;
 use Flarum\Core;
-use Flarum\Database\AbstractModel;
+use Flarum\Core\Access\Gate;
 use Flarum\Core\Notification;
+use Flarum\Core\Support\EventGeneratorTrait;
+use Flarum\Core\Support\ScopeVisibilityTrait;
+use Flarum\Database\AbstractModel;
 use Flarum\Event\ConfigureUserPreferences;
-use Illuminate\Contracts\Hashing\Hasher;
-use Flarum\Event\UserWasDeleted;
 use Flarum\Event\PostWasDeleted;
-use Flarum\Event\UserWasRegistered;
-use Flarum\Event\UserWasRenamed;
+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\UserBioWasChanged;
-use Flarum\Event\UserAvatarWasChanged;
 use Flarum\Event\UserWasActivated;
-use Flarum\Event\UserEmailChangeWasRequested;
-use Flarum\Event\PrepareUserGroups;
-use Flarum\Core\Support\ScopeVisibilityTrait;
-use Flarum\Core\Support\EventGeneratorTrait;
+use Flarum\Event\UserWasDeleted;
+use Flarum\Event\UserWasRegistered;
+use Flarum\Event\UserWasRenamed;
+use Flarum\Foundation\Application;
+use Illuminate\Contracts\Hashing\Hasher;
 
 /**
  * @property int $id