Merge pull request #786 from Luceos/imports

reordering and removing unused imports

src/Admin/AdminServiceProvider.php

@@ -10,14 +10,12 @@
 
 namespace Flarum\Admin;
 
-use Flarum\Event\SettingWasSet;
 use Flarum\Event\ExtensionWasDisabled;
 use Flarum\Event\ExtensionWasEnabled;
-use Flarum\Http\RouteCollection;
+use Flarum\Event\SettingWasSet;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Http\GenerateRouteHandlerTrait;
-use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\RedirectResponse;
+use Flarum\Http\RouteCollection;
 
 class AdminServiceProvider extends AbstractServiceProvider
 {

src/Admin/Server.php

@@ -14,8 +14,8 @@ namespace Flarum\Admin;
 use Flarum\Event\ConfigureMiddleware;
 use Flarum\Foundation\Application;
 use Flarum\Http\AbstractServer;
-use Zend\Stratigility\MiddlewarePipe;
 use Flarum\Http\Middleware\HandleErrors;
+use Zend\Stratigility\MiddlewarePipe;
 
 class Server extends AbstractServer
 {

src/Api/ApiServiceProvider.php

@@ -15,9 +15,9 @@ use Flarum\Api\Serializer\AbstractSerializer;
 use Flarum\Api\Serializer\NotificationSerializer;
 use Flarum\Event\ConfigureApiRoutes;
 use Flarum\Event\ConfigureNotificationTypes;
+use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Http\GenerateRouteHandlerTrait;
 use Flarum\Http\RouteCollection;
-use Flarum\Foundation\AbstractServiceProvider;
 use Tobscure\JsonApi\ErrorHandler;
 use Tobscure\JsonApi\Exception\Handler\FallbackExceptionHandler;
 use Tobscure\JsonApi\Exception\Handler\InvalidParameterExceptionHandler;

src/Api/Client.php

@@ -10,11 +10,10 @@
 
 namespace Flarum\Api;
 
-use Flarum\Http\Controller\ControllerInterface;
-use Flarum\Core\User;
-use Flarum\Http\AccessToken;
-use Illuminate\Contracts\Container\Container;
 use Exception;
+use Flarum\Core\User;
+use Flarum\Http\Controller\ControllerInterface;
+use Illuminate\Contracts\Container\Container;
 use InvalidArgumentException;
 use Zend\Diactoros\ServerRequestFactory;
 

src/Api/Controller/AbstractSerializeController.php

@@ -11,10 +11,10 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Api\JsonApiResponse;
-use Flarum\Http\Controller\ControllerInterface;
-use Illuminate\Contracts\Container\Container;
 use Flarum\Event\ConfigureApiController;
 use Flarum\Event\PrepareApiData;
+use Flarum\Http\Controller\ControllerInterface;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;

src/Api/Controller/CreateDiscussionController.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Api\Controller;
 
-use Flarum\Core\Command\StartDiscussion;
 use Flarum\Core\Command\ReadDiscussion;
+use Flarum\Core\Command\StartDiscussion;
 use Flarum\Core\Post\Floodgate;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Psr\Http\Message\ServerRequestInterface;

src/Api/Controller/ForgotPasswordController.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Api\Controller;
 
-use Flarum\Core\Repository\UserRepository;
 use Flarum\Core\Command\RequestPasswordReset;
+use Flarum\Core\Repository\UserRepository;
 use Flarum\Http\Controller\ControllerInterface;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Psr\Http\Message\ServerRequestInterface;

src/Api/Controller/ListDiscussionsController.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Api\Controller;
 
-use Flarum\Core\Search\SearchCriteria;
-use Flarum\Core\Search\Discussion\DiscussionSearcher;
 use Flarum\Api\UrlGenerator;
+use Flarum\Core\Search\Discussion\DiscussionSearcher;
+use Flarum\Core\Search\SearchCriteria;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 

src/Api/Controller/ListNotificationsController.php

@@ -11,8 +11,8 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Core\Discussion;
-use Flarum\Core\Repository\NotificationRepository;
 use Flarum\Core\Exception\PermissionDeniedException;
+use Flarum\Core\Repository\NotificationRepository;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 

src/Api/Controller/ListUsersController.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Api\Controller;
 
+use Flarum\Api\UrlGenerator;
 use Flarum\Core\Search\SearchCriteria;
 use Flarum\Core\Search\User\UserSearcher;
-use Flarum\Api\UrlGenerator;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 

src/Api/Controller/SetSettingsController.php

@@ -11,10 +11,10 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\Event\PrepareSerializedSetting;
+use Flarum\Event\SettingWasSet;
 use Flarum\Http\Controller\ControllerInterface;
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\Event\SettingWasSet;
-use Flarum\Event\PrepareSerializedSetting;
 use Illuminate\Contracts\Events\Dispatcher;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response\EmptyResponse;

src/Api/Controller/TokenController.php

@@ -12,8 +12,8 @@ namespace Flarum\Api\Controller;
 
 use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Repository\UserRepository;
-use Flarum\Http\Controller\ControllerInterface;
 use Flarum\Http\AccessToken;
+use Flarum\Http\Controller\ControllerInterface;
 use Illuminate\Contracts\Bus\Dispatcher as BusDispatcher;
 use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
 use Psr\Http\Message\ServerRequestInterface;

src/Api/Controller/UpdateExtensionController.php

@@ -13,7 +13,6 @@ namespace Flarum\Api\Controller;
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Extension\ExtensionManager;
 use Flarum\Http\Controller\ControllerInterface;
-use Illuminate\Contracts\Bus\Dispatcher;
 use Psr\Http\Message\ServerRequestInterface;
 
 class UpdateExtensionController implements ControllerInterface

src/Api/Handler/ModelNotFoundExceptionHandler.php

@@ -11,7 +11,6 @@
 namespace Flarum\Api\Handler;
 
 use Exception;
-use Flarum\Http\Exception\RouteNotFoundException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Tobscure\JsonApi\Exception\Handler\ExceptionHandlerInterface;
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;

src/Api/Serializer/AbstractSerializer.php

@@ -10,18 +10,18 @@
 
 namespace Flarum\Api\Serializer;
 
-use DateTime;
 use Closure;
+use DateTime;
+use Flarum\Api\Relationship\HasManyBuilder;
+use Flarum\Api\Relationship\HasOneBuilder;
 use Flarum\Core\User;
-use Flarum\Event\PrepareApiAttributes;
 use Flarum\Event\GetApiRelationship;
+use Flarum\Event\PrepareApiAttributes;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
 use InvalidArgumentException;
 use LogicException;
 use Tobscure\JsonApi\AbstractSerializer as BaseAbstractSerializer;
-use Flarum\Api\Relationship\HasOneBuilder;
-use Flarum\Api\Relationship\HasManyBuilder;
 use Tobscure\JsonApi\Collection;
 use Tobscure\JsonApi\Relationship;
 use Tobscure\JsonApi\Relationship\BuilderInterface;

src/Api/Serializer/DiscussionSerializer.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Api\Serializer;
 
-use Flarum\Core\Discussion;
 use Flarum\Core\Access\Gate;
+use Flarum\Core\Discussion;
 
 class DiscussionSerializer extends DiscussionBasicSerializer
 {

src/Api/Serializer/ForumSerializer.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Api\Serializer;
 
-use Flarum\Foundation\Application;
 use Flarum\Core\Access\Gate;
+use Flarum\Foundation\Application;
 use Flarum\Settings\SettingsRepositoryInterface;
 
 class ForumSerializer extends AbstractSerializer

src/Api/Serializer/PostBasicSerializer.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Api\Serializer;
 
-use Flarum\Core\Post\CommentPost;
 use Flarum\Core\Post;
+use Flarum\Core\Post\CommentPost;
 use InvalidArgumentException;
 
 class PostBasicSerializer extends AbstractSerializer

src/Asset/AssetManager.php

@@ -11,7 +11,6 @@
 namespace Flarum\Asset;
 
 use DomainException;
-use Flarum\Asset\CompilerInterface;
 
 class AssetManager
 {

src/Asset/RevisionCompiler.php

@@ -10,8 +10,6 @@
 
 namespace Flarum\Asset;
 
-use Illuminate\Support\Str;
-
 class RevisionCompiler implements CompilerInterface
 {
     /**

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

src/Database/AbstractMigration.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Database;
 
-use Illuminate\Database\Schema\Builder;
 use Flarum\Settings\SettingsRepositoryInterface;
+use Illuminate\Database\Schema\Builder;
 
 abstract class AbstractMigration
 {

src/Database/MigrationCreator.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Database;
 
-use Illuminate\Support\Str;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Str;
 
 class MigrationCreator
 {

src/Database/Migrator.php

@@ -11,9 +11,9 @@
 
 namespace Flarum\Database;
 
-use Illuminate\Support\Str;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Str;
 
 class Migrator
 {

src/Event/ConfigureClientView.php

@@ -10,10 +10,10 @@
 
 namespace Flarum\Event;
 
-use Flarum\Http\Controller\AbstractClientController;
-use Flarum\Http\Controller\ClientView;
 use Flarum\Admin\Controller\ClientController as AdminClientAction;
 use Flarum\Forum\Controller\ClientController as ForumClientAction;
+use Flarum\Http\Controller\AbstractClientController;
+use Flarum\Http\Controller\ClientView;
 
 class ConfigureClientView
 {

src/Event/ConfigureMiddleware.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Event;
 
-use Flarum\Forum\Server as ForumServer;
-use Flarum\Api\Server as ApiServer;
 use Flarum\Admin\Server as AdminServer;
+use Flarum\Api\Server as ApiServer;
+use Flarum\Forum\Server as ForumServer;
 use Flarum\Foundation\AbstractServer;
 use Zend\Stratigility\MiddlewarePipe;
 

src/Event/ConfigureUserSearch.php

@@ -10,8 +10,8 @@
 
 namespace Flarum\Event;
 
-use Flarum\Core\Search\User\UserSearch;
 use Flarum\Core\Search\SearchCriteria;
+use Flarum\Core\Search\User\UserSearch;
 
 class ConfigureUserSearch
 {

src/Event/ScopeModelVisibility.php

@@ -11,8 +11,8 @@
 namespace Flarum\Event;
 
 use Flarum\Core\User;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * The `ScopeModelVisibility` event allows constraints to be applied in a query

src/Extension/ExtensionManager.php

@@ -11,12 +11,12 @@
 namespace Flarum\Extension;
 
 use Flarum\Core;
+use Flarum\Database\Migrator;
 use Flarum\Event\ExtensionWasDisabled;
 use Flarum\Event\ExtensionWasEnabled;
 use Flarum\Event\ExtensionWasUninstalled;
 use Flarum\Foundation\Application;
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\Database\Migrator;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Filesystem\Filesystem;
 

src/Formatter/Formatter.php

@@ -10,13 +10,13 @@
 
 namespace Flarum\Formatter;
 
+use Flarum\Event\ConfigureFormatter;
+use Flarum\Event\ConfigureFormatterParser;
+use Flarum\Event\ConfigureFormatterRenderer;
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
 use s9e\TextFormatter\Configurator;
 use s9e\TextFormatter\Unparser;
-use Flarum\Event\ConfigureFormatter;
-use Flarum\Event\ConfigureFormatterParser;
-use Flarum\Event\ConfigureFormatterRenderer;
 
 class Formatter
 {

src/Forum/AuthenticationResponseFactory.php

@@ -12,7 +12,6 @@ namespace Flarum\Forum;
 
 use Flarum\Core\AuthToken;
 use Flarum\Core\User;
-use Flarum\Http\AccessToken;
 use Flarum\Http\Rememberer;
 use Flarum\Http\SessionAuthenticator;
 use Psr\Http\Message\ServerRequestInterface as Request;

src/Forum/Server.php

@@ -14,9 +14,9 @@ namespace Flarum\Forum;
 use Flarum\Event\ConfigureMiddleware;
 use Flarum\Foundation\Application;
 use Flarum\Http\AbstractServer;
+use Flarum\Http\Middleware\HandleErrors;
 use Zend\Diactoros\Response\HtmlResponse;
 use Zend\Stratigility\MiddlewarePipe;
-use Flarum\Http\Middleware\HandleErrors;
 
 class Server extends AbstractServer
 {

src/Foundation/AbstractServer.php

@@ -10,7 +10,6 @@
 
 namespace Flarum\Foundation;
 
-use Exception;
 use Flarum\Core;
 use Illuminate\Config\Repository as ConfigRepository;
 use Monolog\Formatter\LineFormatter;

src/Foundation/Application.php

@@ -10,12 +10,12 @@
 
 namespace Flarum\Foundation;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
 use Illuminate\Events\EventServiceProvider;
+use Illuminate\Support\Arr;
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 
 class Application extends Container implements ApplicationContract
 {

src/Http/AbstractServer.php

@@ -13,9 +13,9 @@ namespace Flarum\Http;
 use Flarum\Core\AuthToken;
 use Flarum\Core\EmailToken;
 use Flarum\Core\PasswordToken;
+use Flarum\Foundation\AbstractServer as BaseAbstractServer;
 use Flarum\Foundation\Application;
 use Zend\Diactoros\Server;
-use Flarum\Foundation\AbstractServer as BaseAbstractServer;
 use Zend\Stratigility\MiddlewareInterface;
 
 abstract class AbstractServer extends BaseAbstractServer

src/Install/InstallServiceProvider.php

@@ -10,14 +10,13 @@
 
 namespace Flarum\Install;
 
+use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Http\GenerateRouteHandlerTrait;
 use Flarum\Http\RouteCollection;
+use Flarum\Install\Prerequisite\Composite;
 use Flarum\Install\Prerequisite\PhpExtensions;
 use Flarum\Install\Prerequisite\PhpVersion;
 use Flarum\Install\Prerequisite\WritablePaths;
-use Flarum\Install\Prerequisite\Composite;
-use Flarum\Foundation\AbstractServiceProvider;
-use Psr\Http\Message\ServerRequestInterface;
 
 class InstallServiceProvider extends AbstractServiceProvider
 {

src/Update/UpdateServiceProvider.php

@@ -10,9 +10,9 @@
 
 namespace Flarum\Update;
 
+use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Http\GenerateRouteHandlerTrait;
 use Flarum\Http\RouteCollection;
-use Flarum\Foundation\AbstractServiceProvider;
 
 class UpdateServiceProvider extends AbstractServiceProvider
 {