Merge remote-tracking branch 'origin/master' into master

Author: curtisdelicata

src/Events/GedComProgressSent.php

@@ -21,7 +21,9 @@ class GedComProgressSent implements ShouldBroadcast
     /**
      * Create a new event instance.
      *
-     * @return void
+     * @param $slug
+     * @param $total
+     * @param $complete
      */
     public function __construct($slug, $total, $complete)
     {
@@ -34,7 +36,7 @@ public function __construct($slug, $total, $complete)
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return \Illuminate\Broadcasting\Channel|array
+     * @return Channel|array
      */
     public function broadcastOn()
     {

src/Models/Event.php

@@ -15,11 +15,7 @@ public function place()
 
     public function getPlacename()
     {
-        if ($this->place) {
-            return $this->place->title;
-        } else {
-            return 'unknown place';
-        }
+        return $this->place ? $this->place->title : 'unknown place';
     }
 
     public function getTitle()

src/Models/Family.php

@@ -34,14 +34,14 @@ public function wife()
 
     public function title()
     {
-        return (($this->husband) ? $this->husband->fullname() : '?').
+        return ($this->husband ? $this->husband->fullname() : '?').
             ' + '.
-            (($this->wife) ? $this->wife->fullname() : '?');
+            ($this->wife ? $this->wife->fullname() : '?');
     }
 
     public static function getList()
     {
-        $families = self::get();
+        $families = self::query()->get();
         $result = [];
         foreach ($families as $family) {
             $result[$family->id] = $family->title();
@@ -53,7 +53,7 @@ public static function getList()
     public function addEvent($title, $date, $place, $description = '')
     {
         $place_id = Place::getIdByTitle($place);
-        $event = FamilyEvent::updateOrCreate(
+        $event = FamilyEvent::query()->updateOrCreate(
             [
                 'family_id' => $this->id,
                 'title'     => $title,
@@ -76,19 +76,11 @@ public function addEvent($title, $date, $place, $description = '')
 
     public function getWifeName()
     {
-        if ($this->wife) {
-            return $this->wife->fullname();
-        } else {
-            return 'unknown woman';
-        }
+        return $this->wife ? $this->wife->fullname() : 'unknown woman';
     }
 
     public function getHusbandName()
     {
-        if ($this->husband) {
-            return $this->husband->fullname();
-        } else {
-            return 'unknown man';
-        }
+        return $this->husband ? $this->husband->fullname() : 'unknown man';
     }
 }

src/Models/Person.php

@@ -63,7 +63,7 @@ public function getSex()
 
     public static function getList()
     {
-        $persons = self::get();
+        $persons = self::query()->get();
         $result = [];
         foreach ($persons as $person) {
             $result[$person->id] = $person->fullname();
@@ -75,7 +75,7 @@ public static function getList()
     public function addEvent($title, $date, $place, $description = '')
     {
         $place_id = Place::getIdByTitle($place);
-        $event = PersonEvent::updateOrCreate(
+        $event = PersonEvent::query()->updateOrCreate(
             [
                 'person_id' => $this->id,
                 'title'     => $title,

src/Models/Place.php

@@ -14,11 +14,11 @@ public static function getIdByTitle($title)
         if (empty($title)) {
             return $id;
         }
-        $place = self::where('title', $title)->first();
+        $place = self::query()->where('title', $title)->first();
         if ($place !== null) {
             $id = $place->id;
         } else {
-            $place = self::create(compact('title'));
+            $place = self::query()->create(compact('title'));
             $id = $place->id;
         }