From d6954a997a7206eae48e104f55cb74682a9d4182 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Sat, 24 Jun 2017 14:24:42 +0200
Subject: [PATCH] Move UserState class to Flarum\Discussion namespace

---
 .../core/src/Core/Command/ReadDiscussionHandler.php    |  2 +-
 framework/core/src/Discussion/Discussion.php           | 10 +++++-----
 framework/core/src/Discussion/Event/UserDataSaving.php |  8 ++++----
 framework/core/src/Discussion/Event/UserRead.php       |  8 ++++----
 .../DiscussionState.php => Discussion/UserState.php}   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename framework/core/src/{Core/DiscussionState.php => Discussion/UserState.php} (97%)

diff --git a/framework/core/src/Core/Command/ReadDiscussionHandler.php b/framework/core/src/Core/Command/ReadDiscussionHandler.php
index 9be64074b..dea81e8b6 100644
--- a/framework/core/src/Core/Command/ReadDiscussionHandler.php
+++ b/framework/core/src/Core/Command/ReadDiscussionHandler.php
@@ -39,7 +39,7 @@ class ReadDiscussionHandler
 
     /**
      * @param ReadDiscussion $command
-     * @return \Flarum\Core\DiscussionState
+     * @return \Flarum\Discussion\UserState
      * @throws \Flarum\User\Exception\PermissionDeniedException
      */
     public function handle(ReadDiscussion $command)
diff --git a/framework/core/src/Discussion/Discussion.php b/framework/core/src/Discussion/Discussion.php
index 0b06f632f..2c73a5aea 100644
--- a/framework/core/src/Discussion/Discussion.php
+++ b/framework/core/src/Discussion/Discussion.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Discussion;
 
-use Flarum\Core\DiscussionState;
+use Flarum\Discussion\UserState;
 use Flarum\Post\MergeableInterface;
 use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Database\ScopeVisibilityTrait;
@@ -44,7 +44,7 @@ use Flarum\Util\Str;
  * @property int|null $last_post_number
  * @property \Carbon\Carbon|null $hide_time
  * @property int|null $hide_user_id
- * @property DiscussionState|null $state
+ * @property UserState|null $state
  * @property \Illuminate\Database\Eloquent\Collection $posts
  * @property \Illuminate\Database\Eloquent\Collection $comments
  * @property \Illuminate\Database\Eloquent\Collection $participants
@@ -416,7 +416,7 @@ class Discussion extends AbstractModel
     {
         $user = $user ?: static::$stateUser;
 
-        return $this->hasOne('Flarum\Core\DiscussionState')->where('user_id', $user ? $user->id : null);
+        return $this->hasOne('Flarum\Discussion\UserState')->where('user_id', $user ? $user->id : null);
     }
 
     /**
@@ -424,14 +424,14 @@ class Discussion extends AbstractModel
      * exist.
      *
      * @param User $user
-     * @return \Flarum\Core\DiscussionState
+     * @return \Flarum\Discussion\UserState
      */
     public function stateFor(User $user)
     {
         $state = $this->state($user)->first();
 
         if (! $state) {
-            $state = new DiscussionState;
+            $state = new UserState;
             $state->discussion_id = $this->id;
             $state->user_id = $user->id;
         }
diff --git a/framework/core/src/Discussion/Event/UserDataSaving.php b/framework/core/src/Discussion/Event/UserDataSaving.php
index 1574b44b6..52a85fe6b 100644
--- a/framework/core/src/Discussion/Event/UserDataSaving.php
+++ b/framework/core/src/Discussion/Event/UserDataSaving.php
@@ -11,19 +11,19 @@
 
 namespace Flarum\Discussion\Event;
 
-use Flarum\Core\DiscussionState;
+use Flarum\Discussion\UserState;
 
 class UserDataSaving
 {
     /**
-     * @var DiscussionState
+     * @var \Flarum\Discussion\UserState
      */
     public $state;
 
     /**
-     * @param DiscussionState $state
+     * @param \Flarum\Discussion\UserState $state
      */
-    public function __construct(DiscussionState $state)
+    public function __construct(UserState $state)
     {
         $this->state = $state;
     }
diff --git a/framework/core/src/Discussion/Event/UserRead.php b/framework/core/src/Discussion/Event/UserRead.php
index 8baf3fc31..972a20129 100644
--- a/framework/core/src/Discussion/Event/UserRead.php
+++ b/framework/core/src/Discussion/Event/UserRead.php
@@ -11,19 +11,19 @@
 
 namespace Flarum\Discussion\Event;
 
-use Flarum\Core\DiscussionState;
+use Flarum\Discussion\UserState;
 
 class UserRead
 {
     /**
-     * @var DiscussionState
+     * @var UserState
      */
     public $state;
 
     /**
-     * @param DiscussionState $state
+     * @param UserState $state
      */
-    public function __construct(DiscussionState $state)
+    public function __construct(UserState $state)
     {
         $this->state = $state;
     }
diff --git a/framework/core/src/Core/DiscussionState.php b/framework/core/src/Discussion/UserState.php
similarity index 97%
rename from framework/core/src/Core/DiscussionState.php
rename to framework/core/src/Discussion/UserState.php
index be5e246fc..68a9ad714 100644
--- a/framework/core/src/Core/DiscussionState.php
+++ b/framework/core/src/Discussion/UserState.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core;
+namespace Flarum\Discussion;
 
 use Flarum\Discussion\Discussion;
 use Flarum\Foundation\EventGeneratorTrait;
@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Builder;
  * @property Discussion $discussion
  * @property \Flarum\User\User $user
  */
-class DiscussionState extends AbstractModel
+class UserState extends AbstractModel
 {
     use EventGeneratorTrait;