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

Fix some phpstan issues.

Browse Source
This commit is contained in:
James Cole
2022-10-31 05:50:44 +01:00
parent bd245d5c92
commit 0059ed7bde
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.ci/phpstan.neon
View File

@@ -15,6 +15,7 @@ parameters:
paths:
- ../app/Api/V1/Controllers/Data/DestroyController.php
- ../app/Console/Commands/Correction/FixAccountTypes.php
- ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
paths:
- ../app
@@ -24,4 +25,4 @@ parameters:
- ../bootstrap/app.php
# The level 8 is the highest level. original was 5
level: 3
level: 1

8
app/Console/Commands/Upgrade/BackToJournals.php
View File

@@ -148,12 +148,12 @@ class BackToJournals extends Command
*/
private function getIdsForBudgets(): array
{
$transactions = DB::table('budget_transaction')->distinct()->get(['transaction_id'])->pluck('transaction_id')->toArray();
$transactions = DB::table('budget_transaction')->distinct()->pluck('transaction_id')->toArray();
$array = [];
$chunks = array_chunk($transactions, 500);
foreach ($chunks as $chunk) {
$set = DB::table('transactions')->whereIn('transactions.id', $chunk)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
$set = DB::table('transactions')->whereIn('transactions.id', $chunk)->pluck('transaction_journal_id')->toArray();
$array = array_merge($array, $set);
}
@@ -222,12 +222,12 @@ class BackToJournals extends Command
*/
private function getIdsForCategories(): array
{
$transactions = DB::table('category_transaction')->distinct()->get(['transaction_id'])->pluck('transaction_id')->toArray();
$transactions = DB::table('category_transaction')->distinct()->pluck('transaction_id')->toArray();
$array = [];
$chunks = array_chunk($transactions, 500);
foreach ($chunks as $chunk) {
$set = DB::table('transactions')
$set = DB::table('transactions')
->whereIn('transactions.id', $chunk)
->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
$array = array_merge($array, $set);

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

@@ -56,18 +56,12 @@ class OtherCurrenciesCorrections extends Command
* @var string
*/
protected $signature = 'firefly-iii:other-currencies {--F|force : Force the execution of this command.}';
/** @var array */
private $accountCurrencies;
/** @var AccountRepositoryInterface */
private $accountRepos;
/** @var JournalCLIRepositoryInterface */
private $cliRepos;
/** @var int */
private $count;
/** @var CurrencyRepositoryInterface */
private $currencyRepos;
/** @var JournalRepositoryInterface */
private $journalRepos;
private array $accountCurrencies;
private AccountRepositoryInterface $accountRepos;
private JournalCLIRepositoryInterface $cliRepos;
private int $count;
private CurrencyRepositoryInterface $currencyRepos;
private JournalRepositoryInterface $journalRepos;
/**
* Execute the console command.

8
app/Exceptions/GracefulNotFoundHandler.php
View File

@@ -147,7 +147,13 @@ class GracefulNotFoundHandler extends ExceptionHandler
/** @var User $user */
$user = auth()->user();
$route = $request->route();
$accountId = (int) $route->parameter('account');
$param = $route->parameter('account');
if($param instanceof Account) {
$accountId = (int) $param->id;
}
if(!($param instanceof Account)) {
$accountId = (int) $param;
}
/** @var Account $account */
$account = $user->accounts()->with(['accountType'])->withTrashed()->find($accountId);
if (null === $account) {