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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-04-26 21:40:15 +02:00
parent 1d2a4e707e
commit da202317c0
41 changed files with 167 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/UpgradeFireflyInstructions.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Console\Commands; namespace FireflyIII\Console\Commands;
use Config;
use Illuminate\Console\Command; use Illuminate\Console\Command;
/** /**
@@ -43,8 +42,9 @@ class UpgradeFireflyInstructions extends Command
public function handle() public function handle()
{ {
// //
$version = Config::get('firefly.version'); /** @var string $version */
$config = Config::get('upgrade.text'); $version = config('firefly.version');
$config = config('upgrade.text');
$text = $config[$version] ?? null; $text = $config[$version] ?? null;
$this->line('+------------------------------------------------------------------------------+'); $this->line('+------------------------------------------------------------------------------+');

1
app/Console/Kernel.php
View File

@@ -13,7 +13,6 @@ namespace FireflyIII\Console;
use FireflyIII\Console\Commands\UpgradeFireflyInstructions; use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
use FireflyIII\Console\Commands\VerifyDatabase; use FireflyIII\Console\Commands\VerifyDatabase;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel; use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
/** /**

14
app/Export/Entry/EntryAccount.php
View File

@@ -18,10 +18,10 @@ use FireflyIII\Models\Account;
*/ */
class EntryAccount class EntryAccount
{ {
/** @var int */
public $accountId;
/** @var string */ /** @var string */
public $iban; public $iban;
/** @var int */
public $id;
/** @var string */ /** @var string */
public $name; public $name;
/** @var int */ /** @var int */
@@ -36,10 +36,10 @@ class EntryAccount
*/ */
public function __construct(Account $account) public function __construct(Account $account)
{ {
$this->id = $account->id; $this->accountId = $account->id;
$this->name = $account->name; $this->name = $account->name;
$this->iban = $account->iban; $this->iban = $account->iban;
$this->type = $account->accountType->type; $this->type = $account->accountType->type;
$this->number = $account->getMeta('accountNumber'); $this->number = $account->getMeta('accountNumber');
} }
} }

6
app/Export/Entry/EntryBill.php
View File

