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

Various code cleanup

Browse Source
This commit is contained in:
James Cole
2023-01-03 06:48:53 +01:00
parent 6784fe4436
commit 07e4e93632
47 changed files with 118 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/Correction/DeleteOrphanedTransactions.php
View File

@@ -146,11 +146,7 @@ class DeleteOrphanedTransactions extends Command
// delete journals
$journal = TransactionJournal::find((int)$transaction->transaction_journal_id);
if ($journal) {
try {
$journal->delete();
} catch (QueryException $e) {
Log::info(sprintf('Could not delete journal %s', $e->getMessage()));
}
$journal->delete();
}
Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
$this->line(

6
app/Console/Commands/Correction/DeleteZeroAmount.php
View File

@@ -60,11 +60,7 @@ class DeleteZeroAmount extends Command
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
$this->info(sprintf('Deleted transaction journal #%d because the amount is zero (0.00).', $journal->id));
try {
$journal->delete();
} catch (QueryException $e) {
$this->line($e->getMessage());
}
$journal->delete();
Transaction::where('transaction_journal_id', $journal->id)->delete();
}

2
app/Console/Commands/Correction/FixPiggies.php
View File

@@ -64,7 +64,7 @@ class FixPiggies extends Command
if (null === $event->transaction_journal_id) {
continue;
}
/** @var TransactionJournal $journal */
/** @var TransactionJournal|null $journal */
$journal = $event->transactionJournal;
if (null === $journal) {

2
app/Console/Commands/Correction/FixTransactionTypes.php
View File

@@ -146,6 +146,7 @@ class FixTransactionTypes extends Command
}
/** @var Transaction $transaction */
$transaction = $collection->first();
/** @var Account|null $account */
$account = $transaction->account;
if (null === $account) {
throw new FireflyException(sprintf('Journal #%d, transaction #%d has no source account.', $journal->id, $transaction->id));
@@ -175,6 +176,7 @@ class FixTransactionTypes extends Command
}
/** @var Transaction $transaction */
$transaction = $collection->first();
/** @var Account|null $account */
$account = $transaction->account;
if (null === $account) {
throw new FireflyException(sprintf('Journal #%d, transaction #%d has no destination account.', $journal->id, $transaction->id));

4
app/Console/Commands/Correction/FixUnevenAmount.php
View File

@@ -93,7 +93,7 @@ class FixUnevenAmount extends Command
if (!$journal) {
return;
}
/** @var Transaction $source */
/** @var Transaction|null $source */
$source = $journal->transactions()->where('amount', '<', 0)->first();
if (null === $source) {
@@ -113,7 +113,7 @@ class FixUnevenAmount extends Command
$amount = bcmul('-1', (string)$source->amount);
// fix amount of destination:
/** @var Transaction $destination */
/** @var Transaction|null $destination */
$destination = $journal->transactions()->where('amount', '>', 0)->first();
if (null === $destination) {

2
app/Console/Commands/Correction/RemoveBills.php
View File

@@ -53,7 +53,7 @@ class RemoveBills extends Command
public function handle(): int
{
$start = microtime(true);
/** @var TransactionType $withdrawal */
/** @var TransactionType|null $withdrawal */
$withdrawal = TransactionType::where('type', TransactionType::WITHDRAWAL)->first();
if (null === $withdrawal) {
return 0;