gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 20:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:42:26 +01:00
parent dbf3e76ecc
commit 6cfdc58cb1
415 changed files with 7462 additions and 6874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/Services/Internal/Update/AccountUpdateService.php
View File

@@ -62,19 +62,11 @@ class AccountUpdateService
$this->accountRepository = app(AccountRepositoryInterface::class);
}
/**
* @param User $user
*/
public function setUser(User $user): void
{
$this->user = $user;
}
/**
* Update account data.
*
* @param Account $account
* @param array $data
* @param Account $account
* @param array $data
*
* @return Account
* @throws FireflyException
@@ -89,7 +81,7 @@ class AccountUpdateService
// find currency, or use default currency instead.
if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
$currency = $this->getCurrency((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null));
$currency = $this->getCurrency((int)($data['currency_id'] ?? null), (string)($data['currency_code'] ?? null));
unset($data['currency_code'], $data['currency_id']);
$data['currency_id'] = $currency->id;
}
@@ -108,7 +100,7 @@ class AccountUpdateService
// update note:
if (array_key_exists('notes', $data) && null !== $data['notes']) {
$this->updateNote($account, (string) $data['notes']);
$this->updateNote($account, (string)$data['notes']);
}
// update preferences if inactive:
@@ -120,8 +112,16 @@ class AccountUpdateService
}
/**
* @param Account $account
* @param array $data
* @param User $user
*/
public function setUser(User $user): void
{
$this->user = $user;
}
/**
* @param Account $account
* @param array $data
*
* @return Account
*/
@@ -135,19 +135,19 @@ class AccountUpdateService
$account->active = $data['active'];
}
if (array_key_exists('iban', $data)) {
$account->iban = app('steam')->filterSpaces((string) $data['iban']);
$account->iban = app('steam')->filterSpaces((string)$data['iban']);
}
// set liability, but account must already be a liability.
//$liabilityType = $data['liability_type'] ?? '';
if ($this->isLiability($account) && array_key_exists('liability_type', $data)) {
$type = $this->getAccountType($data['liability_type']);
$type = $this->getAccountType($data['liability_type']);
$account->account_type_id = $type->id;
}
// set liability, alternative method used in v1 layout:
if ($this->isLiability($account) && array_key_exists('account_type_id', $data)) {
$type = AccountType::find((int) $data['account_type_id']);
$type = AccountType::find((int)$data['account_type_id']);
if (null !== $type && in_array($type->type, config('firefly.valid_liabilities'), true)) {
$account->account_type_id = $type->id;
@@ -165,7 +165,7 @@ class AccountUpdateService
}
/**
* @param Account $account
* @param Account $account
*
* @return bool
*/
@@ -177,7 +177,7 @@ class AccountUpdateService
}
/**
* @param string $type
* @param string $type
*
* @return AccountType
*/
@@ -187,8 +187,8 @@ class AccountUpdateService
}
/**
* @param Account $account
* @param array $data
* @param Account $account
* @param array $data
*
* @return Account
*/
@@ -208,7 +208,7 @@ class AccountUpdateService
return $account;
}
// get account type ID's because a join and an update is hard:
$oldOrder = (int) $account->order;
$oldOrder = (int)$account->order;
$newOrder = $data['order'];
Log::debug(sprintf('Order is set to be updated from %s to %s', $oldOrder, $newOrder));
$list = $this->getTypeIds([AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT]);
@@ -246,15 +246,15 @@ class AccountUpdateService
foreach ($array as $type) {
/** @var AccountType $type */
$type = AccountType::whereType($type)->first();
$return[] = (int) $type->id;
$return[] = (int)$type->id;
}
return $return;
}
/**
* @param Account $account
* @param array $data
* @param Account $account
* @param array $data
*/
private function updateLocation(Account $account, array $data): void
{
@@ -283,8 +283,8 @@ class AccountUpdateService
}
/**
* @param Account $account
* @param array $data
* @param Account $account
* @param array $data
*
* @throws FireflyException
*/
@@ -308,8 +308,8 @@ class AccountUpdateService
}
/**
* @param Account $account
* @param array $data
* @param Account $account
* @param array $data
*
* @throws FireflyException
*/
@@ -338,7 +338,7 @@ class AccountUpdateService
}
/**
* @param Account $account
* @param Account $account
*
* @throws FireflyException
*/
@@ -355,12 +355,12 @@ class AccountUpdateService
$array = $preference->data;
Log::debug('Old array is: ', $array);
Log::debug(sprintf('Must remove : %d', $account->id));
$removeAccountId = (int) $account->id;
$removeAccountId = (int)$account->id;
$new = [];
foreach ($array as $value) {
if ((int) $value !== $removeAccountId) {
if ((int)$value !== $removeAccountId) {
Log::debug(sprintf('Will include: %d', $value));
$new[] = (int) $value;
$new[] = (int)$value;
}
}
Log::debug('Final new array is', $new);