Auto commit for release 'branch-v6.2' on 2024-12-22

app/Support/Twig/AmountFormat.php

@@ -108,8 +108,8 @@ class AmountFormat extends AbstractExtension
         return new TwigFunction(
             'formatAmountBySymbol',
             static function (string $amount, string $symbol, ?int $decimalPlaces = null, ?bool $coloured = null): string {
-                $decimalPlaces            ??= 2;
-                $coloured                 ??= true;
+                $decimalPlaces ??= 2;
+                $coloured      ??= true;
                 $currency                 = new TransactionCurrency();
                 $currency->symbol         = $symbol;
                 $currency->decimal_places = $decimalPlaces;

app/Support/Twig/General.php

@@ -78,6 +78,7 @@ class General extends AbstractExtension
                         if (!$convertToNative || $currency->code === $native->code) {
                             $strings[] = app('amount')->formatAnything($currency, $balance, false);
                         }
+
                         continue;
                     }
                     if ('native_balance' === $key) {
@@ -85,6 +86,7 @@ class General extends AbstractExtension
                         if ($convertToNative) {
                             $strings[] = app('amount')->formatAnything($native, $balance, false);
                         }
+
                         continue;
                     }
                     if ($key !== $currency->code) {
@@ -108,15 +110,15 @@ class General extends AbstractExtension
             static function (int $size): string {
                 // less than one GB, more than one MB
                 if ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {
-                    return round($size / (1024 * 1024), 2) . ' MB';
+                    return round($size / (1024 * 1024), 2).' MB';
                 }
 
                 // less than one MB
                 if ($size < (1024 * 1024)) {
-                    return round($size / 1024, 2) . ' KB';
+                    return round($size / 1024, 2).' KB';
                 }
 
-                return $size . ' bytes';
+                return $size.' bytes';
             }
         );
     }
@@ -138,7 +140,7 @@ class General extends AbstractExtension
                     case 'application/pdf':
                         return 'fa-file-pdf-o';
 
-                    // image
+                        // image
                     case 'image/png':
                     case 'image/jpeg':
                     case 'image/svg+xml':
@@ -147,7 +149,7 @@ class General extends AbstractExtension
                     case 'application/vnd.oasis.opendocument.image':
                         return 'fa-file-image-o';
 
-                    // MS word
+                        // MS word
                     case 'application/msword':
                     case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
                     case 'application/vnd.openxmlformats-officedocument.wordprocessingml.template':
@@ -163,7 +165,7 @@ class General extends AbstractExtension
                     case 'application/vnd.oasis.opendocument.text-master':
                         return 'fa-file-word-o';
 
-                    // MS excel
+                        // MS excel
                     case 'application/vnd.ms-excel':
                     case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
                     case 'application/vnd.openxmlformats-officedocument.spreadsheetml.template':
@@ -174,7 +176,7 @@ class General extends AbstractExtension
                     case 'application/vnd.oasis.opendocument.spreadsheet-template':
                         return 'fa-file-excel-o';
 
-                    // MS powerpoint
+                        // MS powerpoint
                     case 'application/vnd.ms-powerpoint':
                     case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
                     case 'application/vnd.openxmlformats-officedocument.presentationml.template':
@@ -186,7 +188,7 @@ class General extends AbstractExtension
                     case 'application/vnd.oasis.opendocument.presentation-template':
                         return 'fa-file-powerpoint-o';
 
-                    // calc
+                        // calc
                     case 'application/vnd.sun.xml.draw':
                     case 'application/vnd.sun.xml.draw.template':
                     case 'application/vnd.stardivision.draw':
@@ -282,7 +284,7 @@ class General extends AbstractExtension
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
 