@@ -19,7 +19,7 @@ use FireflyIII\Models\Bill;
class EntryBill class EntryBill
{ {
/** @var string */ /** @var string */
public $id = ''; public $billId = '';
/** @var string */ /** @var string */
public $name = ''; public $name = '';
@@ -31,8 +31,8 @@ class EntryBill
public function __construct(Bill $bill = null) public function __construct(Bill $bill = null)
{ {
if (!is_null($bill)) { if (!is_null($bill)) {
$this->id = $bill->id; $this->billId = $bill->id;
$this->name = $bill->name; $this->name = $bill->name;
} }
} }

6
app/Export/Entry/EntryBudget.php
View File

@@ -19,7 +19,7 @@ use FireflyIII\Models\Budget;
class EntryBudget class EntryBudget
{ {
/** @var string */ /** @var string */
public $id = ''; public $budgetId = '';
/** @var string */ /** @var string */
public $name = ''; public $name = '';
@@ -31,8 +31,8 @@ class EntryBudget
public function __construct(Budget $budget = null) public function __construct(Budget $budget = null)
{ {
if (!is_null($budget)) { if (!is_null($budget)) {
$this->id = $budget->id; $this->budgetId = $budget->id;
$this->name = $budget->name; $this->name = $budget->name;
} }
} }

6
app/Export/Entry/EntryCategory.php
View File

@@ -19,7 +19,7 @@ use FireflyIII\Models\Category;
class EntryCategory class EntryCategory
{ {
/** @var string */ /** @var string */
public $id = ''; public $categoryId = '';
/** @var string */ /** @var string */
public $name = ''; public $name = '';
@@ -31,8 +31,8 @@ class EntryCategory
public function __construct(Category $category = null) public function __construct(Category $category = null)
{ {
if (!is_null($category)) { if (!is_null($category)) {
$this->id = $category->id; $this->categoryId = $category->id;
$this->name = $category->name; $this->name = $category->name;
} }
} }
} }

8
app/Export/Exporter/CsvExporter.php
View File

@@ -69,10 +69,10 @@ class CsvExporter extends BasicExporter implements ExporterInterface
foreach ($this->getEntries() as $entry) { foreach ($this->getEntries() as $entry) {
// order is defined in Entry::getFieldsAndTypes. // order is defined in Entry::getFieldsAndTypes.
$rows[] = [ $rows[] = [
$entry->description, $entry->amount, $entry->date, $entry->sourceAccount->id, $entry->sourceAccount->name, $entry->sourceAccount->iban, $entry->description, $entry->amount, $entry->date, $entry->sourceAccount->accountId, $entry->sourceAccount->name, $entry->sourceAccount->iban,
$entry->sourceAccount->type, $entry->sourceAccount->number, $entry->destinationAccount->id, $entry->destinationAccount->name, $entry->sourceAccount->type, $entry->sourceAccount->number, $entry->destinationAccount->accountId, $entry->destinationAccount->name,
$entry->destinationAccount->iban, $entry->destinationAccount->type, $entry->destinationAccount->number, $entry->budget->id, $entry->destinationAccount->iban, $entry->destinationAccount->type, $entry->destinationAccount->number, $entry->budget->budgetId,
$entry->budget->name, $entry->category->id, $entry->category->name, $entry->bill->id, $entry->bill->name, $entry->budget->name, $entry->category->categoryId, $entry->category->name, $entry->bill->billId, $entry->bill->name,
]; ];
} }

21
app/Export/Processor.php
View File

@@ -11,12 +11,12 @@ declare(strict_types = 1);
namespace FireflyIII\Export; namespace FireflyIII\Export;
use Auth; use Auth;
use Config;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Export\Entry\Entry; use FireflyIII\Export\Entry\Entry;
use FireflyIII\Models\ExportJob; use FireflyIII\Models\ExportJob;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalCollector; use FireflyIII\Repositories\Journal\JournalCollector;
use Illuminate\Filesystem\FilesystemAdapter;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Storage; use Storage;
@@ -174,10 +174,7 @@ class Processor
$zip->close(); $zip->close();
// delete the files: // delete the files:
foreach ($this->getFiles() as $file) { $this->deleteFiles($disk);
Log::debug('Will now delete file "' . $file . '".');
$disk->delete($file);
}
Log::debug('Done!'); Log::debug('Done!');
return true; return true;
@@ -188,7 +185,7 @@ class Processor
*/ */
public function exportJournals(): bool public function exportJournals(): bool
{ {
$exporterClass = Config::get('firefly.export_formats.' . $this->exportFormat); $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
$exporter = app($exporterClass, [$this->job]); $exporter = app($exporterClass, [$this->job]);
Log::debug('Going to export ' . $this->exportEntries->count() . ' export entries into ' . $this->exportFormat . ' format.'); Log::debug('Going to export ' . $this->exportEntries->count() . ' export entries into ' . $this->exportFormat . ' format.');
$exporter->setEntries($this->exportEntries); $exporter->setEntries($this->exportEntries);
@@ -206,4 +203,16 @@ class Processor
{ {
return $this->files; return $this->files;
} }
/**
* @param FilesystemAdapter $disk
*/
private function deleteFiles(FilesystemAdapter $disk)
{
Log::debug('Class of $disk: ' . get_class($disk));
foreach ($this->getFiles() as $file) {
Log::debug('Will now delete file "' . $file . '".');
$disk->delete($file);
}
}
} }

10
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@@ -54,11 +54,7 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
public function single(Bill $bill, Collection $entries): array public function single(Bill $bill, Collection $entries): array
{ {
$format = (string)trans('config.month'); $format = (string)trans('config.month');
$data = [ $data = ['count' => 3, 'labels' => [], 'datasets' => [],];
'count' => 3,
'labels' => [],
'datasets' => [],
];
$minAmount = []; $minAmount = [];
$maxAmount = []; $maxAmount = [];
$actualAmount = []; $actualAmount = [];
@@ -67,9 +63,7 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
$data['labels'][] = $entry->date->formatLocalized($format); $data['labels'][] = $entry->date->formatLocalized($format);
$minAmount[] = round($bill->amount_min, 2); $minAmount[] = round($bill->amount_min, 2);
$maxAmount[] = round($bill->amount_max, 2); $maxAmount[] = round($bill->amount_max, 2);
/* // journalAmount has been collected in BillRepository::getJournals
* journalAmount has been collected in BillRepository::getJournals
*/
$actualAmount[] = round(TransactionJournal::amountPositive($entry), 2); $actualAmount[] = round(TransactionJournal::amountPositive($entry), 2);
} }

3
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Generator\Chart\Budget; namespace FireflyIII\Generator\Chart\Budget;
use Config;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Navigation; use Navigation;
use Preferences; use Preferences;
@@ -25,7 +24,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
public function budgetLimit(Collection $entries, string $dateFormat = 'monthAndDay'): array public function budgetLimit(Collection $entries, string $dateFormat = 'monthAndDay'): array
{ {
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data; $language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
$format = Config::get('firefly.' . $dateFormat . '.' . $language); $format = config('firefly.' . $dateFormat . '.' . $language);
$data = [ $data = [
'labels' => [], 'labels' => [],

14
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@@ -20,8 +20,6 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*/ */
public function all(Collection $entries): array public function all(Collection $entries): array
{ {
$data = [ $data = [
'count' => 2, 'count' => 2,
'labels' => [], 'labels' => [],
@@ -116,18 +114,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
*/ */
public function multiYear(Collection $entries): array public function multiYear(Collection $entries): array
{ {
// dataset:
$data = [
'count' => 0,
'labels' => [],
'datasets' => [],
];
// get labels from one of the categories (assuming there's at least one): // get labels from one of the categories (assuming there's at least one):
$first = $entries->first(); $first = $entries->first();
$keys = array_keys($first['spent']); $data = ['count' => 0, 'labels' => array_keys($first['spent']), 'datasets' => [],];
foreach ($keys as $year) {
$data['labels'][] = strval($year);
}
// then, loop all entries and create datasets: // then, loop all entries and create datasets:
foreach ($entries as $entry) { foreach ($entries as $entry) {
@@ -144,7 +133,6 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
$data['count'] = count($data['datasets']); $data['count'] = count($data['datasets']);
return $data; return $data;
} }
/** /**

12
app/Handlers/Events/UserConfirmation.php
View File

@@ -74,11 +74,7 @@ class UserConfirmation
private function doConfirm(User $user, string $ipAddress) private function doConfirm(User $user, string $ipAddress)
{ {
Log::debug('Trigger UserConfirmation::doConfirm'); Log::debug('Trigger UserConfirmation::doConfirm');
// if user must confirm account, send email
$confirmAccount = env('MUST_CONFIRM_ACCOUNT', false); $confirmAccount = env('MUST_CONFIRM_ACCOUNT', false);
// otherwise, auto-confirm:
if ($confirmAccount === false) { if ($confirmAccount === false) {
Log::debug('Confirm account is false, so user will be auto-confirmed.'); Log::debug('Confirm account is false, so user will be auto-confirmed.');
Preferences::setForUser($user, 'user_confirmed', true); Preferences::setForUser($user, 'user_confirmed', true);
@@ -87,19 +83,12 @@ class UserConfirmation
return; return;
} }
// send email message:
$email = $user->email; $email = $user->email;
$code = str_random(16); $code = str_random(16);
$route = route('do_confirm_account', [$code]); $route = route('do_confirm_account', [$code]);
// set preferences:
Preferences::setForUser($user, 'user_confirmed', false); Preferences::setForUser($user, 'user_confirmed', false);
Preferences::setForUser($user, 'user_confirmed_last_mail', time()); Preferences::setForUser($user, 'user_confirmed_last_mail', time());
Preferences::setForUser($user, 'user_confirmed_code', $code); Preferences::setForUser($user, 'user_confirmed_code', $code);
Log::debug('Set preferences for user.');
// send email.
try { try {
Log::debug('Now in try block for user email message thing to ' . $email . '.'); Log::debug('Now in try block for user email message thing to ' . $email . '.');
Mail::send( Mail::send(
@@ -109,7 +98,6 @@ class UserConfirmation
} }
); );
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
Log::error($e->getMessage()); Log::error($e->getMessage());
} catch (Exception $e) { } catch (Exception $e) {
Log::debug('Caught general exception.'); Log::debug('Caught general exception.');

59
app/Helpers/Attachments/AttachmentHelper.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Helpers\Attachments; namespace FireflyIII\Helpers\Attachments;
use Auth; use Auth;
use Config;
use Crypt; use Crypt;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@@ -39,8 +38,8 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
public function __construct() public function __construct()
{ {
$this->maxUploadSize = Config::get('firefly.maxUploadSize'); $this->maxUploadSize = config('firefly.maxUploadSize');
$this->allowedMimes = Config::get('firefly.allowedMimes'); $this->allowedMimes = config('firefly.allowedMimes');
$this->errors = new MessageBag; $this->errors = new MessageBag;
$this->messages = new MessageBag; $this->messages = new MessageBag;
$this->uploadDisk = Storage::disk('upload'); $this->uploadDisk = Storage::disk('upload');
@@ -81,26 +80,14 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
public function saveAttachmentsForModel(Model $model): bool public function saveAttachmentsForModel(Model $model): bool
{ {
$files = null; $files = $this->getFiles();
try {
if (Input::hasFile('attachments')) { if (!is_null($files) && !is_array($files)) {
$files = Input::file('attachments'); $this->processFile($files, $model);
}
} catch (TypeError $e) {
// Log it, do nothing else.
Log::error($e->getMessage());
} }
if (is_array($files)) { if (is_array($files)) {
foreach ($files as $entry) { $this->processFiles($files, $model);
if (!is_null($entry)) {
$this->processFile($entry, $model);
}
}
} else {
if (!is_null($files)) {
$this->processFile($files, $model);
}
} }
return true; return true;
@@ -234,5 +221,37 @@ class AttachmentHelper implements AttachmentHelperInterface
return true; return true;
} }
/**
* @return array|null|UploadedFile
*/
private function getFiles()
{
$files = null;
try {
if (Input::hasFile('attachments')) {
$files = Input::file('attachments');
}
} catch (TypeError $e) {
// Log it, do nothing else.
Log::error($e->getMessage());
}
return $files;
}
/**
* @param array $files
*
* @return bool
*/
private function processFiles(array $files, Model $model): bool
{
foreach ($files as $entry) {
if (!is_null($entry)) {
$this->processFile($entry, $model);
}
}
}
} }

9
app/Helpers/Csv/Importer.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Helpers\Csv; namespace FireflyIII\Helpers\Csv;
use Auth; use Auth;
use Config;
use FireflyIII\Events\TransactionJournalStored; use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Csv\Converter\ConverterInterface; use FireflyIII\Helpers\Csv\Converter\ConverterInterface;
@@ -219,8 +218,8 @@ class Importer
$data = $this->getFiller(); // These fields are necessary to create a new transaction journal. Some are optional $data = $this->getFiller(); // These fields are necessary to create a new transaction journal. Some are optional
foreach ($row as $index => $value) { foreach ($row as $index => $value) {
$role = $this->roles[$index] ?? '_ignore'; $role = $this->roles[$index] ?? '_ignore';
$class = Config::get('csv.roles.' . $role . '.converter'); $class = config('csv.roles.' . $role . '.converter');
$field = Config::get('csv.roles.' . $role . '.field'); $field = config('csv.roles.' . $role . '.field');
Log::debug('Column #' . $index . ' (role: ' . $role . ') : converter ' . $class . ' stores its data into field ' . $field . ':'); Log::debug('Column #' . $index . ' (role: ' . $role . ') : converter ' . $class . ' stores its data into field ' . $field . ':');
@@ -282,7 +281,7 @@ class Importer
} }
$set = Config::get('csv.post_processors'); $set = config('csv.post_processors');
foreach ($set as $className) { foreach ($set as $className) {
/** @var PostProcessorInterface $postProcessor */ /** @var PostProcessorInterface $postProcessor */
$postProcessor = app('FireflyIII\Helpers\Csv\PostProcessing\\' . $className); $postProcessor = app('FireflyIII\Helpers\Csv\PostProcessing\\' . $className);
@@ -356,7 +355,7 @@ class Importer
private function getFiller() private function getFiller()
{ {
$filler = []; $filler = [];
foreach (Config::get('csv.roles') as $role) { foreach (config('csv.roles') as $role) {
if (isset($role['field'])) { if (isset($role['field'])) {
$fieldName = $role['field']; $fieldName = $role['field'];
$filler[$fieldName] = null; $filler[$fieldName] = null;

5
app/Helpers/Csv/Wizard.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Helpers\Csv; namespace FireflyIII\Helpers\Csv;
use Auth; use Auth;
use Config;
use Crypt; use Crypt;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Csv\Mapper\MapperInterface; use FireflyIII\Helpers\Csv\Mapper\MapperInterface;
@@ -61,7 +60,7 @@ class Wizard implements WizardInterface
*/ */
public function processSelectedMapping(array $roles, array $map): array public function processSelectedMapping(array $roles, array $map): array
{ {
$configRoles = Config::get('csv.roles'); $configRoles = config('csv.roles');
$maps = []; $maps = [];
@@ -134,7 +133,7 @@ class Wizard implements WizardInterface
$options = []; $options = [];
foreach ($map as $index => $columnRole) { foreach ($map as $index => $columnRole) {
$mapper = Config::get('csv.roles.' . $columnRole . '.mapper'); $mapper = config('csv.roles.' . $columnRole . '.mapper');
if (is_null($mapper)) { if (is_null($mapper)) {
throw new FireflyException('Cannot map field of type "' . $columnRole . '".'); throw new FireflyException('Cannot map field of type "' . $columnRole . '".');
} }

56
app/Helpers/Report/BalanceReportHelper.php
View File

@@ -104,33 +104,33 @@ class BalanceReportHelper implements BalanceReportHelperInterface
{ {
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
$set = Auth::user()->tags() $set = Auth::user()->tags()
->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id') ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id') ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
->leftJoin( ->leftJoin(
'transactions AS t_source', function (JoinClause $join) { 'transactions AS t_source', function (JoinClause $join) {
$join->on('transaction_journals.id', '=', 't_source.transaction_journal_id')->where('t_source.amount', '<', 0); $join->on('transaction_journals.id', '=', 't_source.transaction_journal_id')->where('t_source.amount', '<', 0);
} }
) )
->leftJoin( ->leftJoin(
'transactions AS t_destination', function (JoinClause $join) { 'transactions AS t_destination', function (JoinClause $join) {
$join->on('transaction_journals.id', '=', 't_destination.transaction_journal_id')->where('t_destination.amount', '>', 0); $join->on('transaction_journals.id', '=', 't_destination.transaction_journal_id')->where('t_destination.amount', '>', 0);
} }
) )
->where('tags.tagMode', 'balancingAct') ->where('tags.tagMode', 'balancingAct')
->where('transaction_types.type', TransactionType::TRANSFER) ->where('transaction_types.type', TransactionType::TRANSFER)
->where('transaction_journals.date', '>=', $start->format('Y-m-d')) ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->whereNull('transaction_journals.deleted_at') ->whereNull('transaction_journals.deleted_at')
->whereIn('t_source.account_id', $ids) ->whereIn('t_source.account_id', $ids)
->whereIn('t_destination.account_id', $ids) ->whereIn('t_destination.account_id', $ids)
->groupBy('t_destination.account_id') ->groupBy('t_destination.account_id')
->get( ->get(
[ [
't_destination.account_id', 't_destination.account_id',
DB::raw('SUM(`t_destination`.`amount`) as `sum`'), DB::raw('SUM(`t_destination`.`amount`) as `sum`'),
] ]
); );
return $set; return $set;
} }
@@ -178,7 +178,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* *
* *
* *
* @return BalanceLine * @return BalanceLine
*/ */

19
app/Http/Controllers/AccountController.php
View File

@@ -2,7 +2,6 @@
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Http\Requests\AccountFormRequest; use FireflyIII\Http\Requests\AccountFormRequest;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
@@ -40,7 +39,7 @@ class AccountController extends Controller
{ {
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
$subTitle = trans('firefly.make_new_' . $what . '_account'); $subTitle = trans('firefly.make_new_' . $what . '_account');
Session::flash('preFilled', []); Session::flash('preFilled', []);
@@ -64,7 +63,7 @@ class AccountController extends Controller
*/ */
public function delete(ARI $repository, Account $account) public function delete(ARI $repository, Account $account)
{ {
$typeName = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
$accountList = ExpandedForm::makeSelectList($repository->getAccounts([$account->accountType->type]), true); $accountList = ExpandedForm::makeSelectList($repository->getAccounts([$account->accountType->type]), true);
unset($accountList[$account->id]); unset($accountList[$account->id]);
@@ -86,7 +85,7 @@ class AccountController extends Controller
public function destroy(ARI $repository, Account $account) public function destroy(ARI $repository, Account $account)
{ {
$type = $account->accountType->type; $type = $account->accountType->type;
$typeName = Config::get('firefly.shortNamesByFullName.' . $type); $typeName = config('firefly.shortNamesByFullName.' . $type);
$name = $account->name; $name = $account->name;
$moveTo = $repository->find(intval(Input::get('move_account_before_delete'))); $moveTo = $repository->find(intval(Input::get('move_account_before_delete')));
@@ -107,9 +106,9 @@ class AccountController extends Controller
public function edit(ARI $repository, Account $account) public function edit(ARI $repository, Account $account)
{ {
$what = Config::get('firefly.shortNamesByFullName')[$account->accountType->type]; $what = config('firefly.shortNamesByFullName')[$account->accountType->type];
$subTitle = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]); $subTitle = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]);
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
$openingBalance = $repository->openingBalanceTransaction($account); $openingBalance = $repository->openingBalanceTransaction($account);
// put previous url in session if not redirect from store (not "return_to_edit"). // put previous url in session if not redirect from store (not "return_to_edit").
@@ -155,8 +154,8 @@ class AccountController extends Controller
$what = $what ?? 'asset'; $what = $what ?? 'asset';
$subTitle = trans('firefly.' . $what . '_accounts'); $subTitle = trans('firefly.' . $what . '_accounts');
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
$types = Config::get('firefly.accountTypesByIdentifier.' . $what); $types = config('firefly.accountTypesByIdentifier.' . $what);
$accounts = $repository->getAccounts($types); $accounts = $repository->getAccounts($types);
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', Carbon::now()->startOfMonth());
@@ -190,8 +189,8 @@ class AccountController extends Controller
{ {
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
$pageSize = Preferences::get('transactionPageSize', 50)->data; $pageSize = Preferences::get('transactionPageSize', 50)->data;
$subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type); $subTitleIcon = config('firefly.subTitlesByIdentifier.' . $account->accountType->type);
$what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$journals = $repository->getJournals($account, $page, $pageSize); $journals = $repository->getJournals($account, $page, $pageSize);
$subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]); $subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]);
$journals->setPath('accounts/show/' . $account->id); $journals->setPath('accounts/show/' . $account->id);

5
app/Http/Controllers/Auth/ConfirmationController.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Auth; namespace FireflyIII\Http\Controllers\Auth;
use Auth; use Auth;
use Config;
use FireflyIII\Events\ResendConfirmation; use FireflyIII\Events\ResendConfirmation;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
@@ -48,7 +47,7 @@ class ConfirmationController extends Controller
$database = Preferences::get('user_confirmed_code')->data; $database = Preferences::get('user_confirmed_code')->data;
$time = Preferences::get('user_confirmed_last_mail', 0)->data; $time = Preferences::get('user_confirmed_last_mail', 0)->data;
$now = time(); $now = time();
$maxDiff = Config::get('firefly.confirmation_age'); $maxDiff = config('firefly.confirmation_age');
if ($database === $code && ($now - $time <= $maxDiff)) { if ($database === $code && ($now - $time <= $maxDiff)) {
Preferences::setForUser(Auth::user(), 'user_confirmed', true); Preferences::setForUser(Auth::user(), 'user_confirmed', true);
@@ -68,7 +67,7 @@ class ConfirmationController extends Controller
{ {
$time = Preferences::get('user_confirmed_last_mail', 0)->data; $time = Preferences::get('user_confirmed_last_mail', 0)->data;
$now = time(); $now = time();
$maxDiff = Config::get('firefly.resend_confirmation'); $maxDiff = config('firefly.resend_confirmation');
$owner = env('SITE_OWNER', 'mail@example.com'); $owner = env('SITE_OWNER', 'mail@example.com');
if ($now - $time > $maxDiff) { if ($now - $time > $maxDiff) {

5
app/Http/Controllers/BillController.php
View File

@@ -1,6 +1,5 @@
<?php namespace FireflyIII\Http\Controllers; <?php namespace FireflyIII\Http\Controllers;
use Config;
use FireflyIII\Http\Requests\BillFormRequest; use FireflyIII\Http\Requests\BillFormRequest;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -34,7 +33,7 @@ class BillController extends Controller
*/ */
public function create() public function create()
{ {
$periods = Config::get('firefly.periods_to_text'); $periods = config('firefly.periods_to_text');
$subTitle = trans('firefly.create_new_bill'); $subTitle = trans('firefly.create_new_bill');
@@ -89,7 +88,7 @@ class BillController extends Controller
*/ */
public function edit(Bill $bill) public function edit(Bill $bill)
{ {
$periods = Config::get('firefly.periods_to_text'); $periods = config('firefly.periods_to_text');
$subTitle = trans('firefly.edit_bill', ['name' => $bill->name]); $subTitle = trans('firefly.edit_bill', ['name' => $bill->name]);
// put previous url in session if not redirect from store (not "return_to_edit"). // put previous url in session if not redirect from store (not "return_to_edit").

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

@@ -163,8 +163,6 @@ class BudgetController extends Controller
/** /**
* Warn user if necessary * Warn user if necessary
*/ */
$range = Preferences::get('viewRange', '1M')->data;
$repeatFreq = Config::get('firefly.range_to_repeat_freq.' . $range);
$userWarning = ''; $userWarning = '';
if (session('is_custom_range', false) === true) { if (session('is_custom_range', false) === true) {
$userWarning = strval(trans('firefly.warn_range_' . $repeatFreq)); $userWarning = strval(trans('firefly.warn_range_' . $repeatFreq));

2
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -9,8 +9,8 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI; use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface as SCRI;
use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface; use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface;
use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface as SCRI;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Navigation; use Navigation;

7
app/Http/Controllers/CsvController.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Csv\Data; use FireflyIII\Helpers\Csv\Data;
@@ -39,7 +38,7 @@ class CsvController extends Controller
View::share('title', trans('firefly.csv')); View::share('title', trans('firefly.csv'));
View::share('mainTitleIcon', 'fa-file-text-o'); View::share('mainTitleIcon', 'fa-file-text-o');
if (Config::get('firefly.csv_import_enabled') === false) { if (config('firefly.csv_import_enabled') === false) {
throw new FireflyException('CSV Import is not enabled.'); throw new FireflyException('CSV Import is not enabled.');
} }
@@ -81,7 +80,7 @@ class CsvController extends Controller
if ($this->data->hasHeaders()) { if ($this->data->hasHeaders()) {
$headers = $firstRow; $headers = $firstRow;
} }
$keys = array_keys(Config::get('csv.roles')); $keys = array_keys(config('csv.roles'));
foreach ($keys as $name) { foreach ($keys as $name) {
$availableRoles[$name] = trans('firefly.csv_column_' . $name); $availableRoles[$name] = trans('firefly.csv_column_' . $name);
} }
@@ -179,7 +178,7 @@ class CsvController extends Controller
// get list of supported specifix // get list of supported specifix
$specifix = []; $specifix = [];
foreach (Config::get('csv.specifix') as $entry) { foreach (config('csv.specifix') as $entry) {
$specifix[$entry] = trans('firefly.csv_specifix_' . $entry); $specifix[$entry] = trans('firefly.csv_specifix_' . $entry);
} }

5
app/Http/Controllers/ExportController.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Export\Processor; use FireflyIII\Export\Processor;
@@ -106,8 +105,8 @@ class ExportController extends Controller
$accounts = $repository->getAccounts(['Default account', 'Asset account']); $accounts = $repository->getAccounts(['Default account', 'Asset account']);
$accountList = ExpandedForm::makeSelectList($accounts); $accountList = ExpandedForm::makeSelectList($accounts);
$checked = array_keys($accountList); $checked = array_keys($accountList);
$formats = array_keys(Config::get('firefly.export_formats')); $formats = array_keys(config('firefly.export_formats'));
$defaultFormat = Preferences::get('export_format', Config::get('firefly.default_export_format'))->data; $defaultFormat = Preferences::get('export_format', config('firefly.default_export_format'))->data;
$first = session('first')->format('Y-m-d'); $first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d');

12
app/Http/Controllers/HomeController.php
View File

@@ -3,13 +3,11 @@
use Amount; use Amount;
use Artisan; use Artisan;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Input; use Input;
use Log;
use Preferences; use Preferences;
use Route; use Route;
use Session; use Session;
@@ -34,9 +32,9 @@ class HomeController extends Controller
public function dateRange() public function dateRange()
{ {
$start = new Carbon(Input::get('start')); $start = new Carbon(Input::get('start'));
$end = new Carbon(Input::get('end')); $end = new Carbon(Input::get('end'));
$label = Input::get('label'); $label = Input::get('label');
// check if the label is "everything" or "Custom range" which will betray // check if the label is "everything" or "Custom range" which will betray
// a possible problem with the budgets. // a possible problem with the budgets.
@@ -101,7 +99,7 @@ class HomeController extends Controller
*/ */
public function index(ARI $repository) public function index(ARI $repository)
{ {
$types = Config::get('firefly.accountTypesByIdentifier.asset'); $types = config('firefly.accountTypesByIdentifier.asset');
$count = $repository->countAccounts($types); $count = $repository->countAccounts($types);
if ($count == 0) { if ($count == 0) {
@@ -168,7 +166,7 @@ class HomeController extends Controller
$methods = $route->getMethods(); $methods = $route->getMethods();
if (!is_null($name) && in_array('GET', $methods) && !$this->startsWithAny($ignore, $name)) { if (!is_null($name) && in_array('GET', $methods) && !$this->startsWithAny($ignore, $name)) {
foreach (array_keys(Config::get('firefly.languages')) as $lang) { foreach (array_keys(config('firefly.languages')) as $lang) {
echo 'touch ' . $lang . '/' . $name . '.md<br>'; echo 'touch ' . $lang . '/' . $name . '.md<br>';
} }

5
app/Http/Controllers/JsonController.php
View File

@@ -2,7 +2,6 @@
use Amount; use Amount;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Report\ReportQueryInterface; use FireflyIII\Helpers\Report\ReportQueryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -36,7 +35,7 @@ class JsonController extends Controller
public function action() public function action()
{ {
$count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1;
$keys = array_keys(Config::get('firefly.rule-actions')); $keys = array_keys(config('firefly.rule-actions'));
$actions = []; $actions = [];
foreach ($keys as $key) { foreach ($keys as $key) {
$actions[$key] = trans('firefly.rule_action_' . $key . '_choice'); $actions[$key] = trans('firefly.rule_action_' . $key . '_choice');
@@ -297,7 +296,7 @@ class JsonController extends Controller
public function trigger() public function trigger()
{ {
$count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1;
$keys = array_keys(Config::get('firefly.rule-triggers')); $keys = array_keys(config('firefly.rule-triggers'));
$triggers = []; $triggers = [];
foreach ($keys as $key) { foreach ($keys as $key) {
if ($key != 'user_action') { if ($key != 'user_action') {

3
app/Http/Controllers/NewUserController.php
View File

@@ -2,7 +2,6 @@
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use FireflyIII\Http\Requests\NewUserFormRequest; use FireflyIII\Http\Requests\NewUserFormRequest;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Preferences; use Preferences;
@@ -36,7 +35,7 @@ class NewUserController extends Controller
View::share('mainTitleIcon', 'fa-fire'); View::share('mainTitleIcon', 'fa-fire');
$types = Config::get('firefly.accountTypesByIdentifier.asset'); $types = config('firefly.accountTypesByIdentifier.asset');
$count = $repository->countAccounts($types); $count = $repository->countAccounts($types);
if ($count > 0) { if ($count > 0) {

5
app/Http/Controllers/PiggyBankController.php
View File

@@ -2,7 +2,6 @@
use Amount; use Amount;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Http\Requests\PiggyBankFormRequest; use FireflyIII\Http\Requests\PiggyBankFormRequest;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
@@ -65,7 +64,7 @@ class PiggyBankController extends Controller
public function create(ARI $repository) public function create(ARI $repository)
{ {
$periods = Config::get('firefly.piggy_bank_periods'); $periods = config('firefly.piggy_bank_periods');
$accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
$subTitle = trans('firefly.new_piggy_bank'); $subTitle = trans('firefly.new_piggy_bank');
$subTitleIcon = 'fa-plus'; $subTitleIcon = 'fa-plus';
@@ -124,7 +123,7 @@ class PiggyBankController extends Controller
public function edit(ARI $repository, PiggyBank $piggyBank) public function edit(ARI $repository, PiggyBank $piggyBank)
{ {
$periods = Config::get('firefly.piggy_bank_periods'); $periods = config('firefly.piggy_bank_periods');
$accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
$subTitle = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]); $subTitle = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]);
$subTitleIcon = 'fa-pencil'; $subTitleIcon = 'fa-pencil';

3
app/Http/Controllers/PreferencesController.php
View File

@@ -1,7 +1,6 @@
<?php namespace FireflyIII\Http\Controllers; <?php namespace FireflyIII\Http\Controllers;
use Auth; use Auth;
use Config;
use FireflyIII\Http\Requests\TokenFormRequest; use FireflyIII\Http\Requests\TokenFormRequest;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Input; use Input;
@@ -155,7 +154,7 @@ class PreferencesController extends Controller
// language: // language:
$lang = Input::get('language'); $lang = Input::get('language');
if (in_array($lang, array_keys(Config::get('firefly.languages')))) { if (in_array($lang, array_keys(config('firefly.languages')))) {
Preferences::set('language', $lang); Preferences::set('language', $lang);
} }

5
app/Http/Controllers/RuleController.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use Auth; use Auth;
use Config;
use FireflyIII\Http\Requests\RuleFormRequest; use FireflyIII\Http\Requests\RuleFormRequest;
use FireflyIII\Http\Requests\TestRuleFormRequest; use FireflyIII\Http\Requests\TestRuleFormRequest;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
@@ -292,8 +291,8 @@ class RuleController extends Controller
return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]);
} }
$limit = Config::get('firefly.test-triggers.limit'); $limit = config('firefly.test-triggers.limit');
$range = Config::get('firefly.test-triggers.range'); $range = config('firefly.test-triggers.range');
/** @var TransactionMatcher $matcher */ /** @var TransactionMatcher $matcher */
$matcher = app('FireflyIII\Rules\TransactionMatcher'); $matcher = app('FireflyIII\Rules\TransactionMatcher');

5
app/Http/Controllers/TransactionController.php
View File

@@ -3,7 +3,6 @@
use Amount; use Amount;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Events\TransactionJournalStored; use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Events\TransactionJournalUpdated; use FireflyIII\Events\TransactionJournalUpdated;
@@ -212,8 +211,8 @@ class TransactionController extends Controller
public function index(JournalRepositoryInterface $repository, string $what) public function index(JournalRepositoryInterface $repository, string $what)
{ {
$pageSize = Preferences::get('transactionPageSize', 50)->data; $pageSize = Preferences::get('transactionPageSize', 50)->data;
$subTitleIcon = Config::get('firefly.transactionIconsByWhat.' . $what); $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what);
$types = Config::get('firefly.transactionTypesByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what);
$subTitle = trans('firefly.title_' . $what); $subTitle = trans('firefly.title_' . $what);
$page = intval(Input::get('page')); $page = intval(Input::get('page'));
$journals = $repository->getJournalsOfTypes($types, $page, $pageSize); $journals = $repository->getJournalsOfTypes($types, $page, $pageSize);

7
app/Http/Requests/AccountFormRequest.php
View File

@@ -4,7 +4,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use Auth; use Auth;
use Config;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use Input; use Input;
@@ -30,9 +29,9 @@ class AccountFormRequest extends Request
*/ */
public function rules() public function rules()
{ {
$accountRoles = join(',', array_keys(Config::get('firefly.accountRoles'))); $accountRoles = join(',', array_keys(config('firefly.accountRoles')));
$types = join(',', array_keys(Config::get('firefly.subTitlesByIdentifier'))); $types = join(',', array_keys(config('firefly.subTitlesByIdentifier')));
$ccPaymentTypes = join(',', array_keys(Config::get('firefly.ccTypes'))); $ccPaymentTypes = join(',', array_keys(config('firefly.ccTypes')));
$nameRule = 'required|min:1|uniqueAccountForUser'; $nameRule = 'required|min:1|uniqueAccountForUser';
$idRule = ''; $idRule = '';

7
app/Http/Requests/RuleFormRequest.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use Auth; use Auth;
use Config;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
use Input; use Input;
@@ -38,11 +37,11 @@ class RuleFormRequest extends Request
public function rules() public function rules()
{ {
$validTriggers = array_keys(Config::get('firefly.rule-triggers')); $validTriggers = array_keys(config('firefly.rule-triggers'));
$validActions = array_keys(Config::get('firefly.rule-actions')); $validActions = array_keys(config('firefly.rule-actions'));
// some actions require text: // some actions require text:
$contextActions = join(',', Config::get('firefly.rule-actions-text')); $contextActions = join(',', config('firefly.rule-actions-text'));
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
if (RuleGroup::find(Input::get('id'))) { if (RuleGroup::find(Input::get('id'))) {

3
app/Http/Requests/TestRuleFormRequest.php
View File

@@ -20,7 +20,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use Auth; use Auth;
use Config;
/** /**
* Class RuleFormRequest * Class RuleFormRequest
@@ -45,7 +44,7 @@ class TestRuleFormRequest extends Request
public function rules() public function rules()
{ {
$validTriggers = array_keys(Config::get('firefly.rule-triggers')); $validTriggers = array_keys(config('firefly.rule-triggers'));
$rules = [ $rules = [
'rule-trigger.*' => 'required|min:1|in:' . join(',', $validTriggers), 'rule-trigger.*' => 'required|min:1|in:' . join(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue', 'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue',

4
app/Http/breadcrumbs.php
View File

@@ -55,7 +55,7 @@ Breadcrumbs::register(
Breadcrumbs::register( Breadcrumbs::register(
'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) { 'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
$what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$breadcrumbs->parent('accounts.index', $what); $breadcrumbs->parent('accounts.index', $what);
@@ -73,7 +73,7 @@ Breadcrumbs::register(
Breadcrumbs::register( Breadcrumbs::register(
'accounts.edit', function (BreadCrumbGenerator $breadcrumbs, Account $account) { 'accounts.edit', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
$breadcrumbs->parent('accounts.show', $account); $breadcrumbs->parent('accounts.show', $account);
$what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id]));
} }

3
app/Providers/AppServiceProvider.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Providers; namespace FireflyIII\Providers;
use Config;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Log; use Log;
@@ -34,7 +33,7 @@ class AppServiceProvider extends ServiceProvider
// make sure the logger doesn't log everything when it doesn't need to. // make sure the logger doesn't log everything when it doesn't need to.
$monolog = Log::getMonolog(); $monolog = Log::getMonolog();
foreach ($monolog->getHandlers() as $handler) { foreach ($monolog->getHandlers() as $handler) {
$handler->setLevel(Config::get('app.log-level')); $handler->setLevel(config('app.log-level'));
} }
} }
} }

3
app/Repositories/Account/AccountRepository.php
View File

@@ -3,7 +3,6 @@
namespace FireflyIII\Repositories\Account; namespace FireflyIII\Repositories\Account;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use DB; use DB;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta; use FireflyIII\Models\AccountMeta;
@@ -614,7 +613,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
protected function storeAccount(array $data): Account protected function storeAccount(array $data): Account
{ {
$type = Config::get('firefly.accountTypeByIdentifier.' . $data['accountType']); $type = config('firefly.accountTypeByIdentifier.' . $data['accountType']);
$accountType = AccountType::whereType($type)->first(); $accountType = AccountType::whereType($type)->first();
$newAccount = new Account( $newAccount = new Account(
[ [

3
app/Repositories/Budget/BudgetRepository.php
View File

@@ -4,7 +4,6 @@ declare(strict_types = 1);
namespace FireflyIII\Repositories\Budget; namespace FireflyIII\Repositories\Budget;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use DB; use DB;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
@@ -870,7 +869,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
// there might be a budget limit for this startdate: // there might be a budget limit for this startdate:
$viewRange = Preferences::get('viewRange', '1M')->data; $viewRange = Preferences::get('viewRange', '1M')->data;
$repeatFreq = Config::get('firefly.range_to_repeat_freq.' . $viewRange); $repeatFreq = config('firefly.range_to_repeat_freq.' . $viewRange);
/** @var BudgetLimit $limit */ /** @var BudgetLimit $limit */
$limit = $budget->budgetlimits()->where('budget_limits.startdate', $date)->where('budget_limits.repeat_freq', $repeatFreq)->first(['budget_limits.*']); $limit = $budget->budgetlimits()->where('budget_limits.startdate', $date)->where('budget_limits.repeat_freq', $repeatFreq)->first(['budget_limits.*']);

4
app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
View File

@@ -18,8 +18,8 @@ interface RuleGroupRepositoryInterface
/** /**
* *
* *
* @return int * @return int
*/ */
public function count(): int; public function count(): int;

1
app/Repositories/Tag/TagRepositoryInterface.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Repositories\Tag; namespace FireflyIII\Repositories\Tag;
use Carbon\Carbon;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;

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

@@ -40,7 +40,7 @@ interface UserRepositoryInterface
/** /**
* Returns a count of all users. * Returns a count of all users.
* *
* @return int * @return int
*/ */
public function count(): int; public function count(): int;

8
app/Support/Domain.php
View File

@@ -10,8 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Support; namespace FireflyIII\Support;
use Config;
/** /**
* Class Domain * Class Domain
* *
@@ -24,7 +22,7 @@ class Domain
*/ */
public static function getBindables(): array public static function getBindables(): array
{ {
return Config::get('firefly.bindables'); return config('firefly.bindables');
} }
@@ -33,7 +31,7 @@ class Domain
*/ */
public static function getRuleActions(): array public static function getRuleActions(): array
{ {
return Config::get('firefly.rule-actions'); return config('firefly.rule-actions');
} }
/** /**
@@ -41,6 +39,6 @@ class Domain
*/ */
public static function getRuleTriggers(): array public static function getRuleTriggers(): array
{ {
return Config::get('firefly.rule-triggers'); return config('firefly.rule-triggers');
} }
} }