Use PSR-12 code style

app/Enums/AccountTypeEnum.php

@@ -43,5 +43,4 @@ enum AccountTypeEnum: string
     case MORTGAGE = 'Mortgage';
     case RECONCILIATION = 'Reconciliation account';
     case REVENUE = 'Revenue account';
-
 }

app/Enums/WebhookResponse.php

@@ -29,5 +29,4 @@ enum WebhookResponse: int
     case TRANSACTIONS = 200;
     case ACCOUNTS = 210;
     case NONE = 220;
-
 }

app/Events/RequestedReportOnJournals.php

@@ -38,7 +38,9 @@ use Log;
  */
 class RequestedReportOnJournals
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     public Collection $groups;
     public int        $userId;

app/Events/StoredAccount.php

@@ -45,5 +45,4 @@ class StoredAccount extends Event
     {
         $this->account = $account;
     }
-
 }

app/Events/TriggeredAuditLog.php

@@ -31,7 +31,6 @@ use Illuminate\Queue\SerializesModels;
  * Class TriggeredAuditLog
  */
 class TriggeredAuditLog extends Event
-
 {
     use SerializesModels;
 
@@ -52,5 +51,4 @@ class TriggeredAuditLog extends Event
         $this->before    = $before;
         $this->after     = $after;
     }
-
 }

app/Events/UpdatedAccount.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-
 namespace FireflyIII\Events;
 
 use FireflyIII\Models\Account;
@@ -46,5 +45,4 @@ class UpdatedAccount extends Event
     {
         $this->account = $account;
     }
-
 }

app/Exceptions/GracefulNotFoundHandler.php

@@ -132,7 +132,6 @@ class GracefulNotFoundHandler extends ExceptionHandler
 
                 return parent::render($request, $e);
         }