-                if (Route::getCurrentRoute()->getName() === $route) {
+                if (\Route::getCurrentRoute()->getName() === $route) {
                     return 'active';
                 }
 
@@ -302,7 +304,7 @@ class General extends AbstractExtension
             static function (): string {
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
-                $name  = Route::getCurrentRoute()->getName() ?? '';
+                $name  = \Route::getCurrentRoute()->getName() ?? '';
                 if (str_contains($name, $route)) {
                     return 'active';
                 }
@@ -322,11 +324,11 @@ class General extends AbstractExtension
             'activeRoutePartialObjectType',
             static function ($context): string {
                 [, $route, $objectType] = func_get_args();
-                $activeObjectType = $context['objectType'] ?? false;
+                $activeObjectType       = $context['objectType'] ?? false;
 
                 if ($objectType === $activeObjectType
                     && false !== stripos(
-                        Route::getCurrentRoute()->getName(),
+                        \Route::getCurrentRoute()->getName(),
                         $route
                     )) {
                     return 'active';
@@ -349,7 +351,7 @@ class General extends AbstractExtension
             static function (): string {
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
-                $name  = Route::getCurrentRoute()->getName() ?? '';
+                $name  = \Route::getCurrentRoute()->getName() ?? '';
                 if (str_contains($name, $route)) {
                     return 'menu-open';
                 }

app/Support/Twig/Rule.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Twig;
 
-use Config;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -64,7 +63,7 @@ class Rule extends AbstractExtension
                 $possibleTriggers = [];
                 foreach ($ruleTriggers as $key) {
                     if ('user_action' !== $key) {
-                        $possibleTriggers[$key] = (string) trans('firefly.rule_trigger_' . $key . '_choice');
+                        $possibleTriggers[$key] = (string) trans('firefly.rule_trigger_'.$key.'_choice');
                     }
                 }
                 unset($ruleTriggers);
@@ -81,10 +80,10 @@ class Rule extends AbstractExtension
             'allRuleActions',
             static function () {
                 // array of valid values for actions
-                $ruleActions     = array_keys(Config::get('firefly.rule-actions'));
+                $ruleActions     = array_keys(\Config::get('firefly.rule-actions'));
                 $possibleActions = [];
                 foreach ($ruleActions as $key) {
-                    $possibleActions[$key] = (string) trans('firefly.rule_action_' . $key . '_choice');
+                    $possibleActions[$key] = (string) trans('firefly.rule_action_'.$key.'_choice');
                 }
                 unset($ruleActions);
                 asort($possibleActions);

app/Support/Twig/TransactionGroupTwig.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Twig;
 
 use Carbon\Carbon;
-use DB;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
@@ -87,7 +86,7 @@ class TransactionGroupTwig extends AbstractExtension
             $colored = false;
         }
 
-        $result = app('amount')->formatFlat($array['currency_symbol'], (int) $array['currency_decimal_places'], $amount, $colored);
+        $result     = app('amount')->formatFlat($array['currency_symbol'], (int) $array['currency_decimal_places'], $amount, $colored);
         if (TransactionType::TRANSFER === $type) {
             $result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
         }
@@ -120,9 +119,9 @@ class TransactionGroupTwig extends AbstractExtension
      */
     private function foreignJournalArrayAmount(array $array): string
     {
-        $type    = $array['transaction_type_type'] ?? TransactionType::WITHDRAWAL;
-        $amount  = $array['foreign_amount'] ?? '0';
-        $colored = true;
+        $type       = $array['transaction_type_type'] ?? TransactionType::WITHDRAWAL;
+        $amount     = $array['foreign_amount'] ?? '0';
+        $colored    = true;
 
         $sourceType = $array['source_account_type'] ?? 'invalid';
         $amount     = $this->signAmount($amount, $type, $sourceType);
@@ -130,7 +129,7 @@ class TransactionGroupTwig extends AbstractExtension
         if (TransactionType::TRANSFER === $type) {
             $colored = false;
         }
-        $result = app('amount')->formatFlat($array['foreign_currency_symbol'], (int) $array['foreign_currency_decimal_places'], $amount, $colored);
+        $result     = app('amount')->formatFlat($array['foreign_currency_symbol'], (int) $array['foreign_currency_decimal_places'], $amount, $colored);
         if (TransactionType::TRANSFER === $type) {
             $result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
         }
@@ -171,12 +170,12 @@ class TransactionGroupTwig extends AbstractExtension
         $colored    = true;
         $sourceType = $first->account()->first()->accountType()->first()->type;
 
-        $amount = $this->signAmount($amount, $type, $sourceType);
+        $amount     = $this->signAmount($amount, $type, $sourceType);
 
         if (TransactionType::TRANSFER === $type) {
             $colored = false;
         }
-        $result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);
+        $result     = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);
         if (TransactionType::TRANSFER === $type) {
             $result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
         }
@@ -197,7 +196,7 @@ class TransactionGroupTwig extends AbstractExtension
      */
     private function foreignJournalObjectAmount(TransactionJournal $journal): string
     {
-        $type = $journal->transactionType->type;
+        $type       = $journal->transactionType->type;
 
         /** @var Transaction $first */
         $first      = $journal->transactions()->where('amount', '<', 0)->first();
@@ -206,12 +205,12 @@ class TransactionGroupTwig extends AbstractExtension
         $colored    = true;
         $sourceType = $first->account()->first()->accountType()->first()->type;
 
-        $amount = $this->signAmount($amount, $type, $sourceType);
+        $amount     = $this->signAmount($amount, $type, $sourceType);
 
         if (TransactionType::TRANSFER === $type) {
             $colored = false;
         }
-        $result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);
+        $result     = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);
         if (TransactionType::TRANSFER === $type) {
             $result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
         }
@@ -224,11 +223,12 @@ class TransactionGroupTwig extends AbstractExtension
         return new TwigFunction(
             'journalHasMeta',
             static function (int $journalId, string $metaField) {
-                $count = DB::table('journal_meta')
-                            ->where('name', $metaField)
-                            ->where('transaction_journal_id', $journalId)
-                            ->whereNull('deleted_at')
-                            ->count();
+                $count = \DB::table('journal_meta')
+                    ->where('name', $metaField)
+                    ->where('transaction_journal_id', $journalId)
+                    ->whereNull('deleted_at')
+                    ->count()
+                ;
 
                 return 1 === $count;
             }
@@ -241,11 +241,12 @@ class TransactionGroupTwig extends AbstractExtension
             'journalGetMetaDate',
             static function (int $journalId, string $metaField) {
                 /** @var null|TransactionJournalMeta $entry */
-                $entry = DB::table('journal_meta')
-                            ->where('name', $metaField)
-                            ->where('transaction_journal_id', $journalId)
-                            ->whereNull('deleted_at')
-                            ->first();
+                $entry = \DB::table('journal_meta')
+                    ->where('name', $metaField)
+                    ->where('transaction_journal_id', $journalId)
+                    ->whereNull('deleted_at')
+                    ->first()
+                ;
                 if (null === $entry) {
                     return today(config('app.timezone'));
                 }
@@ -261,11 +262,12 @@ class TransactionGroupTwig extends AbstractExtension
             'journalGetMetaField',
             static function (int $journalId, string $metaField) {
                 /** @var null|TransactionJournalMeta $entry */
-                $entry = DB::table('journal_meta')
-                            ->where('name', $metaField)
-                            ->where('transaction_journal_id', $journalId)
-                            ->whereNull('deleted_at')
-                            ->first();
+                $entry = \DB::table('journal_meta')
+                    ->where('name', $metaField)
+                    ->where('transaction_journal_id', $journalId)
+                    ->whereNull('deleted_at')
+                    ->first()
+                ;
                 if (null === $entry) {
                     return '';
                 }