Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

app/Helpers/Collector/GroupCollector.php

@@ -714,9 +714,9 @@ class GroupCollector implements GroupCollectorInterface
                 if (null === $transaction['amount']) {
                     throw new FireflyException(sprintf('Amount is NULL for a transaction in group #%d, please investigate.', $groudId));
                 }
-                $nativeAmount = (string) ('' === $transaction['native_amount'] ? '0' : $transaction['native_amount']);
-                $nativeForeignAmount = (string) ('' === $transaction['native_foreign_amount'] ? '0' : $transaction['native_foreign_amount']);
-                $foreignAmount = (string) ('' === $transaction['foreign_amount'] ? '0' : $transaction['foreign_amount']);
+                $nativeAmount                                           = (string) ('' === $transaction['native_amount'] ? '0' : $transaction['native_amount']);
+                $nativeForeignAmount                                    = (string) ('' === $transaction['native_foreign_amount'] ? '0' : $transaction['native_foreign_amount']);
+                $foreignAmount                                          = (string) ('' === $transaction['foreign_amount'] ? '0' : $transaction['foreign_amount']);
 
                 // set default:
                 if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {
@@ -740,7 +740,7 @@ class GroupCollector implements GroupCollectorInterface
                         $groups[$groudId]['sums'][$currencyId]['currency_symbol']         = $transaction['foreign_currency_symbol'];
                         $groups[$groudId]['sums'][$currencyId]['currency_decimal_places'] = $transaction['foreign_currency_decimal_places'];
                         $groups[$groudId]['sums'][$currencyId]['amount']                  = '0';
-                        $groups[$groudId]['sums'][$currencyId]['native_amount']             = '0';
+                        $groups[$groudId]['sums'][$currencyId]['native_amount']           = '0';
                     }
                     $groups[$groudId]['sums'][$currencyId]['amount']        = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $foreignAmount);
                     $groups[$groudId]['sums'][$currencyId]['native_amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $nativeForeignAmount);

app/Http/Controllers/Chart/AccountController.php

@@ -84,11 +84,11 @@ class AccountController extends Controller
         Log::debug('RevenueAccounts');
 
         /** @var Carbon $start */
-        $start = clone session('start', today(config('app.timezone'))->startOfMonth());
+        $start         = clone session('start', today(config('app.timezone'))->startOfMonth());
 
         /** @var Carbon $end */
-        $end   = clone session('end', today(config('app.timezone'))->endOfMonth());
-        $cache = new CacheProperties();
+        $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
+        $cache         = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($this->convertToNative);
@@ -99,13 +99,13 @@ class AccountController extends Controller
         $start->subDay();
 
         // prep some vars:
-        $currencies = [];
-        $chartData  = [];
-        $tempData   = [];
+        $currencies    = [];
+        $chartData     = [];
+        $tempData      = [];
 
         // grab all accounts and names
-        $accounts     = $this->accountRepository->getAccountsByType([AccountTypeEnum::EXPENSE->value]);
-        $accountNames = $this->extractNames($accounts);
+        $accounts      = $this->accountRepository->getAccountsByType([AccountTypeEnum::EXPENSE->value]);
+        $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
         $startBalances = app('steam')->finalAccountsBalance($accounts, $start);
@@ -137,13 +137,13 @@ class AccountController extends Controller
                     continue;
                 }
                 // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
-                $searchCode = $this->convertToNative ? $this->defaultCurrency->code : $key;
+                $searchCode   = $this->convertToNative ? $this->defaultCurrency->code : $key;
                 // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
                 $startBalance = ($startBalances[$account->id][$key] ?? '0');
                 //                Log::debug(sprintf('Start balance is %s', $startBalance));
-                $diff                    = bcsub($endBalance, $startBalance);
+                $diff         = bcsub($endBalance, $startBalance);
                 $currencies[$searchCode] ??= $this->currencyRepository->findByCode($searchCode);
                 if (0 !== bccomp($diff, '0')) {
                     // store the values in a temporary array.
@@ -161,10 +161,10 @@ class AccountController extends Controller
         foreach ($currencies as $currency) {
             $newCurrencies[$currency->id] = $currency;
         }
-        $currencies = $newCurrencies;
+        $currencies    = $newCurrencies;
 
         // sort temp array by amount.
-        $amounts = array_column($tempData, 'diff_float');
+        $amounts       = array_column($tempData, 'diff_float');
         array_multisort($amounts, SORT_DESC, $tempData);
 
         // loop all found currencies and build the data array for the chart.
@@ -175,12 +175,12 @@ class AccountController extends Controller
         foreach ($currencies as $currencyId => $currency) {
             $dataSet
                                     = [
-                'label'           => (string) trans('firefly.spent'),
-                'type'            => 'bar',
-                'currency_symbol' => $currency->symbol,
-                'currency_code'   => $currency->code,
-                'entries'         => $this->expandNames($tempData),
-            ];
+                                        'label'           => (string) trans('firefly.spent'),
+                                        'type'            => 'bar',
+                                        'currency_symbol' => $currency->symbol,
+                                        'currency_code'   => $currency->code,
+                                        'entries'         => $this->expandNames($tempData),
+                                    ];
             $chartData[$currencyId] = $dataSet;
         }
 
