kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-02 15:10:40 +02:00
parent fa7ab45a40
commit a3c34e6b3c
151 changed files with 802 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,9 +50,7 @@ class AccountRepository implements AccountRepositoryInterface
*/
public function count(array $types): int
{
$count = $this->user->accounts()->accountTypeIn($types)->count();
return $count;
return $this->user->accounts()->accountTypeIn($types)->count();
}
/**
@@ -63,7 +61,7 @@ class AccountRepository implements AccountRepositoryInterface
*
* @return bool
*
* @throws \Exception
*/
public function destroy(Account $account, ?Account $moveTo): bool
{
@@ -108,7 +106,7 @@ class AccountRepository implements AccountRepositoryInterface
{
foreach ($account->accountMeta as $meta) {
if ($meta->name === $field) {
return strval($meta->data);
return (string)$meta->data;
}
}
@@ -135,7 +133,7 @@ class AccountRepository implements AccountRepositoryInterface
public function getNoteText(Account $account): ?string
{
$note = $account->notes()->first();
if (is_null($note)) {
if (null === $note) {
return null;
}
@@ -164,7 +162,7 @@ class AccountRepository implements AccountRepositoryInterface
return null;
}
return strval($transaction->amount);
return (string)$transaction->amount;
}
/**
@@ -227,7 +225,7 @@ class AccountRepository implements AccountRepositoryInterface
->orderBy('transaction_journals.id', 'ASC')
->first(['transaction_journals.id']);
if (null !== $first) {
return TransactionJournal::find(intval($first->id));
return TransactionJournal::find((int)$first->id);
}
return new TransactionJournal();
@@ -272,9 +270,8 @@ class AccountRepository implements AccountRepositoryInterface
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
$factory->setUser($this->user);
$account = $factory->create($data);
return $account;
return $factory->create($data);
}
/**

6
app/Repositories/Account/AccountTasker.php
View File

@@ -130,7 +130,7 @@ class AccountTasker implements AccountTaskerInterface
// Obtain a list of columns
$sum = [];
foreach ($expenses as $accountId => $row) {
$sum[$accountId] = floatval($row['sum']);
$sum[$accountId] = (float)$row['sum'];
}
array_multisort($sum, SORT_ASC, $expenses);
@@ -172,7 +172,7 @@ class AccountTasker implements AccountTaskerInterface
// Obtain a list of columns
$sum = [];
foreach ($income as $accountId => $row) {
$sum[$accountId] = floatval($row['sum']);
$sum[$accountId] = (float)$row['sum'];
}
array_multisort($sum, SORT_DESC, $income);
@@ -216,7 +216,7 @@ class AccountTasker implements AccountTaskerInterface
$keys = array_keys($expenses);
foreach ($keys as $key) {
if ($expenses[$key]['count'] > 1) {
$expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], strval($expenses[$key]['count']));
$expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], (string)$expenses[$key]['count']);
}
}

12
app/Repositories/Account/FindAccountsTrait.php
View File

@@ -251,9 +251,8 @@ trait FindAccountsTrait
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
$factory->setUser($this->user);
$account = $factory->findOrCreate('Cash account', $type->type);
return $account;
return $factory->findOrCreate('Cash account', $type->type);
}
/**
@@ -262,7 +261,6 @@ trait FindAccountsTrait
* @return Account|null
*
* @throws FireflyException
* @throws \Exception
*/
public function getReconciliation(Account $account): ?Account
{
@@ -272,10 +270,10 @@ trait FindAccountsTrait
$name = $account->name . ' reconciliation';
$type = AccountType::where('type', AccountType::RECONCILIATION)->first();
$accounts = $this->user->accounts()->where('account_type_id', $type->id)->get();
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->name === $name) {
return $account;
/** @var Account $current */
foreach ($accounts as $current) {
if ($current->name === $name) {
return $current;
}
}
/** @var AccountFactory $factory */