From be685d72e605e9eeea64f11da398044f40862e89 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 24 Jun 2017 12:09:22 +0200 Subject: [PATCH] Move ScopeVisibilityTrait to Database namespace --- framework/core/src/Core/Discussion.php | 2 +- framework/core/src/Core/Group.php | 2 +- framework/core/src/Core/Post.php | 2 +- framework/core/src/Core/User.php | 2 +- .../src/{Core/Support => Database}/ScopeVisibilityTrait.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename framework/core/src/{Core/Support => Database}/ScopeVisibilityTrait.php (95%) diff --git a/framework/core/src/Core/Discussion.php b/framework/core/src/Core/Discussion.php index a73e437e2..2d510ede5 100644 --- a/framework/core/src/Core/Discussion.php +++ b/framework/core/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; diff --git a/framework/core/src/Core/Group.php b/framework/core/src/Core/Group.php index ad265e6f0..db081ffe5 100755 --- a/framework/core/src/Core/Group.php +++ b/framework/core/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; diff --git a/framework/core/src/Core/Post.php b/framework/core/src/Core/Post.php index cb6717f4d..6d4ad5620 100755 --- a/framework/core/src/Core/Post.php +++ b/framework/core/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; diff --git a/framework/core/src/Core/User.php b/framework/core/src/Core/User.php index 32f58e86a..fd175c998 100755 --- a/framework/core/src/Core/User.php +++ b/framework/core/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; diff --git a/framework/core/src/Core/Support/ScopeVisibilityTrait.php b/framework/core/src/Database/ScopeVisibilityTrait.php similarity index 95% rename from framework/core/src/Core/Support/ScopeVisibilityTrait.php rename to framework/core/src/Database/ScopeVisibilityTrait.php index 2768cbe62..0cfe43fc3 100644 --- a/framework/core/src/Core/Support/ScopeVisibilityTrait.php +++ b/framework/core/src/Database/ScopeVisibilityTrait.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Core\Support; +namespace Flarum\Database; use Flarum\Core\User; use Flarum\Event\ScopeModelVisibility;