-
     }
 
     /**
@@ -200,7 +199,6 @@ class GracefulNotFoundHandler extends ExceptionHandler
         }
 
         return redirect(route('transactions.index', [strtolower($type)]));
-
     }
 
     /**
@@ -232,7 +230,6 @@ class GracefulNotFoundHandler extends ExceptionHandler
             if (null !== $journal) {
                 return redirect(route('transactions.show', [$journal->transaction_group_id]));
             }
-
         }
         if (Bill::class === $attachment->attachable_type) {
             // is linked to bill.
@@ -247,5 +244,4 @@ class GracefulNotFoundHandler extends ExceptionHandler
 
         return parent::render($request, $exception);
     }
-
 }

app/Exceptions/Handler.php

@@ -215,7 +215,8 @@ class Handler extends ExceptionHandler
     {
         return !is_null(
             Arr::first(
-                $this->dontReport, function ($type) use ($e) {
+                $this->dontReport,
+                function ($type) use ($e) {
                     return $e instanceof $type;
                 }
             )

app/Factory/AccountFactory.php

@@ -43,7 +43,8 @@ use Log;
  */
 class AccountFactory
 {
-    use AccountServiceTrait, LocationServiceTrait;
+    use AccountServiceTrait;
+    use LocationServiceTrait;
 
     protected AccountRepositoryInterface $accountRepository;
     protected array                      $validAssetFields;
@@ -279,7 +280,6 @@ class AccountFactory
      */
     private function storeMetaData(Account $account, array $data): void
     {
-
         $fields = $this->validFields;
         if ($account->accountType->type === AccountType::ASSET) {
             $fields = $this->validAssetFields;
@@ -292,7 +292,7 @@ class AccountFactory
         $type = $account->accountType->type;
         $list = config('firefly.valid_currency_account_types');
         if (!in_array($type, $list, true)) {
-            $pos = array_search('currency_id', $fields);
+            $pos = array_search('currency_id', $fields, true);
             if ($pos !== false) {
                 unset($fields[$pos]);
             }
@@ -399,6 +399,4 @@ class AccountFactory
         $this->user = $user;
         $this->accountRepository->setUser($user);
     }
-
-
 }

app/Factory/AccountMetaFactory.php

@@ -49,7 +49,6 @@ class AccountMetaFactory
         $entry = $account->accountMeta()->where('name', $field)->first();
         // must not be an empty string:
         if ('' !== $value) {
-
             // if $data has field and $entry is null, create new one:
             if (null === $entry) {
                 Log::debug(sprintf('Created meta-field "%s":"%s" for account #%d ("%s") ', $field, $value, $account->id, $account->name));
@@ -84,5 +83,4 @@ class AccountMetaFactory
     {
         return AccountMeta::create($data);
     }
-
 }

app/Factory/AttachmentFactory.php

@@ -77,7 +77,7 @@ class AttachmentFactory
         );
         $notes      = (string) ($data['notes'] ?? '');
         if ('' !== $notes) {
-            $note = new Note;
+            $note = new Note();
             $note->noteable()->associate($attachment);
             $note->text = $notes;
             $note->save();
@@ -93,5 +93,4 @@ class AttachmentFactory
     {
         $this->user = $user;
     }
-
 }

app/Factory/BillFactory.php

@@ -37,7 +37,8 @@ use Log;
  */
 class BillFactory
 {
-    use BillServiceTrait, CreatesObjectGroups;
+    use BillServiceTrait;
+    use CreatesObjectGroups;
 
     private User $user;
 
@@ -129,7 +130,6 @@ class BillFactory
         }
 
         return $bill;
-
     }
 
     /**
@@ -149,5 +149,4 @@ class BillFactory
     {
         $this->user = $user;
     }
-
 }

app/Factory/BudgetFactory.php

@@ -83,5 +83,4 @@ class BudgetFactory
     {
         $this->user = $user;
     }
-
 }

app/Factory/CategoryFactory.php

@@ -99,5 +99,4 @@ class CategoryFactory
     {
         $this->user = $user;
     }
-
 }

app/Factory/PiggyBankFactory.php

@@ -64,7 +64,6 @@ class PiggyBankFactory
         }
 
         return null;
-
     }
 
     /**
@@ -83,7 +82,5 @@ class PiggyBankFactory
     public function setUser(User $user): void
     {
         $this->user = $user;
-
     }
-
 }

app/Factory/RecurrenceFactory.php

@@ -37,8 +37,8 @@ use Log;
  */
 class RecurrenceFactory
 {
-
+    use TransactionTypeTrait;
-    use TransactionTypeTrait, RecurringTransactionTrait;
+    use RecurringTransactionTrait;
 
     private MessageBag $errors;
     private User       $user;
@@ -50,7 +50,7 @@ class RecurrenceFactory
      */
     public function __construct()
     {
-        $this->errors = new MessageBag;
+        $this->errors = new MessageBag();
     }
 
     /**
@@ -120,20 +120,17 @@ class RecurrenceFactory
 
         if (array_key_exists('notes', $data['recurrence'])) {
             $this->updateNote($recurrence, (string) $data['recurrence']['notes']);
-
         }
 
         $this->createRepetitions($recurrence, $data['repetitions'] ?? []);
         try {
             $this->createTransactions($recurrence, $data['transactions'] ?? []);
-
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
             $recurrence->forceDelete();
             $message = sprintf('Could not create recurring transaction: %s', $e->getMessage());
             $this->errors->add('store', $message);
             throw new FireflyException($message, 0, $e);
-
         }
 
 
@@ -155,6 +152,4 @@ class RecurrenceFactory
     {
         $this->user = $user;
     }
-
-
 }

app/Factory/TagFactory.php

@@ -95,7 +95,7 @@ class TagFactory
         $tag       = Tag::create($array);
         if (null !== $tag && null !== $latitude && null !== $longitude) {
             // create location object.
-            $location             = new Location;
+            $location             = new Location();
             $location->latitude   = $latitude;
             $location->longitude  = $longitude;
             $location->zoom_level = $zoomLevel;
@@ -113,5 +113,4 @@ class TagFactory
     {
         $this->user = $user;
     }
-
 }

app/Factory/TransactionFactory.php

@@ -102,7 +102,6 @@ class TransactionFactory
         ];
         try {
             $result = Transaction::create($data);
-
         } catch (QueryException $e) {
             Log::error(sprintf('Could not create transaction: %s', $e->getMessage()), $data);
             Log::error($e->getMessage());

app/Factory/TransactionGroupFactory.php

@@ -78,7 +78,7 @@ class TransactionGroupFactory
             throw new FireflyException('Created zero transaction journals.');
         }
 
-        $group = new TransactionGroup;
+        $group = new TransactionGroup();
         $group->user()->associate($this->user);
         $group->title = $title;
         $group->save();

app/Factory/TransactionJournalFactory.php

@@ -106,12 +106,12 @@ class TransactionJournalFactory
         $dataObject = new NullArrayObject($data);
 
         Log::debug('Start of TransactionJournalFactory::create()');
-        $collection   = new Collection;
+        $collection   = new Collection();
         $transactions = $dataObject['transactions'] ?? [];
         if (empty($transactions)) {
             Log::error('There are no transactions in the array, the TransactionJournalFactory cannot continue.');
 
-            return new Collection;
+            return new Collection();
         }
         try {
             /** @var array $row */
@@ -312,10 +312,8 @@ class TransactionJournalFactory
         unset($dataRow['import_hash_v2'], $dataRow['original_source']);
         $json = json_encode($dataRow, JSON_THROW_ON_ERROR);
         if (false === $json) {
-
             $json = json_encode((string) microtime(), JSON_THROW_ON_ERROR);
             Log::error(sprintf('Could not hash the original row! %s', json_last_error_msg()), $dataRow);
-
         }
         $hash = hash('sha256', $json);
         Log::debug(sprintf('The hash is: %s', $hash), $dataRow);

app/Factory/TransactionJournalMetaFactory.php

@@ -87,5 +87,4 @@ class TransactionJournalMetaFactory
 
         return $entry;
     }
-
 }

