Merge pull request #14 from the-turk/analysis-Vr5WbD

Apply fixes from StyleCI

extend.php

@@ -9,15 +9,15 @@
 
 namespace TheTurk\RegRole;
 
+use Flarum\Api\Controller\ShowUserController;
 use Flarum\Api\Serializer\BasicUserSerializer;
+use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Api\Serializer\GroupSerializer;
-use Flarum\Api\Controller\ShowUserController;
 use Flarum\Extend;
 use Flarum\Group\Group;
 use Flarum\User\Event\Saving as UserSaving;
 use Flarum\User\User;
 use TheTurk\RegRole\Api\Controllers\AttachRoleController;
-use Flarum\Api\Serializer\ForumSerializer;
 
 return [
     (new Extend\Frontend('forum'))

src/Api/Controllers/AttachRoleController.php

@@ -11,10 +11,10 @@
 
 use Flarum\Api\Controller\AbstractShowController;
 use Flarum\Api\Serializer\CurrentUserSerializer;
-use TheTurk\RegRole\Commands\AttachRole;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
+use TheTurk\RegRole\Commands\AttachRole;
 use Tobscure\JsonApi\Document;
 
 class AttachRoleController extends AbstractShowController

src/Listeners/SetRoles.php

@@ -15,8 +15,8 @@
 use Flarum\User\Event\Saving as UserSaving;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\User\User;
-use Illuminate\Support\Arr;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
 use TheTurk\RegRole\Validators\RoleValidator;
 
@@ -45,9 +45,9 @@ class SetRoles
     private $forceUsers;
 
     /**
-     * @param Dispatcher $events
+     * @param Dispatcher                  $events
      * @param SettingsRepositoryInterface $settings
-     * @param RoleValidator $validator
+     * @param RoleValidator               $validator
      */
     public function __construct(Dispatcher $events, SettingsRepositoryInterface $settings, RoleValidator $validator)
     {
@@ -66,6 +66,7 @@ public function __construct(Dispatcher $events, SettingsRepositoryInterface $set
 
     /**
      * @param UserSaving $event
+     *
      * @throws PermissionDeniedException|ValidationException
      */
     public function handle(UserSaving $event)

src/LoadSettings.php

@@ -46,16 +46,16 @@ public function __invoke(ForumSerializer $serializer): array
 
         return [
             'regrole.allow_multiple_roles' => boolval($this->settings->get('the-turk-regrole.allow_multiple_roles', '0')),
-            'regrole.force_users' => boolval($this->settings->get('the-turk-regrole.force_users', '0')),
-            'regrole.allowed_role_ids' => $allowedRoleIds,
-            'regrole.suspended_actor' => $actor && $actor->suspended_until,
-            'regrole.available_roles' =>
+            'regrole.force_users'          => boolval($this->settings->get('the-turk-regrole.force_users', '0')),
+            'regrole.allowed_role_ids'     => $allowedRoleIds,
+            'regrole.suspended_actor'      => $actor && $actor->suspended_until,
+            'regrole.available_roles'      =>
                 // We had to overcome visibility scopes due to `viewHiddenGroups` permission.
                 // @see https://github.com/the-turk/flarum-regrole/issues/13
                 Group::query()
                     ->select('id', 'icon', 'color', 'name_singular')
                     ->whereIn('id', $allowedRoleIds)
-                    ->get()
+                    ->get(),
         ];
     }
 }

src/RevokeAccessFromUsers.php

@@ -39,8 +39,9 @@ public function __construct(SettingsRepositoryInterface $settings)
     }
 
     /**
-     * @param User $user
+     * @param User  $user
      * @param array $groupIds
+     *
      * @return array
      */
     public function __invoke(User $user, array $groupIds): array

src/Validators/RoleValidator.php

@@ -17,7 +17,7 @@ class RoleValidator extends AbstractValidator
      * {@inheritdoc}
      */
     protected $rules = [
-        'regrole_role_ids' => ['required', 'array']
+        'regrole_role_ids' => ['required', 'array'],
     ];
 
     /**
@@ -26,7 +26,7 @@ class RoleValidator extends AbstractValidator
     protected function getMessages(): array
     {
         return [
-            'required' => $this->translator->trans('the-turk-regrole.forum.required_role_message')
+            'required' => $this->translator->trans('the-turk-regrole.forum.required_role_message'),
         ];
     }
 }