kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-09-18 10:20:19 +02:00
parent 481a6bdd5f
commit 3589c9f60f
137 changed files with 369 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/Account/AccountRepository.php
View File

@@ -452,9 +452,7 @@ class AccountRepository implements AccountRepositoryInterface
{
$journal = $this->getOpeningBalance($account);
$group = null;
if (null !== $journal) {
$group = $journal->transactionGroup;
}
$group = $journal?->transactionGroup;
return $group;
}
@@ -598,9 +596,7 @@ class AccountRepository implements AccountRepositoryInterface
{
$result = null;
$journal = $this->oldestJournal($account);
if (null !== $journal) {
$result = $journal->date;
}
$result = $journal?->date;
return $result;
}

4
app/Repositories/Journal/JournalRepository.php
View File

@@ -228,9 +228,7 @@ class JournalRepository implements JournalRepositoryInterface
{
/** @var TransactionJournal $journal */
$journal = $this->user->transactionJournals()->find($journalId);
if (null !== $journal) {
$journal->transactions()->update(['reconciled' => true]);
}
$journal?->transactions()->update(['reconciled' => true]);
}
/**

2
app/Repositories/LinkType/LinkTypeRepository.php
View File

@@ -331,7 +331,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
public function updateLink(TransactionJournalLink $journalLink, array $data): TransactionJournalLink
{
$journalLink->source_id = $data['inward_id'] ?: $journalLink->source_id;
$journalLink->destination_id = $data['outward_id'] ? $data['outward_id'] : $journalLink->destination_id;
$journalLink->destination_id = $data['outward_id'] ?: $journalLink->destination_id;
$journalLink->save();
if (array_key_exists('link_type_name', $data)) {
$linkType = LinkType::whereName($data['link_type_name'])->first();

4
app/Repositories/PiggyBank/ModifiesPiggyBanks.php
View File

@@ -267,7 +267,7 @@ trait ModifiesPiggyBanks
if ($newOrder > $oldOrder) {
$this->user->piggyBanks()->where('piggy_banks.order', '<=', $newOrder)->where('piggy_banks.order', '>', $oldOrder)
->where('piggy_banks.id', '!=', $piggyBank->id)
->decrement('piggy_banks.order', 1);
->decrement('piggy_banks.order');
$piggyBank->order = $newOrder;
Log::debug(sprintf('Order of piggy #%d ("%s") is now %d', $piggyBank->id, $piggyBank->name, $newOrder));
$piggyBank->save();
@@ -277,7 +277,7 @@ trait ModifiesPiggyBanks
$this->user->piggyBanks()->where('piggy_banks.order', '>=', $newOrder)->where('piggy_banks.order', '<', $oldOrder)
->where('piggy_banks.id', '!=', $piggyBank->id)
->increment('piggy_banks.order', 1);
->increment('piggy_banks.order');
$piggyBank->order = $newOrder;
Log::debug(sprintf('Order of piggy #%d ("%s") is now %d', $piggyBank->id, $piggyBank->name, $newOrder));
$piggyBank->save();

3
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -45,6 +45,7 @@ use FireflyIII\Support\Repositories\Recurring\FiltersWeekends;
use FireflyIII\User;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use JsonException;
use Log;
/**
@@ -290,7 +291,7 @@ class RecurringRepository implements RecurringRepositoryInterface
* @param RecurrenceTransaction $transaction
*
* @return array
* @throws \JsonException
* @throws JsonException
*/
public function getTags(RecurrenceTransaction $transaction): array
{

3
app/Repositories/User/UserRepository.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\User;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\Role;
use FireflyIII\User;
@@ -375,7 +376,7 @@ class UserRepository implements UserRepositoryInterface
* @param string $newEmail
*
* @return bool
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
* @see changeEmail
*/
public function updateEmail(User $user, string $newEmail): bool