From 4d8f23b215feb309c47fa38ad10d6bc2b26b45cd Mon Sep 17 00:00:00 2001 From: Rob D <036@users.noreply.github.com> Date: Mon, 2 Oct 2017 11:12:48 +0100 Subject: [PATCH] Updated Controllers import to adhere to extended coding style guide (#309) * Updated Controllers import to adhere to extended coding style guide Updated the controllers namespacing import to adhere to PHP FIG Extended Coding Style Guide * Updated classes to follow extended coding style guide for imports --- app/Captcha/CaptchaRecaptcha.php | 5 +-- app/Console/Commands/RecountCommand.php | 7 ++-- app/Console/Commands/TaskMakeCommand.php | 5 +-- app/Database/Models/Conversation.php | 5 +-- app/Database/Models/Forum.php | 5 +-- ...ConversationMessageRepositoryInterface.php | 5 +-- .../ConversationRepositoryInterface.php | 10 +++--- .../Decorators/Forum/CachingDecorator.php | 6 ++-- .../ConversationMessageRepository.php | 10 +++--- .../Eloquent/ConversationRepository.php | 15 +++++---- .../Repositories/Eloquent/ForumRepository.php | 6 ++-- .../ModerationLogSubjectRepository.php | 5 +-- .../Repositories/Eloquent/PollRepository.php | 10 +++--- .../Eloquent/PollVoteRepository.php | 6 ++-- .../Repositories/Eloquent/PostRepository.php | 11 ++++--- .../Eloquent/ProfileFieldOptionRepository.php | 5 +-- .../Eloquent/ProfileFieldRepository.php | 5 +-- .../Repositories/Eloquent/TasksRepository.php | 5 +-- .../Repositories/Eloquent/TopicRepository.php | 14 ++++---- .../Eloquent/UserProfileFieldRepository.php | 7 ++-- .../Repositories/ForumRepositoryInterface.php | 6 ++-- ...oderationLogSubjectRepositoryInterface.php | 5 +-- .../Repositories/PollRepositoryInterface.php | 5 +-- .../PollVoteRepositoryInterface.php | 6 ++-- .../Repositories/PostRepositoryInterface.php | 5 +-- .../ProfileFieldOptionRepositoryInterface.php | 5 +-- .../ProfileFieldRepositoryInterface.php | 5 +-- .../Repositories/TopicRepositoryInterface.php | 6 ++-- .../UserProfileFieldRepositoryInterface.php | 7 ++-- app/Http/Controllers/AccountController.php | 16 ++++------ .../Admin/Forums/ForumsController.php | 5 +-- .../Admin/Settings/SettingsController.php | 5 +-- .../Admin/Users/ProfileFieldController.php | 13 ++++---- .../Admin/Users/UserController.php | 10 +++--- .../Controllers/ConversationsController.php | 22 +++++++------ app/Http/Controllers/ForumController.php | 7 ++-- app/Http/Controllers/ModerationController.php | 16 ++++++---- app/Http/Controllers/PollController.php | 16 ++++------ app/Http/Controllers/PostController.php | 5 +-- app/Http/Controllers/SearchController.php | 10 +++--- app/Http/Controllers/TopicController.php | 23 ++++++------- app/Http/Controllers/UserController.php | 6 ++-- app/Http/Controllers/WarningsController.php | 19 ++++++----- .../Requests/Account/UpdateProfileRequest.php | 5 +-- .../Requests/Moderation/ModerationRequest.php | 8 ++--- app/Moderation/Logger/DatabaseLogger.php | 5 +-- app/Permissions/PermissionChecker.php | 11 ++++--- app/Presenters/ConversationPresenter.php | 5 +-- app/Presenters/ForumPresenter.php | 7 ++-- app/Presenters/ModerationLogPresenter.php | 10 +++--- .../Moderations/MovePostPresenter.php | 5 +-- app/Presenters/PostPresenter.php | 5 +-- app/Presenters/ProfileFieldPresenter.php | 10 +++--- app/Presenters/UserPresenter.php | 13 ++++---- app/Services/TopicDeleter.php | 6 ++-- app/Tasking/ScheduleManager.php | 4 ++- app/Tasking/ServiceProvider.php | 5 +-- ...5_193903_add_options_to_settings_table.php | 32 +++++++++++++++++++ 58 files changed, 281 insertions(+), 220 deletions(-) create mode 100644 database/migrations/2017_02_15_193903_add_options_to_settings_table.php diff --git a/app/Captcha/CaptchaRecaptcha.php b/app/Captcha/CaptchaRecaptcha.php index 10db2c0c..955d7fb1 100644 --- a/app/Captcha/CaptchaRecaptcha.php +++ b/app/Captcha/CaptchaRecaptcha.php @@ -8,8 +8,9 @@ namespace MyBB\Core\Captcha; -use Greggilbert\Recaptcha\Recaptcha; -use Greggilbert\Recaptcha\Service\CheckRecaptcha; +use Greggilbert\Recaptcha\{ + Recaptcha, Service\CheckRecaptcha +}; use Illuminate\Config\Repository; use Illuminate\Http\Request; use MyBB\Settings\Store; diff --git a/app/Console/Commands/RecountCommand.php b/app/Console/Commands/RecountCommand.php index d9e6a067..74e71d0c 100644 --- a/app/Console/Commands/RecountCommand.php +++ b/app/Console/Commands/RecountCommand.php @@ -10,10 +10,9 @@ use Illuminate\Console\Command; use Illuminate\Contracts\Cache\Repository as CacheRepository; -use MyBB\Core\Database\Models\Forum; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Models\User; +use MyBB\Core\Database\Models\{ + Forum, Post, Topic, User +}; use Symfony\Component\Console\Input\InputOption; class RecountCommand extends Command diff --git a/app/Console/Commands/TaskMakeCommand.php b/app/Console/Commands/TaskMakeCommand.php index e38ed381..c77f7096 100644 --- a/app/Console/Commands/TaskMakeCommand.php +++ b/app/Console/Commands/TaskMakeCommand.php @@ -4,8 +4,9 @@ use Illuminate\Console\GeneratorCommand; use Illuminate\Filesystem\Filesystem; -use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\{ + InputOption, InputArgument +}; use MyBB\Core\Database\Repositories\TasksRepositoryInterface; class TaskMakeCommand extends GeneratorCommand diff --git a/app/Database/Models/Conversation.php b/app/Database/Models/Conversation.php index e03bd2b7..a8b126e3 100644 --- a/app/Database/Models/Conversation.php +++ b/app/Database/Models/Conversation.php @@ -8,8 +8,9 @@ namespace MyBB\Core\Database\Models; -use Illuminate\Database\Eloquent\Collection; -use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\{ + Collection, Model +}; use McCool\LaravelAutoPresenter\HasPresenter; use MyBB\Core\Presenters\ConversationPresenter; diff --git a/app/Database/Models/Forum.php b/app/Database/Models/Forum.php index 2af280e7..0c6a0715 100644 --- a/app/Database/Models/Forum.php +++ b/app/Database/Models/Forum.php @@ -13,8 +13,9 @@ use Illuminate\Database\Eloquent\Model; use McCool\LaravelAutoPresenter\HasPresenter; use MyBB\Core\Content\ContentInterface; -use MyBB\Core\Moderation\Moderations\CloseableInterface; -use MyBB\Core\Moderation\Moderations\StickableInterface; +use MyBB\Core\Moderation\Moderations\{ + CloseableInterface, StickableInterface +}; use MyBB\Core\Permissions\Interfaces\InheritPermissionInterface; use MyBB\Core\Permissions\Traits\InheritPermissionableTrait; use MyBB\Core\Presenters\ForumPresenter; diff --git a/app/Database/Repositories/ConversationMessageRepositoryInterface.php b/app/Database/Repositories/ConversationMessageRepositoryInterface.php index e8d6d901..fda9e3ac 100644 --- a/app/Database/Repositories/ConversationMessageRepositoryInterface.php +++ b/app/Database/Repositories/ConversationMessageRepositoryInterface.php @@ -11,8 +11,9 @@ namespace MyBB\Core\Database\Repositories; use Illuminate\Contracts\Pagination\Paginator; -use MyBB\Core\Database\Models\Conversation; -use MyBB\Core\Database\Models\ConversationMessage; +use MyBB\Core\Database\Models\{ + Conversation, ConversationMessage +}; interface ConversationMessageRepositoryInterface { diff --git a/app/Database/Repositories/ConversationRepositoryInterface.php b/app/Database/Repositories/ConversationRepositoryInterface.php index 24000779..14595243 100644 --- a/app/Database/Repositories/ConversationRepositoryInterface.php +++ b/app/Database/Repositories/ConversationRepositoryInterface.php @@ -11,10 +11,12 @@ namespace MyBB\Core\Database\Repositories; use Illuminate\Database\Eloquent\Collection; -use MyBB\Core\Database\Models\Conversation; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Exceptions\ConversationAlreadyParticipantException; -use MyBB\Core\Exceptions\ConversationCantSendToSelfException; +use MyBB\Core\Database\Models\{ + Conversation, User +}; +use MyBB\Core\Exceptions\{ + ConversationAlreadyParticipantException, ConversationCantSendToSelfException +}; interface ConversationRepositoryInterface { diff --git a/app/Database/Repositories/Decorators/Forum/CachingDecorator.php b/app/Database/Repositories/Decorators/Forum/CachingDecorator.php index c6b5ee4d..55f57967 100644 --- a/app/Database/Repositories/Decorators/Forum/CachingDecorator.php +++ b/app/Database/Repositories/Decorators/Forum/CachingDecorator.php @@ -13,9 +13,9 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Cache\Repository as CacheRepository; use Illuminate\Database\Eloquent\Collection; -use MyBB\Core\Database\Models\Forum; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; +use MyBB\Core\Database\Models\{ + Forum, Post, Topic +}; use MyBB\Core\Database\Repositories\ForumRepositoryInterface; use MyBB\Core\Permissions\PermissionChecker; diff --git a/app/Database/Repositories/Eloquent/ConversationMessageRepository.php b/app/Database/Repositories/Eloquent/ConversationMessageRepository.php index afd89378..885aa81c 100644 --- a/app/Database/Repositories/Eloquent/ConversationMessageRepository.php +++ b/app/Database/Repositories/Eloquent/ConversationMessageRepository.php @@ -11,10 +11,12 @@ namespace MyBB\Core\Database\Repositories\Eloquent; use Illuminate\Contracts\Pagination\Paginator; -use MyBB\Core\Database\Models\Conversation; -use MyBB\Core\Database\Models\ConversationMessage; -use MyBB\Core\Database\Repositories\ConversationMessageRepositoryInterface; -use MyBB\Core\Database\Repositories\UserRepositoryInterface; +use MyBB\Core\Database\Models\{ + Conversation, ConversationMessage +}; +use MyBB\Core\Database\Repositories\{ + ConversationMessageRepositoryInterface, UserRepositoryInterface +}; use MyBB\Parser\Parser; use MyBB\Settings\Store; diff --git a/app/Database/Repositories/Eloquent/ConversationRepository.php b/app/Database/Repositories/Eloquent/ConversationRepository.php index 54fa34aa..3fa0bfa7 100644 --- a/app/Database/Repositories/Eloquent/ConversationRepository.php +++ b/app/Database/Repositories/Eloquent/ConversationRepository.php @@ -13,12 +13,15 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Database\DatabaseManager; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\Conversation; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Repositories\ConversationMessageRepositoryInterface; -use MyBB\Core\Database\Repositories\ConversationRepositoryInterface; -use MyBB\Core\Exceptions\ConversationAlreadyParticipantException; -use MyBB\Core\Exceptions\ConversationCantSendToSelfException; +use MyBB\Core\Database\Models\{ + Conversation, User +}; +use MyBB\Core\Database\Repositories\{ + ConversationMessageRepositoryInterface, ConversationRepositoryInterface +}; +use MyBB\Core\Exceptions\{ + ConversationAlreadyParticipantException, ConversationCantSendToSelfException +}; use MyBB\Settings\Store; class ConversationRepository implements ConversationRepositoryInterface diff --git a/app/Database/Repositories/Eloquent/ForumRepository.php b/app/Database/Repositories/Eloquent/ForumRepository.php index 9f90cb5e..77fe62c8 100644 --- a/app/Database/Repositories/Eloquent/ForumRepository.php +++ b/app/Database/Repositories/Eloquent/ForumRepository.php @@ -11,9 +11,9 @@ namespace MyBB\Core\Database\Repositories\Eloquent; use Illuminate\Database\DatabaseManager; -use MyBB\Core\Database\Models\Forum; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; +use MyBB\Core\Database\Models\{ + Forum, Post, Topic +}; use MyBB\Core\Database\Repositories\ForumRepositoryInterface; use MyBB\Core\Permissions\PermissionChecker; diff --git a/app/Database/Repositories/Eloquent/ModerationLogSubjectRepository.php b/app/Database/Repositories/Eloquent/ModerationLogSubjectRepository.php index e05e4b74..9d9e9f4b 100644 --- a/app/Database/Repositories/Eloquent/ModerationLogSubjectRepository.php +++ b/app/Database/Repositories/Eloquent/ModerationLogSubjectRepository.php @@ -10,8 +10,9 @@ use Illuminate\Database\Eloquent\Model; use MyBB\Core\Content\ContentInterface; -use MyBB\Core\Database\Models\ModerationLog; -use MyBB\Core\Database\Models\ModerationLogSubject; +use MyBB\Core\Database\Models\{ + ModerationLog, ModerationLogSubject +}; use MyBB\Core\Database\Repositories\ModerationLogSubjectRepositoryInterface; class ModerationLogSubjectRepository implements ModerationLogSubjectRepositoryInterface diff --git a/app/Database/Repositories/Eloquent/PollRepository.php b/app/Database/Repositories/Eloquent/PollRepository.php index 393a28c1..962d98dd 100644 --- a/app/Database/Repositories/Eloquent/PollRepository.php +++ b/app/Database/Repositories/Eloquent/PollRepository.php @@ -12,10 +12,12 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Database\DatabaseManager; -use MyBB\Core\Database\Models\Poll; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Repositories\PollRepositoryInterface; -use MyBB\Core\Database\Repositories\PollVoteRepositoryInterface; +use MyBB\Core\Database\Models\{ + Poll, Topic +}; +use MyBB\Core\Database\Repositories\{ + PollRepositoryInterface, PollVoteRepositoryInterface +}; class PollRepository implements PollRepositoryInterface { diff --git a/app/Database/Repositories/Eloquent/PollVoteRepository.php b/app/Database/Repositories/Eloquent/PollVoteRepository.php index ab2625ca..d812b0ad 100644 --- a/app/Database/Repositories/Eloquent/PollVoteRepository.php +++ b/app/Database/Repositories/Eloquent/PollVoteRepository.php @@ -11,9 +11,9 @@ namespace MyBB\Core\Database\Repositories\Eloquent; use Illuminate\Contracts\Auth\Guard; -use MyBB\Core\Database\Models\Poll; -use MyBB\Core\Database\Models\PollVote; -use MyBB\Core\Database\Models\User; +use MyBB\Core\Database\Models\{ + Poll, PollVote, User +}; use MyBB\Core\Database\Repositories\PollVoteRepositoryInterface; class PollVoteRepository implements PollVoteRepositoryInterface diff --git a/app/Database/Repositories/Eloquent/PostRepository.php b/app/Database/Repositories/Eloquent/PostRepository.php index bf33860d..eb116f3e 100644 --- a/app/Database/Repositories/Eloquent/PostRepository.php +++ b/app/Database/Repositories/Eloquent/PostRepository.php @@ -12,11 +12,12 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PostRepositoryInterface; +use MyBB\Core\Database\Models\{ + Post, Topic, User +}; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, PostRepositoryInterface +}; use MyBB\Core\Likes\Database\Repositories\LikesRepositoryInterface; use MyBB\Core\Permissions\PermissionChecker; use MyBB\Parser\Parser; diff --git a/app/Database/Repositories/Eloquent/ProfileFieldOptionRepository.php b/app/Database/Repositories/Eloquent/ProfileFieldOptionRepository.php index ad077e81..e0142f8a 100644 --- a/app/Database/Repositories/Eloquent/ProfileFieldOptionRepository.php +++ b/app/Database/Repositories/Eloquent/ProfileFieldOptionRepository.php @@ -9,8 +9,9 @@ namespace MyBB\Core\Database\Repositories\Eloquent; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Models\ProfileFieldOption; +use MyBB\Core\Database\Models\{ + ProfileField, ProfileFieldOption +}; use MyBB\Core\Database\Repositories\ProfileFieldOptionRepositoryInterface; class ProfileFieldOptionRepository implements ProfileFieldOptionRepositoryInterface diff --git a/app/Database/Repositories/Eloquent/ProfileFieldRepository.php b/app/Database/Repositories/Eloquent/ProfileFieldRepository.php index 8af80dc7..358a254b 100644 --- a/app/Database/Repositories/Eloquent/ProfileFieldRepository.php +++ b/app/Database/Repositories/Eloquent/ProfileFieldRepository.php @@ -9,8 +9,9 @@ namespace MyBB\Core\Database\Repositories\Eloquent; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Models\ProfileFieldGroup; +use MyBB\Core\Database\Models\{ + ProfileField, ProfileFieldGroup +}; use Mybb\Core\Database\Repositories\ProfileFieldRepositoryInterface; class ProfileFieldRepository implements ProfileFieldRepositoryInterface diff --git a/app/Database/Repositories/Eloquent/TasksRepository.php b/app/Database/Repositories/Eloquent/TasksRepository.php index 06f6ca37..2e2bdc40 100644 --- a/app/Database/Repositories/Eloquent/TasksRepository.php +++ b/app/Database/Repositories/Eloquent/TasksRepository.php @@ -10,8 +10,9 @@ use Illuminate\Support\Collection; use Illuminate\Contracts\Pagination\Paginator; -use MyBB\Core\Database\Models\Task; -use MyBB\Core\Database\Models\TaskLog; +use MyBB\Core\Database\Models\{ + Task, TaskLog +}; use MyBB\Core\Database\Repositories\TasksRepositoryInterface; use Cron\CronExpression; diff --git a/app/Database/Repositories/Eloquent/TopicRepository.php b/app/Database/Repositories/Eloquent/TopicRepository.php index 538bb1bf..586ec4a9 100644 --- a/app/Database/Repositories/Eloquent/TopicRepository.php +++ b/app/Database/Repositories/Eloquent/TopicRepository.php @@ -13,14 +13,12 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Database\DatabaseManager; use Illuminate\Support\Str; -use MyBB\Core\Database\Models\Forum; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PollRepositoryInterface; -use MyBB\Core\Database\Repositories\PostRepositoryInterface; -use MyBB\Core\Database\Repositories\TopicRepositoryInterface; +use MyBB\Core\Database\Models\{ + Forum, Post, Topic, User +}; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, PollRepositoryInterface, PostRepositoryInterface, TopicRepositoryInterface +}; use MyBB\Core\Permissions\PermissionChecker; use MyBB\Settings\Store; diff --git a/app/Database/Repositories/Eloquent/UserProfileFieldRepository.php b/app/Database/Repositories/Eloquent/UserProfileFieldRepository.php index 3b2aec1c..7600ba0f 100644 --- a/app/Database/Repositories/Eloquent/UserProfileFieldRepository.php +++ b/app/Database/Repositories/Eloquent/UserProfileFieldRepository.php @@ -10,10 +10,9 @@ use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Models\ProfileFieldGroup; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Models\UserProfileField; +use MyBB\Core\Database\Models\{ + ProfileField, ProfileFieldGroup, User, UserProfileField +}; use MyBB\Core\Database\Repositories\UserProfileFieldRepositoryInterface; class UserProfileFieldRepository implements UserProfileFieldRepositoryInterface diff --git a/app/Database/Repositories/ForumRepositoryInterface.php b/app/Database/Repositories/ForumRepositoryInterface.php index 867e6bd1..326c34f9 100644 --- a/app/Database/Repositories/ForumRepositoryInterface.php +++ b/app/Database/Repositories/ForumRepositoryInterface.php @@ -11,9 +11,9 @@ namespace MyBB\Core\Database\Repositories; use Doctrine\Common\Collections\Collection; -use MyBB\Core\Database\Models\Forum; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; +use MyBB\Core\Database\Models\{ + Forum, Post, Topic +}; interface ForumRepositoryInterface { diff --git a/app/Database/Repositories/ModerationLogSubjectRepositoryInterface.php b/app/Database/Repositories/ModerationLogSubjectRepositoryInterface.php index 29f42929..48f15411 100644 --- a/app/Database/Repositories/ModerationLogSubjectRepositoryInterface.php +++ b/app/Database/Repositories/ModerationLogSubjectRepositoryInterface.php @@ -9,8 +9,9 @@ namespace MyBB\Core\Database\Repositories; use MyBB\Core\Content\ContentInterface; -use MyBB\Core\Database\Models\ModerationLog; -use MyBB\Core\Database\Models\ModerationLogSubject; +use MyBB\Core\Database\Models\{ + ModerationLog, ModerationLogSubject +}; interface ModerationLogSubjectRepositoryInterface extends RepositoryInterface { diff --git a/app/Database/Repositories/PollRepositoryInterface.php b/app/Database/Repositories/PollRepositoryInterface.php index a4d21a24..b32ef34e 100644 --- a/app/Database/Repositories/PollRepositoryInterface.php +++ b/app/Database/Repositories/PollRepositoryInterface.php @@ -10,8 +10,9 @@ namespace MyBB\Core\Database\Repositories; -use MyBB\Core\Database\Models\Poll; -use MyBB\Core\Database\Models\Topic; +use MyBB\Core\Database\Models\{ + Poll, Topic +}; interface PollRepositoryInterface { diff --git a/app/Database/Repositories/PollVoteRepositoryInterface.php b/app/Database/Repositories/PollVoteRepositoryInterface.php index a7afc271..ce2e9ac7 100644 --- a/app/Database/Repositories/PollVoteRepositoryInterface.php +++ b/app/Database/Repositories/PollVoteRepositoryInterface.php @@ -10,9 +10,9 @@ namespace MyBB\Core\Database\Repositories; -use MyBB\Core\Database\Models\Poll; -use MyBB\Core\Database\Models\PollVote; -use MyBB\Core\Database\Models\User; +use MyBB\Core\Database\Models\{ + Poll, PollVote, User +}; interface PollVoteRepositoryInterface { diff --git a/app/Database/Repositories/PostRepositoryInterface.php b/app/Database/Repositories/PostRepositoryInterface.php index 9962ef25..c22535a4 100644 --- a/app/Database/Repositories/PostRepositoryInterface.php +++ b/app/Database/Repositories/PostRepositoryInterface.php @@ -10,8 +10,9 @@ namespace MyBB\Core\Database\Repositories; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; +use MyBB\Core\Database\Models\{ + Post, Topic +}; interface PostRepositoryInterface { diff --git a/app/Database/Repositories/ProfileFieldOptionRepositoryInterface.php b/app/Database/Repositories/ProfileFieldOptionRepositoryInterface.php index 55607c26..750a096b 100644 --- a/app/Database/Repositories/ProfileFieldOptionRepositoryInterface.php +++ b/app/Database/Repositories/ProfileFieldOptionRepositoryInterface.php @@ -8,8 +8,9 @@ namespace MyBB\Core\Database\Repositories; -use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Models\ProfileFieldOption; +use MyBB\Core\Database\Models\{ + ProfileField, ProfileFieldOption +}; interface ProfileFieldOptionRepositoryInterface { diff --git a/app/Database/Repositories/ProfileFieldRepositoryInterface.php b/app/Database/Repositories/ProfileFieldRepositoryInterface.php index c206e750..fc998774 100644 --- a/app/Database/Repositories/ProfileFieldRepositoryInterface.php +++ b/app/Database/Repositories/ProfileFieldRepositoryInterface.php @@ -9,8 +9,9 @@ namespace MyBB\Core\Database\Repositories; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Models\ProfileFieldGroup; +use MyBB\Core\Database\Models\{ + ProfileField, ProfileFieldGroup +}; interface ProfileFieldRepositoryInterface { diff --git a/app/Database/Repositories/TopicRepositoryInterface.php b/app/Database/Repositories/TopicRepositoryInterface.php index 730cdf33..038c51fe 100644 --- a/app/Database/Repositories/TopicRepositoryInterface.php +++ b/app/Database/Repositories/TopicRepositoryInterface.php @@ -10,9 +10,9 @@ namespace MyBB\Core\Database\Repositories; -use MyBB\Core\Database\Models\Forum; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; +use MyBB\Core\Database\Models\{ + Forum, Post, Topic +}; interface TopicRepositoryInterface { diff --git a/app/Database/Repositories/UserProfileFieldRepositoryInterface.php b/app/Database/Repositories/UserProfileFieldRepositoryInterface.php index 8ad2baa7..7eb12f3d 100644 --- a/app/Database/Repositories/UserProfileFieldRepositoryInterface.php +++ b/app/Database/Repositories/UserProfileFieldRepositoryInterface.php @@ -9,10 +9,9 @@ namespace MyBB\Core\Database\Repositories; use Illuminate\Support\Collection; -use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Models\ProfileFieldGroup; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Models\UserProfileField; +use MyBB\Core\Database\Models\{ + ProfileField, ProfileFieldGroup, User, UserProfileField +}; interface UserProfileFieldRepositoryInterface { diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index d39547ba..71ebc0d9 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -13,17 +13,13 @@ use Illuminate\Hashing\BcryptHasher; use Illuminate\Http\Request; use Illuminate\Translation\Translator; -use MyBB\Core\Database\Repositories\ProfileFieldGroupRepositoryInterface; -use MyBB\Core\Database\Repositories\UserProfileFieldRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ProfileFieldGroupRepositoryInterface, UserProfileFieldRepositoryInterface +}; use MyBB\Settings\Repositories\SettingRepositoryInterface; -use MyBB\Core\Http\Requests\Account\CropAvatarRequest; -use MyBB\Core\Http\Requests\Account\UpdateAvatarRequest; -use MyBB\Core\Http\Requests\Account\UpdateEmailRequest; -use MyBB\Core\Http\Requests\Account\UpdatePasswordRequest; -use MyBB\Core\Http\Requests\Account\UpdatePreferencesRequest; -use MyBB\Core\Http\Requests\Account\UpdatePrivacyRequest; -use MyBB\Core\Http\Requests\Account\UpdateProfileRequest; -use MyBB\Core\Http\Requests\Account\UpdateUsernameRequest; +use MyBB\Core\Http\Requests\Account\{ + CropAvatarRequest, UpdateAvatarRequest, UpdateEmailRequest, UpdatePasswordRequest, UpdatePreferencesRequest, UpdatePrivacyRequest, UpdateProfileRequest, UpdateUsernameRequest +}; use MyBB\Core\Services\ConfirmationManager; use MyBB\Settings\Store; diff --git a/app/Http/Controllers/Admin/Forums/ForumsController.php b/app/Http/Controllers/Admin/Forums/ForumsController.php index ea268b08..621d2245 100644 --- a/app/Http/Controllers/Admin/Forums/ForumsController.php +++ b/app/Http/Controllers/Admin/Forums/ForumsController.php @@ -10,8 +10,9 @@ use Illuminate\Http\Request; use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\TopicRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, TopicRepositoryInterface +}; use MyBB\Core\Exceptions\ForumNotFoundException; use MyBB\Core\Http\Controllers\Admin\AdminController; use MyBB\Core\Http\Requests\Forums\CreateForumRequest; diff --git a/app/Http/Controllers/Admin/Settings/SettingsController.php b/app/Http/Controllers/Admin/Settings/SettingsController.php index 3594d9d7..725867d2 100644 --- a/app/Http/Controllers/Admin/Settings/SettingsController.php +++ b/app/Http/Controllers/Admin/Settings/SettingsController.php @@ -10,8 +10,9 @@ use Illuminate\Http\Request; use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\RoleRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, RoleRepositoryInterface +}; use MyBB\Core\Exceptions\SettingNotFoundException; use MyBB\Core\Http\Controllers\Admin\AdminController; use MyBB\Settings\Repositories\SettingRepositoryInterface; diff --git a/app/Http/Controllers/Admin/Users/ProfileFieldController.php b/app/Http/Controllers/Admin/Users/ProfileFieldController.php index e2b3ed13..99e573e8 100644 --- a/app/Http/Controllers/Admin/Users/ProfileFieldController.php +++ b/app/Http/Controllers/Admin/Users/ProfileFieldController.php @@ -10,14 +10,13 @@ use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; use Illuminate\Http\Request; -use MyBB\Core\Database\Repositories\ProfileFieldGroupRepositoryInterface; -use MyBB\Core\Database\Repositories\ProfileFieldOptionRepositoryInterface; -use MyBB\Core\Database\Repositories\ProfileFieldRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ProfileFieldGroupRepositoryInterface, ProfileFieldOptionRepositoryInterface, ProfileFieldRepositoryInterface +}; use MyBB\Core\Http\Controllers\Admin\AdminController; -use MyBB\Core\Http\Requests\ProfileField\SaveProfileFieldGroupRequest; -use MyBB\Core\Http\Requests\ProfileField\SaveProfileFieldOptionRequest; -use MyBB\Core\Http\Requests\ProfileField\SaveProfileFieldRequest; -use MyBB\Core\Http\Requests\ProfileField\TestSubmitRequest; +use MyBB\Core\Http\Requests\ProfileField\{ + SaveProfileFieldGroupRequest, SaveProfileFieldOptionRequest, SaveProfileFieldRequest, TestSubmitRequest +}; class ProfileFieldController extends AdminController { diff --git a/app/Http/Controllers/Admin/Users/UserController.php b/app/Http/Controllers/Admin/Users/UserController.php index 9d1f4164..aa859757 100644 --- a/app/Http/Controllers/Admin/Users/UserController.php +++ b/app/Http/Controllers/Admin/Users/UserController.php @@ -10,11 +10,13 @@ use Illuminate\Http\Request; use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; -use MyBB\Core\Database\Repositories\UserRepositoryInterface; -use MyBB\Core\Database\Repositories\RoleRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + UserRepositoryInterface, RoleRepositoryInterface +}; use MyBB\Core\Http\Controllers\Admin\AdminController; -use MyBB\Core\Http\Requests\User\CreateRequest; -use MyBB\Core\Http\Requests\User\SaveUserRequest; +use MyBB\Core\Http\Requests\User\{ + CreateRequest, SaveUserRequest +}; class UserController extends AdminController { diff --git a/app/Http/Controllers/ConversationsController.php b/app/Http/Controllers/ConversationsController.php index dfc5743f..299226dd 100644 --- a/app/Http/Controllers/ConversationsController.php +++ b/app/Http/Controllers/ConversationsController.php @@ -15,16 +15,18 @@ use Breadcrumbs; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; -use MyBB\Core\Database\Models\Conversation; -use MyBB\Core\Database\Models\ConversationMessage; -use MyBB\Core\Database\Repositories\ConversationMessageRepositoryInterface; -use MyBB\Core\Database\Repositories\ConversationRepositoryInterface; -use MyBB\Core\Exceptions\ConversationAlreadyParticipantException; -use MyBB\Core\Exceptions\ConversationCantSendToSelfException; -use MyBB\Core\Exceptions\ConversationNotFoundException; -use MyBB\Core\Http\Requests\Conversations\CreateRequest; -use MyBB\Core\Http\Requests\Conversations\ParticipantRequest; -use MyBB\Core\Http\Requests\Conversations\ReplyRequest; +use MyBB\Core\Database\Models\{ + Conversation, ConversationMessage +}; +use MyBB\Core\Database\Repositories\{ + ConversationMessageRepositoryInterface, ConversationRepositoryInterface +}; +use MyBB\Core\Exceptions\{ + ConversationAlreadyParticipantException, ConversationCantSendToSelfException, ConversationNotFoundException +}; +use MyBB\Core\Http\Requests\Conversations\{ + CreateRequest, ParticipantRequest, ReplyRequest +}; use MyBB\Parser\Parser; use MyBB\Settings\Store; diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index b8429792..35120eac 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -10,10 +10,9 @@ use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; use Illuminate\Http\Request; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PostRepositoryInterface; -use MyBB\Core\Database\Repositories\TopicRepositoryInterface; -use MyBB\Core\Database\Repositories\UserRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, PostRepositoryInterface, TopicRepositoryInterface, UserRepositoryInterface +}; use MyBB\Core\Exceptions\ForumNotFoundException; use MyBB\Settings\Store; diff --git a/app/Http/Controllers/ModerationController.php b/app/Http/Controllers/ModerationController.php index 241c6e36..a45165f8 100644 --- a/app/Http/Controllers/ModerationController.php +++ b/app/Http/Controllers/ModerationController.php @@ -3,13 +3,15 @@ namespace MyBB\Core\Http\Controllers; use Illuminate\Contracts\Auth\Guard; -use MyBB\Core\Database\Models\ModerationLog; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Http\Requests\Moderation\ModerationRequest; -use MyBB\Core\Http\Requests\Moderation\ReversibleModerationRequest; -use MyBB\Core\Moderation\ArrayModerationInterface; -use MyBB\Core\Moderation\Logger\ModerationLoggerInterface; +use MyBB\Core\Database\Models\{ + ModerationLog, Post, Topic +}; +use MyBB\Core\Http\Requests\Moderation\{ + ModerationRequest, ReversibleModerationRequest +}; +use MyBB\Core\Moderation\{ + ArrayModerationInterface, Logger\ModerationLoggerInterface +}; class ModerationController extends AbstractController { diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php index ea651bc2..85138883 100644 --- a/app/Http/Controllers/PollController.php +++ b/app/Http/Controllers/PollController.php @@ -14,16 +14,12 @@ use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; use Illuminate\Contracts\Auth\Guard; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PollRepositoryInterface; -use MyBB\Core\Database\Repositories\PollVoteRepositoryInterface; -use MyBB\Core\Database\Repositories\TopicRepositoryInterface; -use MyBB\Core\Exceptions\PollAlreadyVotedException; -use MyBB\Core\Exceptions\PollClosedException; -use MyBB\Core\Exceptions\PollNoGuestUndoException; -use MyBB\Core\Exceptions\PollNotFoundException; -use MyBB\Core\Exceptions\PollNoUndoException; -use MyBB\Core\Exceptions\TopicNotFoundException; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, PollRepositoryInterface, PollVoteRepositoryInterface, TopicRepositoryInterface +}; +use MyBB\Core\Exceptions\{ + PollAlreadyVotedException, PollClosedException, PollNoGuestUndoException, PollNotFoundException, PollNoUndoException, TopicNotFoundException +}; use MyBB\Core\Http\Requests\Poll\CreateRequest; class PollController extends AbstractController diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php index 4ca90d53..b420d1a4 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -14,8 +14,9 @@ use MyBB\Core\Database\Repositories\PostRepositoryInterface; use MyBB\Core\Exceptions\PostNotFoundException; -use MyBB\Core\Http\Requests\Post\LikePostRequest; -use MyBB\Core\Http\Requests\Post\QuotePostRequest; +use MyBB\Core\Http\Requests\Post\{ + LikePostRequest, QuotePostRequest +}; use MyBB\Core\Likes\Database\Repositories\LikesRepositoryInterface; use MyBB\Core\Renderers\Post\Quote\QuoteInterface as QuoteRenderer; use MyBB\Settings\Store; diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 73864099..280f7463 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -10,10 +10,12 @@ use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; use Illuminate\Http\Request; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\SearchRepositoryInterface; +use MyBB\Core\Database\Models\{ + Post, Topic +}; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, SearchRepositoryInterface +}; use MyBB\Core\Http\Requests\Search\SearchRequest; use MyBB\Core\Permissions\PermissionChecker; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/app/Http/Controllers/TopicController.php b/app/Http/Controllers/TopicController.php index ab06958b..5f150f4d 100644 --- a/app/Http/Controllers/TopicController.php +++ b/app/Http/Controllers/TopicController.php @@ -15,17 +15,18 @@ use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; -use MyBB\Core\Database\Models\Post; -use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PollRepositoryInterface; -use MyBB\Core\Database\Repositories\PostRepositoryInterface; -use MyBB\Core\Database\Repositories\TopicRepositoryInterface; -use MyBB\Core\Exceptions\ForumNotFoundException; -use MyBB\Core\Exceptions\PostNotFoundException; -use MyBB\Core\Exceptions\TopicNotFoundException; -use MyBB\Core\Http\Requests\Topic\CreateRequest; -use MyBB\Core\Http\Requests\Topic\ReplyRequest; +use MyBB\Core\Database\Models\{ + Post, Topic +}; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, PollRepositoryInterface, PostRepositoryInterface, TopicRepositoryInterface +}; +use MyBB\Core\Exceptions\{ + ForumNotFoundException, PostNotFoundException, TopicNotFoundException +}; +use MyBB\Core\Http\Requests\Topic\{ + CreateRequest, ReplyRequest +}; use MyBB\Core\Renderers\Post\Quote\QuoteInterface as QuoteRenderer; use MyBB\Core\Services\TopicDeleter; use MyBB\Parser\Parser; diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ed9fb732..2a2c53f0 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -9,9 +9,9 @@ namespace MyBB\Core\Http\Controllers; use DaveJamesMiller\Breadcrumbs\Manager as Breadcrumbs; -use MyBB\Core\Database\Repositories\ProfileFieldGroupRepositoryInterface; -use MyBB\Core\Database\Repositories\UserProfileFieldRepositoryInterface; -use MyBB\Core\Database\Repositories\UserRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ProfileFieldGroupRepositoryInterface, UserProfileFieldRepositoryInterface, UserRepositoryInterface +}; use MyBB\Core\Exceptions\UserNotFoundException; class UserController extends AbstractController diff --git a/app/Http/Controllers/WarningsController.php b/app/Http/Controllers/WarningsController.php index 3d87a324..54d80463 100644 --- a/app/Http/Controllers/WarningsController.php +++ b/app/Http/Controllers/WarningsController.php @@ -9,17 +9,16 @@ namespace MyBB\Core\Http\Controllers; use Illuminate\Auth\Access\Response; -use MyBB\Core\Database\Repositories\WarningsRepositoryInterface; -use MyBB\Core\Database\Repositories\WarningTypesRepositoryInterface; -use MyBB\Core\Database\Repositories\UserRepositoryInterface; -use MyBB\Core\Exceptions\UserNotFoundException; -use MyBB\Core\Exceptions\UserNotBelongsToThisContentException; -use MyBB\Core\Exceptions\WarningTypeNotFoundException; -use MyBB\Core\Exceptions\WarningNotFoundException; +use MyBB\Core\Database\Repositories\{ + WarningsRepositoryInterface, WarningTypesRepositoryInterface, UserRepositoryInterface +}; +use MyBB\Core\Exceptions\{ + UserNotFoundException, UserNotBelongsToThisContentException, WarningTypeNotFoundException, WarningNotFoundException +}; use MyBB\Core\Warnings\WarningsManager; -use MyBB\Core\Http\Requests\Warnings\WarnUserRequest; -use MyBB\Core\Http\Requests\Warnings\RevokeWarnRequest; -use MyBB\Core\Http\Requests\Warnings\AckWithWarnRequest; +use MyBB\Core\Http\Requests\Warnings\{ + WarnUserRequest, RevokeWarnRequest, AckWithWarnRequest +}; use MyBB\Core\Presenters\UserPresenter; use MyBB\Settings\Store; use Illuminate\Contracts\Auth\Guard; diff --git a/app/Http/Requests/Account/UpdateProfileRequest.php b/app/Http/Requests/Account/UpdateProfileRequest.php index 742fd21f..9dceaba7 100644 --- a/app/Http/Requests/Account/UpdateProfileRequest.php +++ b/app/Http/Requests/Account/UpdateProfileRequest.php @@ -9,8 +9,9 @@ namespace MyBB\Core\Http\Requests\Account; use MyBB\Core\Database\Models\ProfileField; -use MyBB\Core\Database\Repositories\ProfileFieldGroupRepositoryInterface; -use MyBB\Core\Database\Repositories\ProfileFieldRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ProfileFieldGroupRepositoryInterface, ProfileFieldRepositoryInterface +}; use MyBB\Core\Http\Requests\AbstractRequest; use MyBB\Core\Http\Requests\ProfileField\ProfileFieldRequestSubmitTrait; diff --git a/app/Http/Requests/Moderation/ModerationRequest.php b/app/Http/Requests/Moderation/ModerationRequest.php index 75af5d15..99941f4a 100644 --- a/app/Http/Requests/Moderation/ModerationRequest.php +++ b/app/Http/Requests/Moderation/ModerationRequest.php @@ -4,11 +4,9 @@ use MyBB\Core\Content\ContentInterface; use MyBB\Core\Http\Requests\AbstractRequest; -use MyBB\Core\Moderation\ArrayModerationInterface; -use MyBB\Core\Moderation\DestinedInterface; -use MyBB\Core\Moderation\ModerationInterface; -use MyBB\Core\Moderation\ModerationRegistry; -use MyBB\Core\Moderation\SourceableInterface; +use MyBB\Core\Moderation\{ + ArrayModerationInterface, DestinedInterface, ModerationInterface, ModerationRegistry, SourceableInterface +}; use MyBB\Core\Permissions\PermissionChecker; use MyBB\Core\Repository\RepositoryFactory; diff --git a/app/Moderation/Logger/DatabaseLogger.php b/app/Moderation/Logger/DatabaseLogger.php index 19e0d466..59eb2440 100644 --- a/app/Moderation/Logger/DatabaseLogger.php +++ b/app/Moderation/Logger/DatabaseLogger.php @@ -11,8 +11,9 @@ use Illuminate\Support\Collection; use MyBB\Core\Content\ContentInterface; use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Repositories\ModerationLogRepositoryInterface; -use MyBB\Core\Database\Repositories\ModerationLogSubjectRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ModerationLogRepositoryInterface, ModerationLogSubjectRepositoryInterface +}; use MyBB\Core\Http\Requests\Moderation\ModerationRequest; use MyBB\Core\Moderation\ModerationInterface; diff --git a/app/Permissions/PermissionChecker.php b/app/Permissions/PermissionChecker.php index 282e4bc1..e88fc7c2 100644 --- a/app/Permissions/PermissionChecker.php +++ b/app/Permissions/PermissionChecker.php @@ -10,11 +10,12 @@ use Illuminate\Contracts\Cache\Repository as CacheRepository; use Illuminate\Database\DatabaseManager; -use MyBB\Core\Database\Models\ContentClass; -use MyBB\Core\Database\Models\Role; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Exceptions\PermissionImplementInterfaceException; -use MyBB\Core\Exceptions\PermissionInvalidContentException; +use MyBB\Core\Database\Models\{ + ContentClass, Role, User +}; +use MyBB\Core\Exceptions\{ + PermissionImplementInterfaceException, PermissionInvalidContentException +}; use MyBB\Core\Permissions\Interfaces\PermissionInterface; class PermissionChecker diff --git a/app/Presenters/ConversationPresenter.php b/app/Presenters/ConversationPresenter.php index 8b7742a7..303f206b 100644 --- a/app/Presenters/ConversationPresenter.php +++ b/app/Presenters/ConversationPresenter.php @@ -12,8 +12,9 @@ use Illuminate\Contracts\Auth\Guard; use McCool\LaravelAutoPresenter\BasePresenter; -use MyBB\Core\Database\Models\Conversation as ConversationModel; -use MyBB\Core\Database\Models\User; +use MyBB\Core\Database\Models\{ + Conversation as ConversationModel, User +}; class ConversationPresenter extends BasePresenter { diff --git a/app/Presenters/ForumPresenter.php b/app/Presenters/ForumPresenter.php index 87887563..ee985088 100644 --- a/app/Presenters/ForumPresenter.php +++ b/app/Presenters/ForumPresenter.php @@ -12,10 +12,9 @@ use Illuminate\Foundation\Application; use McCool\LaravelAutoPresenter\BasePresenter; -use MyBB\Core\Database\Models\Forum as ForumModel; -use MyBB\Core\Database\Models\Topic as TopicModel; -use MyBB\Core\Database\Models\User as UserModel; -use MyBB\Core\Database\Models\User; +use MyBB\Core\Database\Models\{ + Forum as ForumModel, Topic as TopicModel, User as UserModel, User +}; use MyBB\Core\Moderation\ModerationRegistry; class ForumPresenter extends BasePresenter diff --git a/app/Presenters/ModerationLogPresenter.php b/app/Presenters/ModerationLogPresenter.php index 975f6c1b..51637e5f 100644 --- a/app/Presenters/ModerationLogPresenter.php +++ b/app/Presenters/ModerationLogPresenter.php @@ -9,11 +9,13 @@ namespace MyBB\Core\Presenters; use Illuminate\Contracts\View\Factory; -use McCool\LaravelAutoPresenter\BasePresenter; -use McCool\LaravelAutoPresenter\PresenterDecorator; +use McCool\LaravelAutoPresenter\{ + BasePresenter, PresenterDecorator +}; use MyBB\Core\Content\ContentInterface; -use MyBB\Core\Database\Models\ModerationLog; -use MyBB\Core\Database\Models\User as UserModel; +use MyBB\Core\Database\Models\{ + ModerationLog, User as UserModel +}; use MyBB\Core\Moderation\ModerationRegistry; use MyBB\Core\Repository\RepositoryFactory; diff --git a/app/Presenters/Moderations/MovePostPresenter.php b/app/Presenters/Moderations/MovePostPresenter.php index 1ff5ba86..c1976453 100644 --- a/app/Presenters/Moderations/MovePostPresenter.php +++ b/app/Presenters/Moderations/MovePostPresenter.php @@ -2,8 +2,9 @@ namespace MyBB\Core\Presenters\Moderations; -use MyBB\Core\Form\Field; -use MyBB\Core\Form\RenderableInterface; +use MyBB\Core\Form\{ + Field, RenderableInterface +}; use MyBB\Core\Moderation\Moderations\MovePost; class MovePostPresenter extends AbstractModerationPresenter implements ModerationPresenterInterface diff --git a/app/Presenters/PostPresenter.php b/app/Presenters/PostPresenter.php index 321cd9e8..1c6ba2a6 100644 --- a/app/Presenters/PostPresenter.php +++ b/app/Presenters/PostPresenter.php @@ -13,8 +13,9 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Foundation\Application; use McCool\LaravelAutoPresenter\BasePresenter; -use MyBB\Core\Database\Models\Post as PostModel; -use MyBB\Core\Database\Models\User as UserModel; +use MyBB\Core\Database\Models\{ + Post as PostModel, User as UserModel +}; use MyBB\Core\Likes\Database\Models\Like; class PostPresenter extends BasePresenter diff --git a/app/Presenters/ProfileFieldPresenter.php b/app/Presenters/ProfileFieldPresenter.php index 4c4f9607..c95e0fdb 100644 --- a/app/Presenters/ProfileFieldPresenter.php +++ b/app/Presenters/ProfileFieldPresenter.php @@ -10,10 +10,12 @@ use Illuminate\Contracts\Auth\Guard; use McCool\LaravelAutoPresenter\BasePresenter; -use MyBB\Core\Database\Models\ProfileField as ProfileFieldModel; -use MyBB\Core\Database\Models\User; -use MyBB\Core\Database\Repositories\ProfileFieldOptionRepositoryInterface; -use MyBB\Core\Database\Repositories\UserProfileFieldRepositoryInterface; +use MyBB\Core\Database\Models\{ + ProfileField as ProfileFieldModel, User +}; +use MyBB\Core\Database\Repositories\{ + ProfileFieldOptionRepositoryInterface, UserProfileFieldRepositoryInterface +}; use MyBB\Core\Form\RenderableInterface; class ProfileFieldPresenter extends BasePresenter implements RenderableInterface diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index d902d19c..863e9fdc 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -16,15 +16,14 @@ use Illuminate\Translation\Translator; use McCool\LaravelAutoPresenter\BasePresenter; use MyBB\Core\Database\Models\User as UserModel; -use MyBB\Core\Database\Repositories\ConversationRepositoryInterface; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PostRepositoryInterface; -use MyBB\Core\Database\Repositories\TopicRepositoryInterface; -use MyBB\Core\Database\Repositories\UserRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ConversationRepositoryInterface, ForumRepositoryInterface, PostRepositoryInterface, TopicRepositoryInterface, UserRepositoryInterface +}; use MyBB\Core\Permissions\PermissionChecker; use MyBB\Gravatar\Generator; -use MyBB\Settings\Models\Setting; -use MyBB\Settings\Models\SettingValue; +use MyBB\Settings\Models\{ + Setting, SettingValue +}; use MyBB\Settings\Store; class UserPresenter extends BasePresenter diff --git a/app/Services/TopicDeleter.php b/app/Services/TopicDeleter.php index a76ea3f6..59698164 100644 --- a/app/Services/TopicDeleter.php +++ b/app/Services/TopicDeleter.php @@ -9,9 +9,9 @@ namespace MyBB\Core\Services; use MyBB\Core\Database\Models\Topic; -use MyBB\Core\Database\Repositories\ForumRepositoryInterface; -use MyBB\Core\Database\Repositories\PollRepositoryInterface; -use MyBB\Core\Database\Repositories\PostRepositoryInterface; +use MyBB\Core\Database\Repositories\{ + ForumRepositoryInterface, PollRepositoryInterface, PostRepositoryInterface +}; class TopicDeleter { diff --git a/app/Tasking/ScheduleManager.php b/app/Tasking/ScheduleManager.php index 62c1a70a..60cabd9b 100644 --- a/app/Tasking/ScheduleManager.php +++ b/app/Tasking/ScheduleManager.php @@ -10,7 +10,9 @@ use Illuminate\Console\Scheduling\Schedule; use Illuminate\Contracts\Foundation\Application; -use Illuminate\Contracts\Cache\Repository as CacheRepository; +use Illuminate\Contracts\Cache\{ + Repository as CacheRepository +}; use MyBB\Settings\Store; use MyBB\Core\Database\Models\Task; use MyBB\Core\Exceptions\TaskFailedException; diff --git a/app/Tasking/ServiceProvider.php b/app/Tasking/ServiceProvider.php index 3cb10e97..3e234882 100644 --- a/app/Tasking/ServiceProvider.php +++ b/app/Tasking/ServiceProvider.php @@ -8,8 +8,9 @@ namespace MyBB\Core\Tasking; -use MyBB\Core\Tasking\Tasks\ExampleTask; -use MyBB\Core\Tasking\Tasks\LogPruningTask; +use MyBB\Core\Tasking\Tasks\{ + ExampleTask, LogPruningTask +}; class ServiceProvider extends \Illuminate\Support\ServiceProvider { diff --git a/database/migrations/2017_02_15_193903_add_options_to_settings_table.php b/database/migrations/2017_02_15_193903_add_options_to_settings_table.php new file mode 100644 index 00000000..1e3e4ad2 --- /dev/null +++ b/database/migrations/2017_02_15_193903_add_options_to_settings_table.php @@ -0,0 +1,32 @@ +string('options')->nullable()->default(null); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('options'); + }); + } +}