kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 19:35:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove static references

Browse Source
This commit is contained in:
James Cole
2023-10-29 06:31:27 +01:00
parent 91b7d20f9b
commit e65d0eef6e
30 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Controllers/Data/DestroyController.php
View File

@@ -303,12 +303,12 @@ class DestroyController extends Controller
foreach ($collection as $account) { foreach ($collection as $account) {
$count = $account->transactions()->count(); $count = $account->transactions()->count();
if (true === $this->unused && 0 === $count) { if (true === $this->unused && 0 === $count) {
Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name)); app('log')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
$service->destroy($account, null); $service->destroy($account, null);
continue; continue;
} }
if (false === $this->unused) { if (false === $this->unused) {
Log::info(sprintf('Deleting account #%d "%s"', $account->id, $account->name)); app('log')->info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
$service->destroy($account, null); $service->destroy($account, null);
} }
} }

4
app/Console/Commands/Correction/DeleteEmptyJournals.php
View File

@@ -81,7 +81,7 @@ class DeleteEmptyJournals extends Command
try { try {
TransactionJournal::find((int)$row->transaction_journal_id)->delete(); TransactionJournal::find((int)$row->transaction_journal_id)->delete();
} catch (QueryException $e) { } catch (QueryException $e) {
Log::info(sprintf('Could not delete journal: %s', $e->getMessage())); app('log')->info(sprintf('Could not delete journal: %s', $e->getMessage()));
Log::error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
@@ -113,7 +113,7 @@ class DeleteEmptyJournals extends Command
try { try {
TransactionJournal::find($entry->id)->delete(); TransactionJournal::find($entry->id)->delete();
} catch (QueryException $e) { } catch (QueryException $e) {
Log::info(sprintf('Could not delete entry: %s', $e->getMessage())); app('log')->info(sprintf('Could not delete entry: %s', $e->getMessage()));
Log::error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }

2
app/Console/Commands/Export/ExportData.php
View File

@@ -209,7 +209,7 @@ class ExportData extends Command
} }
} }
if (null === $this->option($field)) { if (null === $this->option($field)) {
Log::info(sprintf('No date given in field "%s"', $field)); app('log')->info(sprintf('No date given in field "%s"', $field));
$error = true; $error = true;
} }

2
app/Factory/TransactionJournalFactory.php
View File

@@ -626,7 +626,7 @@ class TransactionJournalFactory
{ {
$this->errorOnHash = $errorOnHash; $this->errorOnHash = $errorOnHash;
if (true === $errorOnHash) { if (true === $errorOnHash) {
Log::info('Will trigger duplication alert for this journal.'); app('log')->info('Will trigger duplication alert for this journal.');
} }
} }
} }

4
app/Handlers/Events/StoredGroupEventHandler.php
View File

@@ -47,7 +47,7 @@ class StoredGroupEventHandler
public function processRules(StoredTransactionGroup $storedGroupEvent): void public function processRules(StoredTransactionGroup $storedGroupEvent): void
{ {
if (false === $storedGroupEvent->applyRules) { if (false === $storedGroupEvent->applyRules) {
Log::info(sprintf('Will not run rules on group #%d', $storedGroupEvent->transactionGroup->id)); app('log')->info(sprintf('Will not run rules on group #%d', $storedGroupEvent->transactionGroup->id));
return; return;
} }
@@ -100,7 +100,7 @@ class StoredGroupEventHandler
Log::debug(__METHOD__); Log::debug(__METHOD__);
$group = $storedGroupEvent->transactionGroup; $group = $storedGroupEvent->transactionGroup;
if (false === $storedGroupEvent->fireWebhooks) { if (false === $storedGroupEvent->fireWebhooks) {
Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id)); app('log')->info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
return; return;
} }

4
app/Handlers/Events/UpdatedGroupEventHandler.php
View File

@@ -50,7 +50,7 @@ class UpdatedGroupEventHandler
public function processRules(UpdatedTransactionGroup $updatedGroupEvent): void public function processRules(UpdatedTransactionGroup $updatedGroupEvent): void
{ {
if (false === $updatedGroupEvent->applyRules) { if (false === $updatedGroupEvent->applyRules) {
Log::info(sprintf('Will not run rules on group #%d', $updatedGroupEvent->transactionGroup->id)); app('log')->info(sprintf('Will not run rules on group #%d', $updatedGroupEvent->transactionGroup->id));
return; return;
} }
@@ -98,7 +98,7 @@ class UpdatedGroupEventHandler
Log::debug(__METHOD__); Log::debug(__METHOD__);
$group = $updatedGroupEvent->transactionGroup; $group = $updatedGroupEvent->transactionGroup;
if (false === $updatedGroupEvent->fireWebhooks) { if (false === $updatedGroupEvent->fireWebhooks) {
Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id)); app('log')->info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
return; return;
} }

