Fixes based on sonar recommandations (#934)

This commit is contained in:
Alexis Saettler
2018-02-26 19:31:39 +01:00
committed by GitHub
parent 20d601580d
commit 9fbf194e89
21 changed files with 76 additions and 126 deletions
+4 -10
View File
@@ -57,7 +57,7 @@ class JournalController extends Controller
// I need the pagination items when I send back the array.
// There is probably a simpler way to achieve this.
$jsonToSendBack = [
return [
'total' => $journalEntries->total(),
'per_page' => $journalEntries->perPage(),
'current_page' => $journalEntries->currentPage(),
@@ -65,8 +65,6 @@ class JournalController extends Controller
'prev_page_url' => $journalEntries->previousPageUrl(),
'data' => $entries,
];
return $jsonToSendBack;
}
/**
@@ -76,9 +74,7 @@ class JournalController extends Controller
*/
public function get(JournalEntry $journalEntry)
{
$object = $journalEntry->getObjectData();
return $object;
return $journalEntry->getObjectData();
}
/**
@@ -94,7 +90,7 @@ class JournalController extends Controller
// Log a journal entry
$journalEntry = (new JournalEntry)->add($day);
$data = [
return [
'id' => $journalEntry->id,
'date' => $journalEntry->date,
'journalable_id' => $journalEntry->journalable_id,
@@ -102,8 +98,6 @@ class JournalController extends Controller
'object' => $journalEntry->getObjectData(),
'show_calendar' => true,
];
return $data;
}
/**
@@ -169,7 +163,7 @@ class JournalController extends Controller
$entry->save();
// Log a journal entry
$journalEntry = (new JournalEntry)->add($entry);
(new JournalEntry)->add($entry);
return redirect()->route('journal.index');
}