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

Code reordering and reformatting. I should really start employing style CI.

Browse Source
This commit is contained in:
James Cole
2021-09-18 10:26:12 +02:00
parent 9b9d52e99f
commit 4003cea759
344 changed files with 2776 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Commands/Upgrade/BudgetLimitCurrency.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\BudgetLimit;
use Illuminate\Console\Command;
use JsonException;
/**
* Class BudgetLimitCurrency
@@ -51,7 +52,7 @@ class BudgetLimitCurrency extends Command
*
* @return int
* @throws FireflyException
* @throws \JsonException
* @throws JsonException
*/
public function handle(): int
{
@@ -106,7 +107,7 @@ class BudgetLimitCurrency extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

2
app/Console/Commands/Upgrade/CCLiabilities.php
View File

@@ -104,7 +104,7 @@ class CCLiabilities extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

2
app/Console/Commands/Upgrade/MigrateAttachments.php
View File

@@ -116,7 +116,7 @@ class MigrateAttachments extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

4
app/Console/Commands/Upgrade/MigrateJournalNotes.php
View File

@@ -66,7 +66,7 @@ class MigrateJournalNotes extends Command
}
$count = 0;
$set = TransactionJournalMeta::whereName('notes')->get();
$set = TransactionJournalMeta::whereName('notes')->get();
/** @var TransactionJournalMeta $meta */
foreach ($set as $meta) {
$journal = $meta->transactionJournal;
@@ -114,7 +114,7 @@ class MigrateJournalNotes extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

2
app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php
View File

@@ -92,7 +92,7 @@ class MigrateRecurrenceMeta extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

2
app/Console/Commands/Upgrade/MigrateRecurrenceType.php
View File

@@ -85,7 +85,7 @@ class MigrateRecurrenceType extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

2
app/Console/Commands/Upgrade/MigrateTagLocations.php
View File

@@ -83,7 +83,7 @@ class MigrateTagLocations extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
private function migrateTagLocations(): void

2
app/Console/Commands/Upgrade/MigrateToGroups.php
View File

@@ -137,7 +137,7 @@ class MigrateToGroups extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

2
app/Console/Commands/Upgrade/MigrateToRules.php
View File

@@ -128,7 +128,7 @@ class MigrateToRules extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

6
app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
View File

@@ -123,7 +123,7 @@ class OtherCurrenciesCorrections extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**
@@ -248,10 +248,10 @@ class OtherCurrenciesCorrections extends Command
{
$accountId = $account->id;
if (array_key_exists($accountId, $this->accountCurrencies) && 0 === $this->accountCurrencies[$accountId]) {
return null;
return null;
}
if (array_key_exists($accountId, $this->accountCurrencies) && $this->accountCurrencies[$accountId] instanceof TransactionCurrency) {
return $this->accountCurrencies[$accountId];
return $this->accountCurrencies[$accountId];
}
$currency = $this->accountRepos->getAccountCurrency($account);
if (null === $currency) {

2
app/Console/Commands/Upgrade/RenameAccountMeta.php
View File

@@ -107,7 +107,7 @@ class RenameAccountMeta extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**

1
app/Console/Commands/Upgrade/TransactionIdentifier.php
View File

@@ -191,6 +191,7 @@ class TransactionIdentifier extends Command
return null;
}
return $opposing;
}

9
app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
@@ -132,7 +133,7 @@ class TransferCurrenciesCorrections extends Command
/**
* @return bool
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
private function isExecuted(): bool
{
@@ -141,7 +142,7 @@ class TransferCurrenciesCorrections extends Command
return (bool)$configVar->data;
}
return false;
return false;
}
/**
@@ -271,10 +272,10 @@ class TransferCurrenciesCorrections extends Command
{
$accountId = $account->id;
if (array_key_exists($accountId, $this->accountCurrencies) && 0 === $this->accountCurrencies[$accountId]) {
return null;
return null;
}
if (array_key_exists($accountId, $this->accountCurrencies) && $this->accountCurrencies[$accountId] instanceof TransactionCurrency) {
return $this->accountCurrencies[$accountId];
return $this->accountCurrencies[$accountId];
}
$currency = $this->accountRepos->getAccountCurrency($account);
if (null === $currency) {

2
app/Console/Commands/Upgrade/UpgradeDatabase.php
View File

@@ -106,7 +106,7 @@ class UpgradeDatabase extends Command
// instructions
'firefly:instructions update',
'firefly-iii:verify-security-alerts'
'firefly-iii:verify-security-alerts',
];
$args = [];
if ($this->option('force')) {

106
app/Console/Commands/Upgrade/UpgradeLiabilities.php
View File

@@ -92,59 +92,6 @@ class UpgradeLiabilities extends Command
return false;
}
/**
* @param Account $account
* @param TransactionJournal $openingBalance
*/
private function correctOpeningBalance(Account $account, TransactionJournal $openingBalance): void
{
$source = $this->getSourceTransaction($openingBalance);
$destination = $this->getDestinationTransaction($openingBalance);
if (null === $source || null === $destination) {
return;
}
// source MUST be the liability.
if ((int)$destination->account_id === (int)$account->id) {
Log::debug(sprintf('Must switch around, because account #%d is the destination.', $destination->account_id));
// so if not, switch things around:
$sourceAccountId = (int)$source->account_id;
$source->account_id = $destination->account_id;
$destination->account_id = $sourceAccountId;
$source->save();
$destination->save();
Log::debug(sprintf('Source transaction #%d now has account #%d', $source->id, $source->account_id));
Log::debug(sprintf('Dest transaction #%d now has account #%d', $destination->id, $destination->account_id));
}
}
/**
* @param TransactionJournal $journal
*
* @return Transaction|null
*/
private function getSourceTransaction(TransactionJournal $journal): ?Transaction
{
return $journal->transactions()->where('amount', '<', 0)->first();
}
/**
* @param TransactionJournal $journal
*
* @return Transaction|null
*/
private function getDestinationTransaction(TransactionJournal $journal): ?Transaction
{
return $journal->transactions()->where('amount', '>', 0)->first();
}
/**
*
*/
private function markAsExecuted(): void
{
app('fireflyconfig')->set(self::CONFIG_NAME, true);
}
/**
*
*/
@@ -200,4 +147,57 @@ class UpgradeLiabilities extends Command
$factory->crud($account, 'liability_direction', 'debit');
}
/**
* @param Account $account
* @param TransactionJournal $openingBalance
*/
private function correctOpeningBalance(Account $account, TransactionJournal $openingBalance): void
{
$source = $this->getSourceTransaction($openingBalance);
$destination = $this->getDestinationTransaction($openingBalance);
if (null === $source || null === $destination) {
return;
}
// source MUST be the liability.
if ((int)$destination->account_id === (int)$account->id) {
Log::debug(sprintf('Must switch around, because account #%d is the destination.', $destination->account_id));
// so if not, switch things around:
$sourceAccountId = (int)$source->account_id;
$source->account_id = $destination->account_id;
$destination->account_id = $sourceAccountId;
$source->save();
$destination->save();
Log::debug(sprintf('Source transaction #%d now has account #%d', $source->id, $source->account_id));
Log::debug(sprintf('Dest transaction #%d now has account #%d', $destination->id, $destination->account_id));
}
}
/**
* @param TransactionJournal $journal
*
* @return Transaction|null
*/
private function getSourceTransaction(TransactionJournal $journal): ?Transaction
{
return $journal->transactions()->where('amount', '<', 0)->first();
}
/**
* @param TransactionJournal $journal
*
* @return Transaction|null
*/
private function getDestinationTransaction(TransactionJournal $journal): ?Transaction
{
return $journal->transactions()->where('amount', '>', 0)->first();
}
/**
*
*/
private function markAsExecuted(): void
{
app('fireflyconfig')->set(self::CONFIG_NAME, true);
}
}