2
app/Handlers/Events/UserEventHandler.php
View File

@@ -102,7 +102,7 @@ class UserEventHandler
Log::error('Could not find role "owner". This is weird.'); Log::error('Could not find role "owner". This is weird.');
} }
Log::info(sprintf('Gave user #%d role #%d ("%s")', $user->id, $role->id, $role->name)); app('log')->info(sprintf('Gave user #%d role #%d ("%s")', $user->id, $role->id, $role->name));
// give user the role // give user the role
$repository->attachRole($user, 'owner'); $repository->attachRole($user, 'owner');
} }

2
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -68,7 +68,7 @@ class ForgotPasswordController extends Controller
*/ */
public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository) public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
{ {
Log::info('Start of sendResetLinkEmail()'); app('log')->info('Start of sendResetLinkEmail()');
if ('web' !== config('firefly.authentication_guard')) { if ('web' !== config('firefly.authentication_guard')) {
$message = sprintf('Cannot reset password when authenticating over "%s".', config('firefly.authentication_guard')); $message = sprintf('Cannot reset password when authenticating over "%s".', config('firefly.authentication_guard'));
Log::error($message); Log::error($message);

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -87,7 +87,7 @@ class LoginController extends Controller
public function login(Request $request) public function login(Request $request)
{ {
Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get($this->username()))); Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get($this->username())));
Log::info('User is trying to login.'); app('log')->info('User is trying to login.');
$this->validateLogin($request); $this->validateLogin($request);
Log::debug('Login data is present.'); Log::debug('Login data is present.');

2
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -98,7 +98,7 @@ class RegisterController extends Controller
$this->validator($request->all())->validate(); $this->validator($request->all())->validate();
$user = $this->createUser($request->all()); $user = $this->createUser($request->all());
Log::info(sprintf('Registered new user %s', $user->email)); app('log')->info(sprintf('Registered new user %s', $user->email));
event(new RegisteredUser($user)); event(new RegisteredUser($user));
$this->guard()->login($user); $this->guard()->login($user);

2
app/Http/Controllers/DebugController.php
View File

@@ -70,7 +70,7 @@ class DebugController extends Controller
public function displayError(): void public function displayError(): void
{ {
Log::debug('This is a test message at the DEBUG level.'); Log::debug('This is a test message at the DEBUG level.');
Log::info('This is a test message at the INFO level.'); app('log')->info('This is a test message at the INFO level.');
Log::notice('This is a test message at the NOTICE level.'); Log::notice('This is a test message at the NOTICE level.');
app('log')->warning('This is a test message at the WARNING level.'); app('log')->warning('This is a test message at the WARNING level.');
Log::error('This is a test message at the ERROR level.'); Log::error('This is a test message at the ERROR level.');

2
app/Http/Controllers/ProfileController.php
View File

@@ -595,7 +595,7 @@ class ProfileController extends Controller
} }
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
Log::info(sprintf('User #%d has opted to delete their account', auth()->user()->id)); app('log')->info(sprintf('User #%d has opted to delete their account', auth()->user()->id));
// make repository delete user: // make repository delete user:
auth()->logout(); auth()->logout();
session()->flush(); session()->flush();

2
app/Http/Controllers/Recurring/TriggerController.php
View File

@@ -55,7 +55,7 @@ class TriggerController extends Controller
$backupDate = $recurrence->latest_date; $backupDate = $recurrence->latest_date;
// fire the recurring cron job on the given date, then post-date the created transaction. // fire the recurring cron job on the given date, then post-date the created transaction.
Log::info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s'))); app('log')->info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s')));
/** @var CreateRecurringTransactions $job */ /** @var CreateRecurringTransactions $job */
$job = app(CreateRecurringTransactions::class); $job = app(CreateRecurringTransactions::class);
$job->setRecurrences(new Collection([$recurrence])); $job->setRecurrences(new Collection([$recurrence]));

2
app/Http/Controllers/System/InstallController.php
View File

@@ -171,7 +171,7 @@ class InstallController extends Controller
// switch on PHP version. // switch on PHP version.
$keys = []; $keys = [];
// switch on class existence. // switch on class existence.
Log::info('Will run PHP8 code.'); app('log')->info('Will run PHP8 code.');
$keys = RSA::createKey(4096); $keys = RSA::createKey(4096);
[$publicKey, $privateKey] = [ [$publicKey, $privateKey] = [

4
app/Http/Middleware/Installer.php
View File

@@ -160,7 +160,7 @@ class Installer
return true; return true;
} }
//Log::info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion)); //app('log')->info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
return false; return false;
} }
@@ -187,7 +187,7 @@ class Installer
return true; return true;
} }
//Log::info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion)); //app('log')->info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
return false; return false;
} }

2
app/Http/Middleware/IsDemoUser.php
View File

