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

Fix various phpstan issues.

Browse Source
This commit is contained in:
James Cole
2023-11-28 05:05:42 +01:00
parent 14e9d73768
commit cbecacd652
13 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Services/FireflyIIIOrg/Update/UpdateRequest.php
View File

@@ -123,10 +123,15 @@ class UpdateRequest implements UpdateRequestInterface
}
// parse response a bit. No message yet.
$response = $json['firefly_iii'][$channel];
$response = $json['firefly_iii'][$channel];
$date = Carbon::createFromFormat('Y-m-d', $response['date']);
if (false === $date) {
$date = today(config('app.timezone'));
}
$return['version'] = $response['version'];
$return['level'] = 'success';
$return['date'] = Carbon::createFromFormat('Y-m-d', $response['date'])->startOfDay();
$return['date'] = $date->startOfDay();
app('log')->info('Response from update server', $response);
return $return;

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

@@ -118,7 +118,7 @@ class AccountDestroyService
$collection = Transaction::groupBy('transaction_journal_id', 'account_id')
->where('account_id', $moveTo->id)
->get(['transaction_journal_id', 'account_id', DB::raw('count(*) as the_count')]);
->get(['transaction_journal_id', 'account_id', DB::raw('count(*) as the_count')]); // @phpstan-ignore-line
if (0 === $collection->count()) {
return;
}

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

@@ -224,7 +224,11 @@ trait AccountServiceTrait
protected function createOBGroup(Account $account, array $data): TransactionGroup
{
app('log')->debug('Now going to create an OB group.');
$language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data;
$language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data;
if (is_array($language)) {
$language = 'en_US';
}
$language = (string)$language;
$sourceId = null;
$sourceName = null;
$destId = null;
@@ -478,6 +482,10 @@ trait AccountServiceTrait
}
$language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data;
if (is_array($language)) {
$language = 'en_US';
}
$language = (string)$language;
// set source and/or destination based on whether the amount is positive or negative.
// first, assume the amount is positive and go from there:
@@ -686,6 +694,10 @@ trait AccountServiceTrait
{
app('log')->debug('Now going to create an OB group.');
$language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data;
if (is_array($language)) {
$language = 'en_US';
}
$language= (string)$language;
$sourceId = null;
$sourceName = null;
$destId = null;

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

@@ -338,6 +338,9 @@ class AccountUpdateService
return;
}
$array = $preference->data;
if(!is_array($array)) {
$array = [$array];
}
app('log')->debug('Old array is: ', $array);
app('log')->debug(sprintf('Must remove : %d', $account->id));
$removeAccountId = $account->id;