PHPStorm can order methods by alphabet, who knew.

app/Http/Controllers/Chart/AccountController.php

@@ -409,6 +409,58 @@ class AccountController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * @throws FireflyException
+     */
+    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
+    {
+        app('log')->debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
+        $locale            = app('steam')->getLocale();
+        $step              = $this->calculateStep($start, $end);
+        $result            = [
+            'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
+            'currency_symbol' => $currency->symbol,
+            'currency_code'   => $currency->code,
+        ];
+        $entries           = [];
+        $current           = clone $start;
+        app('log')->debug(sprintf('Step is %s', $step));
+
+        // 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.
+        // This period depends on the size of the chart
+        $current           = app('navigation')->endOfX($current, $step, null);
+        app('log')->debug(sprintf('$current date is %s', $current->format('Y-m-d')));
+        if ('1D' === $step) {
+            // per day the entire period, balance for every day.
+            $format   = (string)trans('config.month_and_day_js', [], $locale);
+            $range    = app('steam')->balanceInRange($account, $start, $end, $currency);
+            $previous = array_values($range)[0];
+            while ($end >= $current) {
+                $theDate         = $current->format('Y-m-d');
+                $balance         = $range[$theDate] ?? $previous;
+                $label           = $current->isoFormat($format);
+                $entries[$label] = (float)$balance;
+                $previous        = $balance;
+                $current->addDay();
+            }
+        }
+        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
+            while ($end >= $current) {
+                app('log')->debug(sprintf('Current is: %s', $current->format('Y-m-d')));
+                $balance         = (float)app('steam')->balance($account, $current, $currency);
+                $label           = app('navigation')->periodShow($current, $step);
+                $entries[$label] = $balance;
+                $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);
+            }
+        }
+        $result['entries'] = $entries;
+
+        return $result;
+    }
+
     /**
      * Shows the balances for a given set of dates and accounts.
      *
@@ -512,56 +564,4 @@ class AccountController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * @throws FireflyException
-     */
-    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
-    {
-        app('log')->debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
-        $locale            = app('steam')->getLocale();
-        $step              = $this->calculateStep($start, $end);
-        $result            = [
-            'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
-            'currency_symbol' => $currency->symbol,
-            'currency_code'   => $currency->code,
-        ];
-        $entries           = [];
-        $current           = clone $start;
-        app('log')->debug(sprintf('Step is %s', $step));
-
-        // 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.
-        // This period depends on the size of the chart
-        $current           = app('navigation')->endOfX($current, $step, null);
-        app('log')->debug(sprintf('$current date is %s', $current->format('Y-m-d')));
-        if ('1D' === $step) {
-            // per day the entire period, balance for every day.
-            $format   = (string)trans('config.month_and_day_js', [], $locale);
-            $range    = app('steam')->balanceInRange($account, $start, $end, $currency);
-            $previous = array_values($range)[0];
-            while ($end >= $current) {
-                $theDate         = $current->format('Y-m-d');
-                $balance         = $range[$theDate] ?? $previous;
-                $label           = $current->isoFormat($format);
-                $entries[$label] = (float)$balance;
-                $previous        = $balance;
-                $current->addDay();
-            }
-        }
-        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
-            while ($end >= $current) {
-                app('log')->debug(sprintf('Current is: %s', $current->format('Y-m-d')));
-                $balance         = (float)app('steam')->balance($account, $current, $currency);
-                $label           = app('navigation')->periodShow($current, $step);
-                $entries[$label] = $balance;
-                $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);
-            }
-        }
-        $result['entries'] = $entries;
-
-        return $result;
-    }
 }

app/Http/Controllers/Chart/BudgetReportController.php

@@ -195,6 +195,23 @@ class BudgetReportController extends Controller
         return response()->json($data);
     }
 
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     /**
      * Chart that groups expenses by the account.
      */
@@ -224,21 +241,4 @@ class BudgetReportController extends Controller
 
         return response()->json($data);
     }
-
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Chart/CategoryController.php

