diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 19dbce3dd2..3a512e34ad 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -187,7 +187,7 @@ class CategoryController extends Controller $spentArray = $repository->spentInPeriodPerCurrency(new Collection([$category]), $accounts, $start, $end); foreach ($spentArray as $currencyId => $spent) { if (bccomp($spent, '0') === -1) { - $currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepository->findNull($currencyId); + $currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepository->findNull((int)$currencyId); $tempData[] = [ 'name' => $category->name, 'spent' => bcmul($spent, '-1'), diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 3c7a2039b1..c14d95aebb 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -138,7 +138,7 @@ class InstallController extends Controller } try { Log::debug('Am now calling upgrade database routine...'); - Artisan::call('firefly:upgrade-database'); + Artisan::call('firefly:upgrade-database', ['--force' => true]); Log::debug(Artisan::output()); } catch (Exception $e) { Log::error($e->getMessage()); @@ -165,7 +165,7 @@ class InstallController extends Controller } try { Log::debug('Am now calling verify database routine...'); - Artisan::call('firefly:verify'); + Artisan::call('firefly:verify', ['--force' => true]); Log::debug(Artisan::output()); } catch (Exception $e) { Log::error($e->getMessage());