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
mybb · Oct 2, 2017 · 4d8f23b · 4d8f23b
1 parent b4db977
commit 4d8f23b
Show file tree

Hide file tree

Showing 58 changed files with 281 additions and 220 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 {