Rearrange some code.

app/Support/Http/Api/AccountBalanceGrouped.php

@@ -44,10 +44,10 @@ class AccountBalanceGrouped
     private readonly ExchangeRateConverter $converter;
     private array                          $currencies = [];
     private array                          $data       = [];
-    private TransactionCurrency            $primary;
     private Carbon                         $end;
     private array                          $journals   = [];
     private string                         $preferredRange;
+    private TransactionCurrency            $primary;
     private Carbon                         $start;
 
     public function __construct()
@@ -259,6 +259,22 @@ class AccountBalanceGrouped
         $this->accountIds = $accounts->pluck('id')->toArray();
     }
 
+    public function setEnd(Carbon $end): void
+    {
+        $this->end = $end;
+    }
+
+    public function setJournals(array $journals): void
+    {
+        $this->journals = $journals;
+    }
+
+    public function setPreferredRange(string $preferredRange): void
+    {
+        $this->preferredRange = $preferredRange;
+        $this->carbonFormat   = Navigation::preferredCarbonFormatByPeriod($preferredRange);
+    }
+
     public function setPrimary(TransactionCurrency $primary): void
     {
         $this->primary                  = $primary;
@@ -278,22 +294,6 @@ class AccountBalanceGrouped
         ];
     }
 
-    public function setEnd(Carbon $end): void
-    {
-        $this->end = $end;
-    }
-
-    public function setJournals(array $journals): void
-    {
-        $this->journals = $journals;
-    }
-
-    public function setPreferredRange(string $preferredRange): void
-    {
-        $this->preferredRange = $preferredRange;
-        $this->carbonFormat   = Navigation::preferredCarbonFormatByPeriod($preferredRange);
-    }
-
     public function setStart(Carbon $start): void
     {
         $this->start = $start;

app/Support/Http/Api/ExchangeRateConverter.php

@@ -187,8 +187,7 @@ class ExchangeRateConverter
                                   ->where('to_currency_id', $to)
                                   ->where('date', '<=', $date)
                                   ->orderBy('date', 'DESC')
-            ->first()
+                                  ->first();
-        ;
         ++$this->queryCount;
         $rate = (string)$result?->rate;
 

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -38,8 +38,8 @@ use Illuminate\Support\Facades\Log;
  */
 trait ValidatesUserGroupTrait
 {
-    protected UserGroup $userGroup;
     protected User      $user;
+    protected UserGroup $userGroup;
 
     /**
      * An "undocumented" filter

app/Support/Http/Controllers/CreateStuff.php

@@ -32,7 +32,6 @@ use FireflyIII\User;
 use Illuminate\Support\Facades\Log;
 use Laravel\Passport\Passport;
 use phpseclib3\Crypt\RSA;
-
 use function Safe\file_put_contents;
 
 /**

app/Support/Http/Controllers/CronRunner.php

@@ -63,32 +63,6 @@ trait CronRunner
         ];
     }
 
-    protected function webhookCronJob(bool $force, Carbon $date): array
-    {
-        /** @var WebhookCronjob $webhook */
-        $webhook = app(WebhookCronjob::class);
-        $webhook->setForce($force);
-        $webhook->setDate($date);
-
-        try {
-            $webhook->fire();
-        } catch (FireflyException $e) {
-            return [
-                'job_fired'     => false,
-                'job_succeeded' => false,
-                'job_errored'   => true,
-                'message'       => $e->getMessage(),
-            ];
-        }
-
-        return [
-            'job_fired'     => $webhook->jobFired,
-            'job_succeeded' => $webhook->jobSucceeded,
-            'job_errored'   => $webhook->jobErrored,
-            'message'       => $webhook->message,
-        ];
-    }
-
     protected function exchangeRatesCronJob(bool $force, Carbon $date): array
     {
         /** @var ExchangeRatesCronjob $exchangeRates */
@@ -166,4 +140,30 @@ trait CronRunner
             'message'       => $recurring->message,
         ];
     }
