cleanup/optimizations

Author: cmgmyr

src/Models/Models.php

@@ -83,11 +83,7 @@ public static function setTables(array $map)
      */
     public static function table($table)
     {
-        if (isset(static::$tables[$table])) {
-            return static::$tables[$table];
-        }
-
-        return $table;
+        return static::$tables[$table] ?? $table;
     }
 
     /**
@@ -98,11 +94,7 @@ public static function table($table)
      */
     public static function classname($model)
     {
-        if (isset(static::$models[$model])) {
-            return static::$models[$model];
-        }
-
-        return $model;
+        return static::$models[$model] ?? $model;
     }
 
     /**

src/Models/Thread.php

@@ -36,9 +36,9 @@ class Thread extends Eloquent
     /**
      * Internal cache for creator.
      *
-     * @var null|Models::user()
+     * @var null|Models::user()|\Illuminate\Database\Eloquent\Model
      */
-    protected $creatorCache = null;
+    protected $creatorCache;
 
     /**
      * {@inheritDoc}
@@ -99,11 +99,11 @@ public function users()
     /**
      * Returns the user object that created the thread.
      *
-     * @return Models::user()
+     * @return null|Models::user()|\Illuminate\Database\Eloquent\Model
      */
     public function creator()
     {
-        if (is_null($this->creatorCache)) {
+        if ($this->creatorCache === null) {
             $firstMessage = $this->messages()->withTrashed()->oldest()->first();
             $this->creatorCache = $firstMessage ? $firstMessage->user : Models::user();
         }
@@ -136,12 +136,13 @@ public static function getBySubject($subject)
     /**
      * Returns an array of user ids that are associated with the thread.
      *
-     * @param null $userId
+     * @param null|int $userId
      *
      * @return array
      */
     public function participantsUserIds($userId = null)
     {
+        /** @var \Illuminate\Support\Collection $users */
         $users = $this->participants()->withTrashed()->select('user_id')->get()->map(function ($participant) {
             return $participant->user_id;
         });
@@ -351,11 +352,8 @@ public function participantsString($userId = null, $columns = ['name'])
     public function hasParticipant($userId)
     {
         $participants = $this->participants()->where('user_id', '=', $userId);
-        if ($participants->count() > 0) {
-            return true;
-        }
 
-        return false;
+        return $participants->count() > 0;
     }
 
     /**