@@ -94,6 +94,11 @@ class CategoryController extends Controller
         return response()->json($data);
     }
 
+    private function getDate(): Carbon
+    {
+        return today(config('app.timezone'));
+    }
+
     /**
      * Shows the category chart on the front page.
      * TODO test method for category refactor.
@@ -141,6 +146,85 @@ class CategoryController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * Generate report chart for either with or without category.
+     */
+    private function reportPeriodChart(Collection $accounts, Carbon $start, Carbon $end, ?Category $category): array
+    {
+        $income     = [];
+        $expenses   = [];
+        $categoryId = 0;
+        if (null === $category) {
+            /** @var NoCategoryRepositoryInterface $noCatRepository */
+            $noCatRepository = app(NoCategoryRepositoryInterface::class);
+
+            // this gives us all currencies
+            $expenses        = $noCatRepository->listExpenses($start, $end, $accounts);
+            $income          = $noCatRepository->listIncome($start, $end, $accounts);
+        }
+
+        if (null !== $category) {
+            /** @var OperationsRepositoryInterface $opsRepository */
+            $opsRepository = app(OperationsRepositoryInterface::class);
+            $categoryId    = $category->id;
+            // this gives us all currencies
+            $collection    = new Collection([$category]);
+            $expenses      = $opsRepository->listExpenses($start, $end, null, $collection);
+            $income        = $opsRepository->listIncome($start, $end, null, $collection);
+        }
+        $currencies = array_unique(array_merge(array_keys($income), array_keys($expenses)));
+        $periods    = app('navigation')->listOfPeriods($start, $end);
+        $format     = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $chartData  = [];
+        // make empty data array:
+        // double foreach (bad) to make empty array:
+        foreach ($currencies as $currencyId) {
+            $currencyInfo = $expenses[$currencyId] ?? $income[$currencyId];
+            $outKey       = sprintf('%d-out', $currencyId);
+            $inKey        = sprintf('%d-in', $currencyId);
+            $chartData[$outKey]
+                          = [
+                              'label'           => sprintf('%s (%s)', (string)trans('firefly.spent'), $currencyInfo['currency_name']),
+                              'entries'         => [],
+                              'type'            => 'bar',
+                              'backgroundColor' => 'rgba(219, 68, 55, 0.5)', // red
+                          ];
+
+            $chartData[$inKey]
+                          = [
+                    'label'           => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']),
+                    'entries'         => [],
+                    'type'            => 'bar',
+                    'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
+                ];
+            // loop empty periods:
+            foreach (array_keys($periods) as $period) {
+                $label                                 = $periods[$period];
+                $chartData[$outKey]['entries'][$label] = '0';
+                $chartData[$inKey]['entries'][$label]  = '0';
+            }
+            // loop income and expenses for this category.:
+            $outSet       = $expenses[$currencyId]['categories'][$categoryId] ?? ['transaction_journals' => []];
+            foreach ($outSet['transaction_journals'] as $journal) {
+                $amount                               = app('steam')->positive($journal['amount']);
+                $date                                 = $journal['date']->isoFormat($format);
+                $chartData[$outKey]['entries'][$date] ??= '0';
+
+                $chartData[$outKey]['entries'][$date] = bcadd($amount, $chartData[$outKey]['entries'][$date]);
+            }
+
+            $inSet        = $income[$currencyId]['categories'][$categoryId] ?? ['transaction_journals' => []];
+            foreach ($inSet['transaction_journals'] as $journal) {
+                $amount                              = app('steam')->positive($journal['amount']);
+                $date                                = $journal['date']->isoFormat($format);
+                $chartData[$inKey]['entries'][$date] ??= '0';
+                $chartData[$inKey]['entries'][$date] = bcadd($amount, $chartData[$inKey]['entries'][$date]);
+            }
+        }
+
+        return $this->generator->multiSet($chartData);
+    }
+
     /**
      * Chart for period for transactions without a category.
      * TODO test me.
@@ -195,88 +279,4 @@ class CategoryController extends Controller
 
         return response()->json($data);
     }
-
-    private function getDate(): Carbon
-    {
-        return today(config('app.timezone'));
-    }
-
-    /**
-     * Generate report chart for either with or without category.
-     */
-    private function reportPeriodChart(Collection $accounts, Carbon $start, Carbon $end, ?Category $category): array
-    {
-        $income     = [];
-        $expenses   = [];
-        $categoryId = 0;
-        if (null === $category) {
-            /** @var NoCategoryRepositoryInterface $noCatRepository */
-            $noCatRepository = app(NoCategoryRepositoryInterface::class);
-
-            // this gives us all currencies
-            $expenses        = $noCatRepository->listExpenses($start, $end, $accounts);
-            $income          = $noCatRepository->listIncome($start, $end, $accounts);
-        }
-
-        if (null !== $category) {
-            /** @var OperationsRepositoryInterface $opsRepository */
-            $opsRepository = app(OperationsRepositoryInterface::class);
-            $categoryId    = $category->id;
-            // this gives us all currencies
-            $collection    = new Collection([$category]);
-            $expenses      = $opsRepository->listExpenses($start, $end, null, $collection);
-            $income        = $opsRepository->listIncome($start, $end, null, $collection);
-        }
-        $currencies = array_unique(array_merge(array_keys($income), array_keys($expenses)));
-        $periods    = app('navigation')->listOfPeriods($start, $end);
-        $format     = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $chartData  = [];
-        // make empty data array:
-        // double foreach (bad) to make empty array:
-        foreach ($currencies as $currencyId) {
-            $currencyInfo = $expenses[$currencyId] ?? $income[$currencyId];
-            $outKey       = sprintf('%d-out', $currencyId);
-            $inKey        = sprintf('%d-in', $currencyId);
-            $chartData[$outKey]
-                          = [
-                              'label'           => sprintf('%s (%s)', (string)trans('firefly.spent'), $currencyInfo['currency_name']),
-                              'entries'         => [],
-                              'type'            => 'bar',
-                              'backgroundColor' => 'rgba(219, 68, 55, 0.5)', // red
-                          ];
-
-            $chartData[$inKey]
-                          = [
-                              'label'           => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']),
-                              'entries'         => [],
-                              'type'            => 'bar',
-                              'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
-                          ];
-            // loop empty periods:
-            foreach (array_keys($periods) as $period) {
-                $label                                 = $periods[$period];
-                $chartData[$outKey]['entries'][$label] = '0';
-                $chartData[$inKey]['entries'][$label]  = '0';
-            }
-            // loop income and expenses for this category.:
-            $outSet       = $expenses[$currencyId]['categories'][$categoryId] ?? ['transaction_journals' => []];
-            foreach ($outSet['transaction_journals'] as $journal) {
-                $amount                               = app('steam')->positive($journal['amount']);
-                $date                                 = $journal['date']->isoFormat($format);
-                $chartData[$outKey]['entries'][$date] ??= '0';
-
-                $chartData[$outKey]['entries'][$date] = bcadd($amount, $chartData[$outKey]['entries'][$date]);
-            }
-
-            $inSet        = $income[$currencyId]['categories'][$categoryId] ?? ['transaction_journals' => []];
-            foreach ($inSet['transaction_journals'] as $journal) {
-                $amount                              = app('steam')->positive($journal['amount']);
-                $date                                = $journal['date']->isoFormat($format);
-                $chartData[$inKey]['entries'][$date] ??= '0';
-                $chartData[$inKey]['entries'][$date] = bcadd($amount, $chartData[$inKey]['entries'][$date]);
-            }
-        }
-
-        return $this->generator->multiSet($chartData);
-    }
 }