+
+    protected function webhookCronJob(bool $force, Carbon $date): array
+    {
+        /** @var WebhookCronjob $webhook */
+        $webhook = app(WebhookCronjob::class);
+        $webhook->setForce($force);
+        $webhook->setDate($date);
+
+        try {
+            $webhook->fire();
+        } catch (FireflyException $e) {
+            return [
+                'job_fired'     => false,
+                'job_succeeded' => false,
+                'job_errored'   => true,
+                'message'       => $e->getMessage(),
+            ];
+        }
+
+        return [
+            'job_fired'     => $webhook->jobFired,
+            'job_succeeded' => $webhook->jobSucceeded,
+            'job_errored'   => $webhook->jobErrored,
+            'message'       => $webhook->message,
+        ];
+    }
 }

app/Support/Http/Controllers/PeriodOverview.php

@@ -183,14 +183,6 @@ trait PeriodOverview
         return $grouped;
     }
 
-    protected function saveGroupedAsStatistics(Account $account, Carbon $start, Carbon $end, string $type, array $array): void
-    {
-        unset($array['count']);
-        foreach ($array as $entry) {
-            $this->periodStatisticRepo->saveStatistic($account, $entry['currency_id'], $start, $end, $type, $entry['count'], $entry['amount']);
-        }
-    }
-
     private function filterTransactionsByType(TransactionTypeEnum $type, array $transactions, Carbon $start, Carbon $end): array
     {
         $result = [];
@@ -298,6 +290,14 @@ trait PeriodOverview
         return $return;
     }
 
+    protected function saveGroupedAsStatistics(Account $account, Carbon $start, Carbon $end, string $type, array $array): void
+    {
+        unset($array['count']);
+        foreach ($array as $entry) {
+            $this->periodStatisticRepo->saveStatistic($account, $entry['currency_id'], $start, $end, $type, $entry['count'], $entry['amount']);
+        }
+    }
+
     /**
      * Overview for single category. Has been refactored recently.
      *

app/Support/Http/Controllers/RequestInformation.php

@@ -32,10 +32,9 @@ use FireflyIII\Support\Binder\AccountList;
 use FireflyIII\User;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Routing\Route;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\Route as RouteFacade;
 use Illuminate\Support\Facades\Hash;
-
+use Illuminate\Support\Facades\Route as RouteFacade;
+use Illuminate\Support\Facades\Validator;
 use function Safe\parse_url;
 
 /**

app/Support/Http/Controllers/TransactionCalculation.php

@@ -46,8 +46,7 @@ trait TransactionCalculation
         $collector->setAccounts($total)
                   ->setRange($start, $end)
                   ->withAccountInformation()
-            ->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
+                  ->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
-        ;
 
         return $collector->getExtractedJournals();
     }
@@ -61,8 +60,7 @@ trait TransactionCalculation
         $collector = app(GroupCollectorInterface::class);
 
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value])
-            ->setTags($tags)->withAccountInformation()
+                  ->setTags($tags)->withAccountInformation();
-        ;
 
         return $collector->getExtractedJournals();
     }
@@ -75,8 +73,7 @@ trait TransactionCalculation
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value])
-            ->setBudgets($budgets)->withAccountInformation()
+                  ->setBudgets($budgets)->withAccountInformation();
-        ;
 
         return $collector->getExtractedJournals();
     }
@@ -93,8 +90,7 @@ trait TransactionCalculation
             ->setRange($start, $end)
             ->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value])
             ->setCategories($categories)
-            ->withAccountInformation()
+            ->withAccountInformation();
-        ;
 
         return $collector->getExtractedJournals();
     }
@@ -107,8 +103,7 @@ trait TransactionCalculation
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])
-            ->setCategories($categories)->withAccountInformation()
+                  ->setCategories($categories)->withAccountInformation();
-        ;
 
         return $collector->getExtractedJournals();
     }
@@ -135,8 +130,7 @@ trait TransactionCalculation
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])
-            ->setTags($tags)->withAccountInformation()
+                  ->setTags($tags)->withAccountInformation();
-        ;
 
         return $collector->getExtractedJournals();
     }