@@ -191,7 +191,7 @@ class AccountController extends Controller
             $chartData[$currencyId]['entries'][$name] = (float) $entry['difference'];
         }
 
-        $data = $this->generator->multiSet($chartData);
+        $data          = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -213,7 +213,7 @@ class AccountController extends Controller
      */
     public function expenseBudget(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
-        $cache = new CacheProperties();
+        $cache     = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -232,9 +232,9 @@ class AccountController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $budgetId    = (int) $journal['budget_id'];
-            $key         = sprintf('%d-%d', $budgetId, $journal['currency_id']);
-            $budgetIds[] = $budgetId;
+            $budgetId              = (int) $journal['budget_id'];
+            $key                   = sprintf('%d-%d', $budgetId, $journal['currency_id']);
+            $budgetIds[]           = $budgetId;
             if (!array_key_exists($key, $result)) {
                 $result[$key] = [
                     'total'           => '0',
@@ -247,7 +247,7 @@ class AccountController extends Controller
             $result[$key]['total'] = bcadd($journal['amount'], $result[$key]['total']);
         }
 
-        $names = $this->getBudgetNames($budgetIds);
+        $names     = $this->getBudgetNames($budgetIds);
 
         foreach ($result as $row) {
             $budgetId          = $row['budget_id'];
@@ -256,7 +256,7 @@ class AccountController extends Controller
             $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']];
         }
 
-        $data = $this->generator->multiCurrencyPieChart($chartData);
+        $data      = $this->generator->multiCurrencyPieChart($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -278,7 +278,7 @@ class AccountController extends Controller
      */
     public function expenseCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
-        $cache = new CacheProperties();
+        $cache     = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -296,7 +296,7 @@ class AccountController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $key = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
+            $key                   = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
             if (!array_key_exists($key, $result)) {
                 $result[$key] = [
                     'total'           => '0',
@@ -308,7 +308,7 @@ class AccountController extends Controller
             }
             $result[$key]['total'] = bcadd($journal['amount'], $result[$key]['total']);
         }
-        $names = $this->getCategoryNames(array_keys($result));
+        $names     = $this->getCategoryNames(array_keys($result));
 
         foreach ($result as $row) {
             $categoryId        = $row['category_id'];
@@ -317,7 +317,7 @@ class AccountController extends Controller
             $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']];
         }
 
-        $data = $this->generator->multiCurrencyPieChart($chartData);
+        $data      = $this->generator->multiCurrencyPieChart($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -330,9 +330,9 @@ class AccountController extends Controller
      *                                              */
     public function frontpage(AccountRepositoryInterface $repository): JsonResponse
     {
-        $start      = clone session('start', today(config('app.timezone'))->startOfMonth());
-        $end        = clone session('end', today(config('app.timezone'))->endOfMonth());
-        $defaultSet = $repository->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
+        $start          = clone session('start', today(config('app.timezone'))->startOfMonth());
+        $end            = clone session('end', today(config('app.timezone'))->endOfMonth());
+        $defaultSet     = $repository->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
         Log::debug('Default set is ', $defaultSet);
         $frontpage      = app('preferences')->get('frontpageAccounts', $defaultSet);
         $frontpageArray = !is_array($frontpage->data) ? [] : $frontpage->data;
@@ -341,7 +341,7 @@ class AccountController extends Controller
             app('preferences')->set('frontpageAccounts', $defaultSet);
             Log::debug('frontpage set is empty!');
         }
-        $accounts = $repository->getAccountsById($frontpageArray);
+        $accounts       = $repository->getAccountsById($frontpageArray);
 
         return response()->json($this->accountBalanceChart($accounts, $start, $end));
     }
@@ -362,7 +362,7 @@ class AccountController extends Controller
      */
     public function incomeCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
-        $cache = new CacheProperties();
+        $cache     = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
@@ -382,7 +382,7 @@ class AccountController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $key = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
+            $key                   = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
             if (!array_key_exists($key, $result)) {
                 $result[$key] = [
                     'total'           => '0',
@@ -395,14 +395,14 @@ class AccountController extends Controller
             $result[$key]['total'] = bcadd($journal['amount'], $result[$key]['total']);
         }
 
-        $names = $this->getCategoryNames(array_keys($result));
+        $names     = $this->getCategoryNames(array_keys($result));
         foreach ($result as $row) {
             $categoryId        = $row['category_id'];
             $name              = $names[$categoryId] ?? '(unknown)';
             $label             = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
             $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']];
         }
-        $data = $this->generator->multiCurrencyPieChart($chartData);
+        $data      = $this->generator->multiCurrencyPieChart($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -418,22 +418,22 @@ class AccountController extends Controller
         $start->startOfDay();
         $end->endOfDay();
         Log::debug(sprintf('Now in period("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
-        $chartData = [];
-        $cache     = new CacheProperties();
+        $chartData       = [];
+        $cache           = new CacheProperties();
         $cache->addProperty('chart.account.period');
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($this->convertToNative);
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            //return response()->json($cache->get());
+            // return response()->json($cache->get());
         }
 
         // collect and filter balances for the entire period.
-        $step = $this->calculateStep($start, $end);
+        $step            = $this->calculateStep($start, $end);
         Log::debug(sprintf('Step is %s', $step));
-        $locale = app('steam')->getLocale();
-        $return = [];
+        $locale          = app('steam')->getLocale();
+        $return          = [];
 
         // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
         // have to make sure this chart is always based on the balance at the END of the period.
@@ -443,8 +443,8 @@ class AccountController extends Controller
         $format          = (string) trans('config.month_and_day_js', [], $locale);
         $accountCurrency = $this->accountRepository->getAccountCurrency($account);
 
-        $range = Steam::finalAccountBalanceInRange($account, $start, $end, $this->convertToNative);
-        $range = Steam::filterAccountBalances($range, $account, $this->convertToNative, $accountCurrency);
+        $range           = Steam::finalAccountBalanceInRange($account, $start, $end, $this->convertToNative);
+        $range           = Steam::filterAccountBalances($range, $account, $this->convertToNative, $accountCurrency);
 
         // temp, get end balance.
         Log::debug('temp get end balance');
@@ -455,14 +455,14 @@ class AccountController extends Controller
         $accountCurrency ??= $this->defaultCurrency; // do this AFTER getting the balances.
         Log::debug('Start chart loop.');
 
-        $newRange      = [];
-        $expectedIndex = 0;
+        $newRange        = [];
+        $expectedIndex   = 0;
         Log::debug('Balances exist at:');
         foreach ($range as $key => $value) {
             $newRange[] = ['date' => $key, 'info' => $value];
             Log::debug(sprintf('%d - %s (%s)', count($newRange) - 1, $key, json_encode($value)));
         }
-        $carbon = Carbon::createFromFormat('Y-m-d', $newRange[0]['date'])->endOfDay();
+        $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date'])->endOfDay();
         Log::debug(sprintf('Start of loop, $carbon is %s', $carbon->format('Y-m-d H:i:s')));
         while ($end->gte($current)) {
             $momentBalance = $previous;
@@ -483,21 +483,21 @@ class AccountController extends Controller
                 }
             }
             Log::debug(sprintf('momentBalance is now %s', json_encode($momentBalance)));
-            $return   = $this->updateChartKeys($return, $momentBalance);
-            $previous = $momentBalance;
+            $return        = $this->updateChartKeys($return, $momentBalance);
+            $previous      = $momentBalance;
 
             // process each balance thing.
             foreach ($momentBalance as $key => $amount) {
                 $label                           = $current->isoFormat($format);
                 $return[$key]['entries'][$label] = $amount;
             }
-            $current = app('navigation')->addPeriod($current, $step, 0);
+            $current       = app('navigation')->addPeriod($current, $step, 0);
             // here too, to fix #8041, the data is corrected to the end of the period.
-            $current = app('navigation')->endOfX($current, $step, null);
+            $current       = app('navigation')->endOfX($current, $step, null);
         }
         Log::debug('End of chart loop.');
         // second loop (yes) to create nice array with info! Yay!
-        $chartData = [];
+        $chartData       = [];
 
         foreach ($return as $key => $info) {
             if (3 === strlen($key)) {
@@ -520,7 +520,7 @@ class AccountController extends Controller
             $chartData[] = $info;
         }
 
-        $data = $this->generator->multiSet($chartData);
+        $data            = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -546,11 +546,11 @@ class AccountController extends Controller
     public function revenueAccounts(): JsonResponse
     {
         /** @var Carbon $start */
-        $start = clone session('start', today(config('app.timezone'))->startOfMonth());
+        $start         = clone session('start', today(config('app.timezone'))->startOfMonth());
 
         /** @var Carbon $end */
-        $end   = clone session('end', today(config('app.timezone'))->endOfMonth());
-        $cache = new CacheProperties();
+        $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
+        $cache         = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($this->convertToNative);
@@ -561,13 +561,13 @@ class AccountController extends Controller
         $start->subDay();
 
         // prep some vars:
-        $currencies = [];
-        $chartData  = [];
-        $tempData   = [];
+        $currencies    = [];
+        $chartData     = [];
+        $tempData      = [];
 
         // grab all accounts and names
-        $accounts     = $this->accountRepository->getAccountsByType([AccountTypeEnum::REVENUE->value]);
-        $accountNames = $this->extractNames($accounts);
+        $accounts      = $this->accountRepository->getAccountsByType([AccountTypeEnum::REVENUE->value]);
+        $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
         $startBalances = app('steam')->finalAccountsBalance($accounts, $start);
@@ -600,13 +600,13 @@ class AccountController extends Controller
                     continue;
                 }
                 // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
-                $searchCode = $this->convertToNative ? $this->defaultCurrency->code : $key;
+                $searchCode   = $this->convertToNative ? $this->defaultCurrency->code : $key;
                 // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
                 $startBalance = ($startBalances[$account->id][$key] ?? '0');
                 // Log::debug(sprintf('Start balance is %s', $startBalance));
-                $diff                    = bcsub($endBalance, $startBalance);
+                $diff         = bcsub($endBalance, $startBalance);
                 $currencies[$searchCode] ??= $this->currencyRepository->findByCode($searchCode);
                 if (0 !== bccomp($diff, '0')) {
                     // store the values in a temporary array.
@@ -626,10 +626,10 @@ class AccountController extends Controller
         foreach ($currencies as $currency) {
             $newCurrencies[$currency->id] = $currency;
         }
-        $currencies = $newCurrencies;
+        $currencies    = $newCurrencies;
 
         // sort temp array by amount.
-        $amounts = array_column($tempData, 'diff_float');
+        $amounts       = array_column($tempData, 'diff_float');
         array_multisort($amounts, SORT_ASC, $tempData);
 
         // loop all found currencies and build the data array for the chart.
@@ -640,12 +640,12 @@ class AccountController extends Controller
         foreach ($currencies as $currencyId => $currency) {
             $dataSet
                                     = [
-                'label'           => (string) trans('firefly.earned'),
-                'type'            => 'bar',
-                'currency_symbol' => $currency->symbol,
-                'currency_code'   => $currency->code,
-                'entries'         => $this->expandNames($tempData),
-            ];
+                                        'label'           => (string) trans('firefly.earned'),
+                                        'type'            => 'bar',
+                                        'currency_symbol' => $currency->symbol,
+                                        'currency_code'   => $currency->code,
+                                        'entries'         => $this->expandNames($tempData),
+                                    ];
             $chartData[$currencyId] = $dataSet;
         }
 
@@ -656,7 +656,7 @@ class AccountController extends Controller
             $chartData[$currencyId]['entries'][$name] = bcmul($entry['difference'], '-1');
         }
 
-        $data = $this->generator->multiSet($chartData);
+        $data          = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return response()->json($data);

app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php

@@ -108,6 +108,6 @@ class ExchangeRateRepository implements ExchangeRateRepositoryInterface
     #[\Override]
     public function getAll(): Collection
     {
-        return $this->userGroup->currencyExchangeRates()->orderBy('date','ASC')->get();
+        return $this->userGroup->currencyExchangeRates()->orderBy('date', 'ASC')->get();
     }
 }

app/Support/Steam.php

@@ -410,11 +410,11 @@ class Steam
         $defaultCurrency = app('amount')->getNativeCurrency();
         if ($convertToNative) {
             if ($defaultCurrency->id === $currency?->id) {
-                //Log::debug(sprintf('Unset "native_balance" and "%s" for account #%d', $defaultCurrency->code, $account->id));
+                // Log::debug(sprintf('Unset "native_balance" and "%s" for account #%d', $defaultCurrency->code, $account->id));
                 unset($set['native_balance'], $set[$defaultCurrency->code]);
             }
             if (null !== $currency && $defaultCurrency->id !== $currency->id) {
-                //Log::debug(sprintf('Unset balance for account #%d', $account->id));
+                // Log::debug(sprintf('Unset balance for account #%d', $account->id));
                 unset($set['balance']);
             }
 
@@ -426,13 +426,13 @@ class Steam
 
         if (!$convertToNative) {
             if (null === $currency) {
-                //Log::debug(sprintf('Unset native_balance and make defaultCurrency balance the balance for account #%d', $account->id));
+                // Log::debug(sprintf('Unset native_balance and make defaultCurrency balance the balance for account #%d', $account->id));
                 $set['balance'] = $set[$defaultCurrency->code] ?? '0';
                 unset($set['native_balance'], $set[$defaultCurrency->code]);
             }
 
             if (null !== $currency) {
-                //Log::debug(sprintf('Unset native_balance + defaultCurrency + currencyCode balance for account #%d', $account->id));
+                // Log::debug(sprintf('Unset native_balance + defaultCurrency + currencyCode balance for account #%d', $account->id));
                 unset($set['native_balance'], $set[$defaultCurrency->code], $set[$currency->code]);
             }
         }