Fixes based on sonar recommandations

app/Account.php

@@ -517,12 +517,11 @@ public function getRemindersForMonth(int $month)
     {
         $startOfMonth = \Carbon\Carbon::now()->addMonthsNoOverflow($month)->startOfMonth();
         $endInThreeMonths = \Carbon\Carbon::now()->addMonthsNoOverflow($month)->endOfMonth();
-        $reminders = auth()->user()->account->reminders()
-                            ->whereBetween('next_expected_date', [$startOfMonth, $endInThreeMonths])
-                            ->orderBy('next_expected_date', 'asc')
-                            ->get();
 
-        return $reminders;
+        return auth()->user()->account->reminders()
+                     ->whereBetween('next_expected_date', [$startOfMonth, $endInThreeMonths])
+                     ->orderBy('next_expected_date', 'asc')
+                     ->get();
     }
 
     /**

app/Activity.php

@@ -160,7 +160,7 @@ public function getContactsForAPI()
      */
     public function getInfoForJournalEntry()
     {
-        $data = [
+        return [
             'type' => 'activity',
             'id' => $this->id,
             'activity_type' => (! is_null($this->type) ? $this->type->getTranslationKeyAsString() : null),
@@ -173,7 +173,5 @@ public function getInfoForJournalEntry()
             'year' => $this->date_it_happened->year,
             'attendees' => $this->getContactsForAPI(),
         ];
-
-        return $data;
     }
 }

app/Console/Commands/PingVersionServer.php

