github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-30 13:36:10 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Fix namespace orderings

Browse Source 
(Thanks, StyleCI!)
This commit is contained in:
Franz Liedke 2017-06-24 15:48:20 +02:00
parent 2e87441f0e
commit f33de84540
65 changed files with 95 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Admin/AdminServiceProvider.php
View File

@ -13,10 +13,10 @@ namespace Flarum\Admin;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Settings\Event\Saved;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Settings\Event\Saved;
class AdminServiceProvider extends AbstractServiceProvider
{

4
framework/core/src/Admin/Controller/FrontendController.php
View File

@ -12,10 +12,10 @@
namespace Flarum\Admin\Controller;
use Flarum\Admin\Frontend;
use Flarum\Group\Permission;
use Flarum\Settings\Event\Deserializing;
use Flarum\Extension\ExtensionManager;
use Flarum\Frontend\AbstractFrontendController;
use Flarum\Group\Permission;
use Flarum\Settings\Event\Deserializing;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface;

2
framework/core/src/Admin/routes.php
View File

@ -10,8 +10,8 @@
*/
use Flarum\Admin\Controller;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
return function (RouteCollection $map, RouteHandlerFactory $route) {
$map->get(

2
framework/core/src/Api/ApiServiceProvider.php
View File

@ -17,8 +17,8 @@ use Flarum\Api\Serializer\NotificationSerializer;
use Flarum\Event\ConfigureApiRoutes;
use Flarum\Event\ConfigureNotificationTypes;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
use Tobscure\JsonApi\ErrorHandler;
use Tobscure\JsonApi\Exception\Handler\FallbackExceptionHandler;
use Tobscure\JsonApi\Exception\Handler\InvalidParameterExceptionHandler;

2
framework/core/src/Api/Controller/DeleteFaviconController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Foundation\Application;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use League\Flysystem\Adapter\Local;
use League\Flysystem\Filesystem;
use Psr\Http\Message\ServerRequestInterface;

2
framework/core/src/Api/Controller/DeleteLogoController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Foundation\Application;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use League\Flysystem\Adapter\Local;
use League\Flysystem\Filesystem;
use Psr\Http\Message\ServerRequestInterface;

2
framework/core/src/Api/Controller/ForgotPasswordController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\User\Command\RequestPasswordReset;
use Flarum\User\UserRepository;
use Flarum\Http\Controller\ControllerInterface;
use Illuminate\Contracts\Bus\Dispatcher;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\EmptyResponse;

2
framework/core/src/Api/Controller/ListNotificationsController.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Api\Controller;
use Flarum\Discussion\Discussion;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Notification\NotificationRepository;
use Flarum\User\Exception\PermissionDeniedException;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;

2
framework/core/src/Api/Controller/ListPostsController.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Api\Controller;
use Flarum\Post\PostRepository;
use Flarum\Event\ConfigurePostsQuery;
use Flarum\Post\PostRepository;
use Illuminate\Database\Eloquent\Builder;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;

2
framework/core/src/Api/Controller/ListUsersController.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Api\Controller;
use Flarum\Api\UrlGenerator;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Search\SearchCriteria;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\User\Search\UserSearcher;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;

6
framework/core/src/Api/Controller/SendConfirmationEmailController.php
View File

@ -11,12 +11,12 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\EmailToken;
use Flarum\User\Exception\PermissionDeniedException;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\EmailToken;
use Flarum\User\Exception\PermissionDeniedException;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Mail\Message;
use Psr\Http\Message\ServerRequestInterface;

2
framework/core/src/Api/Controller/SetPermissionController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Group\Permission;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\User\AssertPermissionTrait;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\EmptyResponse;

6
framework/core/src/Api/Controller/SetSettingsController.php
View File

@ -11,11 +11,11 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Settings\Event\Serializing;
use Flarum\Settings\Event\Saved;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Settings\Event\Saved;
use Flarum\Settings\Event\Serializing;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\EmptyResponse;

4
framework/core/src/Api/Controller/TokenController.php
View File

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

2
framework/core/src/Api/Controller/UninstallExtensionController.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Extension\ExtensionManager;
use Flarum\User\AssertPermissionTrait;
use Psr\Http\Message\ServerRequestInterface;
class UninstallExtensionController extends AbstractDeleteController

2
framework/core/src/Api/Controller/UpdateExtensionController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Extension\ExtensionManager;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\User\AssertPermissionTrait;
use Psr\Http\Message\ServerRequestInterface;
class UpdateExtensionController implements ControllerInterface

2
framework/core/src/Api/Controller/UploadFaviconController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Foundation\Application;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Support\Str;
use Intervention\Image\ImageManager;
use League\Flysystem\Adapter\Local;

2
framework/core/src/Api/Controller/UploadLogoController.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Api\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\Foundation\Application;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Support\Str;
use Intervention\Image\ImageManager;
use League\Flysystem\Adapter\Local;

2
framework/core/src/Api/Serializer/BasicPostSerializer.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Api\Serializer;
use Flarum\Post\Post;
use Flarum\Post\CommentPost;
use Flarum\Post\Post;
use InvalidArgumentException;
class BasicPostSerializer extends AbstractSerializer

2
framework/core/src/Api/Serializer/DiscussionSerializer.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Api\Serializer;
use Flarum\User\Gate;
use Flarum\Discussion\Discussion;
use Flarum\User\Gate;
class DiscussionSerializer extends BasicDiscussionSerializer
{

2
framework/core/src/Api/Serializer/PostSerializer.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Api\Serializer;
use Flarum\User\Gate;
use Flarum\Post\CommentPost;
use Flarum\User\Gate;
class PostSerializer extends BasicPostSerializer
{

2
framework/core/src/Api/routes.php
View File

@ -10,8 +10,8 @@
*/
use Flarum\Api\Controller;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
return function (RouteCollection $map, RouteHandlerFactory $route) {
// Get forum information

4
framework/core/src/Console/Server.php
View File

@ -12,11 +12,11 @@
namespace Flarum\Console;
use Flarum\Database\Console\GenerateMigrationCommand;
use Flarum\Database\Console\MigrateCommand;
use Flarum\Foundation\AbstractServer;
use Flarum\Foundation\Console\CacheClearCommand;
use Flarum\Foundation\Console\InfoCommand;
use Flarum\Foundation\AbstractServer;
use Flarum\Install\Console\InstallCommand;
use Flarum\Database\Console\MigrateCommand;
use Symfony\Component\Console\Application;
class Server extends AbstractServer

2
framework/core/src/Database/ScopeVisibilityTrait.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Database;
use Flarum\User\User;
use Flarum\Event\ScopeModelVisibility;
use Flarum\User\User;
use Illuminate\Database\Eloquent\Builder;
trait ScopeVisibilityTrait

9
framework/core/src/Discussion/Discussion.php
View File

@ -11,18 +11,17 @@
namespace Flarum\Discussion;
use Flarum\Discussion\UserState;
use Flarum\Post\MergeableInterface;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Database\AbstractModel;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Discussion\Event\Deleted;
use Flarum\Discussion\Event\Hidden;
use Flarum\Discussion\Event\Renamed;
use Flarum\Discussion\Event\Restored;
use Flarum\Discussion\Event\Started;
use Flarum\Post\Event\Deleted as PostDeleted;
use Flarum\Event\ScopePostVisibility;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Post\Event\Deleted as PostDeleted;
use Flarum\Post\MergeableInterface;
use Flarum\Post\Post;
use Flarum\User\Guest;
use Flarum\User\User;

2
framework/core/src/Discussion/DiscussionMetadataUpdater.php
View File

@ -11,11 +11,11 @@
namespace Flarum\Discussion;
use Flarum\Post\Post;
use Flarum\Post\Event\Deleted;
use Flarum\Post\Event\Hidden;
use Flarum\Post\Event\Posted;
use Flarum\Post\Event\Restored;
use Flarum\Post\Post;
use Illuminate\Contracts\Events\Dispatcher;
class DiscussionMetadataUpdater

1
framework/core/src/Discussion/DiscussionPolicy.php
View File

@ -12,7 +12,6 @@
namespace Flarum\Discussion;
use Carbon\Carbon;
use Flarum\Discussion\Discussion;
use Flarum\Event\ScopeHiddenDiscussionVisibility;
use Flarum\Event\ScopePrivateDiscussionVisibility;
use Flarum\Settings\SettingsRepositoryInterface;

2
framework/core/src/Discussion/DiscussionRenamedLogger.php
View File

@ -11,10 +11,10 @@
namespace Flarum\Discussion;
use Flarum\Discussion\Event\Renamed;
use Flarum\Notification\Blueprint\DiscussionRenamedBlueprint;
use Flarum\Notification\NotificationSyncer;
use Flarum\Post\DiscussionRenamedPost;
use Flarum\Discussion\Event\Renamed;
use Illuminate\Contracts\Events\Dispatcher;
class DiscussionRenamedLogger

5
framework/core/src/Discussion/Search/DiscussionSearcher.php
View File

@ -13,13 +13,10 @@ namespace Flarum\Discussion\Search;
use Flarum\Discussion\Discussion;
use Flarum\Discussion\DiscussionRepository;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\Event\ConfigureDiscussionSearch;
use Flarum\Post\PostRepository;
use Flarum\Search\ApplySearchParametersTrait;
use Flarum\Search\GambitManager;
use Flarum\Search\SearchCriteria;
use Flarum\Search\SearchResults;
use Flarum\Event\ConfigureDiscussionSearch;
use Illuminate\Database\Eloquent\Collection;
/**

4
framework/core/src/Discussion/Search/Gambit/AuthorGambit.php
View File

@ -11,10 +11,10 @@
namespace Flarum\Discussion\Search\Gambit;
use Flarum\User\UserRepository;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\User\UserRepository;
use LogicException;
class AuthorGambit extends AbstractRegexGambit

2
framework/core/src/Discussion/Search/Gambit/CreatedGambit.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Discussion\Search\Gambit;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch;
use Flarum\Discussion\Search\DiscussionSearch;
use LogicException;
class CreatedGambit extends AbstractRegexGambit

2
framework/core/src/Discussion/Search/Gambit/FulltextGambit.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Discussion\Search\Gambit;
use Flarum\Search\AbstractSearch;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\Discussion\Search\Fulltext\DriverInterface;
use Flarum\Search\AbstractSearch;
use Flarum\Search\GambitInterface;
use LogicException;

2
framework/core/src/Discussion/Search/Gambit/HiddenGambit.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Discussion\Search\Gambit;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch;
use Flarum\Discussion\Search\DiscussionSearch;
use LogicException;
class HiddenGambit extends AbstractRegexGambit

2
framework/core/src/Discussion/Search/Gambit/UnreadGambit.php
View File

@ -12,9 +12,9 @@
namespace Flarum\Discussion\Search\Gambit;
use Flarum\Discussion\DiscussionRepository;
use Flarum\Discussion\Search\DiscussionSearch;
use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch;
use Flarum\Discussion\Search\DiscussionSearch;
use LogicException;
class UnreadGambit extends AbstractRegexGambit

3
framework/core/src/Discussion/UserState.php
View File

@ -11,10 +11,9 @@
namespace Flarum\Discussion;
use Flarum\Discussion\Discussion;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\AbstractModel;
use Flarum\Discussion\Event\UserRead;
use Flarum\Foundation\EventGeneratorTrait;
use Illuminate\Database\Eloquent\Builder;
/**

2
framework/core/src/Event/AbstractConfigureRoutes.php
View File

@ -11,8 +11,8 @@
namespace Flarum\Event;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
abstract class AbstractConfigureRoutes
{

4
framework/core/src/Extension/ExtensionManager.php
View File

@ -13,10 +13,10 @@ namespace Flarum\Extension;
use Flarum\Database\Migrator;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Extension\Event\Uninstalled;
use Flarum\Extension\Event\Disabling;
use Flarum\Extension\Event\Enabled;
use Flarum\Extension\Event\Enabling;
use Flarum\Extension\Event\Uninstalled;
use Flarum\Foundation\Application;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Events\Dispatcher;

2
framework/core/src/Forum/Controller/DiscussionController.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Forum\Controller;
use Flarum\Api\Client;
use Flarum\Forum\UrlGenerator;
use Flarum\Forum\Frontend;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\Exception\RouteNotFoundException;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;

2
framework/core/src/Forum/Controller/IndexController.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Forum\Controller;
use Flarum\Api\Client as ApiClient;
use Flarum\User\User;
use Flarum\Forum\Frontend;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface as Request;

4
framework/core/src/Forum/Controller/LogInController.php
View File

@ -13,12 +13,12 @@ namespace Flarum\Forum\Controller;
use Flarum\Api\Client;
use Flarum\Api\Controller\TokenController;
use Flarum\User\UserRepository;
use Flarum\User\Event\LoggedIn;
use Flarum\Http\AccessToken;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Http\Rememberer;
use Flarum\Http\SessionAuthenticator;
use Flarum\User\Event\LoggedIn;
use Flarum\User\UserRepository;
use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Diactoros\Response\EmptyResponse;
use Zend\Diactoros\Response\JsonResponse;

4
framework/core/src/Forum/Controller/LogOutController.php
View File

@ -11,13 +11,13 @@
namespace Flarum\Forum\Controller;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Event\LoggedOut;
use Flarum\Foundation\Application;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Http\Exception\TokenMismatchException;
use Flarum\Http\Rememberer;
use Flarum\Http\SessionAuthenticator;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Event\LoggedOut;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Diactoros\Response\RedirectResponse;

2
framework/core/src/Forum/Controller/ResetPasswordController.php
View File

@ -12,9 +12,9 @@
namespace Flarum\Forum\Controller;
use DateTime;
use Flarum\Http\Controller\AbstractHtmlController;
use Flarum\User\Exception\InvalidConfirmationTokenException;
use Flarum\User\PasswordToken;
use Flarum\Http\Controller\AbstractHtmlController;
use Illuminate\Contracts\View\Factory;
use Psr\Http\Message\ServerRequestInterface as Request;
use Symfony\Component\Translation\TranslatorInterface;

4
framework/core/src/Forum/Controller/SavePasswordController.php
View File

@ -11,11 +11,11 @@
namespace Flarum\Forum\Controller;
use Flarum\User\PasswordToken;
use Flarum\User\UserValidator;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Http\SessionAuthenticator;
use Flarum\User\PasswordToken;
use Flarum\User\UserValidator;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Contracts\Validation\ValidationException;
use Psr\Http\Message\ServerRequestInterface as Request;

4
framework/core/src/Forum/ForumServiceProvider.php
View File

@ -14,10 +14,10 @@ namespace Flarum\Forum;
use Flarum\Event\ConfigureForumRoutes;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Settings\Event\Saved;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Settings\Event\Saved;
class ForumServiceProvider extends AbstractServiceProvider
{

2
framework/core/src/Forum/routes.php
View File

@ -10,8 +10,8 @@
*/
use Flarum\Forum\Controller;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
return function (RouteCollection $map, RouteHandlerFactory $route) {
$map->get(

2
framework/core/src/Frontend/FrontendAssets.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Frontend;
use Flarum\Foundation\Application;
use Flarum\Frontend\Asset\JsCompiler;
use Flarum\Frontend\Asset\LessCompiler;
use Flarum\Foundation\Application;
use Flarum\Frontend\Asset\LocaleJsCompiler as LocaleJsCompiler;
use Flarum\Locale\LocaleManager;
use Illuminate\Contracts\Cache\Repository;

2
framework/core/src/Frontend/FrontendView.php
View File

@ -13,8 +13,8 @@ namespace Flarum\Frontend;
use Flarum\Api\Client;
use Flarum\Api\Serializer\AbstractSerializer;
use Flarum\Frontend\Asset\CompilerInterface;
use Flarum\Foundation\Application;
use Flarum\Frontend\Asset\CompilerInterface;
use Flarum\Frontend\Asset\LocaleJsCompiler;
use Flarum\Locale\LocaleManager;
use Illuminate\View\Factory;

4
framework/core/src/Group/Group.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Group;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Database\AbstractModel;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Group\Event\Created;
use Flarum\Group\Event\Deleting;
use Flarum\Group\Event\Renamed;

4
framework/core/src/Http/AbstractServer.php
View File

@ -11,11 +11,11 @@
namespace Flarum\Http;
use Flarum\Foundation\AbstractServer as BaseAbstractServer;
use Flarum\Foundation\Application;
use Flarum\User\AuthToken;
use Flarum\User\EmailToken;
use Flarum\User\PasswordToken;
use Flarum\Foundation\AbstractServer as BaseAbstractServer;
use Flarum\Foundation\Application;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Server;

2
framework/core/src/Http/Middleware/AuthenticateWithHeader.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Http\Middleware;
use Flarum\Api\ApiKey;
use Flarum\User\User;
use Flarum\Http\AccessToken;
use Flarum\User\User;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Stratigility\MiddlewareInterface;

2
framework/core/src/Install/Console/InstallCommand.php
View File

@ -13,10 +13,10 @@ namespace Flarum\Install\Console;
use Exception;
use Flarum\Console\AbstractCommand;
use Flarum\Database\AbstractModel;
use Flarum\Group\Group;
use Flarum\Group\Permission;
use Flarum\User\User;
use Flarum\Database\AbstractModel;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Validation\Factory;

2
framework/core/src/Install/InstallServiceProvider.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Install;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Install\Prerequisite\Composite;
use Flarum\Install\Prerequisite\PhpExtensions;
use Flarum\Install\Prerequisite\PhpVersion;

2
framework/core/src/Notification/NotificationSyncer.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Notification;
use Carbon\Carbon;
use Flarum\Notification\Event\Sending;
use Flarum\Notification\Blueprint\BlueprintInterface;
use Flarum\Notification\Event\Sending;
use Flarum\User\User;
/**

2
framework/core/src/Post/CommentPost.php
View File

@ -11,11 +11,11 @@
namespace Flarum\Post;
use Flarum\Formatter\Formatter;
use Flarum\Post\Event\Hidden;
use Flarum\Post\Event\Posted;
use Flarum\Post\Event\Restored;
use Flarum\Post\Event\Revised;
use Flarum\Formatter\Formatter;
use Flarum\User\User;
/**

4
framework/core/src/Post/Post.php
View File

@ -11,9 +11,9 @@
namespace Flarum\Post;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Database\AbstractModel;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Post\Event\Deleted;
use Flarum\User\User;
use Illuminate\Database\Eloquent\Builder;

2
framework/core/src/Update/Controller/UpdateController.php
View File

@ -12,9 +12,9 @@
namespace Flarum\Update\Controller;
use Exception;
use Flarum\Database\Console\MigrateCommand;
use Flarum\Foundation\Application;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Database\Console\MigrateCommand;
use Psr\Http\Message\ServerRequestInterface as Request;
use Symfony\Component\Console\Input\StringInput;
use Symfony\Component\Console\Output\StreamOutput;

2
framework/core/src/Update/UpdateServiceProvider.php
View File

@ -12,8 +12,8 @@
namespace Flarum\Update;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory;
class UpdateServiceProvider extends AbstractServiceProvider
{

2
framework/core/src/User/AuthToken.php
View File

@ -12,8 +12,8 @@
namespace Flarum\User;
use DateTime;
use Flarum\User\Exception\InvalidConfirmationTokenException;
use Flarum\Database\AbstractModel;
use Flarum\User\Exception\InvalidConfirmationTokenException;
/**
* @todo document database columns with @property

2
framework/core/src/User/Command/UploadAvatarHandler.php
View File

@ -16,8 +16,8 @@ use Flarum\Event\AvatarWillBeSaved;
use Flarum\Foundation\Application;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\UserRepository;
use Flarum\User\AvatarValidator;
use Flarum\User\UserRepository;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Str;
use Intervention\Image\ImageManager;

4
framework/core/src/User/EmailConfirmationMailer.php
View File

@ -11,10 +11,10 @@
namespace Flarum\User;
use Flarum\User\Event\EmailChangeRequested;
use Flarum\User\Event\Registered;
use Flarum\Forum\UrlGenerator;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\Event\EmailChangeRequested;
use Flarum\User\Event\Registered;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Mail\Message;

2
framework/core/src/User/EmailToken.php
View File

@ -12,8 +12,8 @@
namespace Flarum\User;
use DateTime;
use Flarum\User\Exception\InvalidConfirmationTokenException;
use Flarum\Database\AbstractModel;
use Flarum\User\Exception\InvalidConfirmationTokenException;
/**
* @todo document database columns with @property

2
framework/core/src/User/Event/LoggedIn.php
View File

@ -11,8 +11,8 @@
namespace Flarum\User\Event;
use Flarum\User\User;
use Flarum\Http\AccessToken;
use Flarum\User\User;
class LoggedIn
{

4
framework/core/src/User/Search/UserSearcher.php
View File

@ -11,12 +11,12 @@
namespace Flarum\User\Search;
use Flarum\User\UserRepository;
use Flarum\Event\ConfigureUserSearch;
use Flarum\Search\ApplySearchParametersTrait;
use Flarum\Search\GambitManager;
use Flarum\Search\SearchCriteria;
use Flarum\Search\SearchResults;
use Flarum\Event\ConfigureUserSearch;
use Flarum\User\UserRepository;
/**
* Takes a UserSearchCriteria object, performs a search using gambits,

22
framework/core/src/User/User.php
View File

@ -12,26 +12,26 @@
namespace Flarum\User;
use DomainException;
use Flarum\Group\Group;
use Flarum\Notification\Notification;
use Flarum\Group\Permission;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Database\AbstractModel;
use Flarum\Database\ScopeVisibilityTrait;
use Flarum\Event\CheckUserPassword;
use Flarum\Event\ConfigureUserPreferences;
use Flarum\Post\Event\Deleted as PostDeleted;
use Flarum\Event\PrepareUserGroups;
use Flarum\Foundation\Application;
use Flarum\Foundation\EventGeneratorTrait;
use Flarum\Group\Group;
use Flarum\Group\Permission;
use Flarum\Notification\Notification;
use Flarum\Post\Event\Deleted as PostDeleted;
use Flarum\User\Event\Activated;
use Flarum\User\Event\AvatarChanged;
use Flarum\User\Event\BioChanged;
use Flarum\User\Event\EmailChangeRequested;
use Flarum\User\Event\EmailChanged;
use Flarum\User\Event\PasswordChanged;
use Flarum\User\Event\Activated;
use Flarum\User\Event\Deleted;
use Flarum\User\Event\EmailChanged;
use Flarum\User\Event\EmailChangeRequested;
use Flarum\User\Event\PasswordChanged;
use Flarum\User\Event\Registered;
use Flarum\User\Event\Renamed;
use Flarum\Foundation\Application;
use Illuminate\Contracts\Hashing\Hasher;
use Symfony\Component\HttpFoundation\Session\SessionInterface;

1
framework/core/src/User/UserPolicy.php
View File

@ -11,7 +11,6 @@
namespace Flarum\User;
use Flarum\User\AbstractPolicy;
use Illuminate\Database\Eloquent\Builder;
class UserPolicy extends AbstractPolicy