Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Replace app calls with static calls.
James Cole14622329a8ad
diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.phpindex 61315e2b59..58a187d598 100644--- a/app/Api/V1/Controllers/Chart/BudgetController.php+++ b/app/Api/V1/Controllers/Chart/BudgetController.php@@ -212,7 +212,7 @@ class BudgetController extends Controller*/private function budgetLimits(Budget $budget, Collection $limits): array{- app('log')->debug(sprintf('Now in budgetLimits(#%d)', $budget->id));+ Log::debug(sprintf('Now in budgetLimits(#%d)', $budget->id));$data = [];/** @var BudgetLimit $limit */diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.phpindex c83e18d079..198a804a1b 100644--- a/app/Api/V1/Controllers/Data/DestroyController.php+++ b/app/Api/V1/Controllers/Data/DestroyController.php@@ -176,14 +176,14 @@ class DestroyController extends Controllerforeach ($collection as $account) {$count = $account->transactions()->count();if (true === $this->unused && 0 === $count) {- app('log')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));+ Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));Log::channel('audit')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));$service->destroy($account, null);continue;}if (false === $this->unused) {- app('log')->info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));+ Log::info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));Log::channel('audit')->warning(sprintf('Deleted account #%d "%s"', $account->id, $account->name));$service->destroy($account, null);}diff --git a/app/Api/V1/Controllers/Models/Account/UpdateController.php b/app/Api/V1/Controllers/Models/Account/UpdateController.phpindex e30f53d63f..40dc574663 100644--- a/app/Api/V1/Controllers/Models/Account/UpdateController.php+++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php@@ -32,6 +32,7 @@ use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;use FireflyIII\Transformers\AccountTransformer;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Log;use League\Fractal\Resource\Item;/**@@ -67,7 +68,7 @@ class UpdateController extends Controller*/public function update(UpdateRequest $request, Account $account): JsonResponse{- app('log')->debug(sprintf('Now in %s', __METHOD__));+ Log::debug(sprintf('Now in %s', __METHOD__));$data = $request->getUpdateData();$data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);$account = $this->repository->update($account, $data);diff --git a/app/Api/V1/Controllers/Models/Attachment/StoreController.php b/app/Api/V1/Controllers/Models/Attachment/StoreController.phpindex a80856b14c..a070ff8c5d 100644--- a/app/Api/V1/Controllers/Models/Attachment/StoreController.php+++ b/app/Api/V1/Controllers/Models/Attachment/StoreController.php@@ -80,7 +80,7 @@ class StoreController extends Controllerthrow new NotFoundHttpException();}- app('log')->debug(sprintf('Now in %s', __METHOD__));+ Log::debug(sprintf('Now in %s', __METHOD__));$data = $request->getAll();$attachment = $this->repository->store($data);$manager = $this->getManager();@@ -109,13 +109,13 @@ class StoreController extends Controller$helper = app(AttachmentHelperInterface::class);$body = $request->getContent();if ('' === $body) {- app('log')->error('Body of attachment is empty.');+ Log::error('Body of attachment is empty.');return response()->json([], 422);}$result = $helper->saveAttachmentFromApi($attachment, $body);if (false === $result) {- app('log')->error('Could not save attachment from API.');+ Log::error('Could not save attachment from API.');return response()->json([], 422);}diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.phpindex 00ac92462a..f77339b188 100644--- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php+++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php@@ -34,6 +34,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Log;/*** Class DestroyController@@ -73,7 +74,7 @@ class DestroyController extends Controller*/public function destroy(TransactionGroup $transactionGroup): JsonResponse{- app('log')->debug(sprintf('Now in %s', __METHOD__));+ Log::debug(sprintf('Now in %s', __METHOD__));// grab asset account(s) from group:$accounts = [];@@ -95,7 +96,7 @@ class DestroyController extends Controller/** @var Account $account */foreach ($accounts as $account) {- app('log')->debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));+ Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));event(new UpdatedAccount($account));}diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.phpindex 4491656f51..37acce2eb6 100644--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php@@ -84,7 +84,7 @@ class StoreController extends Controller*/public function store(StoreRequest $request): JsonResponse{- app('log')->debug('Now in API StoreController::store()');+ Log::debug('Now in API StoreController::store()');$data = $request->getAll();$data['user'] = auth()->user();$data['user_group'] = $this->userGroup;@@ -95,13 +95,13 @@ class StoreController extends Controllertry {$transactionGroup = $this->groupRepository->store($data);} catch (DuplicateTransactionException $e) {- app('log')->warning('Caught a duplicate transaction. Return error message.');+ Log::warning('Caught a duplicate transaction. Return error message.');$validator = Validator::make(['transactions' => [['description' => $e->getMessage()]]], ['transactions.0.description' => new IsDuplicateTransaction()]);throw new ValidationException($validator);} catch (FireflyException $e) {- app('log')->warning('Caught an exception. Return error message.');- app('log')->error($e->getMessage());+ Log::warning('Caught an exception. Return error message.');+ Log::error($e->getMessage());$message = sprintf('Internal exception: %s', $e->getMessage());$validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.phpindex f69c876aec..6db7503671 100644--- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php+++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php@@ -34,6 +34,7 @@ use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;use FireflyIII\Transformers\TransactionGroupTransformer;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Log;use League\Fractal\Resource\Item;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;@@ -71,7 +72,7 @@ class UpdateController extends Controller*/public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse{- app('log')->debug('Now in update routine for transaction group');+ Log::debug('Now in update routine for transaction group');$data = $request->getAll();$oldHash = $this->groupRepository->getCompareHash($transactionGroup);$transactionGroup = $this->groupRepository->update($transactionGroup, $data);diff --git a/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php b/app/Api/V1/Controllers/Models/UserGroup/UpdateController.phpindex 8cdfea9715..e1a9e517e5 100644--- a/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php+++ b/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php@@ -30,6 +30,7 @@ use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;use FireflyIII\Transformers\UserGroupTransformer;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Log;class UpdateController extends Controller{@@ -54,7 +55,7 @@ class UpdateController extends Controllerpublic function update(UpdateRequest $request, UserGroup $userGroup): JsonResponse{- app('log')->debug(sprintf('Now in %s', __METHOD__));+ Log::debug(sprintf('Now in %s', __METHOD__));$data = $request->getData();$userGroup = $this->repository->update($userGroup, $data);$userGroup->refresh();diff --git a/app/Api/V1/Controllers/Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.phpindex 71e1e02a43..634c666db3 100644--- a/app/Api/V1/Controllers/Search/AccountController.php+++ b/app/Api/V1/Controllers/Search/AccountController.php@@ -34,6 +34,7 @@ use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Http\Response;use Illuminate\Pagination\LengthAwarePaginator;+use Illuminate\Support\Facades\Log;use League\Fractal\Pagination\IlluminatePaginatorAdapter;use League\Fractal\Resource\Collection as FractalCollection;@@ -71,7 +72,7 @@ class AccountController extends Controllerif ('' === $query || !in_array($field, $this->validFields, true)) {return response(null, 422);}- app('log')->debug(sprintf('Now in account search("%s", "%s")', $field, $query));+ Log::debug(sprintf('Now in account search("%s", "%s")', $field, $query));$types = $this->mapAccountTypes($type);/** @var AccountSearch $search */diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.phpindex 281c0712f8..fcb6351785 100644--- a/app/Api/V1/Controllers/System/ConfigurationController.php+++ b/app/Api/V1/Controllers/System/ConfigurationController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\System;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Validator;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\System\UpdateRequest;@@ -65,8 +66,8 @@ class ConfigurationController extends Controllertry {$dynamicData = $this->getDynamicConfiguration();} catch (FireflyException $e) {- app('log')->error($e->getMessage());- app('log')->error($e->getTraceAsString());+ Log::error($e->getMessage());+ Log::error($e->getTraceAsString());throw new FireflyException('200030: Could not load config variables.', 0, $e);}diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.phpindex f51feb165c..359237b16c 100644--- a/app/Api/V1/Controllers/System/CronController.php+++ b/app/Api/V1/Controllers/System/CronController.php@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\System\CronRequest;use FireflyIII\Support\Http\Controllers\CronRunner;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Log;/*** Class CronController@@ -44,8 +45,8 @@ class CronController extends Controller{$config = $request->getAll();- app('log')->debug(sprintf('Now in %s', __METHOD__));- app('log')->debug(sprintf('Date is %s', $config['date']->toIsoString()));+ Log::debug(sprintf('Now in %s', __METHOD__));+ Log::debug(sprintf('Date is %s', $config['date']->toIsoString()));$return = [];$return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']);$return['auto_budgets'] = $this->runAutoBudget($config['force'], $config['date']);diff --git a/app/Api/V1/Controllers/System/UserController.php b/app/Api/V1/Controllers/System/UserController.phpindex b650b2d3c2..0928c041a9 100644--- a/app/Api/V1/Controllers/System/UserController.php+++ b/app/Api/V1/Controllers/System/UserController.php@@ -33,6 +33,7 @@ use FireflyIII\Transformers\UserTransformer;use FireflyIII\User;use Illuminate\Http\JsonResponse;use Illuminate\Pagination\LengthAwarePaginator;+use Illuminate\Support\Facades\Log;use League\Fractal\Pagination\IlluminatePaginatorAdapter;use League\Fractal\Resource\Collection as FractalCollection;use League\Fractal\Resource\Item;@@ -174,7 +175,7 @@ class UserController extends Controller// can only update 'blocked' when user is admin.if (!$this->repository->hasRole(auth()->user(), 'owner')) {- app('log')->debug('Quietly drop fields "blocked" and "blocked_code" from request.');+ Log::debug('Quietly drop fields "blocked" and "blocked_code" from request.');unset($data['blocked'], $data['blocked_code']);}diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.phpindex bdedcd17d9..6d0246631c 100644--- a/app/Api/V1/Controllers/Webhook/ShowController.php+++ b/app/Api/V1/Controllers/Webhook/ShowController.php@@ -138,7 +138,7 @@ class ShowController extends Controllerthrow new NotFoundHttpException('Webhooks are not enabled.');}- app('log')->debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id));+ Log::debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id));Log::channel('audit')->info(sprintf('User triggers webhook #%d on transaction group #%d.', $webhook->id, $group->id));/** @var MessageGeneratorInterface $engine */@@ -155,7 +155,7 @@ class ShowController extends Controller$engine->generateMessages();// trigger event to send them:- app('log')->debug('send event RequestedSendWebhookMessages');+ Log::debug('send event RequestedSendWebhookMessages');event(new RequestedSendWebhookMessages());return response()->json([], 204);diff --git a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.phpindex ca3c43ca0d..d8b9a03baa 100644--- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php+++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php@@ -55,7 +55,7 @@ class TransactionRequest extends FormRequest];} catch (JsonException $e) {// dont really care. the validation should catch invalid json.- app('log')->error($e->getMessage());+ Log::error($e->getMessage());}return $data;diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.phpindex 9c4cffd668..0a639d84e3 100644--- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php@@ -47,7 +47,7 @@ class StoreRequest extends FormRequest*/public function getAll(): array{- app('log')->debug('Raw fields in Bill StoreRequest', $this->all());+ Log::debug('Raw fields in Bill StoreRequest', $this->all());$fields = ['name' => ['name', 'convertString'],'amount_min' => ['amount_min', 'convertString'],diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.phpindex 73dcb768aa..4c7cb3d43d 100644--- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php@@ -58,7 +58,7 @@ class StoreRequest extends FormRequest*/public function getAll(): array{- app('log')->debug('get all data in TransactionStoreRequest');+ Log::debug('get all data in TransactionStoreRequest');return ['group_title' => $this->convertString('group_title'),@@ -175,7 +175,7 @@ class StoreRequest extends FormRequest*/public function rules(): array{- app('log')->debug('Collect rules of TransactionStoreRequest');+ Log::debug('Collect rules of TransactionStoreRequest');$validProtocols = config('firefly.valid_url_protocols');$locationRules = Location::requestRules([]);@@ -276,9 +276,9 @@ class StoreRequest extends FormRequest$this->validateTransactionArray($validator);// must submit at least one transaction.- app('log')->debug('Now going to validateOneTransaction');+ Log::debug('Now going to validateOneTransaction');$this->validateOneTransaction($validator);- app('log')->debug('Now done with validateOneTransaction');+ Log::debug('Now done with validateOneTransaction');// all journals must have a description$this->validateDescriptions($validator);diff --git a/app/Console/Commands/Correction/CorrectsUnevenAmount.php b/app/Console/Commands/Correction/CorrectsUnevenAmount.phpindex 70b36705f0..30a6107fe1 100644--- a/app/Console/Commands/Correction/CorrectsUnevenAmount.php+++ b/app/Console/Commands/Correction/CorrectsUnevenAmount.php@@ -30,6 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Account\AccountRepositoryInterface;+use FireflyIII\Support\Facades\Steam;use FireflyIII\Support\Models\AccountBalanceCalculator;use Illuminate\Console\Command;use Illuminate\Support\Facades\DB;@@ -140,6 +141,7 @@ class CorrectsUnevenAmount extends Command/** @var stdClass $entry */foreach ($journals as $entry) {$sum = (string) $entry->the_sum;+ $sum = Steam::floatalize($sum);if (!is_numeric($sum)|| '' === $sum // @phpstan-ignore-line|| str_contains($sum, 'e')diff --git a/app/Console/Commands/Integrity/ReportsSums.php b/app/Console/Commands/Integrity/ReportsSums.phpindex 819754f819..71741d520f 100644--- a/app/Console/Commands/Integrity/ReportsSums.php+++ b/app/Console/Commands/Integrity/ReportsSums.php@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Integrity;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Repositories\User\UserRepositoryInterface;+use FireflyIII\Support\Facades\Steam;use FireflyIII\User;use Illuminate\Console\Command;@@ -60,6 +61,8 @@ class ReportsSums extends Command$foreign = (string) $user->transactions()->selectRaw('SUM(foreign_amount) as total')->value('total');$sum = '' === $sum ? '0' : $sum;$foreign = '' === $foreign ? '0' : $foreign;+ $sum = Steam::floatalize($sum);+ $foreign = Steam::floatalize($foreign);$total = bcadd($sum, $foreign);if (0 !== bccomp($total, '0')) {