@@ -53,7 +53,7 @@ class IsDemoUser
/** @var UserRepositoryInterface $repository */ /** @var UserRepositoryInterface $repository */
$repository = app(UserRepositoryInterface::class); $repository = app(UserRepositoryInterface::class);
if ($repository->hasRole($user, 'demo')) { if ($repository->hasRole($user, 'demo')) {
Log::info('User is a demo user.'); app('log')->info('User is a demo user.');
$request->session()->flash('info', (string)trans('firefly.not_available_demo_user')); $request->session()->flash('info', (string)trans('firefly.not_available_demo_user'));
$current = $request->url(); $current = $request->url();
$previous = $request->session()->previousUrl(); $previous = $request->session()->previousUrl();

18
app/Jobs/CreateAutoBudgetLimits.php
View File

@@ -89,18 +89,18 @@ class CreateAutoBudgetLimits implements ShouldQueue
private function handleAutoBudget(AutoBudget $autoBudget): void private function handleAutoBudget(AutoBudget $autoBudget): void
{ {
if (null === $autoBudget->budget) { if (null === $autoBudget->budget) {
Log::info(sprintf('Auto budget #%d is associated with a deleted budget.', $autoBudget->id)); app('log')->info(sprintf('Auto budget #%d is associated with a deleted budget.', $autoBudget->id));
$autoBudget->delete(); $autoBudget->delete();
return; return;
} }
if (false === $autoBudget->budget->active) { if (false === $autoBudget->budget->active) {
Log::info(sprintf('Auto budget #%d is associated with an inactive budget.', $autoBudget->id)); app('log')->info(sprintf('Auto budget #%d is associated with an inactive budget.', $autoBudget->id));
return; return;
} }
if (!$this->isMagicDay($autoBudget)) { if (!$this->isMagicDay($autoBudget)) {
Log::info( app('log')->info(
sprintf( sprintf(
'Today (%s) is not a magic day for %s auto-budget #%d (part of budget #%d "%s")', 'Today (%s) is not a magic day for %s auto-budget #%d (part of budget #%d "%s")',
$this->date->format('Y-m-d'), $this->date->format('Y-m-d'),
@@ -114,7 +114,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
return; return;
} }
Log::info( app('log')->info(
sprintf( sprintf(
'Today (%s) is a magic day for %s auto-budget #%d (part of budget #%d "%s")', 'Today (%s) is a magic day for %s auto-budget #%d (part of budget #%d "%s")',
$this->date->format('Y-m-d'), $this->date->format('Y-m-d'),
@@ -300,11 +300,11 @@ class CreateAutoBudgetLimits implements ShouldQueue
Log::debug(sprintf('Total amount left for previous budget period is %s', $budgetLeft)); Log::debug(sprintf('Total amount left for previous budget period is %s', $budgetLeft));
if (-1 !== bccomp('0', $budgetLeft)) { if (-1 !== bccomp('0', $budgetLeft)) {
Log::info(sprintf('The amount left is negative, so it will be reset to %s.', $totalAmount)); app('log')->info(sprintf('The amount left is negative, so it will be reset to %s.', $totalAmount));
} }
if (1 !== bccomp('0', $budgetLeft)) { if (1 !== bccomp('0', $budgetLeft)) {
$totalAmount = bcadd($budgetLeft, $totalAmount); $totalAmount = bcadd($budgetLeft, $totalAmount);
Log::info(sprintf('The amount left is positive, so the new amount will be %s.', $totalAmount)); app('log')->info(sprintf('The amount left is positive, so the new amount will be %s.', $totalAmount));
} }
// create budget limit: // create budget limit:
@@ -366,17 +366,17 @@ class CreateAutoBudgetLimits implements ShouldQueue
if (-1 !== bccomp($budgetAvailable, $totalAmount)) { if (-1 !== bccomp($budgetAvailable, $totalAmount)) {
Log::info(sprintf('There is no overspending, no need to adjust. Budget limit amount will be %s.', $budgetAvailable)); app('log')->info(sprintf('There is no overspending, no need to adjust. Budget limit amount will be %s.', $budgetAvailable));
// create budget limit: // create budget limit:
$this->createBudgetLimit($autoBudget, $start, $end, $budgetAvailable); $this->createBudgetLimit($autoBudget, $start, $end, $budgetAvailable);
} }
if (1 !== bccomp($budgetAvailable, $totalAmount) && 1 === bccomp($budgetAvailable, '0')) { if (1 !== bccomp($budgetAvailable, $totalAmount) && 1 === bccomp($budgetAvailable, '0')) {
Log::info(sprintf('There was overspending, so the new amount will be %s.', $budgetAvailable)); app('log')->info(sprintf('There was overspending, so the new amount will be %s.', $budgetAvailable));
// create budget limit: // create budget limit:
$this->createBudgetLimit($autoBudget, $start, $end, $budgetAvailable); $this->createBudgetLimit($autoBudget, $start, $end, $budgetAvailable);
} }
if (1 !== bccomp($budgetAvailable, $totalAmount) && -1 === bccomp($budgetAvailable, '0')) { if (1 !== bccomp($budgetAvailable, $totalAmount) && -1 === bccomp($budgetAvailable, '0')) {
Log::info('There was overspending, but so much even this period cant fix that. Reset it to 1.'); app('log')->info('There was overspending, but so much even this period cant fix that. Reset it to 1.');
// create budget limit: // create budget limit:
$this->createBudgetLimit($autoBudget, $start, $end, '1'); $this->createBudgetLimit($autoBudget, $start, $end, '1');
} }

16
app/Jobs/CreateRecurringTransactions.php
View File

@@ -186,7 +186,7 @@ class CreateRecurringTransactions implements ShouldQueue
Log::debug(sprintf('Now filtering recurrence #%d, owned by user #%d', $recurrence->id, $recurrence->user_id)); Log::debug(sprintf('Now filtering recurrence #%d, owned by user #%d', $recurrence->id, $recurrence->user_id));
// is not active. // is not active.
if (!$this->active($recurrence)) { if (!$this->active($recurrence)) {
Log::info(sprintf('Recurrence #%d is not active. Skipped.', $recurrence->id)); app('log')->info(sprintf('Recurrence #%d is not active. Skipped.', $recurrence->id));
return false; return false;
} }
@@ -194,14 +194,14 @@ class CreateRecurringTransactions implements ShouldQueue
// has repeated X times. // has repeated X times.
$journalCount = $this->repository->getJournalCount($recurrence); $journalCount = $this->repository->getJournalCount($recurrence);
if (0 !== $recurrence->repetitions && $journalCount >= $recurrence->repetitions && false === $this->force) { if (0 !== $recurrence->repetitions && $journalCount >= $recurrence->repetitions && false === $this->force) {
Log::info(sprintf('Recurrence #%d has run %d times, so will run no longer.', $recurrence->id, $recurrence->repetitions)); app('log')->info(sprintf('Recurrence #%d has run %d times, so will run no longer.', $recurrence->id, $recurrence->repetitions));
return false; return false;
} }
// is no longer running // is no longer running
if ($this->repeatUntilHasPassed($recurrence)) { if ($this->repeatUntilHasPassed($recurrence)) {
Log::info( app('log')->info(
sprintf( sprintf(
'Recurrence #%d was set to run until %s, and today\'s date is %s. Skipped.', 'Recurrence #%d was set to run until %s, and today\'s date is %s. Skipped.',
$recurrence->id, $recurrence->id,
@@ -215,7 +215,7 @@ class CreateRecurringTransactions implements ShouldQueue
// first_date is in the future // first_date is in the future
if ($this->hasNotStartedYet($recurrence)) { if ($this->hasNotStartedYet($recurrence)) {
Log::info( app('log')->info(
sprintf( sprintf(
'Recurrence #%d is set to run on %s, and today\'s date is %s. Skipped.', 'Recurrence #%d is set to run on %s, and today\'s date is %s. Skipped.',
$recurrence->id, $recurrence->id,
@@ -229,7 +229,7 @@ class CreateRecurringTransactions implements ShouldQueue
// already fired today (with success): // already fired today (with success):
if (false === $this->force && $this->hasFiredToday($recurrence)) { if (false === $this->force && $this->hasFiredToday($recurrence)) {
Log::info(sprintf('Recurrence #%d has already fired today. Skipped.', $recurrence->id)); app('log')->info(sprintf('Recurrence #%d has already fired today. Skipped.', $recurrence->id));
return false; return false;
} }
@@ -391,13 +391,13 @@ class CreateRecurringTransactions implements ShouldQueue
// count created journals on THIS day. // count created journals on THIS day.
$journalCount = $this->repository->getJournalCount($recurrence, $date, $date); $journalCount = $this->repository->getJournalCount($recurrence, $date, $date);
if ($journalCount > 0 && false === $this->force) { if ($journalCount > 0 && false === $this->force) {
Log::info(sprintf('Already created %d journal(s) for date %s', $journalCount, $date->format('Y-m-d'))); app('log')->info(sprintf('Already created %d journal(s) for date %s', $journalCount, $date->format('Y-m-d')));
return null; return null;
} }
if ($this->repository->createdPreviously($recurrence, $date) && false === $this->force) { if ($this->repository->createdPreviously($recurrence, $date) && false === $this->force) {
Log::info('There is a transaction already made for this date, so will not be created now'); app('log')->info('There is a transaction already made for this date, so will not be created now');
return null; return null;
} }
@@ -431,7 +431,7 @@ class CreateRecurringTransactions implements ShouldQueue
/** @var TransactionGroup $group */ /** @var TransactionGroup $group */
$group = $this->groupRepository->store($array); $group = $this->groupRepository->store($array);
$this->created++; $this->created++;
Log::info(sprintf('Created new transaction group #%d', $group->id)); app('log')->info(sprintf('Created new transaction group #%d', $group->id));
// trigger event: // trigger event:
event(new StoredTransactionGroup($group, $recurrence->apply_rules, true)); event(new StoredTransactionGroup($group, $recurrence->apply_rules, true));

2
app/Repositories/User/UserRepository.php
View File

@@ -155,7 +155,7 @@ class UserRepository implements UserRepositoryInterface
foreach ($groups as $group) { foreach ($groups as $group) {
$count = $group->groupMemberships()->count(); $count = $group->groupMemberships()->count();
if (0 === $count) { if (0 === $count) {
Log::info(sprintf('Deleted empty group #%d ("%s")', $group->id, $group->title)); app('log')->info(sprintf('Deleted empty group #%d ("%s")', $group->id, $group->title));
$group->delete(); $group->delete();
} }
} }

2
app/Services/FireflyIIIOrg/Update/UpdateRequest.php
View File

@@ -128,7 +128,7 @@ class UpdateRequest implements UpdateRequestInterface
$return['version'] = $response['version']; $return['version'] = $response['version'];
$return['level'] = 'success'; $return['level'] = 'success';
$return['date'] = Carbon::createFromFormat('Y-m-d', $response['date'])->startOfDay(); $return['date'] = Carbon::createFromFormat('Y-m-d', $response['date'])->startOfDay();
Log::info('Response from update server', $response); app('log')->info('Response from update server', $response);
return $return; return $return;
} }

2
app/Services/Internal/Support/AccountServiceTrait.php
View File

@@ -64,7 +64,7 @@ trait AccountServiceTrait
$rules = ['iban' => 'required|iban']; $rules = ['iban' => 'required|iban'];
$validator = Validator::make($data, $rules); $validator = Validator::make($data, $rules);
if ($validator->fails()) { if ($validator->fails()) {
Log::info(sprintf('Detected invalid IBAN ("%s"). Return NULL instead.', $iban)); app('log')->info(sprintf('Detected invalid IBAN ("%s"). Return NULL instead.', $iban));
return null; return null;
} }

4
app/Services/Internal/Update/JournalUpdateService.php
View File

@@ -148,7 +148,7 @@ class JournalUpdateService
// can we update account data using the new type? // can we update account data using the new type?
if ($this->hasValidAccounts()) { if ($this->hasValidAccounts()) {
Log::info('Account info is valid, now update.'); app('log')->info('Account info is valid, now update.');
// update accounts: // update accounts:
$this->updateAccounts(); $this->updateAccounts();
@@ -805,7 +805,7 @@ class JournalUpdateService
$dest->save(); $dest->save();
Log::debug(sprintf('Foreign amount is "%s" so remove foreign amount info.', $amount)); Log::debug(sprintf('Foreign amount is "%s" so remove foreign amount info.', $amount));
} }
Log::info('Not enough info to update foreign currency info.'); app('log')->info('Not enough info to update foreign currency info.');
// refresh transactions. // refresh transactions.
$this->sourceTransaction->refresh(); $this->sourceTransaction->refresh();

2
app/Support/Binder/CLIToken.php
View File

@@ -55,7 +55,7 @@ class CLIToken implements BinderInterface
foreach ($users as $user) { foreach ($users as $user) {
$accessToken = app('preferences')->getForUser($user, 'access_token'); $accessToken = app('preferences')->getForUser($user, 'access_token');
if (null !== $accessToken && $accessToken->data === $value) { if (null !== $accessToken && $accessToken->data === $value) {
Log::info(sprintf('Recognized user #%d (%s) from his acccess token.', $user->id, $user->email)); app('log')->info(sprintf('Recognized user #%d (%s) from his acccess token.', $user->id, $user->email));
return $value; return $value;
} }

14
app/Support/Cronjobs/AutoBudgetCronjob.php
View File

@@ -45,13 +45,13 @@ class AutoBudgetCronjob extends AbstractCronjob
$diff = time() - $lastTime; $diff = time() - $lastTime;
$diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('Auto budget cron-job has never fired before.'); app('log')->info('Auto budget cron-job has never fired before.');
} }
// less than half a day ago: // less than half a day ago:
if ($lastTime > 0 && $diff <= 43200) { if ($lastTime > 0 && $diff <= 43200) {
Log::info(sprintf('It has been %s since the auto budget cron-job has fired.', $diffForHumans)); app('log')->info(sprintf('It has been %s since the auto budget cron-job has fired.', $diffForHumans));
if (false === $this->force) { if (false === $this->force) {
Log::info('The auto budget cron-job will not fire now.'); app('log')->info('The auto budget cron-job will not fire now.');
$this->message = sprintf('It has been %s since the auto budget cron-job has fired. It will not fire now.', $diffForHumans); $this->message = sprintf('It has been %s since the auto budget cron-job has fired. It will not fire now.', $diffForHumans);
return; return;
@@ -59,12 +59,12 @@ class AutoBudgetCronjob extends AbstractCronjob
// fire job regardless. // fire job regardless.
if (true === $this->force) { if (true === $this->force) {
Log::info('Execution of the auto budget cron-job has been FORCED.'); app('log')->info('Execution of the auto budget cron-job has been FORCED.');
} }
} }
if ($lastTime > 0 && $diff > 43200) { if ($lastTime > 0 && $diff > 43200) {
Log::info(sprintf('It has been %s since the auto budget cron-job has fired. It will fire now!', $diffForHumans)); app('log')->info(sprintf('It has been %s since the auto budget cron-job has fired. It will fire now!', $diffForHumans));
} }
$this->fireAutoBudget(); $this->fireAutoBudget();
@@ -76,7 +76,7 @@ class AutoBudgetCronjob extends AbstractCronjob
*/ */
private function fireAutoBudget(): void private function fireAutoBudget(): void
{ {
Log::info(sprintf('Will now fire auto budget cron job task for date "%s".', $this->date->format('Y-m-d'))); app('log')->info(sprintf('Will now fire auto budget cron job task for date "%s".', $this->date->format('Y-m-d')));
/** @var CreateAutoBudgetLimits $job */ /** @var CreateAutoBudgetLimits $job */
$job = app(CreateAutoBudgetLimits::class, [$this->date]); $job = app(CreateAutoBudgetLimits::class, [$this->date]);
$job->setDate($this->date); $job->setDate($this->date);
@@ -89,6 +89,6 @@ class AutoBudgetCronjob extends AbstractCronjob
$this->message = 'Auto-budget cron job fired successfully.'; $this->message = 'Auto-budget cron job fired successfully.';
app('fireflyconfig')->set('last_ab_job', (int)$this->date->format('U')); app('fireflyconfig')->set('last_ab_job', (int)$this->date->format('U'));
Log::info('Done with auto budget cron job task.'); app('log')->info('Done with auto budget cron job task.');
} }
} }

16
app/Support/Cronjobs/BillWarningCronjob.php
View File

@@ -51,13 +51,13 @@ class BillWarningCronjob extends AbstractCronjob
$diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('The bill warning cron-job has never fired before.'); app('log')->info('The bill warning cron-job has never fired before.');
} }
// less than half a day ago: // less than half a day ago:
if ($lastTime > 0 && $diff <= 43200) { if ($lastTime > 0 && $diff <= 43200) {
Log::info(sprintf('It has been %s since the bill warning cron-job has fired.', $diffForHumans)); app('log')->info(sprintf('It has been %s since the bill warning cron-job has fired.', $diffForHumans));
if (false === $this->force) { if (false === $this->force) {
Log::info('The cron-job will not fire now.'); app('log')->info('The cron-job will not fire now.');
$this->message = sprintf('It has been %s since the bill warning cron-job has fired. It will not fire now.', $diffForHumans); $this->message = sprintf('It has been %s since the bill warning cron-job has fired. It will not fire now.', $diffForHumans);
$this->jobFired = false; $this->jobFired = false;
$this->jobErrored = false; $this->jobErrored = false;
@@ -68,12 +68,12 @@ class BillWarningCronjob extends AbstractCronjob
// fire job regardless. // fire job regardless.
if (true === $this->force) { if (true === $this->force) {
Log::info('Execution of the bill warning cron-job has been FORCED.'); app('log')->info('Execution of the bill warning cron-job has been FORCED.');
} }
} }
if ($lastTime > 0 && $diff > 43200) { if ($lastTime > 0 && $diff > 43200) {
Log::info(sprintf('It has been %s since the bill warning cron-job has fired. It will fire now!', $diffForHumans)); app('log')->info(sprintf('It has been %s since the bill warning cron-job has fired. It will fire now!', $diffForHumans));
} }
$this->fireWarnings(); $this->fireWarnings();
@@ -86,7 +86,7 @@ class BillWarningCronjob extends AbstractCronjob
*/ */
private function fireWarnings(): void private function fireWarnings(): void
{ {
Log::info(sprintf('Will now fire bill warning job task for date "%s".', $this->date->format('Y-m-d H:i:s'))); app('log')->info(sprintf('Will now fire bill warning job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
/** @var WarnAboutBills $job */ /** @var WarnAboutBills $job */
$job = app(WarnAboutBills::class); $job = app(WarnAboutBills::class);
$job->setDate($this->date); $job->setDate($this->date);
@@ -100,7 +100,7 @@ class BillWarningCronjob extends AbstractCronjob
$this->message = 'Bill warning cron job fired successfully.'; $this->message = 'Bill warning cron job fired successfully.';
app('fireflyconfig')->set('last_bw_job', (int)$this->date->format('U')); app('fireflyconfig')->set('last_bw_job', (int)$this->date->format('U'));
Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int)$this->date->format('U'))); app('log')->info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int)$this->date->format('U')));
Log::info('Done with bill warning cron job task.'); app('log')->info('Done with bill warning cron job task.');
} }
} }

14
app/Support/Cronjobs/ExchangeRatesCronjob.php
View File

@@ -45,13 +45,13 @@ class ExchangeRatesCronjob extends AbstractCronjob
$diff = time() - $lastTime; $diff = time() - $lastTime;
$diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('Exchange rates cron-job has never fired before.'); app('log')->info('Exchange rates cron-job has never fired before.');
} }
// less than half a day ago: // less than half a day ago:
if ($lastTime > 0 && $diff <= 43200) { if ($lastTime > 0 && $diff <= 43200) {
Log::info(sprintf('It has been %s since the exchange rates cron-job has fired.', $diffForHumans)); app('log')->info(sprintf('It has been %s since the exchange rates cron-job has fired.', $diffForHumans));
if (false === $this->force) { if (false === $this->force) {
Log::info('The exchange rates cron-job will not fire now.'); app('log')->info('The exchange rates cron-job will not fire now.');
$this->message = sprintf('It has been %s since the exchange rates cron-job has fired. It will not fire now.', $diffForHumans); $this->message = sprintf('It has been %s since the exchange rates cron-job has fired. It will not fire now.', $diffForHumans);
return; return;
@@ -59,12 +59,12 @@ class ExchangeRatesCronjob extends AbstractCronjob
// fire job regardless. // fire job regardless.
if (true === $this->force) { if (true === $this->force) {
Log::info('Execution of the exchange rates cron-job has been FORCED.'); app('log')->info('Execution of the exchange rates cron-job has been FORCED.');
} }
} }
if ($lastTime > 0 && $diff > 43200) { if ($lastTime > 0 && $diff > 43200) {
Log::info(sprintf('It has been %s since the exchange rates cron-job has fired. It will fire now!', $diffForHumans)); app('log')->info(sprintf('It has been %s since the exchange rates cron-job has fired. It will fire now!', $diffForHumans));
} }
$this->fireExchangeRateJob(); $this->fireExchangeRateJob();
@@ -76,7 +76,7 @@ class ExchangeRatesCronjob extends AbstractCronjob
*/ */
private function fireExchangeRateJob(): void private function fireExchangeRateJob(): void
{ {
Log::info(sprintf('Will now fire exchange rates cron job task for date "%s".', $this->date->format('Y-m-d'))); app('log')->info(sprintf('Will now fire exchange rates cron job task for date "%s".', $this->date->format('Y-m-d')));
/** @var DownloadExchangeRates $job */ /** @var DownloadExchangeRates $job */
$job = app(DownloadExchangeRates::class); $job = app(DownloadExchangeRates::class);
$job->setDate($this->date); $job->setDate($this->date);
@@ -89,6 +89,6 @@ class ExchangeRatesCronjob extends AbstractCronjob
$this->message = 'Exchange rates cron job fired successfully.'; $this->message = 'Exchange rates cron job fired successfully.';
app('fireflyconfig')->set('last_cer_job', (int)$this->date->format('U')); app('fireflyconfig')->set('last_cer_job', (int)$this->date->format('U'));
Log::info('Done with exchange rates job task.'); app('log')->info('Done with exchange rates job task.');
} }
} }

16
app/Support/Cronjobs/RecurringCronjob.php
View File

@@ -51,13 +51,13 @@ class RecurringCronjob extends AbstractCronjob
$diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('Recurring transactions cron-job has never fired before.'); app('log')->info('Recurring transactions cron-job has never fired before.');
} }
// less than half a day ago: // less than half a day ago:
if ($lastTime > 0 && $diff <= 43200) { if ($lastTime > 0 && $diff <= 43200) {
Log::info(sprintf('It has been %s since the recurring transactions cron-job has fired.', $diffForHumans)); app('log')->info(sprintf('It has been %s since the recurring transactions cron-job has fired.', $diffForHumans));
if (false === $this->force) { if (false === $this->force) {
Log::info('The cron-job will not fire now.'); app('log')->info('The cron-job will not fire now.');
$this->message = sprintf('It has been %s since the recurring transactions cron-job has fired. It will not fire now.', $diffForHumans); $this->message = sprintf('It has been %s since the recurring transactions cron-job has fired. It will not fire now.', $diffForHumans);
$this->jobFired = false; $this->jobFired = false;
$this->jobErrored = false; $this->jobErrored = false;
@@ -68,12 +68,12 @@ class RecurringCronjob extends AbstractCronjob
// fire job regardless. // fire job regardless.
if (true === $this->force) { if (true === $this->force) {
Log::info('Execution of the recurring transaction cron-job has been FORCED.'); app('log')->info('Execution of the recurring transaction cron-job has been FORCED.');
} }
} }
if ($lastTime > 0 && $diff > 43200) { if ($lastTime > 0 && $diff > 43200) {
Log::info(sprintf('It has been %s since the recurring transactions cron-job has fired. It will fire now!', $diffForHumans)); app('log')->info(sprintf('It has been %s since the recurring transactions cron-job has fired. It will fire now!', $diffForHumans));
} }
$this->fireRecurring(); $this->fireRecurring();
@@ -86,7 +86,7 @@ class RecurringCronjob extends AbstractCronjob
*/ */
private function fireRecurring(): void private function fireRecurring(): void
{ {
Log::info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s'))); app('log')->info(sprintf('Will now fire recurring cron job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
/** @var CreateRecurringTransactions $job */ /** @var CreateRecurringTransactions $job */
$job = app(CreateRecurringTransactions::class); $job = app(CreateRecurringTransactions::class);
$job->setDate($this->date); $job->setDate($this->date);
@@ -100,7 +100,7 @@ class RecurringCronjob extends AbstractCronjob
$this->message = 'Recurring transactions cron job fired successfully.'; $this->message = 'Recurring transactions cron job fired successfully.';
app('fireflyconfig')->set('last_rt_job', (int)$this->date->format('U')); app('fireflyconfig')->set('last_rt_job', (int)$this->date->format('U'));
Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int)$this->date->format('U'))); app('log')->info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int)$this->date->format('U')));
Log::info('Done with recurring cron job task.'); app('log')->info('Done with recurring cron job task.');
} }
} }

4
app/Support/Search/OperatorQuerySearch.php
View File

@@ -261,7 +261,7 @@ class OperatorQuerySearch implements SearchInterface
throw new FireflyException(sprintf('Unsupported search operator: "%s"', $operator)); throw new FireflyException(sprintf('Unsupported search operator: "%s"', $operator));
// some search operators are ignored, basically: // some search operators are ignored, basically:
case 'user_action': case 'user_action':
Log::info(sprintf('Ignore search operator "%s"', $operator)); app('log')->info(sprintf('Ignore search operator "%s"', $operator));
return false; return false;
// //
@@ -863,7 +863,7 @@ class OperatorQuerySearch implements SearchInterface
} }
// no tags found means search must result in nothing. // no tags found means search must result in nothing.
if (null === $result) { if (null === $result) {
Log::info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator)); app('log')->info(sprintf('No valid tags in "%s"-operator, so search will not return ANY results.', $operator));
$this->collector->findNothing(); $this->collector->findNothing();
} }
break; break;

4
app/Support/System/GeneratesInstallationId.php
View File

@@ -41,7 +41,7 @@ trait GeneratesInstallationId
try { try {
$config = app('fireflyconfig')->get('installation_id'); $config = app('fireflyconfig')->get('installation_id');
} catch (FireflyException $e) { } catch (FireflyException $e) {
Log::info('Could not create or generate installation ID. Do not continue.'); app('log')->info('Could not create or generate installation ID. Do not continue.');
return; return;
} }
@@ -54,7 +54,7 @@ trait GeneratesInstallationId
if (null === $config) { if (null === $config) {
$uuid4 = Uuid::uuid4(); $uuid4 = Uuid::uuid4();
$uniqueId = (string)$uuid4; $uniqueId = (string)$uuid4;
Log::info(sprintf('Created Firefly III installation ID %s', $uniqueId)); app('log')->info(sprintf('Created Firefly III installation ID %s', $uniqueId));
app('fireflyconfig')->set('installation_id', $uniqueId); app('fireflyconfig')->set('installation_id', $uniqueId);
} }
} }

4
app/TransactionRules/Actions/UpdatePiggybank.php
View File

@@ -67,7 +67,7 @@ class UpdatePiggybank implements ActionInterface
$piggyBank = $this->findPiggyBank($user); $piggyBank = $this->findPiggyBank($user);
if (null === $piggyBank) { if (null === $piggyBank) {
Log::info( app('log')->info(
sprintf('No piggy bank named "%s", cant execute action #%d of rule #%d', $this->action->action_value, $this->action->id, $this->action->rule_id) sprintf('No piggy bank named "%s", cant execute action #%d of rule #%d', $this->action->action_value, $this->action->id, $this->action->rule_id)
); );
event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.cannot_find_piggy', ['name' => $this->action->action_value]))); event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.cannot_find_piggy', ['name' => $this->action->action_value])));
@@ -123,7 +123,7 @@ class UpdatePiggybank implements ActionInterface
return true; return true;
} }
Log::info( app('log')->info(
sprintf( sprintf(
'Piggy bank is not linked to source ("#%d") or destination ("#%d"), so no action will be taken.', 'Piggy bank is not linked to source ("#%d") or destination ("#%d"), so no action will be taken.',
$source->account_id, $source->account_id,