From 48301b6b9ca4bface2fc77b1b39db5445dae5c4c Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Tue, 5 Aug 2025 13:40:46 +0200 Subject: [PATCH] Add missing classes --- app/Transformers/AvailableBudgetTransformer.php | 1 + app/Transformers/PiggyBankEventTransformer.php | 4 +++- app/Transformers/PiggyBankTransformer.php | 1 + app/Transformers/RecurrenceTransformer.php | 14 ++++++++------ app/Transformers/TransactionGroupTransformer.php | 4 ++-- app/Transformers/WebhookMessageTransformer.php | 3 ++- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Transformers/AvailableBudgetTransformer.php b/app/Transformers/AvailableBudgetTransformer.php index a8248a9f93..bc8523a26b 100644 --- a/app/Transformers/AvailableBudgetTransformer.php +++ b/app/Transformers/AvailableBudgetTransformer.php @@ -27,6 +27,7 @@ namespace FireflyIII\Transformers; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Support\Facades\Amount; +use FireflyIII\Support\Facades\Steam; /** * Class AvailableBudgetTransformer diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index b99c90ee81..d69c03645f 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -28,6 +28,8 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use FireflyIII\Support\Facades\Amount; +use FireflyIII\Support\Facades\Steam; /** * Class PiggyBankEventTransformer @@ -61,7 +63,7 @@ class PiggyBankEventTransformer extends AbstractTransformer $this->piggyRepos->setUser($account->user); // get associated currency or fall back to the default: - $currency = $this->repository->getAccountCurrency($account) ?? app('amount')->getPrimaryCurrencyByUserGroup($account->user->userGroup); + $currency = $this->repository->getAccountCurrency($account) ?? Amount::getPrimaryCurrencyByUserGroup($account->user->userGroup); // get associated journal and transaction, if any: $journalId = $event->transaction_journal_id; diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.php index 367dedf31a..d497b04e2c 100644 --- a/app/Transformers/PiggyBankTransformer.php +++ b/app/Transformers/PiggyBankTransformer.php @@ -29,6 +29,7 @@ use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use FireflyIII\Support\Facades\Steam; /** * Class PiggyBankTransformer diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php index dc6fb9785d..9dd68bd73b 100644 --- a/app/Transformers/RecurrenceTransformer.php +++ b/app/Transformers/RecurrenceTransformer.php @@ -37,6 +37,8 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; +use FireflyIII\Support\Facades\Steam; +use Illuminate\Support\Facades\Log; use function Safe\json_decode; /** @@ -69,17 +71,17 @@ class RecurrenceTransformer extends AbstractTransformer */ public function transform(Recurrence $recurrence): array { - app('log')->debug('Now in Recurrence::transform()'); + Log::debug('Now in Recurrence::transform()'); $this->repository->setUser($recurrence->user); $this->piggyRepos->setUser($recurrence->user); $this->factory->setUser($recurrence->user); $this->budgetRepos->setUser($recurrence->user); - app('log')->debug('Set user.'); + Log::debug('Set user.'); $shortType = (string) config(sprintf('firefly.transactionTypesToShort.%s', $recurrence->transactionType->type)); $notes = $this->repository->getNoteText($recurrence); $reps = 0 === (int) $recurrence->repetitions ? null : (int) $recurrence->repetitions; - app('log')->debug('Get basic data.'); + Log::debug('Get basic data.'); // basic data. return [ @@ -112,7 +114,7 @@ class RecurrenceTransformer extends AbstractTransformer */ private function getRepetitions(Recurrence $recurrence): array { - app('log')->debug('Now in getRepetitions().'); + Log::debug('Now in getRepetitions().'); $fromDate = $recurrence->latest_date ?? $recurrence->first_date; $return = []; @@ -150,7 +152,7 @@ class RecurrenceTransformer extends AbstractTransformer */ private function getTransactions(Recurrence $recurrence): array { - app('log')->debug(sprintf('Now in %s', __METHOD__)); + Log::debug(sprintf('Now in %s', __METHOD__)); $return = []; // get all transactions: @@ -239,7 +241,7 @@ class RecurrenceTransformer extends AbstractTransformer */ private function getTransactionMeta(RecurrenceTransaction $transaction, array $array): array { - app('log')->debug(sprintf('Now in %s', __METHOD__)); + Log::debug(sprintf('Now in %s', __METHOD__)); $array['tags'] = []; $array['category_id'] = null; $array['category_name'] = null; diff --git a/app/Transformers/TransactionGroupTransformer.php b/app/Transformers/TransactionGroupTransformer.php index 62044215e9..93ac1558ab 100644 --- a/app/Transformers/TransactionGroupTransformer.php +++ b/app/Transformers/TransactionGroupTransformer.php @@ -288,8 +288,8 @@ class TransactionGroupTransformer extends AbstractTransformer ], ]; } catch (FireflyException $e) { - app('log')->error($e->getMessage()); - app('log')->error($e->getTraceAsString()); + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); throw new FireflyException(sprintf('Transaction group #%d is broken. Please check out your log files.', $group->id), 0, $e); } diff --git a/app/Transformers/WebhookMessageTransformer.php b/app/Transformers/WebhookMessageTransformer.php index 0839a7c437..24bc25d4c2 100644 --- a/app/Transformers/WebhookMessageTransformer.php +++ b/app/Transformers/WebhookMessageTransformer.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; use FireflyIII\Models\WebhookMessage; +use Illuminate\Support\Facades\Log; use JsonException; use function Safe\json_encode; @@ -44,7 +45,7 @@ class WebhookMessageTransformer extends AbstractTransformer try { $json = json_encode($message->message, JSON_THROW_ON_ERROR); } catch (JsonException $e) { - app('log')->error(sprintf('Could not encode webhook message #%d: %s', $message->id, $e->getMessage())); + Log::error(sprintf('Could not encode webhook message #%d: %s', $message->id, $e->getMessage())); } return [