Move ScopeVisibilityTrait to Database namespace

src/Core/Discussion.php

@@ -13,7 +13,7 @@ namespace Flarum\Core;
 
 use Flarum\Core\Post\MergeableInterface;
 use Flarum\Core\Support\EventGeneratorTrait;
-use Flarum\Core\Support\ScopeVisibilityTrait;
+use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Database\AbstractModel;
 use Flarum\Event\DiscussionWasDeleted;
 use Flarum\Event\DiscussionWasHidden;

src/Core/Group.php

@@ -12,7 +12,7 @@
 namespace Flarum\Core;
 
 use Flarum\Core\Support\EventGeneratorTrait;
-use Flarum\Core\Support\ScopeVisibilityTrait;
+use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Database\AbstractModel;
 use Flarum\Event\GroupWasCreated;
 use Flarum\Event\GroupWasDeleted;

src/Core/Post.php

@@ -13,7 +13,7 @@ namespace Flarum\Core;
 
 use Flarum\Core\Post\RegisteredTypesScope;
 use Flarum\Core\Support\EventGeneratorTrait;
-use Flarum\Core\Support\ScopeVisibilityTrait;
+use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Database\AbstractModel;
 use Flarum\Event\PostWasDeleted;
 use Illuminate\Database\Eloquent\Builder;

src/Core/Support/ScopeVisibilityTrait.php

@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Flarum\Core\Support;
-
-use Flarum\Core\User;
-use Flarum\Event\ScopeModelVisibility;
-use Illuminate\Database\Eloquent\Builder;
-
-trait ScopeVisibilityTrait
-{
-    /**
-     * Scope a query to only include records that are visible to a user.
-     *
-     * @param Builder $query
-     * @param User $actor
-     */
-    public function scopeWhereVisibleTo(Builder $query, User $actor)
-    {
-        static::$dispatcher->fire(
-            new ScopeModelVisibility($query->getModel(), $query, $actor)
-        );
-    }
-}

src/Core/User.php

@@ -14,7 +14,7 @@ namespace Flarum\Core;
 use DomainException;
 use Flarum\Core\Access\Gate;
 use Flarum\Core\Support\EventGeneratorTrait;
-use Flarum\Core\Support\ScopeVisibilityTrait;
+use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Database\AbstractModel;
 use Flarum\Event\CheckUserPassword;
 use Flarum\Event\ConfigureUserPreferences;