@@ -40,7 +40,7 @@ public function __construct()
      */
     public function handle()
     {
-        if (config('monica.check_version') == false) {
+        if (! config('monica.check_version')) {
             return false;
         }
 
@@ -83,7 +83,7 @@ public function handle()
         }
 
         // make sure the JSON has all the fields we need
-        if (isset($json['latest_version']) == false or isset($json['new_version']) == false or isset($json['number_of_versions_since_user_version']) == false) {
+        if (! isset($json['latest_version']) || ! isset($json['new_version']) || ! isset($json['number_of_versions_since_user_version'])) {
             return;
         }
 

app/Contact.php

@@ -993,7 +993,7 @@ public function getPotentialContacts()
                                     ->where('is_the_parent_of', $this->id)
                                     ->count();
 
-            if ($relationship != 0 or $offspring != 0 or $progenitor != 0) {
+            if ($relationship != 0 || $offspring != 0 || $progenitor != 0) {
                 $partners->forget($counter);
             }
             $counter++;
@@ -1055,7 +1055,7 @@ public function getPartialOffsprings()
      */
     public function setRelationshipWith(self $partner, $bilateral = false)
     {
-        $relationship = Relationship::create(
+        Relationship::create(
             [
                 'account_id' => $this->account_id,
                 'contact_id' => $this->id,
@@ -1065,7 +1065,7 @@ public function setRelationshipWith(self $partner, $bilateral = false)
         );
 
         if ($bilateral) {
-            $relationship = Relationship::create(
+            Relationship::create(
                 [
                     'account_id' => $this->account_id,
                     'contact_id' => $partner->id,
@@ -1084,7 +1084,7 @@ public function setRelationshipWith(self $partner, $bilateral = false)
      */
     public function updateRelationshipWith(self $partner)
     {
-        $relationship = Relationship::create(
+        Relationship::create(
             [
                 'account_id' => $this->account_id,
                 'contact_id' => $partner->id,
@@ -1103,7 +1103,7 @@ public function updateRelationshipWith(self $partner)
      */
     public function isTheOffspringOf(self $parent, $bilateral = false)
     {
-        $offspring = Offspring::create(
+        Offspring::create(
             [
                 'account_id' => $this->account_id,
                 'contact_id' => $this->id,
@@ -1112,7 +1112,7 @@ public function isTheOffspringOf(self $parent, $bilateral = false)
         );
 
         if ($bilateral) {
-            $progenitor = Progenitor::create(
+            Progenitor::create(
                 [
                     'account_id' => $this->account_id,
                     'contact_id' => $parent->id,
@@ -1175,15 +1175,15 @@ public function unsetOffspring(self $kid, $bilateral = false)
      */
     public function deleteEventsAboutTheseTwoContacts(self $contact, $type)
     {
-        $events = Event::where('contact_id', $this->id)
-                        ->where('object_id', $contact->id)
-                        ->where('object_type', $type)
-                        ->delete();
+        Event::where('contact_id', $this->id)
+                ->where('object_id', $contact->id)
+                ->where('object_type', $type)
+                ->delete();
 
-        $events = Event::where('contact_id', $contact->id)
-                        ->where('object_id', $this->id)
-                        ->where('object_type', $type)
-                        ->delete();
+        Event::where('contact_id', $contact->id)
+                ->where('object_id', $this->id)
+                ->where('object_type', $type)
+                ->delete();
     }
 
     /**
@@ -1222,9 +1222,7 @@ public function getFirstProgenitor()
         $offspring = Offspring::where('contact_id', $this->id)
                         ->first();
 
-        $progenitor = self::findOrFail($offspring->is_the_child_of);
-
-        return $progenitor;
+        return self::findOrFail($offspring->is_the_child_of);
     }
 
     /**
@@ -1236,9 +1234,7 @@ public function getFirstPartner()
         $relationship = Relationship::where('with_contact_id', $this->id)
                         ->first();
 
-        $relationship = self::findOrFail($relationship->contact_id);
-
-        return $relationship;
+        return self::findOrFail($relationship->contact_id);
     }
 
     /**
@@ -1247,14 +1243,7 @@ public function getFirstPartner()
      */
     public function isOwedMoney()
     {
-        return $this
-            ->debts()
-            ->where('status', '=', 'inprogress')
-            ->getResults()
-            ->sum(function ($d) {
-                return $d->in_debt === 'yes' ? -$d->amount : $d->amount;
-            })
-            > 0;
+        return $this->totalOutstandingDebtAmount() > 0;
     }
 
     /**
@@ -1299,7 +1288,7 @@ public function getFamilyMembers()
      */
     public function hasFirstMetInformation()
     {
-        return ! is_null($this->first_met_additional_info) or ! is_null($this->firstMetDate) or ! is_null($this->first_met_through_contact_id);
+        return ! is_null($this->first_met_additional_info) || ! is_null($this->firstMetDate) || ! is_null($this->first_met_through_contact_id);
     }
 
     /**

app/Day.php

@@ -65,7 +65,7 @@ public function getCommentAttribute($value)
      */
     public function getInfoForJournalEntry()
     {
-        $data = [
+        return [
             'type' => 'day',
             'id' => $this->id,
             'rate' => $this->rate,
@@ -77,7 +77,5 @@ public function getInfoForJournalEntry()
             'year' => $this->date->year,
             'happens_today' => $this->date->isToday(),
         ];
-
-        return $data;
     }
 }

app/Entry.php

@@ -65,7 +65,7 @@ public function getPostAttribute($value)
      */
     public function getInfoForJournalEntry()
     {
-        $data = [
+        return [
             'type' => 'activity',
             'id' => $this->id,
             'title' => $this->title,
@@ -76,7 +76,5 @@ public function getInfoForJournalEntry()
             'month_name' => \App\Helpers\DateHelper::getShortMonth($this->created_at),
             'year' => $this->created_at->year,
         ];
-
-        return $data;
     }
 }

app/Exceptions/Handler.php

@@ -33,10 +33,8 @@ class Handler extends ExceptionHandler
      */
     public function report(Exception $e)
     {
-        if (config('monica.sentry_support') and config('app.env') == 'production') {
-            if ($this->shouldReport($e)) {
-                app('sentry')->captureException($e);
-            }
+        if (config('monica.sentry_support') && config('app.env') == 'production' && $this->shouldReport($e)) {
+            app('sentry')->captureException($e);
         }
         parent::report($e);
     }

app/Helpers/DateHelper.php

@@ -17,9 +17,7 @@ class DateHelper
      */
     public static function createDateFromFormat($date, $timezone)
     {
-        $date = Carbon::createFromFormat('Y-m-d H:i:s', $date, $timezone);
-
-        return $date;
+        return Carbon::createFromFormat('Y-m-d H:i:s', $date, $timezone);
     }
 
     /**

app/Helpers/InstanceHelper.php

@@ -13,9 +13,7 @@ class InstanceHelper
      */
     public static function getNumberOfPaidSubscribers()
     {
-        $paidAccounts = Account::where('stripe_id', '!=', null)->count();
-
-        return $paidAccounts;
+        return Account::where('stripe_id', '!=', null)->count();
     }
 
     /**
@@ -30,14 +28,12 @@ public static function getPlanInformationFromConfig(String $timePeriod)
             return;
         }
 
-        $planInformation = [
+        return [
             'type' => $timePeriod,
             'name' => config('monica.paid_plan_'.$timePeriod.'_friendly_name'),
             'id' => config('monica.paid_plan_'.$timePeriod.'_id'),
             'price' => config('monica.paid_plan_'.$timePeriod.'_price'),
             'friendlyPrice' => config('monica.paid_plan_'.$timePeriod.'_price') / 100,
         ];
-
-        return $planInformation;
     }
 }

app/Http/Controllers/ActivitiesController.php

@@ -66,7 +66,7 @@ public function store(ActivitiesRequest $request, Contact $contact)
         }
 
         // Log a journal entry
-        $journalEntry = (new JournalEntry)->add($activity);
+        (new JournalEntry)->add($activity);
 
         return redirect('/people/'.$contact->id)
             ->with('success', trans('people.activities_add_success'));

app/Http/Controllers/Api/ApiActivityController.php

@@ -94,7 +94,7 @@ public function store(Request $request)
         }
 
         // Log a journal entry
-        $journalEntry = (new JournalEntry)->add($activity);
+        (new JournalEntry)->add($activity);
 
         // Now we associate the activity with each one of the attendees
         $attendeesID = $request->get('contacts');
@@ -167,7 +167,7 @@ public function update(Request $request, $activityId)
 
         // Log a journal entry but need to delete the previous one first
         $activity->deleteJournalEntry();
-        $journalEntry = (new JournalEntry)->add($activity);
+        (new JournalEntry)->add($activity);
 
         // Get the attendees
         $attendees = $request->get('contacts');