app/Http/Controllers/Chart/CategoryReportController.php

@@ -269,6 +269,26 @@ class CategoryReportController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * TODO duplicate function
+     */
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     public function sourceExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): JsonResponse
     {
         $result = [];
@@ -324,24 +344,4 @@ class CategoryReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * TODO duplicate function
-     */
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Chart/DoubleReportController.php

@@ -212,6 +212,44 @@ class DoubleReportController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * TODO duplicate function
+     */
+    private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
+    {
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            if ($account->name === $name && $account->id !== $id) {
+                return $account->name;
+            }
+            if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
+                return $account->iban;
+            }
+        }
+
+        return $name;
+    }
+
+    /**
+     * TODO duplicate function
+     */
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     public function tagExpense(Collection $accounts, Collection $others, Carbon $start, Carbon $end): JsonResponse
     {
         $result           = [];
@@ -317,42 +355,4 @@ class DoubleReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * TODO duplicate function
-     */
-    private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
-    {
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            if ($account->name === $name && $account->id !== $id) {
-                return $account->name;
-            }
-            if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
-                return $account->iban;
-            }
-        }
-
-        return $name;
-    }
-
-    /**
-     * TODO duplicate function
-     */
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }

app/Http/Controllers/Chart/ExpenseReportController.php

