Apply fixes from StyleCI

[ci skip] [skip ci]

src/Database/ScopeVisibilityTrait.php

@@ -10,7 +10,6 @@
 namespace Flarum\Database;
 
 use Flarum\Event\ScopeModelVisibility;
-use Flarum\Group\Group;
 use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Arr;
@@ -28,14 +27,13 @@ public static function registerVisibilityScoper($scoper, $ability = null)
             $ability = static::$DEFAULT;
         }
 
-        if (!Arr::has(static::$visibilityScopers, "$model.$ability")) {
+        if (! Arr::has(static::$visibilityScopers, "$model.$ability")) {
             Arr::set(static::$visibilityScopers, "$model.$ability", []);
         }
 
         static::$visibilityScopers[$model][$ability][] = $scoper;
     }
 
-
     /**
      * Scope a query to only include records that are visible to a user.
      *

src/Discussion/Access/ScopeDiscussionVisibility.php

@@ -36,7 +36,7 @@ public function __invoke(User $actor, $query)
 
         // Hide hidden discussions, unless they are authored by the current
         // user, or the current user has permission to view hidden  discussions.
-        if (!$actor->hasPermission('discussion.hide')) {
+        if (! $actor->hasPermission('discussion.hide')) {
             $query->where(function ($query) use ($actor) {
                 $query->whereNull('discussions.hidden_at')
                 ->orWhere('discussions.user_id', $actor->id)
@@ -48,7 +48,7 @@ public function __invoke(User $actor, $query)
 
         // Hide discussions with no comments, unless they are authored by the
         // current user, or the user is allowed to edit the discussion's posts.
-        if (!$actor->hasPermission('discussion.editPosts')) {
+        if (! $actor->hasPermission('discussion.editPosts')) {
             $query->where(function ($query) use ($actor) {
                 $query->where('discussions.comment_count', '>', 0)
                     ->orWhere('discussions.user_id', $actor->id)

src/Discussion/DiscussionPolicy.php

@@ -9,12 +9,10 @@
 
 namespace Flarum\Discussion;
 
-use Flarum\Event\ScopeModelVisibility;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AbstractPolicy;
 use Flarum\User\User;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Database\Eloquent\Builder;
 
 class DiscussionPolicy extends AbstractPolicy
 {

src/Discussion/DiscussionServiceProvider.php

@@ -9,8 +9,6 @@
 
 namespace Flarum\Discussion;
 
-use Flarum\Database\AbstractModel;
-use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Discussion\Access\ScopeDiscussionVisibility;
 use Flarum\Discussion\Event\Renamed;
 use Flarum\Foundation\AbstractServiceProvider;

src/Extend/ModelVisibility.php

@@ -44,13 +44,13 @@ public function __construct(string $modelClass)
     {
         $this->modelClass = $modelClass;
 
-        if (!method_exists($modelClass, "registerVisibilityScoper")) {
+        if (! method_exists($modelClass, 'registerVisibilityScoper')) {
             throw new Exception("Model $modelClass cannot be visibility scoped as it does not use Flarum\Database\ScopeVisibilityTrait.");
         }
     }
 
     /**
-     * Add a scoper for a given ability
+     * Add a scoper for a given ability.
      *
      * @param callable|string $callback
      * @param string $ability, defaults to 'view'
@@ -69,7 +69,7 @@ public function scoper($callback, $ability = 'view')
     }
 
     /**
-     * Add a default scoper
+     * Add a default scoper.
      *
      * @param callable|string $callback
      *

src/Group/GroupPolicy.php

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

src/Group/GroupServiceProvider.php

@@ -9,8 +9,6 @@
 
 namespace Flarum\Group;
 
-use Flarum\Database\AbstractModel;
-use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Group\Access\ScopeGroupVisibility;
 

src/Notification/Notification.php

@@ -11,7 +11,6 @@
 
 use Carbon\Carbon;
 use Flarum\Database\AbstractModel;
-use Flarum\Event\ScopeModelVisibility;
 use Flarum\Notification\Blueprint\BlueprintInterface;
 use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;

src/Post/Access/ScopePostVisibility.php

@@ -40,7 +40,7 @@ public function __invoke(User $actor, $query)
         // Hide hidden posts, unless they are authored by the current user, or
         // the current user has permission to view hidden posts in the
         // discussion.
-        if (!$actor->hasPermission('discussion.hidePosts')) {
+        if (! $actor->hasPermission('discussion.hidePosts')) {
             $query->where(function ($query) use ($actor) {
                 $query->whereNull('posts.hidden_at')
                 ->orWhere('posts.user_id', $actor->id)

src/User/UserPolicy.php

@@ -9,8 +9,6 @@
 
 namespace Flarum\User;
 
-use Illuminate\Database\Eloquent\Builder;
-
 class UserPolicy extends AbstractPolicy
 {
     /**

src/User/UserServiceProvider.php

@@ -9,8 +9,6 @@
 
 namespace Flarum\User;
 
-use Flarum\Database\AbstractModel;
-use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Event\ConfigureUserPreferences;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\ContainerUtil;

tests/integration/extenders/ModelVisibilityTest.php

@@ -10,7 +10,6 @@
 namespace Flarum\Tests\integration\extenders;
 
 use Carbon\Carbon;
-use Egulias\EmailValidator\Warning\Comment;
 use Flarum\Discussion\Discussion;
 use Flarum\Extend;
 use Flarum\Post\CommentPost;
@@ -75,7 +74,7 @@ public function custom_visibility_scoper_can_stop_user_from_seeing_posts()
         $this->extend(
             (new Extend\ModelVisibility(CommentPost::class))
                 ->scoper(function (User $user, Builder $query) {
-                    $query->whereRaw("1=0");
+                    $query->whereRaw('1=0');
                 }, 'view')
         );
 
@@ -96,7 +95,7 @@ public function custom_visibility_scoper_applies_if_added_to_parent_class()
         $this->extend(
             (new Extend\ModelVisibility(Post::class))
                 ->scoper(function (User $user, Builder $query) {
-                    $query->whereRaw("1=0");
+                    $query->whereRaw('1=0');
                 }, 'view')
         );
 
@@ -117,11 +116,11 @@ public function custom_visibility_scoper_for_class_applied_after_scopers_for_par
         $this->extend(
             (new Extend\ModelVisibility(CommentPost::class))
                 ->scoper(function (User $user, Builder $query) {
-                    $query->orWhereRaw("1=1");
+                    $query->orWhereRaw('1=1');
                 }, 'view'),
             (new Extend\ModelVisibility(Post::class))
                 ->scoper(function (User $user, Builder $query) {
-                    $query->whereRaw("1=0");
+                    $query->whereRaw('1=0');
                 }, 'view'),
         );
 
@@ -142,11 +141,11 @@ public function custom_scoper_works_for_abilities_other_than_view()
         $this->extend(
             (new Extend\ModelVisibility(Discussion::class))
                 ->scoper(function (User $user, Builder $query) {
-                    $query->whereRaw("1=1");
+                    $query->whereRaw('1=1');
                 }, 'viewPrivate'),
             (new Extend\ModelVisibility(Post::class))
                 ->scoper(function (User $user, Builder $query) {
-                    $query->whereRaw("1=1");
+                    $query->whereRaw('1=1');
                 }, 'viewPrivate'),
         );
 
@@ -168,13 +167,13 @@ public function default_scoper_works()
             (new Extend\ModelVisibility(Discussion::class))
                 ->defaultScoper(function (User $user, Builder $query, string $ability) {
                     if ($ability == 'viewPrivate') {
-                        $query->whereRaw("1=1");
+                        $query->whereRaw('1=1');
                     }
                 }),
             (new Extend\ModelVisibility(Post::class))
                 ->defaultScoper(function (User $user, Builder $query, string $ability) {
                     if ($ability == 'viewPrivate') {
-                        $query->whereRaw("1=1");
+                        $query->whereRaw('1=1');
                     }
                 }),
         );