From 1c87c33d4d73fdd2c7c8da58f25f335e5c2c24e3 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 11 Jan 2018 11:55:57 +1030
Subject: [PATCH] Use ::class, update some typehints

---
 src/Discussion/Discussion.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Discussion/Discussion.php b/src/Discussion/Discussion.php
index 38e7bb048..103317b32 100644
--- a/src/Discussion/Discussion.php
+++ b/src/Discussion/Discussion.php
@@ -23,7 +23,6 @@ use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Post\Event\Deleted as PostDeleted;
 use Flarum\Post\MergeableInterface;
 use Flarum\Post\Post;
-use Flarum\User\Guest;
 use Flarum\User\User;
 use Flarum\Util\Str;
 
@@ -101,7 +100,7 @@ class Discussion extends AbstractModel
     {
         parent::boot();
 
-        static::deleted(function ($discussion) {
+        static::deleted(function (Discussion $discussion) {
             $discussion->raise(new Deleted($discussion));
 
             // Delete all of the posts in the discussion. Before we delete them
@@ -234,6 +233,7 @@ class Discussion extends AbstractModel
      */
     public function refreshLastPost()
     {
+        /** @var Post $lastPost */
         if ($lastPost = $this->comments()->latest('time')->first()) {
             $this->setLastPost($lastPost);
         }
@@ -356,7 +356,7 @@ class Discussion extends AbstractModel
      */
     public function startPost()
     {
-        return $this->belongsTo('Flarum\Post\Post', 'start_post_id');
+        return $this->belongsTo(Post::class, 'start_post_id');
     }
 
     /**
@@ -366,7 +366,7 @@ class Discussion extends AbstractModel
      */
     public function startUser()
     {
-        return $this->belongsTo('Flarum\User\User', 'start_user_id');
+        return $this->belongsTo(User::class, 'start_user_id');
     }
 
     /**
@@ -376,7 +376,7 @@ class Discussion extends AbstractModel
      */
     public function lastPost()
     {
-        return $this->belongsTo('Flarum\Post\Post', 'last_post_id');
+        return $this->belongsTo(Post::class, 'last_post_id');
     }
 
     /**
@@ -386,7 +386,7 @@ class Discussion extends AbstractModel
      */
     public function lastUser()
     {
-        return $this->belongsTo('Flarum\User\User', 'last_user_id');
+        return $this->belongsTo(User::class, 'last_user_id');
     }
 
     /**
@@ -396,7 +396,7 @@ class Discussion extends AbstractModel
      */
     public function readers()
     {
-        return $this->belongsToMany('Flarum\User\User', 'users_discussions');
+        return $this->belongsToMany(User::class, 'users_discussions');
     }
 
     /**
@@ -415,7 +415,7 @@ class Discussion extends AbstractModel
     {
         $user = $user ?: static::$stateUser;
 
-        return $this->hasOne('Flarum\Discussion\UserState')->where('user_id', $user ? $user->id : null);
+        return $this->hasOne(UserState::class)->where('user_id', $user ? $user->id : null);
     }
 
     /**