IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-28 06:23:13 +02:00
parent 6f0e1c79ac
commit 13b78bdc20
218 changed files with 621 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Internal/Destroy/AccountDestroyService.php
View File

@@ -65,8 +65,6 @@ class AccountDestroyService
} catch (Exception $e) { // @codeCoverageIgnore
Log::error(sprintf('Could not delete account: %s', $e->getMessage())); // @codeCoverageIgnore
}
return;
}
}

1
app/Services/Internal/Destroy/JournalDestroyService.php
View File

@@ -59,7 +59,6 @@ class JournalDestroyService
Log::error(sprintf('Could not delete bill: %s', $e->getMessage())); // @codeCoverageIgnore
}
return;
}
}

5
app/Services/Internal/Support/AccountServiceTrait.php
View File

@@ -127,6 +127,7 @@ trait AccountServiceTrait
* @param array $data
*
* @return TransactionJournal|null
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function storeIBJournal(Account $account, array $data): ?TransactionJournal
{
@@ -330,7 +331,7 @@ trait AccountServiceTrait
$entry = $account->accountMeta()->where('name', $field)->first();
// must not be an empty string:
if (isset($data[$field]) && strlen((string)$data[$field]) > 0) {
if (isset($data[$field]) && \strlen((string)$data[$field]) > 0) {
// if $data has field and $entry is null, create new one:
if (null === $entry) {
@@ -357,7 +358,7 @@ trait AccountServiceTrait
*/
public function updateNote(Account $account, string $note): bool
{
if (0 === strlen($note)) {
if (0 === \strlen($note)) {
$dbNote = $account->notes()->first();
if (null !== $dbNote) {
$dbNote->delete();

2
app/Services/Internal/Support/BillServiceTrait.php
View File

@@ -68,7 +68,7 @@ trait BillServiceTrait
*/
public function updateNote(Bill $bill, string $note): bool
{
if (0 === strlen($note)) {
if (0 === \strlen($note)) {
$dbNote = $bill->notes()->first();
if (null !== $dbNote) {
$dbNote->delete(); // @codeCoverageIgnore

6
app/Services/Internal/Support/JournalServiceTrait.php
View File

@@ -47,7 +47,7 @@ trait JournalServiceTrait
$factory = app(TagFactory::class);
$factory->setUser($journal->user);
$set = [];
if (!is_array($data['tags'])) {
if (!\is_array($data['tags'])) {
return; // @codeCoverageIgnore
}
foreach ($data['tags'] as $string) {
@@ -81,7 +81,6 @@ trait JournalServiceTrait
$journal->bill_id = null;
$journal->save();
return;
}
/**
@@ -111,7 +110,7 @@ trait JournalServiceTrait
protected function storeNote(TransactionJournal $journal, ?string $notes): void
{
$notes = (string)$notes;
if (strlen($notes) > 0) {
if (\strlen($notes) > 0) {
$note = $journal->notes()->first();
if (null === $note) {
$note = new Note;
@@ -127,7 +126,6 @@ trait JournalServiceTrait
$note->delete();
}
return;
}
}

7
app/Services/Internal/Support/TransactionServiceTrait.php
View File

@@ -128,7 +128,7 @@ trait TransactionServiceTrait
// must be able to find it based on ID. Validator should catch invalid ID's.
return $repository->findNull($accountId);
}
if (strlen($accountName) > 0) {
if (\strlen($accountName) > 0) {
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
$factory->setUser($this->user);
@@ -144,7 +144,7 @@ trait TransactionServiceTrait
// must be able to find it based on ID. Validator should catch invalid ID's.
return $repository->findNull($accountId);
}
if (strlen($accountName) > 0) {
if (\strlen($accountName) > 0) {
// alternatively, return by name.
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
@@ -222,7 +222,6 @@ trait TransactionServiceTrait
}
$transaction->budgets()->sync([$budget->id]);
return;
}
@@ -239,7 +238,6 @@ trait TransactionServiceTrait
}
$transaction->categories()->sync([$category->id]);
return;
}
@@ -269,7 +267,6 @@ trait TransactionServiceTrait
$transaction->foreign_currency_id = $currency->id;
$transaction->save();
return;
}

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

@@ -70,7 +70,7 @@ class AccountUpdateService
}
// update note:
if (isset($data['notes']) && null !== $data['notes']) {
if (isset($data['notes'])) {
$this->updateNote($account, (string)$data['notes']);
}

4
app/Services/Internal/Update/JournalUpdateService.php
View File

@@ -62,7 +62,7 @@ class JournalUpdateService
$factory = app(TransactionFactory::class);
$factory->setUser($journal->user);
Log::debug(sprintf('Found %d rows in array (should result in %d transactions', count($data['transactions']), count($data['transactions']) * 2));
Log::debug(sprintf('Found %d rows in array (should result in %d transactions', \count($data['transactions']), \count($data['transactions']) * 2));
/**
* @var int $identifier
@@ -97,7 +97,7 @@ class JournalUpdateService
$journal->transactions()->where('identifier', $transaction->identifier)->delete();
}
}
Log::debug(sprintf('New count is %d, transactions array held %d items', $journal->transactions()->count(), count($data['transactions'])));
Log::debug(sprintf('New count is %d, transactions array held %d items', $journal->transactions()->count(), \count($data['transactions'])));
// connect bill:
$this->connectBill($journal, $data);