app/Factory/TransactionTypeFactory.php

@@ -40,5 +40,4 @@ class TransactionTypeFactory
     {
         return TransactionType::whereType(ucfirst($type))->first();
     }
-
 }

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -151,7 +151,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
                           $journals[$index]['due_date']      = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'due_date');
                           $journals[$index]['payment_date']  = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'payment_date');
                           $journals[$index]['invoice_date']  = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date');
-
                       }
                       $locale = app('steam')->getLocale();
 

app/Generator/Report/Category/MonthReportGenerator.php

@@ -58,8 +58,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     #[Pure] public function __construct()
     {
-        $this->income   = new Collection;
+        $this->income   = new Collection();
-        $this->expenses = new Collection;
+        $this->expenses = new Collection();
     }
 
     /**

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -56,9 +56,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     #[Pure] public function __construct()
     {
-        $this->expenses = new Collection;
+        $this->expenses = new Collection();
-        $this->income   = new Collection;
+        $this->income   = new Collection();
-        $this->tags     = new Collection;
+        $this->tags     = new Collection();
     }
 
     /**

app/Generator/Webhook/MessageGeneratorInterface.php

@@ -31,7 +31,6 @@ use Illuminate\Support\Collection;
  */
 interface MessageGeneratorInterface
 {
-
     /**
      *
      */

app/Generator/Webhook/StandardMessageGenerator.php

@@ -147,7 +147,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
                 $basicMessage['content'] = [];
                 break;
             case WebhookResponse::TRANSACTIONS->value:
-                $transformer = new TransactionGroupTransformer;
+                $transformer = new TransactionGroupTransformer();
                 try {
                     $basicMessage['content'] = $transformer->transformObject($model);
                 } catch (FireflyException $e) {
@@ -161,8 +161,8 @@ class StandardMessageGenerator implements MessageGeneratorInterface
             case WebhookResponse::ACCOUNTS->value:
                 $accounts = $this->collectAccounts($model);
                 foreach ($accounts as $account) {
-                    $transformer = new AccountTransformer;
+                    $transformer = new AccountTransformer();
-                    $transformer->setParameters(new ParameterBag);
+                    $transformer->setParameters(new ParameterBag());
                     $basicMessage['content'][] = $transformer->transform($account);
                 }
         }
@@ -184,7 +184,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
      */
     private function collectAccounts(TransactionGroup $transactionGroup): Collection
     {
-        $accounts = new Collection;
+        $accounts = new Collection();
         /** @var TransactionJournal $journal */
         foreach ($transactionGroup->transactionJournals as $journal) {
             /** @var Transaction $transaction */
@@ -204,7 +204,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
      */
     private function storeMessage(Webhook $webhook, array $message): void
     {
-        $webhookMessage = new WebhookMessage;
+        $webhookMessage = new WebhookMessage();
         $webhookMessage->webhook()->associate($webhook);
         $webhookMessage->sent    = false;
         $webhookMessage->errored = false;
@@ -212,7 +212,6 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $webhookMessage->message = $message;
         $webhookMessage->save();
         Log::debug(sprintf('Stored new webhook message #%d', $webhookMessage->id));
-
     }
 
     /**

app/User.php

@@ -165,7 +165,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class User extends Authenticatable
 {
-    use Notifiable, HasApiTokens;
+    use Notifiable;
+    use HasApiTokens;
 
     /**
      * The attributes that should be cast to native types.
@@ -212,7 +213,7 @@ class User extends Authenticatable
                 return $user;
             }
         }
-        throw new NotFoundHttpException;
+        throw new NotFoundHttpException();
     }
 
     /**
@@ -605,5 +606,4 @@ class User extends Authenticatable
         }
         return app('preferences')->getForUser($this, 'slack_webhook_url', '')->data;
     }
-
 }