@@ -102,27 +102,27 @@ class ExpenseReportController extends Controller
             /** @var Account $exp */
             $exp                              = $combination->first();
             $chartData[$exp->id.'-in']        = [
-                'label'   => sprintf('%s (%s)', $name, (string) trans('firefly.income')),
+                'label'   => sprintf('%s (%s)', $name, (string)trans('firefly.income')),
                 'type'    => 'bar',
                 'yAxisID' => 'y-axis-0',
                 'entries' => [],
             ];
             $chartData[$exp->id.'-out']       = [
-                'label'   => sprintf('%s (%s)', $name, (string) trans('firefly.expenses')),
+                'label'   => sprintf('%s (%s)', $name, (string)trans('firefly.expenses')),
                 'type'    => 'bar',
                 'yAxisID' => 'y-axis-0',
                 'entries' => [],
             ];
             // total in, total out:
             $chartData[$exp->id.'-total-in']  = [
-                'label'   => sprintf('%s (%s)', $name, (string) trans('firefly.sum_of_income')),
+                'label'   => sprintf('%s (%s)', $name, (string)trans('firefly.sum_of_income')),
                 'type'    => 'line',
                 'fill'    => false,
                 'yAxisID' => 'y-axis-1',
                 'entries' => [],
             ];
             $chartData[$exp->id.'-total-out'] = [
-                'label'   => sprintf('%s (%s)', $name, (string) trans('firefly.sum_of_expenses')),
+                'label'   => sprintf('%s (%s)', $name, (string)trans('firefly.sum_of_expenses')),
                 'type'    => 'line',
                 'fill'    => false,
                 'yAxisID' => 'y-axis-1',

app/Http/Controllers/Chart/TagReportController.php

@@ -274,6 +274,26 @@ class TagReportController extends Controller
         return response()->json($data);
     }
 
+    /**
+     * TODO duplicate function
+     */
+    private function makeEntries(Carbon $start, Carbon $end): array
+    {
+        $return         = [];
+        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
+        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
+        $currentStart   = clone $start;
+        while ($currentStart <= $end) {
+            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
+            $key          = $currentStart->isoFormat($format);
+            $return[$key] = '0';
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay()->startOfDay();
+        }
+
+        return $return;
+    }
+
     public function sourceExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse
     {
         $result = [];
@@ -381,24 +401,4 @@ class TagReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * TODO duplicate function
-     */
-    private function makeEntries(Carbon $start, Carbon $end): array
-    {
-        $return         = [];
-        $format         = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
-        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
-        $currentStart   = clone $start;
-        while ($currentStart <= $end) {
-            $currentEnd   = app('navigation')->endOfPeriod($currentStart, $preferredRange);
-            $key          = $currentStart->isoFormat($format);
-            $return[$key] = '0';
-            $currentStart = clone $currentEnd;
-            $currentStart->addDay()->startOfDay();
-        }
-
-        return $return;
-    }
 }