From cd076cc069b7c6f703a9afc091abc23cca8435f1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 08:33:13 +0200 Subject: [PATCH 01/86] Fix a bug where transfers would be stored reversed (ie. source and destination switched). --- app/Factory/TransactionJournalFactory.php | 2 +- .../Import/Placeholder/ImportTransaction.php | 13 +++++++------ .../Routine/File/ImportableConverter.php | 18 ++++-------------- config/csv.php | 13 +++++++++++++ resources/lang/en_US/import.php | 1 + resources/lang/en_US/list.php | 1 + resources/views/transactions/show.twig | 2 +- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 42061110f8..9096d8099d 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -104,7 +104,7 @@ class TransactionJournalFactory // store date meta fields (if present): $fields = ['sepa-cc', 'sepa-ct-op', 'sepa-ct-id', 'sepa-db', 'sepa-country', 'sepa-ep', 'sepa-ci', 'interest_date', 'book_date', 'process_date', 'due_date', 'recurrence_id', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id', 'importHash', 'importHashV2', - 'external_id']; + 'external_id','sepa-batch-id']; foreach ($fields as $field) { $this->storeMeta($journal, $data, $field); diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index ccc64a7a57..4d070a3393 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -203,13 +203,14 @@ class ImportTransaction case 'external-id': $this->externalId = $columnValue->getValue(); break; - case 'sepa-ct-id'; - case 'sepa-ct-op'; - case 'sepa-db'; + case 'sepa-ct-id': + case 'sepa-ct-op': + case 'sepa-db': case 'sepa-cc': - case 'sepa-country'; - case 'sepa-ep'; - case 'sepa-ci'; + case 'sepa-country': + case 'sepa-batch-id': + case 'sepa-ep': + case 'sepa-ci': case 'internal-reference': case 'date-interest': case 'date-invoice': diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php index 00cc33d789..42ab262aa3 100644 --- a/app/Support/Import/Routine/File/ImportableConverter.php +++ b/app/Support/Import/Routine/File/ImportableConverter.php @@ -183,8 +183,8 @@ class ImportableConverter $transactionType = 'transfer'; } - // amount is positive and its not a transfer? Then switch: - if ($transactionType !== 'transfer' && bccomp($amount, '0') === 1) { + // amount is positive? Then switch: + if (1 === bccomp($amount, '0')) { [$destination, $source] = [$source, $destination]; Log::debug( @@ -194,17 +194,6 @@ class ImportableConverter ) ); } - // amount is negative and type is transfer? then switch. - if ($transactionType === 'transfer' && bccomp($amount, '0') === -1) { - // amount is positive? Then switch: - [$destination, $source] = [$source, $destination]; - Log::debug( - sprintf( - '%s is negative, so "%s" (#%d) is now source and "%s" (#%d) is now destination.', - $amount, $source->name, $source->id, $destination->name, $destination->id - ) - ); - } // get currency preference from source asset account (preferred) // or destination asset account @@ -273,9 +262,10 @@ class ImportableConverter 'sepa-ct-op' => $importable->meta['sepa-ct-op'] ?? null, 'sepa-ct-id' => $importable->meta['sepa-ct-id'] ?? null, 'sepa-db' => $importable->meta['sepa-db'] ?? null, - 'sepa-country' => $importable->meta['sepa-countru'] ?? null, + 'sepa-country' => $importable->meta['sepa-country'] ?? null, 'sepa-ep' => $importable->meta['sepa-ep'] ?? null, 'sepa-ci' => $importable->meta['sepa-ci'] ?? null, + 'sepa-batch-id' => $importable->meta['sepa-batch-id'] ?? null, 'interest_date' => $this->convertDateValue($importable->meta['date-interest'] ?? null), 'book_date' => $this->convertDateValue($importable->meta['date-book'] ?? null), 'process_date' => $this->convertDateValue($importable->meta['date-process'] ?? null), diff --git a/config/csv.php b/config/csv.php index 4af268d126..3e1d1a9d10 100644 --- a/config/csv.php +++ b/config/csv.php @@ -283,6 +283,12 @@ return [ 'converter' => 'AssetAccountNumber', 'mapper' => 'AssetAccounts', ], + 'account-bic' => [ + 'mappable' => false, + 'pre-process-map' => false, + 'field' => 'asset-account-bic', + 'converter' => 'AccountBic', + ], 'opposing-id' => [ 'mappable' => true, 'pre-process-map' => false, @@ -391,6 +397,13 @@ return [ 'converter' => 'Description', 'field' => 'sepa_ci', ], + // SEPA Batch ID + 'sepa-batch-id' => [ + 'mappable' => false, + 'pre-process-map' => false, + 'converter' => 'Description', + 'field' => 'sepa_batch', + ], // Internal reference 'internal-reference' => [ 'mappable' => false, diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php index 824704689e..f6b93c10eb 100644 --- a/resources/lang/en_US/import.php +++ b/resources/lang/en_US/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Asset account (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', 'column_account-name' => 'Asset account (name)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Amount', 'column_amount_foreign' => 'Amount (in foreign currency)', 'column_amount_debit' => 'Amount (debit column)', diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php index 171a7acf23..8932fdf83a 100644 --- a/resources/lang/en_US/list.php +++ b/resources/lang/en_US/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig index f184c82dbe..099f163687 100644 --- a/resources/views/transactions/show.twig +++ b/resources/views/transactions/show.twig @@ -210,7 +210,7 @@ {% endif %} {% endfor %} {# all other meta values #} - {% for metaField in ['external_id','bunq_payment_id','internal_reference','sepa-ct-id','sepa-ct-op','sepa-db','sepa-country','sepa-cc','sepa-ep','sepa-ci'] %} + {% for metaField in ['external_id','bunq_payment_id','internal_reference','sepa-batch-id','sepa-ct-id','sepa-ct-op','sepa-db','sepa-country','sepa-cc','sepa-ep','sepa-ci'] %} {% if journalHasMeta(journal, metaField) %} {{ trans('list.'~metaField) }} From 2ca642120609026ea7e0b425530e691e8cf6c09d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 08:34:27 +0200 Subject: [PATCH 02/86] Remove Rabobank description fix from available fixes. --- config/csv.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config/csv.php b/config/csv.php index 3e1d1a9d10..81f7edd603 100644 --- a/config/csv.php +++ b/config/csv.php @@ -25,7 +25,6 @@ declare(strict_types=1); use FireflyIII\Import\Specifics\AbnAmroDescription; use FireflyIII\Import\Specifics\IngDescription; use FireflyIII\Import\Specifics\PresidentsChoice; -use FireflyIII\Import\Specifics\RabobankDescription; use FireflyIII\Import\Specifics\SnsDescription; return [ @@ -34,11 +33,10 @@ return [ * Configuration for the CSV specifics. */ 'import_specifics' => [ - 'IngDescription' => IngDescription::class, - 'RabobankDescription' => RabobankDescription::class, - 'AbnAmroDescription' => AbnAmroDescription::class, - 'SnsDescription' => SnsDescription::class, - 'PresidentsChoice' => PresidentsChoice::class, + 'IngDescription' => IngDescription::class, + 'AbnAmroDescription' => AbnAmroDescription::class, + 'SnsDescription' => SnsDescription::class, + 'PresidentsChoice' => PresidentsChoice::class, ], /* From a95fdb903b86a17af7b8b697fef845cc9db1cbb7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 11:16:12 +0200 Subject: [PATCH 03/86] Refactor account controller and some associated tests. --- .../Controllers/Account/CreateController.php | 125 +++++++++ .../Controllers/Account/DeleteController.php | 101 ++++++++ .../Controllers/Account/EditController.php | 153 +++++++++++ .../Account/ReconcileController.php | 3 + app/Http/Controllers/AccountController.php | 186 -------------- routes/web.php | 28 +- .../Account/CreateControllerTest.php | 128 +++++++++ .../Account/DeleteControllerTest.php | 86 +++++++ .../Account/EditControllerTest.php | 170 ++++++++++++ .../Controllers/AccountControllerTest.php | 242 ------------------ .../Routine/File/ImportableConverterTest.php | 11 +- 11 files changed, 792 insertions(+), 441 deletions(-) create mode 100644 app/Http/Controllers/Account/CreateController.php create mode 100644 app/Http/Controllers/Account/DeleteController.php create mode 100644 app/Http/Controllers/Account/EditController.php create mode 100644 tests/Feature/Controllers/Account/CreateControllerTest.php create mode 100644 tests/Feature/Controllers/Account/DeleteControllerTest.php create mode 100644 tests/Feature/Controllers/Account/EditControllerTest.php diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php new file mode 100644 index 0000000000..5627fbe8e4 --- /dev/null +++ b/app/Http/Controllers/Account/CreateController.php @@ -0,0 +1,125 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Account; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\AccountFormRequest; +use FireflyIII\Models\AccountType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use Illuminate\Http\Request; +use Preferences; + +/** + * + * Class CreateController + */ +class CreateController extends Controller +{ + /** @var AccountRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + // translations: + $this->middleware( + function ($request, $next) { + app('view')->share('mainTitleIcon', 'fa-credit-card'); + app('view')->share('title', trans('firefly.accounts')); + + $this->repository = app(AccountRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param string|null $what + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function create(Request $request, string $what = null) + { + $what = $what ?? 'asset'; + $defaultCurrency = app('amount')->getDefaultCurrency(); + $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); + $subTitle = trans('firefly.make_new_' . $what . '_account'); + $roles = []; + foreach (config('firefly.accountRoles') as $role) { + $roles[$role] = (string)trans('firefly.account_role_' . $role); + } + + // pre fill some data + $request->session()->flash('preFilled', ['currency_id' => $defaultCurrency->id]); + + // put previous url in session if not redirect from store (not "create another"). + if (true !== session('accounts.create.fromStore')) { + $this->rememberPreviousUri('accounts.create.uri'); + } + $request->session()->forget('accounts.create.fromStore'); + + return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'roles')); + } + + + /** + * @param AccountFormRequest $request + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function store(AccountFormRequest $request) + { + $data = $request->getAccountData(); + $account = $this->repository->store($data); + $request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name])); + app('preferences')->mark(); + + // update preferences if necessary: + $frontPage = Preferences::get('frontPageAccounts', [])->data; + if (AccountType::ASSET === $account->accountType->type && \count($frontPage) > 0) { + // @codeCoverageIgnoreStart + $frontPage[] = $account->id; + Preferences::set('frontPageAccounts', $frontPage); + // @codeCoverageIgnoreEnd + } + // redirect to previous URL. + $redirect = redirect($this->getPreviousUri('accounts.create.uri')); + if (1 === (int)$request->get('create_another')) { + // set value so create routine will not overwrite URL: + $request->session()->put('accounts.create.fromStore', true); + + $redirect = redirect(route('accounts.create', [$request->input('what')]))->withInput(); + } + + return $redirect; + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php new file mode 100644 index 0000000000..cdae3afeee --- /dev/null +++ b/app/Http/Controllers/Account/DeleteController.php @@ -0,0 +1,101 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Account; + + +use ExpandedForm; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Account; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use Illuminate\Http\Request; + +/** + * + * Class DeleteController + */ +class DeleteController extends Controller +{ + /** @var AccountRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + // translations: + $this->middleware( + function ($request, $next) { + app('view')->share('mainTitleIcon', 'fa-credit-card'); + app('view')->share('title', trans('firefly.accounts')); + + $this->repository = app(AccountRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Account $account + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function delete(Account $account) + { + $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type); + $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); + $accountList = ExpandedForm::makeSelectListWithEmpty($this->repository->getAccountsByType([$account->accountType->type])); + unset($accountList[$account->id]); + + // put previous url in session + $this->rememberPreviousUri('accounts.delete.uri'); + + return view('accounts.delete', compact('account', 'subTitle', 'accountList')); + } + + /** + * @param Request $request + * @param Account $account + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function destroy(Request $request, Account $account) + { + $type = $account->accountType->type; + $typeName = config('firefly.shortNamesByFullName.' . $type); + $name = $account->name; + $moveTo = $this->repository->findNull((int)$request->get('move_account_before_delete')); + + $this->repository->destroy($account, $moveTo); + + $request->session()->flash('success', (string)trans('firefly.' . $typeName . '_deleted', ['name' => $name])); + app('preferences')->mark(); + + return redirect($this->getPreviousUri('accounts.delete.uri')); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php new file mode 100644 index 0000000000..5fad8ba628 --- /dev/null +++ b/app/Http/Controllers/Account/EditController.php @@ -0,0 +1,153 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Account; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\AccountFormRequest; +use FireflyIII\Models\Account; +use FireflyIII\Models\Note; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use Illuminate\Http\Request; + +/** + * + * Class EditController + */ +class EditController extends Controller +{ + /** @var CurrencyRepositoryInterface */ + private $currencyRepos; + /** @var AccountRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + // translations: + $this->middleware( + function ($request, $next) { + app('view')->share('mainTitleIcon', 'fa-credit-card'); + app('view')->share('title', trans('firefly.accounts')); + + $this->repository = app(AccountRepositoryInterface::class); + $this->currencyRepos = app(CurrencyRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param Account $account + * @param AccountRepositoryInterface $repository + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function edit(Request $request, Account $account, AccountRepositoryInterface $repository) + { + $what = config('firefly.shortNamesByFullName')[$account->accountType->type]; + $subTitle = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]); + $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); + $roles = []; + foreach (config('firefly.accountRoles') as $role) { + $roles[$role] = (string)trans('firefly.account_role_' . $role); + } + + // put previous url in session if not redirect from store (not "return_to_edit"). + if (true !== session('accounts.edit.fromUpdate')) { + $this->rememberPreviousUri('accounts.edit.uri'); + } + $request->session()->forget('accounts.edit.fromUpdate'); + + // pre fill some useful values. + + // the opening balance is tricky: + $openingBalanceAmount = (string)$repository->getOpeningBalanceAmount($account); + $openingBalanceDate = $repository->getOpeningBalanceDate($account); + $default = app('amount')->getDefaultCurrency(); + $currency = $this->currencyRepos->findNull((int)$repository->getMetaValue($account, 'currency_id')); + if (null === $currency) { + $currency = $default; + } + + // code to handle active-checkboxes + $hasOldInput = null !== $request->old('_token'); + $preFilled = [ + 'accountNumber' => $repository->getMetaValue($account, 'accountNumber'), + 'accountRole' => $repository->getMetaValue($account, 'accountRole'), + 'ccType' => $repository->getMetaValue($account, 'ccType'), + 'ccMonthlyPaymentDate' => $repository->getMetaValue($account, 'ccMonthlyPaymentDate'), + 'BIC' => $repository->getMetaValue($account, 'BIC'), + 'openingBalanceDate' => $openingBalanceDate, + 'openingBalance' => $openingBalanceAmount, + 'virtualBalance' => $account->virtual_balance, + 'currency_id' => $currency->id, + 'notes' => '', + 'active' => $hasOldInput ? (bool)$request->old('active') : $account->active, + ]; + /** @var Note $note */ + $note = $this->repository->getNote($account); + if (null !== $note) { + $preFilled['notes'] = $note->text; + } + + $request->session()->flash('preFilled', $preFilled); + + return view('accounts.edit', compact('account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled')); + } + + + /** + * @param AccountFormRequest $request + * @param Account $account + * + * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function update(AccountFormRequest $request, Account $account) + { + $data = $request->getAccountData(); + $this->repository->update($account, $data); + + $request->session()->flash('success', (string)trans('firefly.updated_account', ['name' => $account->name])); + app('preferences')->mark(); + + $redirect = redirect($this->getPreviousUri('accounts.edit.uri')); + if (1 === (int)$request->get('return_to_edit')) { + // set value so edit routine will not overwrite URL: + $request->session()->put('accounts.edit.fromUpdate', true); + + $redirect = redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]); + } + + return $redirect; + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index f1c96b4055..09f8101ba6 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -284,6 +284,9 @@ class ReconcileController extends Controller * @param TransactionJournal $journal * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function update(ReconciliationUpdateRequest $request, TransactionJournal $journal) { diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 7859efca25..58ddb87578 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -30,7 +30,6 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Requests\AccountFormRequest; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; -use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -74,134 +73,6 @@ class AccountController extends Controller ); } - /** - * @param Request $request - * @param string|null $what - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function create(Request $request, string $what = null) - { - $what = $what ?? 'asset'; - $defaultCurrency = app('amount')->getDefaultCurrency(); - $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); - $subTitle = trans('firefly.make_new_' . $what . '_account'); - $roles = []; - foreach (config('firefly.accountRoles') as $role) { - $roles[$role] = (string)trans('firefly.account_role_' . $role); - } - - // pre fill some data - $request->session()->flash('preFilled', ['currency_id' => $defaultCurrency->id]); - - // put previous url in session if not redirect from store (not "create another"). - if (true !== session('accounts.create.fromStore')) { - $this->rememberPreviousUri('accounts.create.uri'); - } - $request->session()->forget('accounts.create.fromStore'); - - return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'roles')); - } - - /** - * @param Account $account - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function delete(Account $account) - { - $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type); - $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); - $accountList = ExpandedForm::makeSelectListWithEmpty($this->repository->getAccountsByType([$account->accountType->type])); - unset($accountList[$account->id]); - - // put previous url in session - $this->rememberPreviousUri('accounts.delete.uri'); - - return view('accounts.delete', compact('account', 'subTitle', 'accountList')); - } - - /** - * @param Request $request - * @param Account $account - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function destroy(Request $request, Account $account) - { - $type = $account->accountType->type; - $typeName = config('firefly.shortNamesByFullName.' . $type); - $name = $account->name; - $moveTo = $this->repository->findNull((int)$request->get('move_account_before_delete')); - - $this->repository->destroy($account, $moveTo); - - $request->session()->flash('success', (string)trans('firefly.' . $typeName . '_deleted', ['name' => $name])); - app('preferences')->mark(); - - return redirect($this->getPreviousUri('accounts.delete.uri')); - } - - /** - * @param Request $request - * @param Account $account - * @param AccountRepositoryInterface $repository - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function edit(Request $request, Account $account, AccountRepositoryInterface $repository) - { - $what = config('firefly.shortNamesByFullName')[$account->accountType->type]; - $subTitle = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]); - $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); - $roles = []; - foreach (config('firefly.accountRoles') as $role) { - $roles[$role] = (string)trans('firefly.account_role_' . $role); - } - - // put previous url in session if not redirect from store (not "return_to_edit"). - if (true !== session('accounts.edit.fromUpdate')) { - $this->rememberPreviousUri('accounts.edit.uri'); - } - $request->session()->forget('accounts.edit.fromUpdate'); - - // pre fill some useful values. - - // the opening balance is tricky: - $openingBalanceAmount = (string)$repository->getOpeningBalanceAmount($account); - $openingBalanceDate = $repository->getOpeningBalanceDate($account); - $default = app('amount')->getDefaultCurrency(); - $currency = $this->currencyRepos->findNull((int)$repository->getMetaValue($account, 'currency_id')); - if (null === $currency) { - $currency = $default; - } - - // code to handle active-checkboxes - $hasOldInput = null !== $request->old('_token'); - $preFilled = [ - 'accountNumber' => $repository->getMetaValue($account, 'accountNumber'), - 'accountRole' => $repository->getMetaValue($account, 'accountRole'), - 'ccType' => $repository->getMetaValue($account, 'ccType'), - 'ccMonthlyPaymentDate' => $repository->getMetaValue($account, 'ccMonthlyPaymentDate'), - 'BIC' => $repository->getMetaValue($account, 'BIC'), - 'openingBalanceDate' => $openingBalanceDate, - 'openingBalance' => $openingBalanceAmount, - 'virtualBalance' => $account->virtual_balance, - 'currency_id' => $currency->id, - 'notes' => '', - 'active' => $hasOldInput ? (bool)$request->old('active') : $account->active, - ]; - /** @var Note $note */ - $note = $this->repository->getNote($account); - if (null !== $note) { - $preFilled['notes'] = $note->text; - } - - $request->session()->flash('preFilled', $preFilled); - - return view('accounts.edit', compact('account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled')); - } - /** * @param Request $request * @param string $what @@ -351,63 +222,6 @@ class AccountController extends Controller ); } - /** - * @param AccountFormRequest $request - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function store(AccountFormRequest $request) - { - $data = $request->getAccountData(); - $account = $this->repository->store($data); - $request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name])); - app('preferences')->mark(); - - // update preferences if necessary: - $frontPage = Preferences::get('frontPageAccounts', [])->data; - if (AccountType::ASSET === $account->accountType->type && \count($frontPage) > 0) { - // @codeCoverageIgnoreStart - $frontPage[] = $account->id; - Preferences::set('frontPageAccounts', $frontPage); - // @codeCoverageIgnoreEnd - } - // redirect to previous URL. - $redirect = redirect($this->getPreviousUri('accounts.create.uri')); - if (1 === (int)$request->get('create_another')) { - // set value so create routine will not overwrite URL: - $request->session()->put('accounts.create.fromStore', true); - - $redirect = redirect(route('accounts.create', [$request->input('what')]))->withInput(); - } - - return $redirect; - } - - /** - * @param AccountFormRequest $request - * @param Account $account - * - * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function update(AccountFormRequest $request, Account $account) - { - $data = $request->getAccountData(); - $this->repository->update($account, $data); - - $request->session()->flash('success', (string)trans('firefly.updated_account', ['name' => $account->name])); - app('preferences')->mark(); - - $redirect = redirect($this->getPreviousUri('accounts.edit.uri')); - if (1 === (int)$request->get('return_to_edit')) { - // set value so edit routine will not overwrite URL: - $request->session()->put('accounts.edit.fromUpdate', true); - - $redirect = redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]); - } - - return $redirect; - } - /** * @param array $array * @param int $entryId diff --git a/routes/web.php b/routes/web.php index 3232892b16..9de923e8c3 100755 --- a/routes/web.php +++ b/routes/web.php @@ -109,30 +109,40 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'], function () { Route::get('{what}', ['uses' => 'AccountController@index', 'as' => 'index'])->where('what', 'revenue|asset|expense'); - Route::get('create/{what}', ['uses' => 'AccountController@create', 'as' => 'create'])->where('what', 'revenue|asset|expense'); - Route::get('edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'edit']); - Route::get('delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'delete']); + + + // create + Route::get('create/{what}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where('what', 'revenue|asset|expense'); + Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']); + + + // edit + Route::get('edit/{account}', ['uses' => 'Account\EditController@edit', 'as' => 'edit']); + Route::post('update/{account}', ['uses' => 'Account\EditController@update', 'as' => 'update']); + + // delete + Route::get('delete/{account}', ['uses' => 'Account\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{account}', ['uses' => 'Account\DeleteController@destroy', 'as' => 'destroy']); + + // show Route::get('show/{account}/all', ['uses' => 'AccountController@showAll', 'as' => 'show.all']); Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'AccountController@show', 'as' => 'show']); // reconcile routes: Route::get('reconcile/{account}/index/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@reconcile', 'as' => 'reconcile']); - - Route::post('reconcile/{account}/submit/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@submit', 'as' => 'reconcile.submit']); // reconcile JSON routes Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview']); - Route::get('reconcile/{account}/transactions/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions']); + Route::get( + 'reconcile/{account}/transactions/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions'] + ); // show reconciliation Route::get('reconcile/show/{tj}', ['uses' => 'Account\ReconcileController@show', 'as' => 'reconcile.show']); Route::get('reconcile/edit/{tj}', ['uses' => 'Account\ReconcileController@edit', 'as' => 'reconcile.edit']); Route::post('reconcile/update/{tj}', ['uses' => 'Account\ReconcileController@update', 'as' => 'reconcile.update']); - Route::post('store', ['uses' => 'AccountController@store', 'as' => 'store']); - Route::post('update/{account}', ['uses' => 'AccountController@update', 'as' => 'update']); - Route::post('destroy/{account}', ['uses' => 'AccountController@destroy', 'as' => 'destroy']); } ); diff --git a/tests/Feature/Controllers/Account/CreateControllerTest.php b/tests/Feature/Controllers/Account/CreateControllerTest.php new file mode 100644 index 0000000000..1df0d40739 --- /dev/null +++ b/tests/Feature/Controllers/Account/CreateControllerTest.php @@ -0,0 +1,128 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Account; + + +use FireflyIII\Models\Account; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; +use Log; +use Preferences; +use Tests\TestCase; + +/** + * + * Class CreateControllerTest + */ +class CreateControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Account\CreateController + */ + public function testCreate(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('get')->andReturn(new Collection); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('accounts.create', ['asset'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
    '); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Account\CreateController + * @covers \FireflyIII\Http\Requests\AccountFormRequest + * @covers \FireflyIII\Http\Controllers\Controller + */ + public function testStore(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('store')->once()->andReturn(factory(Account::class)->make()); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + // change the preference: + Preferences::setForUser($this->user(), 'frontPageAccounts', [1]); + + $this->session(['accounts.create.uri' => 'http://localhost']); + $this->be($this->user()); + $data = [ + 'name' => 'new account ' . random_int(1000, 9999), + 'what' => 'asset', + ]; + + $response = $this->post(route('accounts.store', ['asset']), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Account\CreateController + * @covers \FireflyIII\Http\Requests\AccountFormRequest + * @covers \FireflyIII\Http\Controllers\Controller + */ + public function testStoreAnother(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('store')->once()->andReturn(factory(Account::class)->make()); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->session(['accounts.create.uri' => 'http://localhost']); + $this->be($this->user()); + $data = [ + 'name' => 'new account ' . random_int(1000, 9999), + 'what' => 'asset', + 'create_another' => 1, + ]; + + $response = $this->post(route('accounts.store', ['asset']), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Account/DeleteControllerTest.php b/tests/Feature/Controllers/Account/DeleteControllerTest.php new file mode 100644 index 0000000000..5269cd3927 --- /dev/null +++ b/tests/Feature/Controllers/Account/DeleteControllerTest.php @@ -0,0 +1,86 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Account; + + +use FireflyIII\Models\AccountType; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; +use Tests\TestCase; + +/** + * + * Class DeleteControllerTest + */ +class DeleteControllerTest extends TestCase +{ + /** + * @covers \FireflyIII\Http\Controllers\Account\DeleteController + * @covers \FireflyIII\Http\Controllers\Controller + */ + public function testDelete(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET]])->andReturn(new Collection); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); + $response = $this->get(route('accounts.delete', [$account->id])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Account\DeleteController + * @covers \FireflyIII\Http\Controllers\Controller + */ + public function testDestroy(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('findNull')->withArgs([0])->once()->andReturn(null); + $repository->shouldReceive('destroy')->andReturn(true); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->session(['accounts.delete.uri' => 'http://localhost/accounts/show/1']); + $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); + + $this->be($this->user()); + $response = $this->post(route('accounts.destroy', [$account->id])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Account/EditControllerTest.php b/tests/Feature/Controllers/Account/EditControllerTest.php new file mode 100644 index 0000000000..69f0832259 --- /dev/null +++ b/tests/Feature/Controllers/Account/EditControllerTest.php @@ -0,0 +1,170 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Account; + + +use Amount; +use FireflyIII\Models\Note; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; +use Mockery; +use Tests\TestCase; + +/** + * + * Class EditControllerTest + */ +class EditControllerTest extends TestCase +{ + + /** + * @covers \FireflyIII\Http\Controllers\Account\EditController + */ + public function testEdit(): void + { + $note = new Note(); + $note->text = 'This is a test'; + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); + $repository->shouldReceive('get')->andReturn(new Collection); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); + $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); + $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccType'])->andReturn(''); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccMonthlyPaymentDate'])->andReturn(''); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + + $this->be($this->user()); + $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); + $response = $this->get(route('accounts.edit', [$account->id])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
        '); + $response->assertSee($note->text); + } + + /** + * @covers \FireflyIII\Http\Controllers\Account\EditController + */ + public function testEditNull(): void + { + $note = new Note(); + $note->text = 'This is a test'; + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + Amount::shouldReceive('getDefaultCurrency')->andReturn(TransactionCurrency::find(2)); + $repository->shouldReceive('findNull')->once()->andReturn(null); + $repository->shouldReceive('get')->andReturn(new Collection); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); + $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); + $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccType'])->andReturn(''); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccMonthlyPaymentDate'])->andReturn(''); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + + $this->be($this->user()); + $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); + $response = $this->get(route('accounts.edit', [$account->id])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
          '); + $response->assertSee($note->text); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Account\EditController + * @covers \FireflyIII\Http\Requests\AccountFormRequest + * @covers \FireflyIII\Http\Controllers\Controller + */ + public function testUpdate(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('update')->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->session(['accounts.edit.uri' => 'http://localhost/javascript/account']); + $this->be($this->user()); + $data = [ + 'name' => 'updated account ' . random_int(1000, 9999), + 'active' => 1, + 'what' => 'asset', + ]; + + $response = $this->post(route('accounts.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Account\EditController + * @covers \FireflyIII\Http\Requests\AccountFormRequest + * @covers \FireflyIII\Http\Controllers\Controller + */ + public function testUpdateAgain(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('update')->once(); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->session(['accounts.edit.uri' => 'http://localhost']); + $this->be($this->user()); + $data = [ + 'name' => 'updated account ' . random_int(1000, 9999), + 'active' => 1,ss + 'what' => 'asset', + 'return_to_edit' => '1', + ]; + + $response = $this->post(route('accounts.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index 290b47e3b9..be500a56db 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -62,138 +62,6 @@ class AccountControllerTest extends TestCase } - /** - * @covers \FireflyIII\Http\Controllers\AccountController::create - */ - public function testCreate(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('get')->andReturn(new Collection); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('accounts.create', ['asset'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::delete - * @covers \FireflyIII\Http\Controllers\Controller::rememberPreviousUri - */ - public function testDelete(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET]])->andReturn(new Collection); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); - $response = $this->get(route('accounts.delete', [$account->id])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::destroy - * @covers \FireflyIII\Http\Controllers\Controller::__construct - * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri - */ - public function testDestroy(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('findNull')->withArgs([0])->once()->andReturn(null); - $repository->shouldReceive('destroy')->andReturn(true); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->session(['accounts.delete.uri' => 'http://localhost/accounts/show/1']); - $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); - - $this->be($this->user()); - $response = $this->post(route('accounts.destroy', [$account->id])); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::edit - */ - public function testEdit(): void - { - $note = new Note(); - $note->text = 'This is a test'; - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(CurrencyRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - - $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); - $repository->shouldReceive('get')->andReturn(new Collection); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); - $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); - $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccType'])->andReturn(''); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccMonthlyPaymentDate'])->andReturn(''); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); - - $this->be($this->user()); - $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); - $response = $this->get(route('accounts.edit', [$account->id])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                '); - $response->assertSee($note->text); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController - */ - public function testEditNull(): void - { - $note = new Note(); - $note->text = 'This is a test'; - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(CurrencyRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - - Amount::shouldReceive('getDefaultCurrency')->andReturn(TransactionCurrency::find(2)); - $repository->shouldReceive('findNull')->once()->andReturn(null); - $repository->shouldReceive('get')->andReturn(new Collection); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); - $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); - $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccType'])->andReturn(''); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccMonthlyPaymentDate'])->andReturn(''); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); - - $this->be($this->user()); - $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); - $response = $this->get(route('accounts.edit', [$account->id])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                  '); - $response->assertSee($note->text); - } /** * @covers \FireflyIII\Http\Controllers\AccountController::index @@ -418,114 +286,4 @@ class AccountControllerTest extends TestCase $response->assertStatus(302); } - /** - * @covers \FireflyIII\Http\Controllers\AccountController::store - * @covers \FireflyIII\Http\Requests\AccountFormRequest - * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri - */ - public function testStore(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('store')->once()->andReturn(factory(Account::class)->make()); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - // change the preference: - Preferences::setForUser($this->user(), 'frontPageAccounts', [1]); - - $this->session(['accounts.create.uri' => 'http://localhost']); - $this->be($this->user()); - $data = [ - 'name' => 'new account ' . random_int(1000, 9999), - 'what' => 'asset', - ]; - - $response = $this->post(route('accounts.store', ['asset']), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::store - * @covers \FireflyIII\Http\Requests\AccountFormRequest - * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri - */ - public function testStoreAnother(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('store')->once()->andReturn(factory(Account::class)->make()); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->session(['accounts.create.uri' => 'http://localhost']); - $this->be($this->user()); - $data = [ - 'name' => 'new account ' . random_int(1000, 9999), - 'what' => 'asset', - 'create_another' => 1, - ]; - - $response = $this->post(route('accounts.store', ['asset']), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::update - * @covers \FireflyIII\Http\Requests\AccountFormRequest - * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri - */ - public function testUpdate(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('update')->once(); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->session(['accounts.edit.uri' => 'http://localhost/javascript/account']); - $this->be($this->user()); - $data = [ - 'name' => 'updated account ' . random_int(1000, 9999), - 'active' => 1, - 'what' => 'asset', - ]; - - $response = $this->post(route('accounts.update', [1]), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::update - * @covers \FireflyIII\Http\Requests\AccountFormRequest - * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri - */ - public function testUpdateAgain(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(AccountRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('update')->once(); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->session(['accounts.edit.uri' => 'http://localhost']); - $this->be($this->user()); - $data = [ - 'name' => 'updated account ' . random_int(1000, 9999), - 'active' => 1, - 'what' => 'asset', - 'return_to_edit' => '1', - ]; - - $response = $this->post(route('accounts.update', [1]), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } } diff --git a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php index 60675e0aa5..aba92aea0a 100644 --- a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php +++ b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php @@ -326,6 +326,7 @@ class ImportableConverterTest extends TestCase $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); $opposingMapper->shouldReceive('map')->once()->withArgs([null, '45.67', $nullAccount])->andReturn($other); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); @@ -341,9 +342,10 @@ class ImportableConverterTest extends TestCase $this->assertEquals(2, $result[0]['bill_id']); // will NOT be ignored. $this->assertEquals($importable->billName, $result[0]['bill_name']); $this->assertEquals($usd->id, $result[0]['transactions'][0]['currency_id']); + // since amount is positive, $asset recieves the money - $this->assertEquals($asset->id, $result[0]['transactions'][0]['source_id']); - $this->assertEquals($other->id, $result[0]['transactions'][0]['destination_id']); + $this->assertEquals($other->id, $result[0]['transactions'][0]['source_id']); + $this->assertEquals($asset->id, $result[0]['transactions'][0]['destination_id']); } /** @@ -411,9 +413,10 @@ class ImportableConverterTest extends TestCase $this->assertEquals(3, $result[0]['bill_id']); $this->assertEquals($importable->billName, $result[0]['bill_name']); $this->assertEquals($usd->id, $result[0]['transactions'][0]['currency_id']); + // since amount is negative, $asset sends the money - $this->assertEquals($other->id, $result[0]['transactions'][0]['source_id']); - $this->assertEquals($asset->id, $result[0]['transactions'][0]['destination_id']); + $this->assertEquals($asset->id, $result[0]['transactions'][0]['source_id']); + $this->assertEquals($other->id, $result[0]['transactions'][0]['destination_id']); } /** From 9116796d90b273742f56191d06bcf5a30779a17e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 11:45:05 +0200 Subject: [PATCH 04/86] Refactor account code and tests. --- .../Controllers/Account/EditController.php | 14 +- .../Controllers/Account/IndexController.php | 126 ++++++++++++++++++ .../ShowController.php} | 91 ++----------- .../Controllers/Auth/TwoFactorController.php | 2 +- routes/web.php | 7 +- .../Account/DeleteControllerTest.php | 10 +- .../Account/EditControllerTest.php | 26 ++-- .../Account/IndexControllerTest.php | 86 ++++++++++++ .../Account/ReconcileControllerTest.php | 2 +- .../ShowControllerTest.php} | 75 ++--------- 10 files changed, 271 insertions(+), 168 deletions(-) create mode 100644 app/Http/Controllers/Account/IndexController.php rename app/Http/Controllers/{AccountController.php => Account/ShowController.php} (77%) create mode 100644 tests/Feature/Controllers/Account/IndexControllerTest.php rename tests/Feature/Controllers/{AccountControllerTest.php => Account/ShowControllerTest.php} (76%) diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 5fad8ba628..d55afb0d69 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -27,7 +27,6 @@ namespace FireflyIII\Http\Controllers\Account; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\AccountFormRequest; use FireflyIII\Models\Account; -use FireflyIII\Models\Note; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Http\Request; @@ -70,6 +69,9 @@ class EditController extends Controller * @param AccountRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function edit(Request $request, Account $account, AccountRepositoryInterface $repository) { @@ -87,9 +89,6 @@ class EditController extends Controller } $request->session()->forget('accounts.edit.fromUpdate'); - // pre fill some useful values. - - // the opening balance is tricky: $openingBalanceAmount = (string)$repository->getOpeningBalanceAmount($account); $openingBalanceDate = $repository->getOpeningBalanceDate($account); $default = app('amount')->getDefaultCurrency(); @@ -110,14 +109,9 @@ class EditController extends Controller 'openingBalance' => $openingBalanceAmount, 'virtualBalance' => $account->virtual_balance, 'currency_id' => $currency->id, - 'notes' => '', + 'notes' => $this->repository->getNoteText($account), 'active' => $hasOldInput ? (bool)$request->old('active') : $account->active, ]; - /** @var Note $note */ - $note = $this->repository->getNote($account); - if (null !== $note) { - $preFilled['notes'] = $note->text; - } $request->session()->flash('preFilled', $preFilled); diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php new file mode 100644 index 0000000000..199dfa7924 --- /dev/null +++ b/app/Http/Controllers/Account/IndexController.php @@ -0,0 +1,126 @@ +. + */ +/** @noinspection CallableParameterUseCaseInTypeContextInspection */ +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Account; + +use Carbon\Carbon; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Account; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use Illuminate\Http\Request; +use Illuminate\Pagination\LengthAwarePaginator; +use Preferences; + +/** + * + * Class IndexController + */ +class IndexController extends Controller +{ + /** @var AccountRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + // translations: + $this->middleware( + function ($request, $next) { + app('view')->share('mainTitleIcon', 'fa-credit-card'); + app('view')->share('title', trans('firefly.accounts')); + + $this->repository = app(AccountRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param string $what + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index(Request $request, string $what) + { + $what = $what ?? 'asset'; + $subTitle = trans('firefly.' . $what . '_accounts'); + $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); + $types = config('firefly.accountTypesByIdentifier.' . $what); + $collection = $this->repository->getAccountsByType($types); + $total = $collection->count(); + $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); + $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize); + unset($collection); + /** @var Carbon $start */ + $start = clone session('start', Carbon::now()->startOfMonth()); + /** @var Carbon $end */ + $end = clone session('end', Carbon::now()->endOfMonth()); + $start->subDay(); + + $ids = $accounts->pluck('id')->toArray(); + $startBalances = app('steam')->balancesByAccounts($accounts, $start); + $endBalances = app('steam')->balancesByAccounts($accounts, $end); + $activities = app('steam')->getLastActivities($ids); + + $accounts->each( + function (Account $account) use ($activities, $startBalances, $endBalances) { + $account->lastActivityDate = $this->isInArray($activities, $account->id); + $account->startBalance = $this->isInArray($startBalances, $account->id); + $account->endBalance = $this->isInArray($endBalances, $account->id); + $account->difference = bcsub($account->endBalance, $account->startBalance); + } + ); + + // make paginator: + $accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page); + $accounts->setPath(route('accounts.index', [$what])); + + return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'page', 'accounts')); + } + + + /** + * @param array $array + * @param int $entryId + * + * @return null|mixed + */ + protected function isInArray(array $array, int $entryId) + { + $result = '0'; + if (isset($array[$entryId])) { + $result = $array[$entryId]; + } + + return $result; + } + + +} diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/Account/ShowController.php similarity index 77% rename from app/Http/Controllers/AccountController.php rename to app/Http/Controllers/Account/ShowController.php index 58ddb87578..7ef899cba9 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -1,7 +1,7 @@ . */ -/** @noinspection CallableParameterUseCaseInTypeContextInspection */ + declare(strict_types=1); -namespace FireflyIII\Http\Controllers; +namespace FireflyIII\Http\Controllers\Account; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Http\Requests\AccountFormRequest; +use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; @@ -36,16 +35,15 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; -use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Preferences; use View; /** - * Class AccountController. * + * Class ShowController */ -class AccountController extends Controller +class ShowController extends Controller { /** @var CurrencyRepositoryInterface */ private $currencyRepos; @@ -73,53 +71,6 @@ class AccountController extends Controller ); } - /** - * @param Request $request - * @param string $what - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function index(Request $request, string $what) - { - $what = $what ?? 'asset'; - $subTitle = trans('firefly.' . $what . '_accounts'); - $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); - $types = config('firefly.accountTypesByIdentifier.' . $what); - $collection = $this->repository->getAccountsByType($types); - $total = $collection->count(); - $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize); - unset($collection); - /** @var Carbon $start */ - $start = clone session('start', Carbon::now()->startOfMonth()); - /** @var Carbon $end */ - $end = clone session('end', Carbon::now()->endOfMonth()); - $start->subDay(); - - $ids = $accounts->pluck('id')->toArray(); - $startBalances = app('steam')->balancesByAccounts($accounts, $start); - $endBalances = app('steam')->balancesByAccounts($accounts, $end); - $activities = app('steam')->getLastActivities($ids); - - $accounts->each( - function (Account $account) use ($activities, $startBalances, $endBalances) { - $account->lastActivityDate = $this->isInArray($activities, $account->id); - $account->startBalance = $this->isInArray($startBalances, $account->id); - $account->endBalance = $this->isInArray($endBalances, $account->id); - $account->difference = bcsub($account->endBalance, $account->startBalance); - } - ); - - // make paginator: - $accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page); - $accounts->setPath(route('accounts.index', [$what])); - - return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'page', 'accounts')); - } - - - /** @noinspection MoreThanThreeArgumentsInspection */ /** * Show an account. * @@ -138,17 +89,12 @@ class AccountController extends Controller if (AccountType::INITIAL_BALANCE === $account->accountType->type) { return $this->redirectToOriginalAccount($account); } - if (null === $start) { - $start = session('start'); - } - if (null === $end) { - $end = session('end'); - } + $start = $start ?? session('start'); + $end = $end ?? session('end'); if ($end < $start) { throw new FireflyException('End is after start!'); // @codeCoverageIgnore } - $what = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); // used for menu $today = new Carbon; $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); @@ -178,7 +124,6 @@ class AccountController extends Controller ); } - /** * Show an account. * @@ -222,22 +167,9 @@ class AccountController extends Controller ); } - /** - * @param array $array - * @param int $entryId - * - * @return null|mixed - */ - protected function isInArray(array $array, int $entryId) - { - $result = '0'; - if (isset($array[$entryId])) { - $result = $array[$entryId]; - } - return $result; - } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * This method returns "period entries", so nov-2015, dec-2015, etc etc (this depends on the users session range) @@ -250,6 +182,7 @@ class AccountController extends Controller * * @return Collection * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function getPeriodOverview(Account $account, ?Carbon $date): Collection { @@ -332,4 +265,4 @@ class AccountController extends Controller return redirect(route('accounts.show', [$opposingTransaction->account_id])); } -} +} \ No newline at end of file diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 3bc779fde6..80bc9de73e 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -42,7 +42,7 @@ class TwoFactorController extends Controller * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View * * @throws FireflyException - * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function index(Request $request) { diff --git a/routes/web.php b/routes/web.php index 9de923e8c3..a3deac49cd 100755 --- a/routes/web.php +++ b/routes/web.php @@ -108,8 +108,9 @@ Route::group( */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'], function () { - Route::get('{what}', ['uses' => 'AccountController@index', 'as' => 'index'])->where('what', 'revenue|asset|expense'); + // show: + Route::get('{what}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('what', 'revenue|asset|expense'); // create Route::get('create/{what}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where('what', 'revenue|asset|expense'); @@ -125,8 +126,8 @@ Route::group( Route::post('destroy/{account}', ['uses' => 'Account\DeleteController@destroy', 'as' => 'destroy']); // show - Route::get('show/{account}/all', ['uses' => 'AccountController@showAll', 'as' => 'show.all']); - Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'AccountController@show', 'as' => 'show']); + Route::get('show/{account}/all', ['uses' => 'Account\ShowController@showAll', 'as' => 'show.all']); + Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show']); // reconcile routes: Route::get('reconcile/{account}/index/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@reconcile', 'as' => 'reconcile']); diff --git a/tests/Feature/Controllers/Account/DeleteControllerTest.php b/tests/Feature/Controllers/Account/DeleteControllerTest.php index 5269cd3927..7133f2f7dc 100644 --- a/tests/Feature/Controllers/Account/DeleteControllerTest.php +++ b/tests/Feature/Controllers/Account/DeleteControllerTest.php @@ -31,13 +31,21 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; - +use Log; /** * * Class DeleteControllerTest */ class DeleteControllerTest extends TestCase { + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } /** * @covers \FireflyIII\Http\Controllers\Account\DeleteController * @covers \FireflyIII\Http\Controllers\Controller diff --git a/tests/Feature/Controllers/Account/EditControllerTest.php b/tests/Feature/Controllers/Account/EditControllerTest.php index 69f0832259..d9b45c48e7 100644 --- a/tests/Feature/Controllers/Account/EditControllerTest.php +++ b/tests/Feature/Controllers/Account/EditControllerTest.php @@ -34,22 +34,26 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Mockery; use Tests\TestCase; - +use Log; /** * * Class EditControllerTest */ class EditControllerTest extends TestCase { - + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } /** * @covers \FireflyIII\Http\Controllers\Account\EditController */ public function testEdit(): void { - $note = new Note(); - $note->text = 'This is a test'; - // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(CurrencyRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -57,7 +61,7 @@ class EditControllerTest extends TestCase $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); $repository->shouldReceive('get')->andReturn(new Collection); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); + $accountRepos->shouldReceive('getNoteText')->andReturn('Some text')->once(); $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); @@ -73,7 +77,7 @@ class EditControllerTest extends TestCase $response->assertStatus(200); // has bread crumb $response->assertSee('
                    '); - $response->assertSee($note->text); + $response->assertSee('Some text'); } /** @@ -81,8 +85,6 @@ class EditControllerTest extends TestCase */ public function testEditNull(): void { - $note = new Note(); - $note->text = 'This is a test'; // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -92,7 +94,7 @@ class EditControllerTest extends TestCase $repository->shouldReceive('findNull')->once()->andReturn(null); $repository->shouldReceive('get')->andReturn(new Collection); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); + $accountRepos->shouldReceive('getNoteText')->andReturn('Some text')->once(); $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); @@ -108,7 +110,7 @@ class EditControllerTest extends TestCase $response->assertStatus(200); // has bread crumb $response->assertSee('
                      '); - $response->assertSee($note->text); + $response->assertSee('Some text'); } @@ -157,7 +159,7 @@ class EditControllerTest extends TestCase $this->be($this->user()); $data = [ 'name' => 'updated account ' . random_int(1000, 9999), - 'active' => 1,ss + 'active' => 1, 'what' => 'asset', 'return_to_edit' => '1', ]; diff --git a/tests/Feature/Controllers/Account/IndexControllerTest.php b/tests/Feature/Controllers/Account/IndexControllerTest.php new file mode 100644 index 0000000000..f8aa6a9ae9 --- /dev/null +++ b/tests/Feature/Controllers/Account/IndexControllerTest.php @@ -0,0 +1,86 @@ +. + */ +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Account; + +use FireflyIII\Models\Account; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; +use Log; +use Mockery; +use Steam; +use Tests\TestCase; + +/** + * Class IndexControllerTest + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class IndexControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Account\IndexController + * @dataProvider dateRangeProvider + * + * @param string $range + * + */ + public function testIndex(string $range): void + { + // mock stuff + $account = factory(Account::class)->make(); + $repository = $this->mock(AccountRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1)); + Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']); + Steam::shouldReceive('getLastActivities')->andReturn([]); + + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('accounts.index', ['asset'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                        '); + } +} diff --git a/tests/Feature/Controllers/Account/ReconcileControllerTest.php b/tests/Feature/Controllers/Account/ReconcileControllerTest.php index e4476b9754..93fded7b6e 100644 --- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php +++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php @@ -43,7 +43,7 @@ class ReconcileControllerTest extends TestCase /** * */ - public function setUp() + public function setUp(): void { parent::setUp(); Log::debug(sprintf('Now in %s.', \get_class($this))); diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/Account/ShowControllerTest.php similarity index 76% rename from tests/Feature/Controllers/AccountControllerTest.php rename to tests/Feature/Controllers/Account/ShowControllerTest.php index be500a56db..323bafe631 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/Account/ShowControllerTest.php @@ -1,7 +1,7 @@ . */ + declare(strict_types=1); -namespace Tests\Feature\Controllers; +namespace Tests\Feature\Controllers\Account; -use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; @@ -38,67 +35,26 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Log; -use Mockery; -use Preferences; -use Steam; use Tests\TestCase; /** - * Class AccountControllerTest * - * @SuppressWarnings(PHPMD.TooManyPublicMethods) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * Class ShowControllerTest */ -class AccountControllerTest extends TestCase +class ShowControllerTest extends TestCase { /** * */ - public function setUp() + public function setUp(): void { parent::setUp(); Log::debug(sprintf('Now in %s.', \get_class($this))); } - /** - * @covers \FireflyIII\Http\Controllers\AccountController::index - * @covers \FireflyIII\Http\Controllers\AccountController::__construct - * @covers \FireflyIII\Http\Controllers\AccountController::isInArray - * @dataProvider dateRangeProvider - * - * @param string $range - * - */ - public function testIndex(string $range): void - { - // mock stuff - $account = factory(Account::class)->make(); - $repository = $this->mock(AccountRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1)); - Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']); - Steam::shouldReceive('getLastActivities')->andReturn([]); - - $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('accounts.index', ['asset'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\AccountController::show - * @covers \FireflyIII\Http\Controllers\AccountController::getPeriodOverview + * @covers \FireflyIII\Http\Controllers\Account\ShowController * @dataProvider dateRangeProvider * * @param string $range @@ -145,8 +101,7 @@ class AccountControllerTest extends TestCase /** - * @covers \FireflyIII\Http\Controllers\AccountController - * @covers \FireflyIII\Http\Controllers\AccountController + * @covers \FireflyIII\Http\Controllers\Account\ShowController * @dataProvider dateRangeProvider * * @param string $range @@ -192,7 +147,7 @@ class AccountControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\AccountController::show + * @covers \FireflyIII\Http\Controllers\Account\ShowController * @expectedExceptionMessage End is after start! */ public function testShowBrokenBadDates(): void @@ -210,8 +165,7 @@ class AccountControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\AccountController::show - * @covers \FireflyIII\Http\Controllers\AccountController::redirectToOriginalAccount + * @covers \FireflyIII\Http\Controllers\Account\ShowController * @expectedExceptionMessage Expected a transaction */ public function testShowBrokenInitial(): void @@ -230,7 +184,7 @@ class AccountControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\AccountController::show + * @covers \FireflyIII\Http\Controllers\Account\ShowController * @dataProvider dateRangeProvider * * @param string $range @@ -267,8 +221,7 @@ class AccountControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\AccountController::show - * @covers \FireflyIII\Http\Controllers\AccountController::redirectToOriginalAccount + * @covers \FireflyIII\Http\Controllers\Account\ShowController */ public function testShowInitial(): void { @@ -286,4 +239,4 @@ class AccountControllerTest extends TestCase $response->assertStatus(302); } -} +} \ No newline at end of file From 0712f30a5141cc00d2299b4a718ce143cf82cb3f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 15:16:32 +0200 Subject: [PATCH 05/86] Fix bug in API: missing destroy budget limit method. --- app/Repositories/Budget/BudgetRepository.php | 14 ++++++++++++++ .../Budget/BudgetRepositoryInterface.php | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 6cc8bd41eb..df207daba6 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -196,6 +196,20 @@ class BudgetRepository implements BudgetRepositoryInterface } } + /** + * Destroy a budget limit. + * + * @param BudgetLimit $budgetLimit + */ + public function destroyBudgetLimit(BudgetLimit $budgetLimit): void + { + try { + $budgetLimit->delete(); + } catch (Exception $e) { + Log::info(sprintf('Could not delete budget limit: %s', $e->getMessage())); + } + } + /** * Filters entries from the result set generated by getBudgetPeriodReport. * diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 229bee793a..68c94efcf3 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -46,6 +46,13 @@ interface BudgetRepositoryInterface */ public function budgetedPerDay(Budget $budget): string; + /** + * Destroy a budget limit. + * + * @param BudgetLimit $budgetLimit + */ + public function destroyBudgetLimit(BudgetLimit $budgetLimit): void; + /** * @return bool */ From 6bc772d640c18010cb4277c3b0612071c3620e16 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 15:21:05 +0200 Subject: [PATCH 06/86] Add Facade methods for scrutinizer. --- app/Support/Facades/FireflyConfig.php | 3 +++ app/Support/FireflyConfig.php | 34 +++++++++++++-------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index 98fdaf7201..01aade0d24 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -22,11 +22,14 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use FireflyIII\Models\Configuration; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class FireflyConfig. + * @method ?Configuration get($name, $default = null) + * @method Configuration set(string $name, $value) */ class FireflyConfig extends Facade { diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index 0890e601ad..f3a1f688b9 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support; use Cache; +use Exception; use FireflyIII\Models\Configuration; use Log; @@ -32,30 +33,29 @@ use Log; class FireflyConfig { /** - * @param $name - * - * @return bool - * - + * @param string $name */ - public function delete($name): bool + public function delete(string $name): void { $fullName = 'ff-config-' . $name; if (Cache::has($fullName)) { Cache::forget($fullName); } - Configuration::where('name', $name)->delete(); + try { + Configuration::where('name', $name)->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete config value: %s', $e->getMessage())); - return true; + } } /** - * @param $name - * @param null $default + * @param string $name + * @param null $default * * @return \FireflyIII\Models\Configuration|null */ - public function get($name, $default = null): ?Configuration + public function get(string $name, $default = null): ?Configuration { $fullName = 'ff-config-' . $name; if (Cache::has($fullName)) { @@ -78,12 +78,12 @@ class FireflyConfig } /** - * @param $name - * @param null $default + * @param string $name + * @param null $default * * @return \FireflyIII\Models\Configuration|null */ - public function getFresh($name, $default = null) + public function getFresh(string $name, $default = null): ?Configuration { $config = Configuration::where('name', $name)->first(['id', 'name', 'data']); if ($config) { @@ -99,12 +99,12 @@ class FireflyConfig } /** - * @param $name - * @param $value + * @param string $name + * @param $value * * @return Configuration */ - public function put($name, $value): Configuration + public function put(string $name, $value): Configuration { return $this->set($name, $value); } From b8699422c8a919aa334ee68589594688b11d9a2a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 15:22:21 +0200 Subject: [PATCH 07/86] Refactor budget controller. --- .../V1/Controllers/BudgetLimitController.php | 4 +- .../Controllers/Account/ShowController.php | 3 +- app/Http/Controllers/BillController.php | 6 +- .../Controllers/Budget/AmountController.php | 276 +++++++ .../Controllers/Budget/CreateController.php | 106 +++ .../Controllers/Budget/DeleteController.php | 94 +++ .../Controllers/Budget/EditController.php | 117 +++ .../Controllers/Budget/IndexController.php | 174 ++++ .../Controllers/Budget/ShowController.php | 274 +++++++ app/Http/Controllers/BudgetController.php | 714 ----------------- routes/web.php | 37 +- .../Budget/AmountControllerTest.php | 220 +++++ .../Budget/CreateControllerTest.php | 95 +++ .../Budget/DeleteControllerTest.php | 85 ++ .../Controllers/Budget/EditControllerTest.php | 94 +++ .../Budget/IndexControllerTest.php | 237 ++++++ .../Controllers/Budget/ShowControllerTest.php | 265 ++++++ .../Controllers/BudgetControllerTest.php | 756 ------------------ .../Triggers/FromAccountStartsTest.php | 25 +- 19 files changed, 2087 insertions(+), 1495 deletions(-) create mode 100644 app/Http/Controllers/Budget/AmountController.php create mode 100644 app/Http/Controllers/Budget/CreateController.php create mode 100644 app/Http/Controllers/Budget/DeleteController.php create mode 100644 app/Http/Controllers/Budget/EditController.php create mode 100644 app/Http/Controllers/Budget/IndexController.php create mode 100644 app/Http/Controllers/Budget/ShowController.php delete mode 100644 app/Http/Controllers/BudgetController.php create mode 100644 tests/Feature/Controllers/Budget/AmountControllerTest.php create mode 100644 tests/Feature/Controllers/Budget/CreateControllerTest.php create mode 100644 tests/Feature/Controllers/Budget/DeleteControllerTest.php create mode 100644 tests/Feature/Controllers/Budget/EditControllerTest.php create mode 100644 tests/Feature/Controllers/Budget/IndexControllerTest.php create mode 100644 tests/Feature/Controllers/Budget/ShowControllerTest.php delete mode 100644 tests/Feature/Controllers/BudgetControllerTest.php diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php index 80dc9f464e..d4cf2dd75c 100644 --- a/app/Api/V1/Controllers/BudgetLimitController.php +++ b/app/Api/V1/Controllers/BudgetLimitController.php @@ -95,8 +95,6 @@ class BudgetLimitController extends Controller { $manager = new Manager; $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; - $start = null; - $end = null; $budgetId = (int)($request->get('budget_id') ?? 0); $budget = $this->repository->findNull($budgetId); $this->parameters->set('budget_id', $budgetId); @@ -119,9 +117,11 @@ class BudgetLimitController extends Controller $collection = new Collection; if (null === $budget) { + /** @noinspection PhpUndefinedVariableInspection */ $collection = $this->repository->getAllBudgetLimits($start, $end); } if (null !== $budget) { + /** @noinspection PhpUndefinedVariableInspection */ $collection = $this->repository->getBudgetLimits($budget, $start, $end); } diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 7ef899cba9..250bf023a3 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -40,8 +40,9 @@ use Preferences; use View; /** - * * Class ShowController + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ShowController extends Controller { diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index c3258b9fea..ca7d6a181d 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -43,6 +43,8 @@ use View; /** * Class BillController. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class BillController extends Controller { @@ -298,6 +300,9 @@ class BillController extends Controller * @param BillFormRequest $request * * @return RedirectResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function store(BillFormRequest $request): RedirectResponse { @@ -316,7 +321,6 @@ class BillController extends Controller $files = $request->hasFile('attachments') ? $request->file('attachments') : null; $this->attachments->saveAttachmentsForModel($bill, $files); - // flash messages if (\count($this->attachments->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore } diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php new file mode 100644 index 0000000000..9274ce18a0 --- /dev/null +++ b/app/Http/Controllers/Budget/AmountController.php @@ -0,0 +1,276 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Budget; + + +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\BudgetIncomeRequest; +use FireflyIII\Models\Budget; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Support\CacheProperties; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\Support\Collection; +use Log; +use Preferences; +use View; + +/** + * + * Class AmountController + */ +class AmountController extends Controller +{ + /** @var BudgetRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + View::share('hideBudgets', true); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); + + return $next($request); + } + ); + } + + + /** + * @param Request $request + * @param BudgetRepositoryInterface $repository + * @param Budget $budget + * + * @return JsonResponse + */ + public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget): JsonResponse + { + $amount = (string)$request->get('amount'); + $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); + $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); + $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount); + $largeDiff = false; + $warnText = ''; + $days = 0; + $daysInMonth = 0; + if (0 === bccomp($amount, '0')) { + $budgetLimit = null; + } + + // if today is between start and end, use the diff in days between end and today (days left) + // otherwise, use diff between start and end. + $today = new Carbon; + Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'), $today->format('Y-m-d'))); + if ($today->gte($start) && $today->lte($end)) { + $days = $end->diffInDays($today); + $daysInMonth = $start->diffInDays($today); + } + if ($today->lte($start) || $today->gte($end)) { + $days = $start->diffInDays($end); + $daysInMonth = $start->diffInDays($end); + } + $days = 0 === $days ? 1 : $days; + $daysInMonth = 0 === $daysInMonth ? 1 : $daysInMonth; + + // calculate left in budget: + $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end); + $currency = app('amount')->getDefaultCurrency(); + $left = app('amount')->formatAnything($currency, bcadd($amount, $spent), true); + $leftPerDay = 'none'; + + // is user has money left, calculate. + if (1 === bccomp(bcadd($amount, $spent), '0')) { + $leftPerDay = app('amount')->formatAnything($currency, bcdiv(bcadd($amount, $spent), (string)$days), true); + } + + + // over or under budgeting, compared to previous budgets? + $average = $this->repository->budgetedPerDay($budget); + // current average per day: + $diff = $start->diffInDays($end); + $current = $amount; + if ($diff > 0) { + $current = bcdiv($amount, (string)$diff); + } + if (bccomp(bcmul('1.1', $average), $current) === -1) { + $largeDiff = true; + $warnText = (string)trans( + 'firefly.over_budget_warn', + [ + 'amount' => app('amount')->formatAnything($currency, $average, false), + 'over_amount' => app('amount')->formatAnything($currency, $current, false), + ] + ); + } + + app('preferences')->mark(); + + return response()->json( + [ + 'left' => $left, + 'name' => $budget->name, + 'limit' => $budgetLimit ? $budgetLimit->id : 0, + 'amount' => $amount, + 'current' => $current, + 'average' => $average, + 'large_diff' => $largeDiff, + 'left_per_day' => $leftPerDay, + 'warn_text' => $warnText, + 'daysInMonth' => $daysInMonth, + + ] + ); + } + + + /** + * @param Carbon $start + * @param Carbon $end + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function infoIncome(Carbon $start, Carbon $end) + { + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('info-income'); + + Log::debug(sprintf('infoIncome start is %s', $start->format('Y-m-d'))); + Log::debug(sprintf('infoIncome end is %s', $end->format('Y-m-d'))); + + if ($cache->has()) { + // @codeCoverageIgnoreStart + $result = $cache->get(); + + return view('budgets.info', compact('result')); + // @codeCoverageIgnoreEnd + } + $result = [ + 'available' => '0', + 'earned' => '0', + 'suggested' => '0', + ]; + $currency = app('amount')->getDefaultCurrency(); + $range = Preferences::get('viewRange', '1M')->data; + /** @var Carbon $begin */ + $begin = app('navigation')->subtractPeriod($start, $range, 3); + + Log::debug(sprintf('Range is %s', $range)); + Log::debug(sprintf('infoIncome begin is %s', $begin->format('Y-m-d'))); + + // get average amount available. + $total = '0'; + $count = 0; + $currentStart = clone $begin; + while ($currentStart < $start) { + + Log::debug(sprintf('Loop: currentStart is %s', $currentStart->format('Y-m-d'))); + $currentEnd = app('navigation')->endOfPeriod($currentStart, $range); + $total = bcadd($total, $this->repository->getAvailableBudget($currency, $currentStart, $currentEnd)); + $currentStart = app('navigation')->addPeriod($currentStart, $range, 0); + ++$count; + } + Log::debug('Loop end'); + + if (0 === $count) { + $count = 1; + } + $result['available'] = bcdiv($total, (string)$count); + + // amount earned in this period: + $subDay = clone $end; + $subDay->subDay(); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount(); + $result['earned'] = bcdiv((string)$collector->getJournals()->sum('transaction_amount'), (string)$count); + + // amount spent in period + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount(); + $result['spent'] = bcdiv((string)$collector->getJournals()->sum('transaction_amount'), (string)$count); + // suggestion starts with the amount spent + $result['suggested'] = bcmul($result['spent'], '-1'); + $result['suggested'] = 1 === bccomp($result['suggested'], $result['earned']) ? $result['earned'] : $result['suggested']; + // unless it's more than you earned. So min() of suggested/earned + + $cache->store($result); + + return view('budgets.info', compact('result', 'begin', 'currentEnd')); + } + + + /** + * @param BudgetIncomeRequest $request + * + * @return RedirectResponse + */ + public function postUpdateIncome(BudgetIncomeRequest $request): RedirectResponse + { + $start = Carbon::createFromFormat('Y-m-d', $request->string('start')); + $end = Carbon::createFromFormat('Y-m-d', $request->string('end')); + $defaultCurrency = app('amount')->getDefaultCurrency(); + $amount = $request->get('amount'); + $page = 0 === $request->integer('page') ? 1 : $request->integer('page'); + $this->repository->cleanupBudgets(); + $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount); + app('preferences')->mark(); + + return redirect(route('budgets.index', [$start->format('Y-m-d')]) . '?page=' . $page); + } + + /** + * @param Request $request + * @param Carbon $start + * @param Carbon $end + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function updateIncome(Request $request, Carbon $start, Carbon $end) + { + $defaultCurrency = app('amount')->getDefaultCurrency(); + $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); + $available = round($available, $defaultCurrency->decimal_places); + $page = (int)$request->get('page'); + + return view('budgets.income', compact('available', 'start', 'end', 'page')); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php new file mode 100644 index 0000000000..6fda49b305 --- /dev/null +++ b/app/Http/Controllers/Budget/CreateController.php @@ -0,0 +1,106 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Budget; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\BudgetFormRequest; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use View; + +/** + * Class CreateController + */ +class CreateController extends Controller +{ + /** @var BudgetRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + View::share('hideBudgets', true); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); + + return $next($request); + } + ); + } + + + /** + * @param Request $request + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function create(Request $request) + { + // put previous url in session if not redirect from store (not "create another"). + if (true !== session('budgets.create.fromStore')) { + $this->rememberPreviousUri('budgets.create.uri'); + } + $request->session()->forget('budgets.create.fromStore'); + $subTitle = (string)trans('firefly.create_new_budget'); + + return view('budgets.create', compact('subTitle')); + } + + + /** + * @param BudgetFormRequest $request + * + * @return \Illuminate\Http\RedirectResponse + */ + public function store(BudgetFormRequest $request): RedirectResponse + { + $data = $request->getBudgetData(); + $budget = $this->repository->store($data); + $this->repository->cleanupBudgets(); + $request->session()->flash('success', (string)trans('firefly.stored_new_budget', ['name' => $budget->name])); + app('preferences')->mark(); + + $redirect = redirect($this->getPreviousUri('budgets.create.uri')); + + if (1 === (int)$request->get('create_another')) { + // @codeCoverageIgnoreStart + $request->session()->put('budgets.create.fromStore', true); + + $redirect = redirect(route('budgets.create'))->withInput(); + // @codeCoverageIgnoreEnd + } + + return $redirect; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php new file mode 100644 index 0000000000..0acdbda200 --- /dev/null +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -0,0 +1,94 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Budget; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Budget; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Http\Request; +use View; + +/** + * + * Class DeleteController + */ +class DeleteController extends Controller +{ + /** @var BudgetRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + View::share('hideBudgets', true); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); + + return $next($request); + } + ); + } + + + /** + * @param Budget $budget + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function delete(Budget $budget) + { + $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]); + + // put previous url in session + $this->rememberPreviousUri('budgets.delete.uri'); + + return view('budgets.delete', compact('budget', 'subTitle')); + } + + /** + * @param Request $request + * @param Budget $budget + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function destroy(Request $request, Budget $budget) + { + $name = $budget->name; + $this->repository->destroy($budget); + $request->session()->flash('success', (string)trans('firefly.deleted_budget', ['name' => $name])); + app('preferences')->mark(); + + return redirect($this->getPreviousUri('budgets.delete.uri')); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php new file mode 100644 index 0000000000..f8e405f670 --- /dev/null +++ b/app/Http/Controllers/Budget/EditController.php @@ -0,0 +1,117 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Budget; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\BudgetFormRequest; +use FireflyIII\Models\Budget; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use View; + +/** + * + * Class EditController + */ +class EditController extends Controller +{ + /** @var BudgetRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + View::share('hideBudgets', true); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param Budget $budget + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function edit(Request $request, Budget $budget) + { + $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]); + + // code to handle active-checkboxes + $hasOldInput = null !== $request->old('_token'); + $preFilled = [ + 'active' => $hasOldInput ? (bool)$request->old('active') : $budget->active, + ]; + + // put previous url in session if not redirect from store (not "return_to_edit"). + if (true !== session('budgets.edit.fromUpdate')) { + $this->rememberPreviousUri('budgets.edit.uri'); + } + $request->session()->forget('budgets.edit.fromUpdate'); + $request->session()->flash('preFilled', $preFilled); + + return view('budgets.edit', compact('budget', 'subTitle')); + } + + /** + * @param BudgetFormRequest $request + * @param Budget $budget + * + * @return \Illuminate\Http\RedirectResponse + */ + public function update(BudgetFormRequest $request, Budget $budget): RedirectResponse + { + $data = $request->getBudgetData(); + $this->repository->update($budget, $data); + + $request->session()->flash('success', (string)trans('firefly.updated_budget', ['name' => $budget->name])); + $this->repository->cleanupBudgets(); + app('preferences')->mark(); + + $redirect = redirect($this->getPreviousUri('budgets.edit.uri')); + + if (1 === (int)$request->get('return_to_edit')) { + // @codeCoverageIgnoreStart + $request->session()->put('budgets.edit.fromUpdate', true); + + $redirect = redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]); + // @codeCoverageIgnoreEnd + } + + return $redirect; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php new file mode 100644 index 0000000000..b53187eeaa --- /dev/null +++ b/app/Http/Controllers/Budget/IndexController.php @@ -0,0 +1,174 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Budget; + + +use Carbon\Carbon; +use Exception; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Http\Request; +use Illuminate\Pagination\LengthAwarePaginator; +use Log; +use Preferences; +use View; + +/** + * + * Class IndexController + */ +class IndexController extends Controller +{ + + /** @var BudgetRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + View::share('hideBudgets', true); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); + + return $next($request); + } + ); + } + + + /** + * @param Request $request + * @param string|null $moment + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index(Request $request, string $moment = null) + { + $range = Preferences::get('viewRange', '1M')->data; + $start = session('start', new Carbon); + $end = session('end', new Carbon); + $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); + $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $days = 0; + $daysInMonth = 0; + + // make date if present: + if (null !== $moment || '' !== (string)$moment) { + try { + $start = new Carbon($moment); + $end = app('navigation')->endOfPeriod($start, $range); + } catch (Exception $e) { + // start and end are already defined. + Log::debug(sprintf('start and end are already defined: %s', $e->getMessage())); + } + } + + // if today is between start and end, use the diff in days between end and today (days left) + // otherwise, use diff between start and end. + $today = new Carbon; + if ($today->gte($start) && $today->lte($end)) { + $days = $end->diffInDays($today); + $daysInMonth = $start->diffInDays($today); + } + if ($today->lte($start) || $today->gte($end)) { + $days = $start->diffInDays($end); + $daysInMonth = $start->diffInDays($end); + } + $days = 0 === $days ? 1 : $days; + $daysInMonth = 0 === $daysInMonth ? 1 : $daysInMonth; + + + $next = clone $end; + $next->addDay(); + $prev = clone $start; + $prev->subDay(); + $prev = app('navigation')->startOfPeriod($prev, $range); + $this->repository->cleanupBudgets(); + $allBudgets = $this->repository->getActiveBudgets(); + $total = $allBudgets->count(); + $budgets = $allBudgets->slice(($page - 1) * $pageSize, $pageSize); + $inactive = $this->repository->getInactiveBudgets(); + $periodStart = $start->formatLocalized($this->monthAndDayFormat); + $periodEnd = $end->formatLocalized($this->monthAndDayFormat); + $budgetInformation = $this->repository->collectBudgetInformation($allBudgets, $start, $end); + $defaultCurrency = app('amount')->getDefaultCurrency(); + $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); + $spent = array_sum(array_column($budgetInformation, 'spent')); + $budgeted = array_sum(array_column($budgetInformation, 'budgeted')); + + // paginate budgets + $budgets = new LengthAwarePaginator($budgets, $total, $pageSize, $page); + $budgets->setPath(route('budgets.index')); + + // select thing for last 12 periods: + $previousLoop = []; + /** @var Carbon $previousDate */ + $previousDate = clone $start; + $count = 0; + while ($count < 12) { + $previousDate->subDay(); + $previousDate = app('navigation')->startOfPeriod($previousDate, $range); + $format = $previousDate->format('Y-m-d'); + $previousLoop[$format] = app('navigation')->periodShow($previousDate, $range); + ++$count; + } + + // select thing for next 12 periods: + $nextLoop = []; + /** @var Carbon $nextDate */ + $nextDate = clone $end; + $nextDate->addDay(); + $count = 0; + + while ($count < 12) { + $format = $nextDate->format('Y-m-d'); + $nextLoop[$format] = app('navigation')->periodShow($nextDate, $range); + $nextDate = app('navigation')->endOfPeriod($nextDate, $range); + ++$count; + $nextDate->addDay(); + } + + // display info + $currentMonth = app('navigation')->periodShow($start, $range); + $nextText = app('navigation')->periodShow($next, $range); + $prevText = app('navigation')->periodShow($prev, $range); + + return view( + 'budgets.index', compact( + 'available', 'currentMonth', 'next', 'nextText', 'prev', 'allBudgets', 'prevText', 'periodStart', 'periodEnd', 'days', 'page', + 'budgetInformation', 'daysInMonth', + 'inactive', 'budgets', 'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end' + ) + ); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php new file mode 100644 index 0000000000..aa97660c37 --- /dev/null +++ b/app/Http/Controllers/Budget/ShowController.php @@ -0,0 +1,274 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Budget; + + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Budget; +use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Support\CacheProperties; +use Illuminate\Http\Request; +use Illuminate\Support\Collection; +use Preferences; +use View; + +/** + * + * Class ShowController + */ +class ShowController extends Controller +{ + + /** @var BudgetRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + View::share('hideBudgets', true); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param string|null $moment + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function noBudget(Request $request, JournalRepositoryInterface $repository, string $moment = null) + { + // default values: + $moment = $moment ?? ''; + $range = Preferences::get('viewRange', '1M')->data; + $start = null; + $end = null; + $periods = new Collection; + + // prep for "all" view. + if ('all' === $moment) { + $subTitle = trans('firefly.all_journals_without_budget'); + $first = $repository->firstNull(); + $start = null === $first ? new Carbon : $first->date; + $end = new Carbon; + } + + // prep for "specific date" view. + if ('all' !== $moment && \strlen($moment) > 0) { + $start = new Carbon($moment); + /** @var Carbon $end */ + $end = app('navigation')->endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->getPeriodOverview(); + } + + // prep for current period + if ('' === $moment) { + $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); + $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); + $periods = $this->getPeriodOverview(); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + + $page = (int)$request->get('page'); + $pageSize = (int)Preferences::get('listPageSize', 50)->data; + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) + ->withoutBudget()->withOpposingAccount(); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.no-budget')); + + return view('budgets.no-budget', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); + } + + /** + * @param Request $request + * @param Budget $budget + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function show(Request $request, Budget $budget) + { + /** @var Carbon $start */ + $start = session('first', Carbon::create()->startOfYear()); + $end = new Carbon; + $page = (int)$request->get('page'); + $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $limits = $this->getLimits($budget, $start, $end); + $repetition = null; + + // collector: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.show', [$budget->id])); + + $subTitle = trans('firefly.all_journals_for_budget', ['name' => $budget->name]); + + return view('budgets.show', compact('limits', 'budget', 'repetition', 'transactions', 'subTitle')); + } + + /** + * @param Request $request + * @param Budget $budget + * @param BudgetLimit $budgetLimit + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @throws FireflyException + */ + public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit) + { + if ($budgetLimit->budget->id !== $budget->id) { + throw new FireflyException('This budget limit is not part of this budget.'); + } + + $page = (int)$request->get('page'); + $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $subTitle = trans( + 'firefly.budget_in_period', + [ + 'name' => $budget->name, + 'start' => $budgetLimit->start_date->formatLocalized($this->monthAndDayFormat), + 'end' => $budgetLimit->end_date->formatLocalized($this->monthAndDayFormat), + ] + ); + + // collector: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) + ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); + $start = session('first', Carbon::create()->startOfYear()); + $end = new Carbon; + $limits = $this->getLimits($budget, $start, $end); + + return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'transactions', 'subTitle')); + } + + /** + * @param Budget $budget + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + private function getLimits(Budget $budget, Carbon $start, Carbon $end): Collection + { + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty($budget->id); + $cache->addProperty('get-limits'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + $set = $this->repository->getBudgetLimits($budget, $start, $end); + $limits = new Collection(); + + /** @var BudgetLimit $entry */ + foreach ($set as $entry) { + $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), new Collection(), $entry->start_date, $entry->end_date); + $limits->push($entry); + } + $cache->store($limits); + + return $set; + } + + + /** + * @return Collection + */ + private function getPeriodOverview(): Collection + { + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + $first = $repository->firstNull(); + $start = null === $first ? new Carbon : $first->date; + $range = Preferences::get('viewRange', '1M')->data; + $start = app('navigation')->startOfPeriod($start, $range); + $end = app('navigation')->endOfX(new Carbon, $range, null); + $entries = new Collection; + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('no-budget-period-entries'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + $dates = app('navigation')->blockPeriods($start, $end, $range); + foreach ($dates as $date) { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutBudget()->withOpposingAccount()->setTypes( + [TransactionType::WITHDRAWAL] + ); + $set = $collector->getJournals(); + $sum = (string)($set->sum('transaction_amount') ?? '0'); + $journals = $set->count(); + /** @noinspection PhpUndefinedMethodInspection */ + $dateStr = $date['end']->format('Y-m-d'); + $dateName = app('navigation')->periodShow($date['end'], $date['period']); + $entries->push(['string' => $dateStr, 'name' => $dateName, 'count' => $journals, 'sum' => $sum, 'date' => clone $date['end']]); + } + $cache->store($entries); + + return $entries; + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php deleted file mode 100644 index e3a1ce7b0d..0000000000 --- a/app/Http/Controllers/BudgetController.php +++ /dev/null @@ -1,714 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers; - -use Carbon\Carbon; -use Exception; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Http\Requests\BudgetFormRequest; -use FireflyIII\Http\Requests\BudgetIncomeRequest; -use FireflyIII\Models\Budget; -use FireflyIII\Models\BudgetLimit; -use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\CacheProperties; -use Illuminate\Http\JsonResponse; -use Illuminate\Http\RedirectResponse; -use Illuminate\Http\Request; -use Illuminate\Pagination\LengthAwarePaginator; -use Illuminate\Support\Collection; -use Log; -use Preferences; -use View; - -/** - * Class BudgetController. - * - */ -class BudgetController extends Controller -{ - /** @var BudgetRepositoryInterface */ - private $repository; - - /** - * - */ - public function __construct() - { - parent::__construct(); - - View::share('hideBudgets', true); - - $this->middleware( - function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); - app('view')->share('mainTitleIcon', 'fa-tasks'); - $this->repository = app(BudgetRepositoryInterface::class); - - return $next($request); - } - ); - } - - /** - * @param Request $request - * @param BudgetRepositoryInterface $repository - * @param Budget $budget - * - * @return JsonResponse - */ - public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget): JsonResponse - { - $amount = (string)$request->get('amount'); - $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); - $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); - $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount); - $largeDiff = false; - $warnText = ''; - $days = 0; - $daysInMonth = 0; - if (0 === bccomp($amount, '0')) { - $budgetLimit = null; - } - - // if today is between start and end, use the diff in days between end and today (days left) - // otherwise, use diff between start and end. - $today = new Carbon; - Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'), $today->format('Y-m-d'))); - if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); - $daysInMonth = $start->diffInDays($today); - } - if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); - $daysInMonth = $start->diffInDays($end); - } - $days = 0 === $days ? 1 : $days; - $daysInMonth = 0 === $daysInMonth ? 1 : $daysInMonth; - - // calculate left in budget: - $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end); - $currency = app('amount')->getDefaultCurrency(); - $left = app('amount')->formatAnything($currency, bcadd($amount, $spent), true); - $leftPerDay = 'none'; - - // is user has money left, calculate. - if (1 === bccomp(bcadd($amount, $spent), '0')) { - $leftPerDay = app('amount')->formatAnything($currency, bcdiv(bcadd($amount, $spent), (string)$days), true); - } - - - // over or under budgeting, compared to previous budgets? - $average = $this->repository->budgetedPerDay($budget); - // current average per day: - $diff = $start->diffInDays($end); - $current = $amount; - if ($diff > 0) { - $current = bcdiv($amount, (string)$diff); - } - if (bccomp(bcmul('1.1', $average), $current) === -1) { - $largeDiff = true; - $warnText = (string)trans( - 'firefly.over_budget_warn', - [ - 'amount' => app('amount')->formatAnything($currency, $average, false), - 'over_amount' => app('amount')->formatAnything($currency, $current, false), - ] - ); - } - - app('preferences')->mark(); - - return response()->json( - [ - 'left' => $left, - 'name' => $budget->name, - 'limit' => $budgetLimit ? $budgetLimit->id : 0, - 'amount' => $amount, - 'current' => $current, - 'average' => $average, - 'large_diff' => $largeDiff, - 'left_per_day' => $leftPerDay, - 'warn_text' => $warnText, - 'daysInMonth' => $daysInMonth, - - ] - ); - } - - /** - * @param Request $request - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function create(Request $request) - { - // put previous url in session if not redirect from store (not "create another"). - if (true !== session('budgets.create.fromStore')) { - $this->rememberPreviousUri('budgets.create.uri'); - } - $request->session()->forget('budgets.create.fromStore'); - $subTitle = (string)trans('firefly.create_new_budget'); - - return view('budgets.create', compact('subTitle')); - } - - /** - * @param Budget $budget - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function delete(Budget $budget) - { - $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]); - - // put previous url in session - $this->rememberPreviousUri('budgets.delete.uri'); - - return view('budgets.delete', compact('budget', 'subTitle')); - } - - /** - * @param Request $request - * @param Budget $budget - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function destroy(Request $request, Budget $budget) - { - $name = $budget->name; - $this->repository->destroy($budget); - $request->session()->flash('success', (string)trans('firefly.deleted_budget', ['name' => $name])); - app('preferences')->mark(); - - return redirect($this->getPreviousUri('budgets.delete.uri')); - } - - /** - * @param Request $request - * @param Budget $budget - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function edit(Request $request, Budget $budget) - { - $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]); - - // code to handle active-checkboxes - $hasOldInput = null !== $request->old('_token'); - $preFilled = [ - 'active' => $hasOldInput ? (bool)$request->old('active') : $budget->active, - ]; - - // put previous url in session if not redirect from store (not "return_to_edit"). - if (true !== session('budgets.edit.fromUpdate')) { - $this->rememberPreviousUri('budgets.edit.uri'); - } - $request->session()->forget('budgets.edit.fromUpdate'); - $request->session()->flash('preFilled', $preFilled); - - return view('budgets.edit', compact('budget', 'subTitle')); - } - - /** - * @param Request $request - * @param string|null $moment - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function index(Request $request, string $moment = null) - { - $range = Preferences::get('viewRange', '1M')->data; - $start = session('start', new Carbon); - $end = session('end', new Carbon); - $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $days = 0; - $daysInMonth = 0; - - // make date if present: - if (null !== $moment || '' !== (string)$moment) { - try { - $start = new Carbon($moment); - $end = app('navigation')->endOfPeriod($start, $range); - } catch (Exception $e) { - // start and end are already defined. - Log::debug(sprintf('start and end are already defined: %s', $e->getMessage())); - } - } - - // if today is between start and end, use the diff in days between end and today (days left) - // otherwise, use diff between start and end. - $today = new Carbon; - if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); - $daysInMonth = $start->diffInDays($today); - } - if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); - $daysInMonth = $start->diffInDays($end); - } - $days = 0 === $days ? 1 : $days; - $daysInMonth = 0 === $daysInMonth ? 1 : $daysInMonth; - - - $next = clone $end; - $next->addDay(); - $prev = clone $start; - $prev->subDay(); - $prev = app('navigation')->startOfPeriod($prev, $range); - $this->repository->cleanupBudgets(); - $allBudgets = $this->repository->getActiveBudgets(); - $total = $allBudgets->count(); - $budgets = $allBudgets->slice(($page - 1) * $pageSize, $pageSize); - $inactive = $this->repository->getInactiveBudgets(); - $periodStart = $start->formatLocalized($this->monthAndDayFormat); - $periodEnd = $end->formatLocalized($this->monthAndDayFormat); - $budgetInformation = $this->repository->collectBudgetInformation($allBudgets, $start, $end); - $defaultCurrency = app('amount')->getDefaultCurrency(); - $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); - $spent = array_sum(array_column($budgetInformation, 'spent')); - $budgeted = array_sum(array_column($budgetInformation, 'budgeted')); - - // paginate budgets - $budgets = new LengthAwarePaginator($budgets, $total, $pageSize, $page); - $budgets->setPath(route('budgets.index')); - - // select thing for last 12 periods: - $previousLoop = []; - /** @var Carbon $previousDate */ - $previousDate = clone $start; - $count = 0; - while ($count < 12) { - $previousDate->subDay(); - $previousDate = app('navigation')->startOfPeriod($previousDate, $range); - $format = $previousDate->format('Y-m-d'); - $previousLoop[$format] = app('navigation')->periodShow($previousDate, $range); - ++$count; - } - - // select thing for next 12 periods: - $nextLoop = []; - /** @var Carbon $nextDate */ - $nextDate = clone $end; - $nextDate->addDay(); - $count = 0; - - while ($count < 12) { - $format = $nextDate->format('Y-m-d'); - $nextLoop[$format] = app('navigation')->periodShow($nextDate, $range); - $nextDate = app('navigation')->endOfPeriod($nextDate, $range); - ++$count; - $nextDate->addDay(); - } - - // display info - $currentMonth = app('navigation')->periodShow($start, $range); - $nextText = app('navigation')->periodShow($next, $range); - $prevText = app('navigation')->periodShow($prev, $range); - - return view( - 'budgets.index', compact( - 'available', 'currentMonth', 'next', 'nextText', 'prev', 'allBudgets', 'prevText', 'periodStart', 'periodEnd', 'days', 'page', - 'budgetInformation', 'daysInMonth', - 'inactive', 'budgets', 'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end' - ) - ); - } - - - /** - * @param Carbon $start - * @param Carbon $end - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function infoIncome(Carbon $start, Carbon $end) - { - // properties for cache - $cache = new CacheProperties; - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty('info-income'); - - Log::debug(sprintf('infoIncome start is %s', $start->format('Y-m-d'))); - Log::debug(sprintf('infoIncome end is %s', $end->format('Y-m-d'))); - - if ($cache->has()) { - // @codeCoverageIgnoreStart - $result = $cache->get(); - - return view('budgets.info', compact('result')); - // @codeCoverageIgnoreEnd - } - $result = [ - 'available' => '0', - 'earned' => '0', - 'suggested' => '0', - ]; - $currency = app('amount')->getDefaultCurrency(); - $range = Preferences::get('viewRange', '1M')->data; - /** @var Carbon $begin */ - $begin = app('navigation')->subtractPeriod($start, $range, 3); - - Log::debug(sprintf('Range is %s', $range)); - Log::debug(sprintf('infoIncome begin is %s', $begin->format('Y-m-d'))); - - // get average amount available. - $total = '0'; - $count = 0; - $currentStart = clone $begin; - while ($currentStart < $start) { - - Log::debug(sprintf('Loop: currentStart is %s', $currentStart->format('Y-m-d'))); - $currentEnd = app('navigation')->endOfPeriod($currentStart, $range); - $total = bcadd($total, $this->repository->getAvailableBudget($currency, $currentStart, $currentEnd)); - $currentStart = app('navigation')->addPeriod($currentStart, $range, 0); - ++$count; - } - Log::debug('Loop end'); - - if (0 === $count) { - $count = 1; - } - $result['available'] = bcdiv($total, (string)$count); - - // amount earned in this period: - $subDay = clone $end; - $subDay->subDay(); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount(); - $result['earned'] = bcdiv((string)$collector->getJournals()->sum('transaction_amount'), (string)$count); - - // amount spent in period - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount(); - $result['spent'] = bcdiv((string)$collector->getJournals()->sum('transaction_amount'), (string)$count); - // suggestion starts with the amount spent - $result['suggested'] = bcmul($result['spent'], '-1'); - $result['suggested'] = 1 === bccomp($result['suggested'], $result['earned']) ? $result['earned'] : $result['suggested']; - // unless it's more than you earned. So min() of suggested/earned - - $cache->store($result); - - return view('budgets.info', compact('result', 'begin', 'currentEnd')); - } - - /** - * @param Request $request - * @param JournalRepositoryInterface $repository - * @param string|null $moment - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function noBudget(Request $request, JournalRepositoryInterface $repository, string $moment = null) - { - // default values: - $moment = $moment ?? ''; - $range = Preferences::get('viewRange', '1M')->data; - $start = null; - $end = null; - $periods = new Collection; - - // prep for "all" view. - if ('all' === $moment) { - $subTitle = trans('firefly.all_journals_without_budget'); - $first = $repository->firstNull(); - $start = null === $first ? new Carbon : $first->date; - $end = new Carbon; - } - - // prep for "specific date" view. - if ('all' !== $moment && \strlen($moment) > 0) { - $start = new Carbon($moment); - /** @var Carbon $end */ - $end = app('navigation')->endOfPeriod($start, $range); - $subTitle = trans( - 'firefly.without_budget_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - $periods = $this->getPeriodOverview(); - } - - // prep for current period - if ('' === $moment) { - $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); - $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); - $periods = $this->getPeriodOverview(); - $subTitle = trans( - 'firefly.without_budget_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - } - - $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) - ->withoutBudget()->withOpposingAccount(); - $transactions = $collector->getPaginatedJournals(); - $transactions->setPath(route('budgets.no-budget')); - - return view('budgets.no-budget', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); - } - - /** - * @param BudgetIncomeRequest $request - * - * @return RedirectResponse - */ - public function postUpdateIncome(BudgetIncomeRequest $request): RedirectResponse - { - $start = Carbon::createFromFormat('Y-m-d', $request->string('start')); - $end = Carbon::createFromFormat('Y-m-d', $request->string('end')); - $defaultCurrency = app('amount')->getDefaultCurrency(); - $amount = $request->get('amount'); - $page = 0 === $request->integer('page') ? 1 : $request->integer('page'); - $this->repository->cleanupBudgets(); - $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount); - app('preferences')->mark(); - - return redirect(route('budgets.index', [$start->format('Y-m-d')]) . '?page=' . $page); - } - - /** - * @param Request $request - * @param Budget $budget - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function show(Request $request, Budget $budget) - { - /** @var Carbon $start */ - $start = session('first', Carbon::create()->startOfYear()); - $end = new Carbon; - $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $limits = $this->getLimits($budget, $start, $end); - $repetition = null; - - // collector: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); - $transactions = $collector->getPaginatedJournals(); - $transactions->setPath(route('budgets.show', [$budget->id])); - - $subTitle = trans('firefly.all_journals_for_budget', ['name' => $budget->name]); - - return view('budgets.show', compact('limits', 'budget', 'repetition', 'transactions', 'subTitle')); - } - - /** - * @param Request $request - * @param Budget $budget - * @param BudgetLimit $budgetLimit - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - * @throws FireflyException - */ - public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit) - { - if ($budgetLimit->budget->id !== $budget->id) { - throw new FireflyException('This budget limit is not part of this budget.'); - } - - $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $subTitle = trans( - 'firefly.budget_in_period', - [ - 'name' => $budget->name, - 'start' => $budgetLimit->start_date->formatLocalized($this->monthAndDayFormat), - 'end' => $budgetLimit->end_date->formatLocalized($this->monthAndDayFormat), - ] - ); - - // collector: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) - ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); - $transactions = $collector->getPaginatedJournals(); - $transactions->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); - $start = session('first', Carbon::create()->startOfYear()); - $end = new Carbon; - $limits = $this->getLimits($budget, $start, $end); - - return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'transactions', 'subTitle')); - } - - /** - * @param BudgetFormRequest $request - * - * @return \Illuminate\Http\RedirectResponse - */ - public function store(BudgetFormRequest $request): RedirectResponse - { - $data = $request->getBudgetData(); - $budget = $this->repository->store($data); - $this->repository->cleanupBudgets(); - $request->session()->flash('success', (string)trans('firefly.stored_new_budget', ['name' => $budget->name])); - app('preferences')->mark(); - - $redirect = redirect($this->getPreviousUri('budgets.create.uri')); - - if (1 === (int)$request->get('create_another')) { - // @codeCoverageIgnoreStart - $request->session()->put('budgets.create.fromStore', true); - - $redirect = redirect(route('budgets.create'))->withInput(); - // @codeCoverageIgnoreEnd - } - - return $redirect; - } - - - /** - * @param BudgetFormRequest $request - * @param Budget $budget - * - * @return \Illuminate\Http\RedirectResponse - */ - public function update(BudgetFormRequest $request, Budget $budget): RedirectResponse - { - $data = $request->getBudgetData(); - $this->repository->update($budget, $data); - - $request->session()->flash('success', (string)trans('firefly.updated_budget', ['name' => $budget->name])); - $this->repository->cleanupBudgets(); - app('preferences')->mark(); - - $redirect = redirect($this->getPreviousUri('budgets.edit.uri')); - - if (1 === (int)$request->get('return_to_edit')) { - // @codeCoverageIgnoreStart - $request->session()->put('budgets.edit.fromUpdate', true); - - $redirect = redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]); - // @codeCoverageIgnoreEnd - } - - return $redirect; - } - - /** - * @param Request $request - * @param Carbon $start - * @param Carbon $end - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function updateIncome(Request $request, Carbon $start, Carbon $end) - { - $defaultCurrency = app('amount')->getDefaultCurrency(); - $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); - $available = round($available, $defaultCurrency->decimal_places); - $page = (int)$request->get('page'); - - return view('budgets.income', compact('available', 'start', 'end', 'page')); - } - - - /** - * @param Budget $budget - * @param Carbon $start - * @param Carbon $end - * - * @return Collection - */ - private function getLimits(Budget $budget, Carbon $start, Carbon $end): Collection - { - // properties for cache - $cache = new CacheProperties; - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty($budget->id); - $cache->addProperty('get-limits'); - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - - $set = $this->repository->getBudgetLimits($budget, $start, $end); - $limits = new Collection(); - - /** @var BudgetLimit $entry */ - foreach ($set as $entry) { - $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), new Collection(), $entry->start_date, $entry->end_date); - $limits->push($entry); - } - $cache->store($limits); - - return $set; - } - - - /** - * @return Collection - */ - private function getPeriodOverview(): Collection - { - /** @var JournalRepositoryInterface $repository */ - $repository = app(JournalRepositoryInterface::class); - $first = $repository->firstNull(); - $start = null === $first ? new Carbon : $first->date; - $range = Preferences::get('viewRange', '1M')->data; - $start = app('navigation')->startOfPeriod($start, $range); - $end = app('navigation')->endOfX(new Carbon, $range, null); - $entries = new Collection; - $cache = new CacheProperties; - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty('no-budget-period-entries'); - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - $dates = app('navigation')->blockPeriods($start, $end, $range); - foreach ($dates as $date) { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutBudget()->withOpposingAccount()->setTypes( - [TransactionType::WITHDRAWAL] - ); - $set = $collector->getJournals(); - $sum = (string)($set->sum('transaction_amount') ?? '0'); - $journals = $set->count(); - /** @noinspection PhpUndefinedMethodInspection */ - $dateStr = $date['end']->format('Y-m-d'); - $dateName = app('navigation')->periodShow($date['end'], $date['period']); - $entries->push(['string' => $dateStr, 'name' => $dateName, 'count' => $journals, 'sum' => $sum, 'date' => clone $date['end']]); - } - $cache->store($entries); - - return $entries; - } -} diff --git a/routes/web.php b/routes/web.php index a3deac49cd..d971cf5344 100755 --- a/routes/web.php +++ b/routes/web.php @@ -190,22 +190,31 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'budgets', 'as' => 'budgets.'], function () { - Route::get('income/{start_date}/{end_date}', ['uses' => 'BudgetController@updateIncome', 'as' => 'income']); - Route::get('info/{start_date}/{end_date}', ['uses' => 'BudgetController@infoIncome', 'as' => 'income.info']); - Route::get('create', ['uses' => 'BudgetController@create', 'as' => 'create']); - Route::get('edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'edit']); - Route::get('delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'delete']); - Route::get('show/{budget}', ['uses' => 'BudgetController@show', 'as' => 'show']); - Route::get('show/{budget}/{budgetLimit}', ['uses' => 'BudgetController@showByBudgetLimit', 'as' => 'show.limit']); - Route::get('list/no-budget/{moment?}', ['uses' => 'BudgetController@noBudget', 'as' => 'no-budget']); - Route::get('{moment?}', ['uses' => 'BudgetController@index', 'as' => 'index']); + // delete + Route::get('delete/{budget}', ['uses' => 'Budget\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{budget}', ['uses' => 'Budget\DeleteController@destroy', 'as' => 'destroy']); + // create + Route::get('create', ['uses' => 'Budget\CreateController@create', 'as' => 'create']); + Route::post('store', ['uses' => 'Budget\CreateController@store', 'as' => 'store']); - Route::post('income', ['uses' => 'BudgetController@postUpdateIncome', 'as' => 'income.post']); - Route::post('store', ['uses' => 'BudgetController@store', 'as' => 'store']); - Route::post('update/{budget}', ['uses' => 'BudgetController@update', 'as' => 'update']); - Route::post('destroy/{budget}', ['uses' => 'BudgetController@destroy', 'as' => 'destroy']); - Route::post('amount/{budget}', ['uses' => 'BudgetController@amount', 'as' => 'amount']); + // edit + Route::get('edit/{budget}', ['uses' => 'Budget\EditController@edit', 'as' => 'edit']); + Route::post('update/{budget}', ['uses' => 'Budget\EditController@update', 'as' => 'update']); + + // show + Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']); + Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']); + Route::get('list/no-budget/{moment?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']); + + // index + Route::get('{moment?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index']); + + // update budget amount and income amount + Route::get('income/{start_date}/{end_date}', ['uses' => 'Budget\AmountController@updateIncome', 'as' => 'income']); + Route::get('info/{start_date}/{end_date}', ['uses' => 'Budget\AmountController@infoIncome', 'as' => 'income.info']); + Route::post('income', ['uses' => 'Budget\AmountController@postUpdateIncome', 'as' => 'income.post']); + Route::post('amount/{budget}', ['uses' => 'Budget\AmountController@amount', 'as' => 'amount']); } ); diff --git a/tests/Feature/Controllers/Budget/AmountControllerTest.php b/tests/Feature/Controllers/Budget/AmountControllerTest.php new file mode 100644 index 0000000000..e42ea09c1e --- /dev/null +++ b/tests/Feature/Controllers/Budget/AmountControllerTest.php @@ -0,0 +1,220 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Budget; + + +use Carbon\Carbon; +use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; +use Log; +use Tests\TestCase; + +/** + * + * Class AmountControllerTest + */ +class AmountControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testAmount(): void + { + Log::debug('Now in testAmount()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('budgetedPerDay')->andReturn('10'); + + + $data = ['amount' => 200, 'start' => '2017-01-01', 'end' => '2017-01-31']; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testAmountLargeDiff(): void + { + Log::debug('Now in testAmount()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('budgetedPerDay')->andReturn('10'); + + + $data = ['amount' => 20000, 'start' => '2017-01-01', 'end' => '2017-01-31']; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + $response->assertSee('Normally you budget about \u20ac10.00 per day.'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testAmountOutOfRange(): void + { + Log::debug('Now in testAmountOutOfRange()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('budgetedPerDay')->andReturn('10'); + + $today = new Carbon; + $start = $today->startOfMonth()->format('Y-m-d'); + $end = $today->endOfMonth()->format('Y-m-d'); + $data = ['amount' => 200, 'start' => $start, 'end' => $end]; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testAmountZero(): void + { + Log::debug('Now in testAmountZero()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('budgetedPerDay')->andReturn('10'); + + $data = ['amount' => 0, 'start' => '2017-01-01', 'end' => '2017-01-31']; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testInfoIncome(): void + { + Log::debug('Now in testInfoIncome()'); + // mock stuff + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $accountRepos->shouldReceive('setUser'); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('budgets.income.info', ['20170101', '20170131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testInfoIncomeExpanded(string $range): void + { + Log::debug(sprintf('Now in testInfoIncomeExpanded(%s)', $range)); + // mock stuff + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $accountRepos->shouldReceive('setUser'); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.income.info', ['20170301', '20170430'])); + $response->assertStatus(200); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testPostUpdateIncome(): void + { + Log::debug('Now in testPostUpdateIncome()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('setAvailableBudget'); + $repository->shouldReceive('cleanupBudgets'); + + $data = ['amount' => '200', 'start' => '2017-01-01', 'end' => '2017-01-31']; + $this->be($this->user()); + $response = $this->post(route('budgets.income.post'), $data); + $response->assertStatus(302); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\AmountController + */ + public function testUpdateIncome(): void + { + Log::debug('Now in testUpdateIncome()'); + // must be in list + $this->be($this->user()); + + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('getAvailableBudget')->andReturn('1'); + $repository->shouldReceive('cleanupBudgets'); + + $response = $this->get(route('budgets.income', ['2017-01-01', '2017-01-31'])); + $response->assertStatus(200); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Budget/CreateControllerTest.php b/tests/Feature/Controllers/Budget/CreateControllerTest.php new file mode 100644 index 0000000000..3f6c64cd70 --- /dev/null +++ b/tests/Feature/Controllers/Budget/CreateControllerTest.php @@ -0,0 +1,95 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Budget; + + +use FireflyIII\Models\Budget; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Log; +use Tests\TestCase; + +/** + * + * Class CreateControllerTest + */ +class CreateControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\CreateController + */ + public function testCreate(): void + { + Log::debug('Now in testCreate()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('budgets.create')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                            '); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\CreateController + */ + public function testStore(): void + { + Log::debug('Now in testStore()'); + // mock stuff + $budget = factory(Budget::class)->make(); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('findNull')->andReturn($budget); + $repository->shouldReceive('store')->andReturn($budget); + $repository->shouldReceive('cleanupBudgets'); + + $this->session(['budgets.create.uri' => 'http://localhost']); + + $data = [ + 'name' => 'New Budget ' . random_int(1000, 9999), + ]; + $this->be($this->user()); + $response = $this->post(route('budgets.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Budget/DeleteControllerTest.php b/tests/Feature/Controllers/Budget/DeleteControllerTest.php new file mode 100644 index 0000000000..0e763580f0 --- /dev/null +++ b/tests/Feature/Controllers/Budget/DeleteControllerTest.php @@ -0,0 +1,85 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Budget; + +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Log; +use Tests\TestCase; + +/** + * + * Class DeleteControllerTest + */ +class DeleteControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\DeleteController + */ + public function testDelete(): void + { + Log::debug('Now in testDelete()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('budgets.delete', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\DeleteController + */ + public function testDestroy(): void + { + Log::debug('Now in testDestroy()'); + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $repository->shouldReceive('destroy')->andReturn(true); + + $this->session(['budgets.delete.uri' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('budgets.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Budget/EditControllerTest.php b/tests/Feature/Controllers/Budget/EditControllerTest.php new file mode 100644 index 0000000000..dd1d7d7e74 --- /dev/null +++ b/tests/Feature/Controllers/Budget/EditControllerTest.php @@ -0,0 +1,94 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Budget; + +use FireflyIII\Models\Budget; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Log; +use Tests\TestCase; + +/** + * + * Class EditControllerTest + */ +class EditControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\EditController + */ + public function testEdit(): void + { + Log::debug('Now in testEdit()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('budgets.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                '); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\EditController + */ + public function testUpdate(): void + { + Log::debug('Now in testUpdate()'); + // mock stuff + $budget = factory(Budget::class)->make(); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('findNull')->andReturn($budget); + $repository->shouldReceive('update'); + $repository->shouldReceive('cleanupBudgets'); + + $this->session(['budgets.edit.uri' => 'http://localhost']); + + $data = [ + 'name' => 'Updated Budget ' . random_int(1000, 9999), + 'active' => 1, + ]; + $this->be($this->user()); + $response = $this->post(route('budgets.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Budget/IndexControllerTest.php b/tests/Feature/Controllers/Budget/IndexControllerTest.php new file mode 100644 index 0000000000..59bf0e6de9 --- /dev/null +++ b/tests/Feature/Controllers/Budget/IndexControllerTest.php @@ -0,0 +1,237 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Budget; + +use Carbon\Carbon; +use FireflyIII\Models\Budget; +use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; +use Log; +use Tests\TestCase; + +/** + * + * Class IndexControllerTest + */ +class IndexControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\IndexController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndex(string $range): void + { + Log::debug(sprintf('Now in testIndex(%s)', $range)); + // mock stuff + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + + // set budget limit to current month: + $budgetLimit->start_date = Carbon::now()->startOfMonth(); + $budgetLimit->end_date = Carbon::now()->endOfMonth(); + $budgetInfo = [ + $budget->id => [ + 'spent' => '0', + 'budgeted' => '0', + 'currentRep' => false, + ], + ]; + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $repository->shouldReceive('cleanupBudgets'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); + $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\IndexController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndexOutOfRange(string $range): void + { + Log::debug(sprintf('Now in testIndexOutOfRange(%s)', $range)); + // mock stuff + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + $budgetInfo = [ + $budget->id => [ + 'spent' => '0', + 'budgeted' => '0', + 'currentRep' => false, + ], + ]; + + // set budget limit to current month: + $budgetLimit->start_date = Carbon::now()->startOfMonth(); + $budgetLimit->end_date = Carbon::now()->endOfMonth(); + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $repository->shouldReceive('cleanupBudgets'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); + $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); + + $this->be($this->user()); + $today = new Carbon; + $today->startOfMonth(); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.index', [$today->format('Y-m-d')])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\IndexController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndexWithDate(string $range): void + { + Log::debug(sprintf('Now in testIndexWithDate(%s)', $range)); + // mock stuff + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + $budgetInfo = [ + $budget->id => [ + 'spent' => '0', + 'budgeted' => '0', + 'currentRep' => false, + ], + ]; + + // set budget limit to current month: + $budgetLimit->start_date = Carbon::now()->startOfMonth(); + $budgetLimit->end_date = Carbon::now()->endOfMonth(); + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $repository->shouldReceive('cleanupBudgets'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); + $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.index', ['2017-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\IndexController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndexWithInvalidDate(string $range): void + { + Log::debug(sprintf('Now in testIndexWithInvalidDate(%s)', $range)); + // mock stuff + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + + // set budget limit to current month: + $budgetLimit->start_date = Carbon::now()->startOfMonth(); + $budgetLimit->end_date = Carbon::now()->endOfMonth(); + $budgetInfo = [ + $budget->id => [ + 'spent' => '0', + 'budgeted' => '0', + 'currentRep' => false, + ], + ]; + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $repository->shouldReceive('cleanupBudgets'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); + $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.index', ['Hello-there'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                        '); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Budget/ShowControllerTest.php b/tests/Feature/Controllers/Budget/ShowControllerTest.php new file mode 100644 index 0000000000..b0fcfa635e --- /dev/null +++ b/tests/Feature/Controllers/Budget/ShowControllerTest.php @@ -0,0 +1,265 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Budget; + +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; +use Log; +use Tests\TestCase; + +/** + * + * Class ShowControllerTest + */ +class ShowControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + * + */ + public function testNoBudget(string $range): void + { + Log::debug(sprintf('Now in testNoBudget(%s)', $range)); + + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(null); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $date = new Carbon(); + $this->session(['start' => $date, 'end' => clone $date]); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.no-budget')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoBudgetAll(string $range): void + { + Log::debug(sprintf('Now in testNoBudgetAll(%s)', $range)); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(null); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $date = new Carbon(); + $this->session(['start' => $date, 'end' => clone $date]); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.no-budget', ['all'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoBudgetDate(string $range): void + { + Log::debug(sprintf('Now in testNoBudgetDate(%s)', $range)); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(null); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $date = new Carbon(); + $this->session(['start' => $date, 'end' => clone $date]); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.no-budget', ['2016-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                              '); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Budget\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShow(string $range): void + { + Log::debug(sprintf('Now in testShow(%s)', $range)); + // mock stuff + + $budgetLimit = factory(BudgetLimit::class)->make(); + + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setBudget')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $repository = $this->mock(BudgetRepositoryInterface::class); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + + $date = new Carbon(); + $date->subDay(); + $this->session(['first' => $date]); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\ShowController + * @expectedExceptionMessage This budget limit is not part of + */ + public function testShowByBadBudgetLimit(): void + { + Log::debug('Now in testShowByBadBudgetLimit()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('budgets.show.limit', [1, 8])); + $response->assertStatus(500); + } + + /** + * @covers \FireflyIII\Http\Controllers\Budget\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowByBudgetLimit(string $range): void + { + Log::debug(sprintf('Now in testShowByBudgetLimit(%s)', $range)); + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + // mock account repository + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection); + + // mock budget repository + $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('1'); + $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); + + // mock journal collector: + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setBudget')->andReturnSelf(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.show.limit', [1, 1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                  '); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php deleted file mode 100644 index 555ce40fdd..0000000000 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ /dev/null @@ -1,756 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace Tests\Feature\Controllers; - -use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Models\Budget; -use FireflyIII\Models\BudgetLimit; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use Illuminate\Pagination\LengthAwarePaginator; -use Illuminate\Support\Collection; -use Log; -use Tests\TestCase; - -/** - * Class BudgetControllerTest - * - * @SuppressWarnings(PHPMD.TooManyPublicMethods) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - */ -class BudgetControllerTest extends TestCase -{ - /** - * - */ - public function setUp() - { - parent::setUp(); - Log::debug(sprintf('Now in %s.', \get_class($this))); - } - - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::amount - */ - public function testAmount(): void - { - Log::debug('Now in testAmount()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); - $repository->shouldReceive('spentInPeriod')->andReturn('0'); - $repository->shouldReceive('budgetedPerDay')->andReturn('10'); - - - $data = ['amount' => 200, 'start' => '2017-01-01', 'end' => '2017-01-31']; - $this->be($this->user()); - $response = $this->post(route('budgets.amount', [1]), $data); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::amount - */ - public function testAmountLargeDiff(): void - { - Log::debug('Now in testAmount()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); - $repository->shouldReceive('spentInPeriod')->andReturn('0'); - $repository->shouldReceive('budgetedPerDay')->andReturn('10'); - - - $data = ['amount' => 20000, 'start' => '2017-01-01', 'end' => '2017-01-31']; - $this->be($this->user()); - $response = $this->post(route('budgets.amount', [1]), $data); - $response->assertStatus(200); - $response->assertSee('Normally you budget about \u20ac10.00 per day.'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::amount - */ - public function testAmountZero(): void - { - Log::debug('Now in testAmountZero()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); - $repository->shouldReceive('spentInPeriod')->andReturn('0'); - $repository->shouldReceive('budgetedPerDay')->andReturn('10'); - - $data = ['amount' => 0, 'start' => '2017-01-01', 'end' => '2017-01-31']; - $this->be($this->user()); - $response = $this->post(route('budgets.amount', [1]), $data); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::amount - */ - public function testAmountOutOfRange(): void - { - Log::debug('Now in testAmountOutOfRange()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); - $repository->shouldReceive('spentInPeriod')->andReturn('0'); - $repository->shouldReceive('budgetedPerDay')->andReturn('10'); - - $today = new Carbon; - $start = $today->startOfMonth()->format('Y-m-d'); - $end = $today->endOfMonth()->format('Y-m-d'); - $data = ['amount' => 200, 'start' => $start, 'end' => $end]; - $this->be($this->user()); - $response = $this->post(route('budgets.amount', [1]), $data); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::create - */ - public function testCreate(): void - { - Log::debug('Now in testCreate()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('budgets.create')); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::delete - */ - public function testDelete(): void - { - Log::debug('Now in testDelete()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('budgets.delete', [1])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::destroy - */ - public function testDestroy(): void - { - Log::debug('Now in testDestroy()'); - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $repository->shouldReceive('destroy')->andReturn(true); - - $this->session(['budgets.delete.uri' => 'http://localhost']); - $this->be($this->user()); - $response = $this->post(route('budgets.destroy', [1])); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::edit - */ - public function testEdit(): void - { - Log::debug('Now in testEdit()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('budgets.edit', [1])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::index - * @covers \FireflyIII\Http\Controllers\BudgetController::__construct - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIndex(string $range): void - { - Log::debug(sprintf('Now in testIndex(%s)', $range)); - // mock stuff - $budget = factory(Budget::class)->make(); - $budgetLimit = factory(BudgetLimit::class)->make(); - - // set budget limit to current month: - $budgetLimit->start_date = Carbon::now()->startOfMonth(); - $budgetLimit->end_date = Carbon::now()->endOfMonth(); - $budgetInfo = [ - $budget->id => [ - 'spent' => '0', - 'budgeted' => '0', - 'currentRep' => false, - ], - ]; - - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $repository->shouldReceive('cleanupBudgets'); - $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); - $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); - $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.index')); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                          '); - } - - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::index - * @covers \FireflyIII\Http\Controllers\BudgetController::__construct - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIndexWithDate(string $range): void - { - Log::debug(sprintf('Now in testIndexWithDate(%s)', $range)); - // mock stuff - $budget = factory(Budget::class)->make(); - $budgetLimit = factory(BudgetLimit::class)->make(); - $budgetInfo = [ - $budget->id => [ - 'spent' => '0', - 'budgeted' => '0', - 'currentRep' => false, - ], - ]; - - // set budget limit to current month: - $budgetLimit->start_date = Carbon::now()->startOfMonth(); - $budgetLimit->end_date = Carbon::now()->endOfMonth(); - - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $repository->shouldReceive('cleanupBudgets'); - $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); - $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); - $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.index', ['2017-01-01'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                            '); - } - - - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::index - * @covers \FireflyIII\Http\Controllers\BudgetController::__construct - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIndexOutOfRange(string $range): void - { - Log::debug(sprintf('Now in testIndexOutOfRange(%s)', $range)); - // mock stuff - $budget = factory(Budget::class)->make(); - $budgetLimit = factory(BudgetLimit::class)->make(); - $budgetInfo = [ - $budget->id => [ - 'spent' => '0', - 'budgeted' => '0', - 'currentRep' => false, - ], - ]; - - // set budget limit to current month: - $budgetLimit->start_date = Carbon::now()->startOfMonth(); - $budgetLimit->end_date = Carbon::now()->endOfMonth(); - - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $repository->shouldReceive('cleanupBudgets'); - $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); - $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); - $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); - - $this->be($this->user()); - $today = new Carbon; - $today->startOfMonth(); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.index', [$today->format('Y-m-d')])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::index - * @covers \FireflyIII\Http\Controllers\BudgetController::__construct - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIndexWithInvalidDate(string $range): void - { - Log::debug(sprintf('Now in testIndexWithInvalidDate(%s)', $range)); - // mock stuff - $budget = factory(Budget::class)->make(); - $budgetLimit = factory(BudgetLimit::class)->make(); - - // set budget limit to current month: - $budgetLimit->start_date = Carbon::now()->startOfMonth(); - $budgetLimit->end_date = Carbon::now()->endOfMonth(); - $budgetInfo = [ - $budget->id => [ - 'spent' => '0', - 'budgeted' => '0', - 'currentRep' => false, - ], - ]; - - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $repository->shouldReceive('cleanupBudgets'); - $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); - $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); - $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.index', ['Hello-there'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::infoIncome - */ - public function testInfoIncome(): void - { - Log::debug('Now in testInfoIncome()'); - // mock stuff - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $accountRepos->shouldReceive('setUser'); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('budgets.income.info', ['20170101', '20170131'])); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::infoIncome - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testInfoIncomeExpanded(string $range): void - { - Log::debug(sprintf('Now in testInfoIncomeExpanded(%s)', $range)); - // mock stuff - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(BudgetRepositoryInterface::class); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $accountRepos->shouldReceive('setUser'); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.income.info', ['20170301', '20170430'])); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget - * @covers \FireflyIII\Http\Controllers\BudgetController::getPeriodOverview - * @dataProvider dateRangeProvider - * - * @param string $range - * - */ - public function testNoBudget(string $range): void - { - Log::debug(sprintf('Now in testNoBudget(%s)', $range)); - - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(null); - - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('withoutBudget')->andReturnSelf(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $date = new Carbon(); - $this->session(['start' => $date, 'end' => clone $date]); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.no-budget')); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testNoBudgetAll(string $range): void - { - Log::debug(sprintf('Now in testNoBudgetAll(%s)', $range)); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(null); - - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('withoutBudget')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $date = new Carbon(); - $this->session(['start' => $date, 'end' => clone $date]); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.no-budget', ['all'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget - * @covers \FireflyIII\Http\Controllers\BudgetController::getPeriodOverview - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testNoBudgetDate(string $range): void - { - Log::debug(sprintf('Now in testNoBudgetDate(%s)', $range)); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(null); - - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('withoutBudget')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $date = new Carbon(); - $this->session(['start' => $date, 'end' => clone $date]); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.no-budget', ['2016-01-01'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::postUpdateIncome - */ - public function testPostUpdateIncome(): void - { - Log::debug('Now in testPostUpdateIncome()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('setAvailableBudget'); - $repository->shouldReceive('cleanupBudgets'); - - $data = ['amount' => '200', 'start' => '2017-01-01', 'end' => '2017-01-31']; - $this->be($this->user()); - $response = $this->post(route('budgets.income.post'), $data); - $response->assertStatus(302); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::show - * @covers \FireflyIII\Http\Controllers\BudgetController::getLimits - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShow(string $range): void - { - Log::debug(sprintf('Now in testShow(%s)', $range)); - // mock stuff - - $budgetLimit = factory(BudgetLimit::class)->make(); - - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); - - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); - - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $repository = $this->mock(BudgetRepositoryInterface::class); - $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - - $date = new Carbon(); - $date->subDay(); - $this->session(['first' => $date]); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.show', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::showByBudgetLimit - * @expectedExceptionMessage This budget limit is not part of - */ - public function testShowByBadBudgetLimit(): void - { - Log::debug('Now in testShowByBadBudgetLimit()'); - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('budgets.show.limit', [1, 8])); - $response->assertStatus(500); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::showByBudgetLimit() - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowByBudgetLimit(string $range): void - { - Log::debug(sprintf('Now in testShowByBudgetLimit(%s)', $range)); - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - // mock account repository - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection); - - // mock budget repository - $budgetRepository = $this->mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('1'); - $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); - - // mock journal collector: - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('budgets.show.limit', [1, 1])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::store - */ - public function testStore(): void - { - Log::debug('Now in testStore()'); - // mock stuff - $budget = factory(Budget::class)->make(); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('findNull')->andReturn($budget); - $repository->shouldReceive('store')->andReturn($budget); - $repository->shouldReceive('cleanupBudgets'); - - $this->session(['budgets.create.uri' => 'http://localhost']); - - $data = [ - 'name' => 'New Budget ' . random_int(1000, 9999), - ]; - $this->be($this->user()); - $response = $this->post(route('budgets.store'), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::update - */ - public function testUpdate(): void - { - Log::debug('Now in testUpdate()'); - // mock stuff - $budget = factory(Budget::class)->make(); - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('findNull')->andReturn($budget); - $repository->shouldReceive('update'); - $repository->shouldReceive('cleanupBudgets'); - - $this->session(['budgets.edit.uri' => 'http://localhost']); - - $data = [ - 'name' => 'Updated Budget ' . random_int(1000, 9999), - 'active' => 1, - ]; - $this->be($this->user()); - $response = $this->post(route('budgets.update', [1]), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::updateIncome - */ - public function testUpdateIncome(): void - { - Log::debug('Now in testUpdateIncome()'); - // must be in list - $this->be($this->user()); - - // mock stuff - $repository = $this->mock(BudgetRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('getAvailableBudget')->andReturn('1'); - $repository->shouldReceive('cleanupBudgets'); - - $response = $this->get(route('budgets.income', ['2017-01-01', '2017-01-31'])); - $response->assertStatus(200); - } -} diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index 7d5185ddb4..a193001169 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -35,7 +35,7 @@ class FromAccountStartsTest extends TestCase /** * */ - public function setUp() + public function setUp(): void { parent::setUp(); Log::debug(sprintf('Now in %s.', \get_class($this))); @@ -54,17 +54,23 @@ class FromAccountStartsTest extends TestCase $transaction = $journal->transactions()->where('amount', '<', 0)->first(); $account = $transaction->account; $count = $journal->transactions()->count(); + $name = $account->name ?? ''; - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); $loops++; - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + // do this while the following is untrue: + // 1) account is not null, + // 2) journal has two transactions + // 3) loops is less than 30 + // 4) $name is longer than 3 + } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); $trigger = FromAccountStarts::makeFromStrings(substr($account->name, 0, -3), false); $result = $trigger->triggered($journal); $this->assertTrue($result); + exit; } /** @@ -80,13 +86,18 @@ class FromAccountStartsTest extends TestCase $transaction = $journal->transactions()->where('amount', '<', 0)->first(); $account = $transaction->account; $count = $journal->transactions()->count(); + $name = $account->name ?? ''; - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); $loops++; - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + // do this while the following is untrue: + // 1) account is not null, + // 2) journal has two transactions + // 3) loops is less than 30 + // 4) $name is longer than 3 + } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); $trigger = FromAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false); $result = $trigger->triggered($journal); From 89834baf01ff367fd07419eb2c4ad6f7ed59fb43 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 16:08:34 +0200 Subject: [PATCH 08/86] Refactor references to static facades. Improve budget controller code. --- .../Controllers/Account/CreateController.php | 5 +- .../Controllers/Account/IndexController.php | 3 +- .../Account/ReconcileController.php | 3 +- .../Controllers/Account/ShowController.php | 7 +- app/Http/Controllers/Admin/UserController.php | 3 +- .../Controllers/Auth/TwoFactorController.php | 5 +- app/Http/Controllers/BillController.php | 8 +- .../Controllers/Budget/AmountController.php | 76 ++++++--------- .../Controllers/Budget/CreateController.php | 3 +- .../Controllers/Budget/DeleteController.php | 3 +- .../Controllers/Budget/EditController.php | 3 +- .../Controllers/Budget/IndexController.php | 36 +++---- .../Controllers/Budget/ShowController.php | 14 ++- app/Http/Controllers/CategoryController.php | 15 ++- .../Controllers/Chart/AccountController.php | 3 +- .../Controllers/Chart/CategoryController.php | 5 +- app/Http/Controllers/Controller.php | 30 +++--- app/Http/Controllers/CurrencyController.php | 7 +- app/Http/Controllers/ExportController.php | 3 +- app/Http/Controllers/HelpController.php | 3 +- app/Http/Controllers/HomeController.php | 3 +- app/Http/Controllers/JavascriptController.php | 7 +- app/Http/Controllers/Json/IntroController.php | 5 +- app/Http/Controllers/NewUserController.php | 7 +- app/Http/Controllers/PiggyBankController.php | 3 +- .../Controllers/Popup/ReportController.php | 5 +- .../Controllers/PreferencesController.php | 31 +++---- app/Http/Controllers/ProfileController.php | 27 +++--- app/Http/Controllers/ReportController.php | 18 ++-- app/Http/Controllers/TagController.php | 3 +- .../Transaction/SingleController.php | 7 +- .../Transaction/SplitController.php | 3 +- .../Controllers/TransactionController.php | 7 +- app/Http/Middleware/Range.php | 20 ++-- .../RedirectIfTwoFactorAuthenticated.php | 5 +- app/Http/Middleware/Sandstorm.php | 13 ++- app/Repositories/Budget/BudgetRepository.php | 28 +++--- .../Budget/BudgetRepositoryInterface.php | 4 +- .../Http/Controllers/DateCalculation.php | 93 +++++++++++++++++++ public/js/ff/budgets/index.js | 4 +- resources/views/budgets/index.twig | 2 +- 41 files changed, 284 insertions(+), 246 deletions(-) create mode 100644 app/Support/Http/Controllers/DateCalculation.php diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 5627fbe8e4..3d2be2799b 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -29,7 +29,6 @@ use FireflyIII\Http\Requests\AccountFormRequest; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Http\Request; -use Preferences; /** * @@ -103,11 +102,11 @@ class CreateController extends Controller app('preferences')->mark(); // update preferences if necessary: - $frontPage = Preferences::get('frontPageAccounts', [])->data; + $frontPage = app('preferences')->get('frontPageAccounts', [])->data; if (AccountType::ASSET === $account->accountType->type && \count($frontPage) > 0) { // @codeCoverageIgnoreStart $frontPage[] = $account->id; - Preferences::set('frontPageAccounts', $frontPage); + app('preferences')->set('frontPageAccounts', $frontPage); // @codeCoverageIgnoreEnd } // redirect to previous URL. diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 199dfa7924..07ac0643e1 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -29,7 +29,6 @@ use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; -use Preferences; /** * @@ -75,7 +74,7 @@ class IndexController extends Controller $collection = $this->repository->getAccountsByType($types); $total = $collection->count(); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize); unset($collection); /** @var Carbon $start */ diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 09f8101ba6..f0596f4b05 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -38,7 +38,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use Log; -use Preferences; /** * Class ReconcileController. @@ -138,7 +137,7 @@ class ReconcileController extends Controller } // no start or end: - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; // get start and end if (null === $start && null === $end) { diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 250bf023a3..ba1d440ed4 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -36,7 +36,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Preferences; use View; /** @@ -100,7 +99,7 @@ class ShowController extends Controller $today = new Carbon; $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $currencyId = (int)$this->repository->getMetaValue($account, 'currency_id'); $currency = $this->currencyRepos->findNull($currencyId); if (0 === $currencyId) { @@ -146,7 +145,7 @@ class ShowController extends Controller $start = $this->repository->oldestJournalDate($account); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type); $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $currencyId = (int)$this->repository->getMetaValue($account, 'currency_id'); $currency = $this->currencyRepos->findNull($currencyId); if (0 === $currencyId) { @@ -187,7 +186,7 @@ class ShowController extends Controller */ private function getPeriodOverview(Account $account, ?Carbon $date): Collection { - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = $this->repository->oldestJournalDate($account); $end = $date ?? new Carbon; if ($end < $start) { diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 2a09646643..ba8b994ad9 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -29,7 +29,6 @@ use FireflyIII\Http\Requests\UserFormRequest; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Log; -use Preferences; /** * Class UserController. @@ -121,7 +120,7 @@ class UserController extends Controller $users->each( function (User $user) use ($repository) { $list = ['twoFactorAuthEnabled', 'twoFactorAuthSecret']; - $preferences = Preferences::getArrayForUser($user, $list); + $preferences = app('preferences')->getArrayForUser($user, $list); $user->isAdmin = $repository->hasRole($user, 'owner'); $is2faEnabled = 1 === $preferences['twoFactorAuthEnabled']; $has2faSecret = null !== $preferences['twoFactorAuthSecret']; diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 80bc9de73e..dce3d27a93 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -29,7 +29,6 @@ use FireflyIII\User; use Illuminate\Cookie\CookieJar; use Illuminate\Http\Request; use Log; -use Preferences; /** * Class TwoFactorController. @@ -49,12 +48,12 @@ class TwoFactorController extends Controller $user = auth()->user(); // to make sure the validator in the next step gets the secret, we push it in session - $secretPreference = Preferences::get('twoFactorAuthSecret', null); + $secretPreference = app('preferences')->get('twoFactorAuthSecret', null); $secret = null === $secretPreference ? null : $secretPreference->data; $title = (string)trans('firefly.two_factor_title'); // make sure the user has two factor configured: - $has2FA = Preferences::get('twoFactorAuthEnabled', false)->data; + $has2FA = app('preferences')->get('twoFactorAuthEnabled', false)->data; if (null === $has2FA || false === $has2FA) { return redirect(route('index')); } diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index ca7d6a181d..9c29c05fe0 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -36,10 +36,8 @@ use Illuminate\Support\Collection; use League\Fractal\Manager; use League\Fractal\Resource\Item; use League\Fractal\Serializer\DataArraySerializer; -use Preferences; use Symfony\Component\HttpFoundation\ParameterBag; use URL; -use View; /** * Class BillController. @@ -65,7 +63,7 @@ class BillController extends Controller $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize')); $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size')); $uploadSize = min($maxFileSize, $maxPostSize); - View::share('uploadSize', $uploadSize); + app('view')->share('uploadSize', $uploadSize); $this->middleware( function ($request, $next) { @@ -186,7 +184,7 @@ class BillController extends Controller { $start = session('start'); $end = session('end'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $paginator = $this->billRepository->getPaginator($pageSize); $parameters = new ParameterBag(); $parameters->set('start', $start); @@ -269,7 +267,7 @@ class BillController extends Controller $end = session('end'); $year = $start->year; $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $yearAverage = $this->billRepository->getYearAverage($bill, $start); $overallAverage = $this->billRepository->getOverallAverage($bill); $manager = new Manager(); diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index 9274ce18a0..1cc575dd95 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -32,13 +32,12 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Support\CacheProperties; +use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; -use Preferences; -use View; /** * @@ -46,6 +45,7 @@ use View; */ class AmountController extends Controller { + use DateCalculation; /** @var BudgetRepositoryInterface */ private $repository; @@ -56,7 +56,7 @@ class AmountController extends Controller { parent::__construct(); - View::share('hideBudgets', true); + app('view')->share('hideBudgets', true); $this->middleware( function ($request, $next) { @@ -79,53 +79,36 @@ class AmountController extends Controller */ public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget): JsonResponse { - $amount = (string)$request->get('amount'); - $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); - $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); - $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount); - $largeDiff = false; - $warnText = ''; - $days = 0; - $daysInMonth = 0; - if (0 === bccomp($amount, '0')) { - $budgetLimit = null; - } + $amount = (string)$request->get('amount'); + $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); + $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); + $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount); + $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end); + $currency = app('amount')->getDefaultCurrency(); + $left = app('amount')->formatAnything($currency, bcadd($amount, $spent), true); + $largeDiff = false; + $warnText = ''; + $leftPerDay = null; + $periodLength = $start->diffInDays($end); + $dayDifference = $this->getDayDifference($start, $end); - // if today is between start and end, use the diff in days between end and today (days left) - // otherwise, use diff between start and end. - $today = new Carbon; - Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'), $today->format('Y-m-d'))); - if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); - $daysInMonth = $start->diffInDays($today); - } - if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); - $daysInMonth = $start->diffInDays($end); - } - $days = 0 === $days ? 1 : $days; - $daysInMonth = 0 === $daysInMonth ? 1 : $daysInMonth; - // calculate left in budget: - $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end); - $currency = app('amount')->getDefaultCurrency(); - $left = app('amount')->formatAnything($currency, bcadd($amount, $spent), true); - $leftPerDay = 'none'; - - // is user has money left, calculate. + /* + * If the user budgets ANY amount per day for this budget (anything but zero) + * Firefly III calculates how much he could spend per day. + */ if (1 === bccomp(bcadd($amount, $spent), '0')) { - $leftPerDay = app('amount')->formatAnything($currency, bcdiv(bcadd($amount, $spent), (string)$days), true); + $leftPerDay = app('amount')->formatAnything($currency, bcdiv(bcadd($amount, $spent), (string)$dayDifference), true); } - - // over or under budgeting, compared to previous budgets? + /* + * Get the average amount of money the user budgets for this budget. + * And calculate the same for the current amount. + * + * If the difference is very large, give the user a notification. + */ $average = $this->repository->budgetedPerDay($budget); - // current average per day: - $diff = $start->diffInDays($end); - $current = $amount; - if ($diff > 0) { - $current = bcdiv($amount, (string)$diff); - } + $current = bcdiv($amount, (string)$periodLength); if (bccomp(bcmul('1.1', $average), $current) === -1) { $largeDiff = true; $warnText = (string)trans( @@ -150,8 +133,6 @@ class AmountController extends Controller 'large_diff' => $largeDiff, 'left_per_day' => $leftPerDay, 'warn_text' => $warnText, - 'daysInMonth' => $daysInMonth, - ] ); } @@ -187,7 +168,7 @@ class AmountController extends Controller 'suggested' => '0', ]; $currency = app('amount')->getDefaultCurrency(); - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; /** @var Carbon $begin */ $begin = app('navigation')->subtractPeriod($start, $range, 3); @@ -272,5 +253,4 @@ class AmountController extends Controller return view('budgets.income', compact('available', 'start', 'end', 'page')); } - } \ No newline at end of file diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 6fda49b305..cbcc7c4d8b 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -29,7 +29,6 @@ use FireflyIII\Http\Requests\BudgetFormRequest; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use View; /** * Class CreateController @@ -46,7 +45,7 @@ class CreateController extends Controller { parent::__construct(); - View::share('hideBudgets', true); + app('view')->share('hideBudgets', true); $this->middleware( function ($request, $next) { diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index 0acdbda200..d1c0e9ab25 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -28,7 +28,6 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Http\Request; -use View; /** * @@ -46,7 +45,7 @@ class DeleteController extends Controller { parent::__construct(); - View::share('hideBudgets', true); + app('view')->share('hideBudgets', true); $this->middleware( function ($request, $next) { diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index f8e405f670..8ccb72f71b 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -30,7 +30,6 @@ use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use View; /** * @@ -48,7 +47,7 @@ class EditController extends Controller { parent::__construct(); - View::share('hideBudgets', true); + app('view')->share('hideBudgets', true); $this->middleware( function ($request, $next) { diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index b53187eeaa..f1db2e95a4 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -28,11 +28,10 @@ use Carbon\Carbon; use Exception; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Log; -use Preferences; -use View; /** * @@ -41,6 +40,7 @@ use View; class IndexController extends Controller { + use DateCalculation; /** @var BudgetRepositoryInterface */ private $repository; @@ -51,7 +51,7 @@ class IndexController extends Controller { parent::__construct(); - View::share('hideBudgets', true); + app('view')->share('hideBudgets', true); $this->middleware( function ($request, $next) { @@ -73,13 +73,13 @@ class IndexController extends Controller */ public function index(Request $request, string $moment = null) { - $range = Preferences::get('viewRange', '1M')->data; - $start = session('start', new Carbon); - $end = session('end', new Carbon); - $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $days = 0; - $daysInMonth = 0; + $range = app('preferences')->get('viewRange', '1M')->data; + $start = session('start', new Carbon); + $end = session('end', new Carbon); + $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $days = 0; + // make date if present: if (null !== $moment || '' !== (string)$moment) { @@ -96,15 +96,12 @@ class IndexController extends Controller // otherwise, use diff between start and end. $today = new Carbon; if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); - $daysInMonth = $start->diffInDays($today); + $days = $end->diffInDays($today); } if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); - $daysInMonth = $start->diffInDays($end); + $days = $start->diffInDays($end); } - $days = 0 === $days ? 1 : $days; - $daysInMonth = 0 === $daysInMonth ? 1 : $daysInMonth; + $days = 0 === $days ? 1 : $days; $next = clone $end; @@ -113,6 +110,7 @@ class IndexController extends Controller $prev->subDay(); $prev = app('navigation')->startOfPeriod($prev, $range); $this->repository->cleanupBudgets(); + $daysPassed = $this->getDaysPassedInPeriod($start, $end); $allBudgets = $this->repository->getActiveBudgets(); $total = $allBudgets->count(); $budgets = $allBudgets->slice(($page - 1) * $pageSize, $pageSize); @@ -165,10 +163,14 @@ class IndexController extends Controller return view( 'budgets.index', compact( 'available', 'currentMonth', 'next', 'nextText', 'prev', 'allBudgets', 'prevText', 'periodStart', 'periodEnd', 'days', 'page', - 'budgetInformation', 'daysInMonth', + 'budgetInformation', 'daysPassed', 'inactive', 'budgets', 'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end' ) ); } + + + + } \ No newline at end of file diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index aa97660c37..168c3c9ebc 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -36,8 +36,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Preferences; -use View; /** * @@ -56,7 +54,7 @@ class ShowController extends Controller { parent::__construct(); - View::share('hideBudgets', true); + app('view')->share('hideBudgets', true); $this->middleware( function ($request, $next) { @@ -80,7 +78,7 @@ class ShowController extends Controller { // default values: $moment = $moment ?? ''; - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = null; $end = null; $periods = new Collection; @@ -117,7 +115,7 @@ class ShowController extends Controller } $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); @@ -141,7 +139,7 @@ class ShowController extends Controller $start = session('first', Carbon::create()->startOfYear()); $end = new Carbon; $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $limits = $this->getLimits($budget, $start, $end); $repetition = null; @@ -172,7 +170,7 @@ class ShowController extends Controller } $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $subTitle = trans( 'firefly.budget_in_period', [ @@ -239,7 +237,7 @@ class ShowController extends Controller $repository = app(JournalRepositoryInterface::class); $first = $repository->firstNull(); $start = null === $first ? new Carbon : $first->date; - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = app('navigation')->startOfPeriod($start, $range); $end = app('navigation')->endOfX(new Carbon, $range, null); $entries = new Collection; diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index d16cc0f81b..184a04e6bd 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -37,7 +37,6 @@ use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Log; -use Preferences; /** * Class CategoryController. @@ -146,7 +145,7 @@ class CategoryController extends Controller public function index(Request $request) { $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $collection = $this->repository->getCategories(); $total = $collection->count(); $collection = $collection->slice(($page - 1) * $pageSize, $pageSize); @@ -174,12 +173,12 @@ class CategoryController extends Controller { // default values: $moment = $moment ?? ''; - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = null; $end = null; $periods = new Collection; $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; Log::debug('Start of noCategory()'); // prep for "all" view. if ('all' === $moment) { @@ -242,8 +241,8 @@ class CategoryController extends Controller $subTitle = $category->name; $subTitleIcon = 'fa-bar-chart'; $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $range = Preferences::get('viewRange', '1M')->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = null; $end = null; $periods = new Collection; @@ -362,7 +361,7 @@ class CategoryController extends Controller private function getNoCategoryPeriodOverview(Carbon $theDate): Collection { Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d'))); - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $first = $this->journalRepos->firstNull(); $start = null === $first ? new Carbon : $first->date; $end = $theDate ?? new Carbon; @@ -447,7 +446,7 @@ class CategoryController extends Controller */ private function getPeriodOverview(Category $category, Carbon $date): Collection { - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $first = $this->journalRepos->firstNull(); $start = null === $first ? new Carbon : $first->date; $end = $date ?? new Carbon; diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 3ebf46d7bc..fc1af1ff91 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -39,7 +39,6 @@ use FireflyIII\Support\CacheProperties; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; use Log; -use Preferences; /** checked * Class AccountController. @@ -231,7 +230,7 @@ class AccountController extends Controller $end = clone session('end', Carbon::now()->endOfMonth()); $defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray(); Log::debug('Default set is ', $defaultSet); - $frontPage = Preferences::get('frontPageAccounts', $defaultSet); + $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); Log::debug('Frontpage preference set is ', $frontPage->data); diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 3d016639c1..f7b020d66c 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -32,7 +32,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; -use Preferences; /** * Class CategoryController. @@ -77,7 +76,7 @@ class CategoryController extends Controller $start = new Carbon; // @codeCoverageIgnore } - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = app('navigation')->startOfPeriod($start, $range); $end = new Carbon; $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); @@ -283,7 +282,7 @@ class CategoryController extends Controller */ public function specificPeriod(Category $category, Carbon $date): JsonResponse { - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = app('navigation')->startOfPeriod($date, $range); $end = app('navigation')->endOfPeriod($date, $range); $data = $this->makePeriodChart($category, $start, $end); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 4cfd23cd0f..4107419f72 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -27,7 +27,6 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; -use FireflyIII\Support\Facades\Preferences; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; @@ -35,7 +34,6 @@ use Illuminate\Routing\Controller as BaseController; use Log; use Route; use URL; -use View; /** * Class Controller. @@ -59,17 +57,17 @@ class Controller extends BaseController public function __construct() { // for transaction lists: - View::share('hideBudgets', false); - View::share('hideCategories', false); - View::share('hideBills', false); - View::share('hideTags', false); + app('view')->share('hideBudgets', false); + app('view')->share('hideCategories', false); + app('view')->share('hideBills', false); + app('view')->share('hideTags', false); // is site a demo site? $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; - View::share('IS_DEMO_SITE', $isDemoSite); - View::share('DEMO_USERNAME', env('DEMO_USERNAME', '')); - View::share('DEMO_PASSWORD', env('DEMO_PASSWORD', '')); - View::share('FF_VERSION', config('firefly.version')); + app('view')->share('IS_DEMO_SITE', $isDemoSite); + app('view')->share('DEMO_USERNAME', env('DEMO_USERNAME', '')); + app('view')->share('DEMO_PASSWORD', env('DEMO_PASSWORD', '')); + app('view')->share('FF_VERSION', config('firefly.version')); $this->middleware( function ($request, $next) { @@ -93,17 +91,17 @@ class Controller extends BaseController // either must be array and either must be > 0 if ((\is_array($intro) || \is_array($specialIntro)) && (\count($intro) > 0 || \count($specialIntro) > 0)) { - $shownDemo = Preferences::get($key, false)->data; + $shownDemo = app('preferences')->get($key, false)->data; Log::debug(sprintf('Check if user has already seen intro with key "%s". Result is %d', $key, $shownDemo)); } // share language - $language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data; + $language = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; - View::share('language', $language); - View::share('shownDemo', $shownDemo); - View::share('current_route_name', $page); - View::share('original_route_name', Route::currentRouteName()); + app('view')->share('language', $language); + app('view')->share('shownDemo', $shownDemo); + app('view')->share('current_route_name', $page); + app('view')->share('original_route_name', Route::currentRouteName()); } return $next($request); diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 7458016608..59051c9226 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -31,7 +31,6 @@ use FireflyIII\User; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Log; -use Preferences; use View; /** @@ -100,7 +99,7 @@ class CurrencyController extends Controller */ public function defaultCurrency(Request $request, TransactionCurrency $currency) { - Preferences::set('currencyPreference', $currency->code); + app('preferences')->set('currencyPreference', $currency->code); app('preferences')->mark(); $request->session()->flash('success', trans('firefly.new_default_currency', ['name' => $currency->name])); @@ -215,7 +214,7 @@ class CurrencyController extends Controller /** @var User $user */ $user = auth()->user(); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $collection = $this->repository->get(); $total = $collection->count(); $collection = $collection->sortBy( @@ -227,7 +226,7 @@ class CurrencyController extends Controller $currencies = new LengthAwarePaginator($collection, $total, $pageSize, $page); $currencies->setPath(route('currencies.index')); - $defaultCurrency = $this->repository->getCurrencyByPreference(Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR'))); + $defaultCurrency = $this->repository->getCurrencyByPreference(app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR'))); $isOwner = true; if (!$this->userRepository->hasRole($user, 'owner')) { $request->session()->flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 34102365bb..aa7f320b10 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -32,7 +32,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; use Illuminate\Http\JsonResponse; use Illuminate\Http\Response as LaravelResponse; -use Preferences; /** * Class ExportController. @@ -118,7 +117,7 @@ class ExportController extends Controller // does the user have shared accounts? $formats = array_keys(config('firefly.export_formats')); - $defaultFormat = Preferences::get('export_format', config('firefly.default_export_format'))->data; + $defaultFormat = app('preferences')->get('export_format', config('firefly.default_export_format'))->data; $first = session('first')->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d'); diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index b472f8ea9d..3ef04f6969 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -25,7 +25,6 @@ namespace FireflyIII\Http\Controllers; use FireflyIII\Helpers\Help\HelpInterface; use Illuminate\Http\JsonResponse; use Log; -use Preferences; /** * Class HelpController. @@ -58,7 +57,7 @@ class HelpController extends Controller */ public function show(string $route): JsonResponse { - $language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data; + $language = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; $html = $this->getHelpText($route, $language); return response()->json(['html' => $html]); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 2c67ce8520..ef151d2c02 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -36,7 +36,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; -use Preferences; use View; /** @@ -111,7 +110,7 @@ class HomeController extends Controller } $subTitle = trans('firefly.welcomeBack'); $transactions = []; - $frontPage = Preferences::get( + $frontPage = app('preferences')->get( 'frontPageAccounts', $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray() ); diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index cc63fdab0c..28568aedd1 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -31,7 +31,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Http\Response; use Log; -use Preferences; /** * Class JavascriptController. @@ -47,7 +46,7 @@ class JavascriptController extends Controller public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response { $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $preference = Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR')); + $preference = app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR')); /** @noinspection NullPointerExceptionInspection */ $default = $currencyRepository->findByCodeNull($preference->data); @@ -114,7 +113,7 @@ class JavascriptController extends Controller $accounting = app('amount')->getJsConfig($localeconv); $localeconv = localeconv(); $localeconv['frac_digits'] = $currency->decimal_places; - $pref = Preferences::get('language', config('firefly.default_language', 'en_US')); + $pref = app('preferences')->get('language', config('firefly.default_language', 'en_US')); /** @noinspection NullPointerExceptionInspection */ $lang = $pref->data; $dateRange = $this->getDateRangeConfig(); @@ -140,7 +139,7 @@ class JavascriptController extends Controller */ private function getDateRangeConfig(): array { - $viewRange = Preferences::get('viewRange', '1M')->data; + $viewRange = app('preferences')->get('viewRange', '1M')->data; $start = session('start'); $end = session('end'); $first = session('first'); diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 31ab70d523..70870db0d5 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -22,7 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; -use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; use Log; @@ -104,7 +103,7 @@ class IntroController $key .= '_' . $specialPage; } Log::debug(sprintf('Going to mark the following route as NOT done: %s with special "%s" (%s)', $route, $specialPage, $key)); - Preferences::set($key, false); + app('preferences')->set($key, false); return response()->json(['message' => trans('firefly.intro_boxes_after_refresh')]); } @@ -123,7 +122,7 @@ class IntroController $key .= '_' . $specialPage; } Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key)); - Preferences::set($key, true); + app('preferences')->set($key, true); return response()->json(['result' => sprintf('Reported demo watched for route "%s".', $route)]); } diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 2ef441b1c2..a6c8ac24bc 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -27,7 +27,6 @@ use FireflyIII\Http\Requests\NewUserFormRequest; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use Preferences; use View; /** @@ -89,7 +88,7 @@ class NewUserController extends Controller } // set language preference: - Preferences::set('language', $language); + app('preferences')->set('language', $language); // Store currency preference from input: $currency = $currencyRepository->findNull((int)$request->input('amount_currency_id_bank_balance')); @@ -108,7 +107,7 @@ class NewUserController extends Controller $this->createCashWalletAccount($currency, $language); // store currency preference: - Preferences::set('currencyPreference', $currency->code); + app('preferences')->set('currencyPreference', $currency->code); app('preferences')->mark(); // set default optional fields: @@ -123,7 +122,7 @@ class NewUserController extends Controller 'notes' => true, 'attachments' => true, ]; - Preferences::set('transaction_journal_optional_fields', $visibleFields); + app('preferences')->set('transaction_journal_optional_fields', $visibleFields); session()->flash('success', (string)trans('firefly.stored_new_accounts_new_user')); app('preferences')->mark(); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 75365e9108..8d03d667e1 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -36,7 +36,6 @@ use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Log; -use Preferences; use Symfony\Component\HttpFoundation\ParameterBag; /** @@ -220,7 +219,7 @@ class PiggyBankController extends Controller $collection = $this->piggyRepos->getPiggyBanks(); $total = $collection->count(); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $accounts = []; /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 3473cf34c0..e93e37755d 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -35,7 +35,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Routing\Route; use InvalidArgumentException; -use View; /** * Class ReportController. @@ -89,8 +88,8 @@ class ReportController extends Controller $attributes = $request->get('attributes') ?? []; $attributes = $this->parseAttributes($attributes); - View::share('start', $attributes['startDate']); - View::share('end', $attributes['endDate']); + app('view')->share('start', $attributes['startDate']); + app('view')->share('end', $attributes['endDate']); switch ($attributes['location']) { default: diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 7a2f461bfe..92bdfb547e 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -25,7 +25,6 @@ namespace FireflyIII\Http\Controllers; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Http\Request; -use Preferences; /** * Class PreferencesController. @@ -57,16 +56,16 @@ class PreferencesController extends Controller public function index(AccountRepositoryInterface $repository) { $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $viewRangePref = Preferences::get('viewRange', '1M'); + $viewRangePref = app('preferences')->get('viewRange', '1M'); /** @noinspection NullPointerExceptionInspection */ $viewRange = $viewRangePref->data; - $frontPageAccounts = Preferences::get('frontPageAccounts', []); - $language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data; - $listPageSize = Preferences::get('listPageSize', 50)->data; - $customFiscalYear = Preferences::get('customFiscalYear', 0)->data; - $fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data; + $frontPageAccounts = app('preferences')->get('frontPageAccounts', []); + $language = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; + $listPageSize = app('preferences')->get('listPageSize', 50)->data; + $customFiscalYear = app('preferences')->get('customFiscalYear', 0)->data; + $fiscalYearStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data; $fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr; - $tjOptionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; + $tjOptionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; return view( 'preferences.index', @@ -96,11 +95,11 @@ class PreferencesController extends Controller foreach ($request->get('frontPageAccounts') as $id) { $frontPageAccounts[] = (int)$id; } - Preferences::set('frontPageAccounts', $frontPageAccounts); + app('preferences')->set('frontPageAccounts', $frontPageAccounts); } // view range: - Preferences::set('viewRange', $request->get('viewRange')); + app('preferences')->set('viewRange', $request->get('viewRange')); // forget session values: session()->forget('start'); session()->forget('end'); @@ -109,20 +108,20 @@ class PreferencesController extends Controller // custom fiscal year $customFiscalYear = 1 === (int)$request->get('customFiscalYear'); $fiscalYearStart = date('m-d', strtotime((string)$request->get('fiscalYearStart'))); - Preferences::set('customFiscalYear', $customFiscalYear); - Preferences::set('fiscalYearStart', $fiscalYearStart); + app('preferences')->set('customFiscalYear', $customFiscalYear); + app('preferences')->set('fiscalYearStart', $fiscalYearStart); // save page size: - Preferences::set('listPageSize', 50); + app('preferences')->set('listPageSize', 50); $listPageSize = (int)$request->get('listPageSize'); if ($listPageSize > 0 && $listPageSize < 1337) { - Preferences::set('listPageSize', $listPageSize); + app('preferences')->set('listPageSize', $listPageSize); } // language: $lang = $request->get('language'); if (array_key_exists($lang, config('firefly.languages'))) { - Preferences::set('language', $lang); + app('preferences')->set('language', $lang); } // optional fields for transactions: @@ -138,7 +137,7 @@ class PreferencesController extends Controller 'notes' => isset($setOptions['notes']), 'attachments' => isset($setOptions['attachments']), ]; - Preferences::set('transaction_journal_optional_fields', $optionalTj); + app('preferences')->set('transaction_journal_optional_fields', $optionalTj); session()->flash('success', (string)trans('firefly.saved_preferences')); app('preferences')->mark(); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index b77631646e..a1e33f6855 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -44,7 +44,6 @@ use Laravel\Passport\ClientRepository; use Laravel\Passport\Passport; use Log; use phpseclib\Crypt\RSA; -use Preferences; /** * Class ProfileController. @@ -125,7 +124,7 @@ class ProfileController extends Controller { // find preference with this token value. /** @var Collection $set */ - $set = Preferences::findByName('email_change_confirm_token'); + $set = app('preferences')->findByName('email_change_confirm_token'); $user = null; Log::debug(sprintf('Found %d preferences', $set->count())); /** @var Preference $preference */ @@ -166,8 +165,8 @@ class ProfileController extends Controller */ public function deleteCode() { - Preferences::delete('twoFactorAuthEnabled'); - Preferences::delete('twoFactorAuthSecret'); + app('preferences')->delete('twoFactorAuthEnabled'); + app('preferences')->delete('twoFactorAuthSecret'); session()->flash('success', (string)trans('firefly.pref_two_factor_auth_disabled')); session()->flash('info', (string)trans('firefly.pref_two_factor_auth_remove_it')); @@ -186,7 +185,7 @@ class ProfileController extends Controller if ($repository->hasRole($user, 'demo')) { return redirect(route('profile.index')); } - $hasTwoFactorAuthSecret = (null !== Preferences::get('twoFactorAuthSecret')); + $hasTwoFactorAuthSecret = (null !== app('preferences')->get('twoFactorAuthSecret')); // if we don't have a valid secret yet, redirect to the code page to get one. if (!$hasTwoFactorAuthSecret) { @@ -196,7 +195,7 @@ class ProfileController extends Controller // If FF3 already has a secret, just set the two factor auth enabled to 1, // and let the user continue with the existing secret. - Preferences::set('twoFactorAuthEnabled', 1); + app('preferences')->set('twoFactorAuthEnabled', 1); return redirect(route('profile.index')); } @@ -220,15 +219,15 @@ class ProfileController extends Controller } $subTitle = auth()->user()->email; $userId = auth()->user()->id; - $enabled2FA = 1 === (int)Preferences::get('twoFactorAuthEnabled', 0)->data; + $enabled2FA = 1 === (int)app('preferences')->get('twoFactorAuthEnabled', 0)->data; /** @var User $user */ $user = auth()->user(); // get access token or create one. - $accessToken = Preferences::get('access_token', null); + $accessToken = app('preferences')->get('access_token', null); if (null === $accessToken) { $token = $user->generateAccessToken(); - $accessToken = Preferences::set('access_token', $token); + $accessToken = app('preferences')->set('access_token', $token); } return view('profile.index', compact('subTitle', 'userId', 'accessToken', 'enabled2FA')); @@ -312,8 +311,8 @@ class ProfileController extends Controller */ public function postCode(TokenFormRequest $request) { - Preferences::set('twoFactorAuthEnabled', 1); - Preferences::set('twoFactorAuthSecret', session()->get('two-factor-secret')); + app('preferences')->set('twoFactorAuthEnabled', 1); + app('preferences')->set('twoFactorAuthSecret', session()->get('two-factor-secret')); session()->flash('success', (string)trans('firefly.saved_preferences')); app('preferences')->mark(); @@ -353,7 +352,7 @@ class ProfileController extends Controller /** @var User $user */ $user = auth()->user(); $token = $user->generateAccessToken(); - Preferences::set('access_token', $token); + app('preferences')->set('access_token', $token); session()->flash('success', (string)trans('firefly.token_regenerated')); return redirect(route('profile.index')); @@ -371,7 +370,7 @@ class ProfileController extends Controller public function undoEmailChange(UserRepositoryInterface $repository, string $token, string $hash) { // find preference with this token value. - $set = Preferences::findByName('email_change_undo_token'); + $set = app('preferences')->findByName('email_change_undo_token'); $user = null; /** @var Preference $preference */ foreach ($set as $preference) { @@ -385,7 +384,7 @@ class ProfileController extends Controller // found user. // which email address to return to? - $set = Preferences::beginsWith($user, 'previous_email_'); + $set = app('preferences')->beginsWith($user, 'previous_email_'); /** @var string $match */ $match = null; foreach ($set as $entry) { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index a912daf83b..169e17ff84 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -37,8 +37,6 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Collection; use Log; -use Preferences; -use View; /** * Class ReportController. @@ -62,7 +60,7 @@ class ReportController extends Controller function ($request, $next) { app('view')->share('title', trans('firefly.reports')); app('view')->share('mainTitleIcon', 'fa-line-chart'); - View::share('subTitleIcon', 'fa-calendar'); + app('view')->share('subTitleIcon', 'fa-calendar'); $this->helper = app(ReportHelperInterface::class); $this->repository = app(BudgetRepositoryInterface::class); @@ -91,7 +89,7 @@ class ReportController extends Controller } $this->repository->cleanupBudgets(); - View::share( + app('view')->share( 'subTitle', trans( 'firefly.report_account', ['start' => $start->formatLocalized($this->monthFormat), 'end' => $end->formatLocalized($this->monthFormat)] @@ -124,7 +122,7 @@ class ReportController extends Controller } $this->repository->cleanupBudgets(); - View::share( + app('view')->share( 'subTitle', trans( 'firefly.report_audit', @@ -161,7 +159,7 @@ class ReportController extends Controller } $this->repository->cleanupBudgets(); - View::share( + app('view')->share( 'subTitle', trans( 'firefly.report_budget', @@ -199,7 +197,7 @@ class ReportController extends Controller } $this->repository->cleanupBudgets(); - View::share( + app('view')->share( 'subTitle', trans( 'firefly.report_category', @@ -237,7 +235,7 @@ class ReportController extends Controller } $this->repository->cleanupBudgets(); - View::share( + app('view')->share( 'subTitle', trans( 'firefly.report_default', @@ -264,7 +262,7 @@ class ReportController extends Controller /** @var Carbon $start */ $start = clone session('first'); $months = $this->helper->listOfMonths($start); - $customFiscalYear = Preferences::get('customFiscalYear', 0)->data; + $customFiscalYear = app('preferences')->get('customFiscalYear', 0)->data; $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); $accountList = implode(',', $accounts->pluck('id')->toArray()); $this->repository->cleanupBudgets(); @@ -395,7 +393,7 @@ class ReportController extends Controller } $this->repository->cleanupBudgets(); - View::share( + app('view')->share( 'subTitle', trans( 'firefly.report_tag', diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 9027432d6e..529a26d4c1 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -33,7 +33,6 @@ use FireflyIII\Support\CacheProperties; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use View; /** * Class TagController. @@ -49,7 +48,7 @@ class TagController extends Controller public function __construct() { parent::__construct(); - View::share('hideTags', true); + app('view')->share('hideTags', true); $this->redirectUri = route('tags.index'); $this->middleware( diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 261119e15b..6ebe79d23d 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -38,7 +38,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Log; -use Preferences; use View; /** @@ -63,7 +62,7 @@ class SingleController extends Controller $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize')); $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size')); $uploadSize = min($maxFileSize, $maxPostSize); - View::share('uploadSize', $uploadSize); + app('view')->share('uploadSize', $uploadSize); // some useful repositories: $this->middleware( @@ -148,7 +147,7 @@ class SingleController extends Controller $preFilled = session()->has('preFilled') ? session('preFilled') : []; $subTitle = trans('form.add_new_' . $what); $subTitleIcon = 'fa-plus'; - $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; + $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; $source = (int)$request->get('source'); // grab old currency ID from old data: @@ -259,7 +258,7 @@ class SingleController extends Controller // journal related code $sourceAccounts = $repository->getJournalSourceAccounts($journal); $destinationAccounts = $repository->getJournalDestinationAccounts($journal); - $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; + $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; $pTransaction = $repository->getFirstPosTransaction($journal); $foreignCurrency = $pTransaction->foreignCurrency ?? $pTransaction->transactionCurrency; $preFilled = [ diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 43d8056620..42772721e4 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -38,7 +38,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Transformers\TransactionTransformer; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Preferences; use Symfony\Component\HttpFoundation\ParameterBag; use View; @@ -102,7 +101,7 @@ class SplitController extends Controller $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); // other fields - $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; + $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; $preFilled = $this->arrayFromJournal($request, $journal); // put previous url in session if not redirect from store (not "return_to_edit"). diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 0a59b0c28c..7c18e342a3 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -40,7 +40,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; -use Preferences; use Symfony\Component\HttpFoundation\ParameterBag; use View; @@ -85,7 +84,7 @@ class TransactionController extends Controller $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what); $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; if (null === $start) { $start = session('start'); $end = session('end'); @@ -130,7 +129,7 @@ class TransactionController extends Controller $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what); $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $path = route('transactions.index.all', [$what]); $first = $this->repository->firstNull(); $start = null === $first ? new Carbon : $first->date; @@ -245,7 +244,7 @@ class TransactionController extends Controller */ private function getPeriodOverview(string $what, Carbon $date): Collection { - $range = Preferences::get('viewRange', '1M')->data; + $range = app('preferences')->get('viewRange', '1M')->data; $first = $this->repository->firstNull(); $start = new Carbon; $start->subYear(); diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index b51d3ec59b..868d69a767 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -27,9 +27,7 @@ use Carbon\Carbon; use Closure; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Http\Request; -use Preferences; use Session; -use View; /** * Class SessionFilter. @@ -68,8 +66,8 @@ class Range */ private function configureList(): void { - $pref = Preferences::get('list-length', config('firefly.list_length', 10))->data; - View::share('listLength', $pref); + $pref = app('preferences')->get('list-length', config('firefly.list_length', 10))->data; + app('view')->share('listLength', $pref); } /** @@ -77,7 +75,7 @@ class Range */ private function configureView(): void { - $pref = Preferences::get('language', config('firefly.default_language', 'en_US')); + $pref = app('preferences')->get('language', config('firefly.default_language', 'en_US')); /** @noinspection NullPointerExceptionInspection */ $lang = $pref->data; App::setLocale($lang); @@ -90,7 +88,7 @@ class Range // send error to view if could not set money format if (false === $moneyResult) { - View::share('invalidMonetaryLocale', true); // @codeCoverageIgnore + app('view')->share('invalidMonetaryLocale', true); // @codeCoverageIgnore } // save some formats: @@ -98,9 +96,9 @@ class Range $dateTimeFormat = (string)trans('config.date_time'); $defaultCurrency = app('amount')->getDefaultCurrency(); - View::share('monthAndDayFormat', $monthAndDayFormat); - View::share('dateTimeFormat', $dateTimeFormat); - View::share('defaultCurrency', $defaultCurrency); + app('view')->share('monthAndDayFormat', $monthAndDayFormat); + app('view')->share('dateTimeFormat', $dateTimeFormat); + app('view')->share('defaultCurrency', $defaultCurrency); } /** @@ -122,10 +120,10 @@ class Range { // ignore preference. set the range to be the current month: if (!Session::has('start') && !Session::has('end')) { - $viewRange = Preferences::get('viewRange', '1M')->data; + $viewRange = app('preferences')->get('viewRange', '1M')->data; if (null === $viewRange) { $viewRange = '1M'; - Preferences::set('viewRange', '1M'); + app('preferences')->set('viewRange', '1M'); } $start = new Carbon; $start = app('navigation')->updateStartDate($viewRange, $start); diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php index f2b4f27e12..c585018bf3 100644 --- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php +++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php @@ -24,7 +24,6 @@ namespace FireflyIII\Http\Middleware; use Closure; use Illuminate\Support\Facades\Auth; -use Preferences; /** * Class RedirectIfTwoFactorAuthenticated. @@ -43,9 +42,9 @@ class RedirectIfTwoFactorAuthenticated public function handle($request, Closure $next, $guard = null) { if (Auth::guard($guard)->check()) { - $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data; + $is2faEnabled = app('preferences')->get('twoFactorAuthEnabled', false)->data; - $has2faSecret = null !== Preferences::get('twoFactorAuthSecret'); + $has2faSecret = null !== app('preferences')->get('twoFactorAuthSecret'); // grab 2auth information from cookie. $is2faAuthed = 'true' === $request->cookie('twoFactorAuthenticated'); diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 34a60b8c16..208ee3f08b 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -30,7 +30,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Http\Request; use Log; -use View; /** * Class Sandstorm. @@ -53,7 +52,7 @@ class Sandstorm { // is in Sandstorm environment? $sandstorm = 1 === (int)getenv('SANDSTORM'); - View::share('SANDSTORM', $sandstorm); + app('view')->share('SANDSTORM', $sandstorm); if (!$sandstorm) { return $next($request); } @@ -76,7 +75,7 @@ class Sandstorm $user = $repository->first(); /** @noinspection NullPointerExceptionInspection */ Auth::guard($guard)->login($user); - View::share('SANDSTORM_ANON', false); + app('view')->share('SANDSTORM_ANON', false); return $next($request); } @@ -86,7 +85,7 @@ class Sandstorm $user = User::first(); /** @noinspection NullPointerExceptionInspection */ Auth::guard($guard)->login($user); - View::share('SANDSTORM_ANON', true); + app('view')->share('SANDSTORM_ANON', true); return $next($request); } @@ -108,7 +107,7 @@ class Sandstorm $repository->attachRole($user, 'owner'); // share value. - View::share('SANDSTORM_ANON', false); + app('view')->share('SANDSTORM_ANON', false); return $next($request); } @@ -124,11 +123,11 @@ class Sandstorm // if in Sandstorm, user logged in, still must check if user is anon. $userId = (string)$request->header('X-Sandstorm-User-Id'); if ('' === $userId) { - View::share('SANDSTORM_ANON', true); + app('view')->share('SANDSTORM_ANON', true); return $next($request); } - View::share('SANDSTORM_ANON', false); + app('view')->share('SANDSTORM_ANON', false); return $next($request); } diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index df207daba6..01c869ea55 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -60,31 +60,29 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function budgetedPerDay(Budget $budget): string { + Log::debug(sprintf('Now with budget #%d "%s"', $budget->id, $budget->name)); $total = '0'; $count = 0; foreach ($budget->budgetlimits as $limit) { - $diff = (string)$limit->start_date->diffInDays($limit->end_date); - if (bccomp('0', $diff) === 0) { - $diff = '1'; - } + $diff = $limit->start_date->diffInDays($limit->end_date); + $diff = 0 === $diff ? 1 : $diff; $amount = (string)$limit->amount; - $perDay = bcdiv($amount, $diff); + $perDay = bcdiv($amount, (string)$diff); $total = bcadd($total, $perDay); $count++; + Log::debug(sprintf('Found %d budget limits. Per day is %s, total is %s', $count, $perDay, $total)); } $avg = $total; if ($count > 0) { $avg = bcdiv($total, (string)$count); } + Log::debug(sprintf('%s / %d = %s = average.', $total, $count, $avg)); return $avg; } /** * @return bool - * - - */ public function cleanupBudgets(): bool { @@ -852,10 +850,9 @@ class BudgetRepository implements BudgetRepositoryInterface * @param Carbon $end * @param string $amount * - * @return BudgetLimit - * @throws \Exception + * @return BudgetLimit|null */ - public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): BudgetLimit + public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit { $this->cleanupBudgets(); // count the limits: @@ -885,9 +882,14 @@ class BudgetRepository implements BudgetRepositoryInterface // 1 if the left_operand is larger than the right_operand, -1 otherwise. if (null !== $limit && bccomp($amount, '0') <= 0) { Log::debug(sprintf('%s is zero, delete budget limit #%d', $amount, $limit->id)); - $limit->delete(); + try { + $limit->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete limit: %s', $e->getMessage())); + } - return new BudgetLimit; + + return null; } // update if exists: if (null !== $limit) { diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 68c94efcf3..b09b130b04 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -292,7 +292,7 @@ interface BudgetRepositoryInterface * @param Carbon $end * @param string $amount * - * @return BudgetLimit + * @return BudgetLimit|null */ - public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): BudgetLimit; + public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit; } diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.php new file mode 100644 index 0000000000..353c695ef2 --- /dev/null +++ b/app/Support/Http/Controllers/DateCalculation.php @@ -0,0 +1,93 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Http\Controllers; + +use Carbon\Carbon; +use Log; + +/** + * Trait DateCalculation + * + * @package FireflyIII\Support\Http\Controllers + */ +trait DateCalculation +{ + /** + * Returns the number of days between the two given dates. + * - If today is within the two dates, give the number of days between today and the end date. + * - If they are the same, return 1. + * + * @param Carbon $start + * @param Carbon $end + * + * @return int + */ + protected function getDayDifference(Carbon $start, Carbon $end): int + { + $dayDifference = 0; + + // if today is between start and end, use the diff in days between end and today (days left) + // otherwise, use diff between start and end. + $today = new Carbon; + Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'), $today->format('Y-m-d'))); + if ($today->gte($start) && $today->lte($end)) { + $dayDifference = $end->diffInDays($today); + } + if ($today->lte($start) || $today->gte($end)) { + $dayDifference = $start->diffInDays($end); + } + $dayDifference = 0 === $dayDifference ? 1 : $dayDifference; + + return $dayDifference; + } + + /** + * Returns the number of days that have passed in this period. If it is zero (start of period) + * then return 1. + * + * @param Carbon $start + * @param Carbon $end + * + * @return int + */ + protected function getDaysPassedInPeriod(Carbon $start, Carbon $end): int + { + // if today is between start and end, use the diff in days between end and today (days left) + // otherwise, use diff between start and end. + $today = new Carbon; + $daysPassed = 0; + Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'), $today->format('Y-m-d'))); + if ($today->gte($start) && $today->lte($end)) { + $daysPassed = $start->diffInDays($today); + } + if ($today->lte($start) || $today->gte($end)) { + $daysPassed = $start->diffInDays($end); + } + $daysPassed = 0 === $daysPassed ? 1 : $daysPassed; + + return $daysPassed; + + } + +} \ No newline at end of file diff --git a/public/js/ff/budgets/index.js b/public/js/ff/budgets/index.js index 8651b947ae..ea31da14e3 100644 --- a/public/js/ff/budgets/index.js +++ b/public/js/ff/budgets/index.js @@ -131,8 +131,8 @@ function updateBudgetedAmounts(e) { // fill in "left" value: - if (data.left_per_day !== 'none') { - leftCell.html(data.left + '(' + data.left_per_day + ')'); + if (data.left_per_day !== null) { + leftCell.html(data.left + ' (' + data.left_per_day + ')'); } else { leftCell.html(data.left); } diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 476199250a..89f02a1877 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -188,7 +188,7 @@ {{ budgetInformation[budget.id]['spent']|formatAmount }} - ({{ (budgetInformation[budget.id]['spent'] / daysInMonth)|formatAmount }}) + ({{ (budgetInformation[budget.id]['spent'] / daysPassed)|formatAmount }}) From ff403dfa2ed61fb064d73c2f38b5af212ee4bec1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 16:40:46 +0200 Subject: [PATCH 09/86] Improve code quality in budget methods. --- .../Controllers/Budget/AmountController.php | 119 ++++++------------ app/Repositories/Budget/BudgetRepository.php | 31 +++++ .../Budget/BudgetRepositoryInterface.php | 26 ++-- resources/views/budgets/info.twig | 9 +- 4 files changed, 91 insertions(+), 94 deletions(-) diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index 1cc575dd95..f4e912cd50 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -31,13 +31,11 @@ use FireflyIII\Http\Requests\BudgetIncomeRequest; use FireflyIII\Models\Budget; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Support\CacheProperties; use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Log; /** * @@ -92,21 +90,13 @@ class AmountController extends Controller $periodLength = $start->diffInDays($end); $dayDifference = $this->getDayDifference($start, $end); - - /* - * If the user budgets ANY amount per day for this budget (anything but zero) - * Firefly III calculates how much he could spend per day. - */ + // If the user budgets ANY amount per day for this budget (anything but zero) Firefly III calculates how much he could spend per day. if (1 === bccomp(bcadd($amount, $spent), '0')) { $leftPerDay = app('amount')->formatAnything($currency, bcdiv(bcadd($amount, $spent), (string)$dayDifference), true); } - /* - * Get the average amount of money the user budgets for this budget. - * And calculate the same for the current amount. - * - * If the difference is very large, give the user a notification. - */ + // Get the average amount of money the user budgets for this budget. And calculate the same for the current amount. + // If the difference is very large, give the user a notification. $average = $this->repository->budgetedPerDay($budget); $current = bcdiv($amount, (string)$periodLength); if (bccomp(bcmul('1.1', $average), $current) === -1) { @@ -123,17 +113,8 @@ class AmountController extends Controller app('preferences')->mark(); return response()->json( - [ - 'left' => $left, - 'name' => $budget->name, - 'limit' => $budgetLimit ? $budgetLimit->id : 0, - 'amount' => $amount, - 'current' => $current, - 'average' => $average, - 'large_diff' => $largeDiff, - 'left_per_day' => $leftPerDay, - 'warn_text' => $warnText, - ] + ['left' => $left, 'name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount, 'current' => $current, + 'average' => $average, 'large_diff' => $largeDiff, 'left_per_day' => $leftPerDay, 'warn_text' => $warnText,] ); } @@ -146,75 +127,51 @@ class AmountController extends Controller */ public function infoIncome(Carbon $start, Carbon $end) { - // properties for cache - $cache = new CacheProperties; - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty('info-income'); + $range = app('preferences')->get('viewRange', '1M')->data; - Log::debug(sprintf('infoIncome start is %s', $start->format('Y-m-d'))); - Log::debug(sprintf('infoIncome end is %s', $end->format('Y-m-d'))); + /** @var Carbon $searchBegin */ + $searchBegin = app('navigation')->subtractPeriod($start, $range, 3); + $searchEnd = app('navigation')->addPeriod($end, $range, 3); + $daysInPeriod = $start->diffInDays($end); + $daysInSearchPeriod = $searchBegin->diffInDays($searchEnd); - if ($cache->has()) { - // @codeCoverageIgnoreStart - $result = $cache->get(); - - return view('budgets.info', compact('result')); - // @codeCoverageIgnoreEnd - } - $result = [ - 'available' => '0', - 'earned' => '0', - 'suggested' => '0', - ]; - $currency = app('amount')->getDefaultCurrency(); - $range = app('preferences')->get('viewRange', '1M')->data; - /** @var Carbon $begin */ - $begin = app('navigation')->subtractPeriod($start, $range, 3); - - Log::debug(sprintf('Range is %s', $range)); - Log::debug(sprintf('infoIncome begin is %s', $begin->format('Y-m-d'))); - - // get average amount available. - $total = '0'; - $count = 0; - $currentStart = clone $begin; - while ($currentStart < $start) { - - Log::debug(sprintf('Loop: currentStart is %s', $currentStart->format('Y-m-d'))); - $currentEnd = app('navigation')->endOfPeriod($currentStart, $range); - $total = bcadd($total, $this->repository->getAvailableBudget($currency, $currentStart, $currentEnd)); - $currentStart = app('navigation')->addPeriod($currentStart, $range, 0); - ++$count; - } - Log::debug('Loop end'); - - if (0 === $count) { - $count = 1; - } - $result['available'] = bcdiv($total, (string)$count); + // get average available budget from repository: + $average = $this->repository->getAverageAvailable($start, $end); + $available = bcmul($average, (string)$daysInPeriod); // amount earned in this period: - $subDay = clone $end; - $subDay->subDay(); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount(); - $result['earned'] = bcdiv((string)$collector->getJournals()->sum('transaction_amount'), (string)$count); + $collector->setAllAssetAccounts()->setRange($searchBegin, $searchEnd)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount(); + $earned = (string)$collector->getJournals()->sum('transaction_amount'); + // Total amount earned divided by the number of days in the whole search period is the average amount earned per day. + // This is multiplied by the number of days in the current period, showing you the average. + $earnedAverage = bcmul(bcdiv($earned, (string)$daysInSearchPeriod), (string)$daysInPeriod); // amount spent in period /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($begin, $subDay)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount(); - $result['spent'] = bcdiv((string)$collector->getJournals()->sum('transaction_amount'), (string)$count); - // suggestion starts with the amount spent - $result['suggested'] = bcmul($result['spent'], '-1'); - $result['suggested'] = 1 === bccomp($result['suggested'], $result['earned']) ? $result['earned'] : $result['suggested']; - // unless it's more than you earned. So min() of suggested/earned + $collector->setAllAssetAccounts()->setRange($searchBegin, $searchEnd)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount(); + $spent = (string)$collector->getJournals()->sum('transaction_amount'); + $spentAverage = app('steam')->positive(bcmul(bcdiv($spent, (string)$daysInSearchPeriod), (string)$daysInPeriod)); - $cache->store($result); + // the default suggestion is the money the user has spent, on average, over this period. + $suggested = $spentAverage; - return view('budgets.info', compact('result', 'begin', 'currentEnd')); + // if the user makes less per period, suggest that amount instead. + if (bccomp($spentAverage, $earnedAverage) === 1) { + $suggested = $earnedAverage; + } + + $result + = [ + 'available' => $available, + 'earned' => $earnedAverage, + 'spent' => $spentAverage, + 'suggested' => $suggested, + ]; + + return view('budgets.info', compact('result', 'searchBegin', 'searchEnd', 'start', 'end')); } diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 01c869ea55..8d1277f6f6 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -439,6 +439,37 @@ class BudgetRepository implements BudgetRepositoryInterface return $this->user->availableBudgets()->get(); } + /** + * Calculate the average amount in the budgets available in this period. + * Grouped by day. + * + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function getAverageAvailable(Carbon $start, Carbon $end): string + { + /** @var Collection $list */ + $list = $this->user->availableBudgets() + ->where('start_date', '>=', $start->format('Y-m-d 00:00:00')) + ->where('end_date', '<=', $end->format('Y-m-d 00:00:00')) + ->get(); + if (0 === $list->count()) { + return '0'; + } + $total = '0'; + $days = 0; + /** @var AvailableBudget $availableBudget */ + foreach ($list as $availableBudget) { + $total = bcadd($availableBudget->amount, $total); + $days += $availableBudget->start_date->diffInDays($availableBudget->end_date); + } + $avg = bcdiv($total, (string)$days); + + return $avg; + } + /** * @param Budget $budget * @param Carbon $start diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index b09b130b04..5cc69db173 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -46,13 +46,6 @@ interface BudgetRepositoryInterface */ public function budgetedPerDay(Budget $budget): string; - /** - * Destroy a budget limit. - * - * @param BudgetLimit $budgetLimit - */ - public function destroyBudgetLimit(BudgetLimit $budgetLimit): void; - /** * @return bool */ @@ -89,6 +82,13 @@ interface BudgetRepositoryInterface */ public function destroyAvailableBudget(AvailableBudget $availableBudget): void; + /** + * Destroy a budget limit. + * + * @param BudgetLimit $budgetLimit + */ + public function destroyBudgetLimit(BudgetLimit $budgetLimit): void; + /** * Filters entries from the result set generated by getBudgetPeriodReport. * @@ -166,6 +166,17 @@ interface BudgetRepositoryInterface */ public function getAvailableBudgets(): Collection; + /** + * Calculate the average amount in the budgets available in this period. + * Grouped by day. + * + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function getAverageAvailable(Carbon $start, Carbon $end): string; + /** * @param Budget $budget * @param Carbon $start @@ -238,7 +249,6 @@ interface BudgetRepositoryInterface */ public function spentInPeriod(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): string; - /** * @param Collection $accounts * @param Carbon $start diff --git a/resources/views/budgets/info.twig b/resources/views/budgets/info.twig index 6bc6ff6582..dc8b3acf0c 100644 --- a/resources/views/budgets/info.twig +++ b/resources/views/budgets/info.twig @@ -4,8 +4,7 @@

                                                                          - {{ trans('firefly.info_on_available_amount', - {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.info_on_available_amount') }}

                                                                          @@ -18,7 +17,7 @@ {{ 'budgeted'|_ }}
                                                                          - {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.average_between', {start:searchBegin.formatLocalized(monthAndDayFormat), end:searchEnd.formatLocalized(monthAndDayFormat)}) }} {{ result.available|formatAmount }} @@ -27,7 +26,7 @@ {{ 'earned'|_ }}
                                                                          - {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.average_between', {start:searchBegin.formatLocalized(monthAndDayFormat), end:searchEnd.formatLocalized(monthAndDayFormat)}) }}                                                                           {{ result.earned|formatAmount }} @@ -35,7 +34,7 @@ {{ 'spent'|_ }}
                                                                          - {{ trans('firefly.average_between', {start:begin.formatLocalized(monthAndDayFormat), end:currentEnd.formatLocalized(monthAndDayFormat)}) }} + {{ trans('firefly.average_between', {start:searchBegin.formatLocalized(monthAndDayFormat), end:searchEnd.formatLocalized(monthAndDayFormat)}) }}                                                                           {{ result.spent|formatAmount }} From 3d1523a06032cd772ca4cb7f9cceda28fa2516d0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 16:41:07 +0200 Subject: [PATCH 10/86] Improve randomness in test data to prevent key collisions. --- .../Controllers/AttachmentControllerTest.php | 6 +- .../Api/V1/Controllers/BillControllerTest.php | 12 +-- .../Controllers/TransactionControllerTest.php | 102 +++++++++--------- .../Api/V1/Controllers/UserControllerTest.php | 10 +- .../Controllers/Admin/LinkControllerTest.php | 30 +++--- .../Import/IndexControllerTest.php | 2 +- .../Import/JobConfigurationControllerTest.php | 14 +-- .../Import/JobStatusControllerTest.php | 24 ++--- .../Import/PrerequisitesControllerTest.php | 12 +-- tests/Unit/Factory/AccountFactoryTest.php | 22 ++-- tests/Unit/Factory/BillFactoryTest.php | 6 +- tests/Unit/Factory/BudgetFactoryTest.php | 2 +- tests/Unit/Factory/CategoryFactoryTest.php | 2 +- tests/Unit/Factory/PiggyBankFactoryTest.php | 2 +- tests/Unit/Factory/TagFactoryTest.php | 2 +- .../FakeJobConfigurationTest.php | 38 +++---- .../FileJobConfigurationTest.php | 26 ++--- .../SpectreJobConfigurationTest.php | 10 +- tests/Unit/Import/Routine/BunqRoutineTest.php | 4 +- tests/Unit/Import/Routine/FakeRoutineTest.php | 6 +- tests/Unit/Import/Routine/FileRoutineTest.php | 2 +- .../Import/Routine/SpectreRoutineTest.php | 10 +- .../Import/Storage/ImportArrayStorageTest.php | 16 +-- .../Destroy/AccountDestroyServiceTest.php | 8 +- .../Update/AccountUpdateServiceTest.php | 22 ++-- .../Update/JournalUpdateServiceTest.php | 6 +- .../Bunq/ChooseAccountsHandlerTest.php | 16 +-- .../Bunq/NewBunqJobHandlerTest.php | 2 +- .../File/ConfigureMappingHandlerTest.php | 18 ++-- .../File/ConfigureRolesHandlerTest.php | 10 +- .../File/ConfigureUploadHandlerTest.php | 6 +- .../File/NewFileJobHandlerTest.php | 10 +- .../Spectre/ChooseAccountsHandlerTest.php | 16 +-- .../Spectre/ChooseLoginHandlerTest.php | 10 +- .../Spectre/DoAuthenticateHandlerTest.php | 2 +- .../Bunq/StageImportDataHandlerTest.php | 14 +-- .../Routine/Bunq/StageNewHandlerTest.php | 6 +- .../Import/Routine/File/LineReaderTest.php | 2 +- .../Routine/File/MappingConvergerTest.php | 2 +- .../Spectre/StageAuthenticatedHandlerTest.php | 6 +- .../Spectre/StageImportDataHandlerTest.php | 6 +- .../Routine/Spectre/StageNewHandlerTest.php | 8 +- .../TransactionRules/Actions/AddTagTest.php | 2 +- .../Actions/PrependDescriptionTest.php | 2 +- .../Actions/SetDescriptionTest.php | 2 +- .../Actions/SetDestinationAccountTest.php | 6 +- .../Actions/SetSourceAccountTest.php | 6 +- .../Transformers/AccountTransformerTest.php | 6 +- .../Unit/Transformers/TagTransformerTest.php | 2 +- .../TransactionTransformerTest.php | 10 +- 50 files changed, 283 insertions(+), 283 deletions(-) diff --git a/tests/Api/V1/Controllers/AttachmentControllerTest.php b/tests/Api/V1/Controllers/AttachmentControllerTest.php index 8096733f6a..e39620347f 100644 --- a/tests/Api/V1/Controllers/AttachmentControllerTest.php +++ b/tests/Api/V1/Controllers/AttachmentControllerTest.php @@ -138,7 +138,7 @@ class AttachmentControllerTest extends TestCase 'user_id' => $this->user()->id, 'attachable_id' => 1, 'attachable_type' => TransactionJournal::class, - 'md5' => md5('Hello' . random_int(1, 1000)), + 'md5' => md5('Hello' . random_int(1, 10000)), 'filename' => 'some name', 'mime' => 'text/plain', 'size' => 5, @@ -230,7 +230,7 @@ class AttachmentControllerTest extends TestCase // data to submit $data = [ 'filename' => 'Some new att', - 'description' => sprintf('Attempt #%d', random_int(1, 1000)), + 'description' => sprintf('Attempt #%d', random_int(1, 10000)), 'model' => TransactionJournal::class, 'model_id' => 1, ]; @@ -265,7 +265,7 @@ class AttachmentControllerTest extends TestCase // data to submit $data = [ 'filename' => $attachment->filename, - 'description' => sprintf('Attempt #%d', random_int(1, 1000)), + 'description' => sprintf('Attempt #%d', random_int(1, 10000)), 'model' => TransactionJournal::class, 'model_id' => 1, ]; diff --git a/tests/Api/V1/Controllers/BillControllerTest.php b/tests/Api/V1/Controllers/BillControllerTest.php index 970b4e8d4f..8621d3779b 100644 --- a/tests/Api/V1/Controllers/BillControllerTest.php +++ b/tests/Api/V1/Controllers/BillControllerTest.php @@ -142,8 +142,8 @@ class BillControllerTest extends TestCase // data to submit: $data = [ - 'name' => 'New bill #' . random_int(1, 1000), - 'match' => 'some,words,' . random_int(1, 1000), + 'name' => 'New bill #' . random_int(1, 10000), + 'match' => 'some,words,' . random_int(1, 10000), 'amount_min' => '66.34', 'amount_max' => '45.67', 'date' => '2018-01-01', @@ -187,8 +187,8 @@ class BillControllerTest extends TestCase $repository->shouldReceive('getRulesForBill')->withAnyArgs()->andReturn(new Collection()); // data to submit: $data = [ - 'name' => 'New bill #' . random_int(1, 1000), - 'match' => 'some,words,' . random_int(1, 1000), + 'name' => 'New bill #' . random_int(1, 10000), + 'match' => 'some,words,' . random_int(1, 10000), 'amount_min' => '12.34', 'amount_max' => '45.67', 'date' => '2018-01-01', @@ -226,8 +226,8 @@ class BillControllerTest extends TestCase $repository->shouldReceive('getRulesForBill')->withAnyArgs()->andReturn(new Collection()); // data to submit: $data = [ - 'name' => 'New bill #' . random_int(1, 1000), - 'match' => 'some,words,' . random_int(1, 1000), + 'name' => 'New bill #' . random_int(1, 10000), + 'match' => 'some,words,' . random_int(1, 10000), 'amount_min' => '12.34', 'amount_max' => '45.67', 'date' => '2018-01-01', diff --git a/tests/Api/V1/Controllers/TransactionControllerTest.php b/tests/Api/V1/Controllers/TransactionControllerTest.php index 2a06e0f402..738c5be471 100644 --- a/tests/Api/V1/Controllers/TransactionControllerTest.php +++ b/tests/Api/V1/Controllers/TransactionControllerTest.php @@ -96,7 +96,7 @@ class TransactionControllerTest extends TestCase $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -142,7 +142,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -240,7 +240,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $data = [ - 'description' => 'Split journal #' . random_int(1, 1000), + 'description' => 'Split journal #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -298,7 +298,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -345,7 +345,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('findByName')->andReturn(null); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -390,7 +390,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('setUser'); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -434,7 +434,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('setUser'); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [], @@ -474,7 +474,7 @@ class TransactionControllerTest extends TestCase $data = [ - 'description' => 'Split journal #' . random_int(1, 1000), + 'description' => 'Split journal #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -524,7 +524,7 @@ class TransactionControllerTest extends TestCase $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -580,7 +580,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'bill_id' => $bill->id, @@ -638,7 +638,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'bill_name' => $bill->name, @@ -696,7 +696,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -754,7 +754,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -812,7 +812,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -876,7 +876,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'piggy_bank_id' => $piggyBank->id, @@ -942,7 +942,7 @@ class TransactionControllerTest extends TestCase // submit with another account. $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'piggy_bank_name' => $piggyBank->name, @@ -996,7 +996,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'deposit', 'transactions' => [ @@ -1045,7 +1045,7 @@ class TransactionControllerTest extends TestCase $data = [ - 'description' => 'Some deposit #' . random_int(1, 1000), + 'description' => 'Some deposit #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'deposit', 'transactions' => [ @@ -1101,7 +1101,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account]), new Collection([$second])); $data = [ - 'description' => 'Some transfer #' . random_int(1, 1000), + 'description' => 'Some transfer #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'transfer', 'transactions' => [ @@ -1165,7 +1165,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account]), new Collection([$second])); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1479,7 +1479,7 @@ class TransactionControllerTest extends TestCase $bill = $this->user()->bills()->first(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'bill_id' => $bill->id, @@ -1520,7 +1520,7 @@ class TransactionControllerTest extends TestCase $bill = $this->user()->bills()->first(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'bill_name' => $bill->name, @@ -1559,7 +1559,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1567,7 +1567,7 @@ class TransactionControllerTest extends TestCase 'amount' => '10', 'currency_id' => 1, 'source_id' => $account->id, - 'destination_name' => 'New expense account #' . random_int(1, 1000), + 'destination_name' => 'New expense account #' . random_int(1, 10000), ], @@ -1600,7 +1600,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1639,7 +1639,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1680,7 +1680,7 @@ class TransactionControllerTest extends TestCase $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1719,7 +1719,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'deposit', 'transactions' => [ @@ -1757,7 +1757,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1797,7 +1797,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1836,7 +1836,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1875,7 +1875,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1915,7 +1915,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -1954,7 +1954,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', // store date meta fields (if present): @@ -1999,9 +1999,9 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); - $name = 'Some new category #' . random_int(1, 1000); + $name = 'Some new category #' . random_int(1, 10000); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -2041,7 +2041,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $name = 'New opposing account #' . random_int(1, 10000); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -2080,7 +2080,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'notes' => 'I am a note', @@ -2119,7 +2119,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account]), new Collection([$opposing])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -2159,7 +2159,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -2199,7 +2199,7 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $piggy = $this->user()->piggyBanks()->first(); $data = [ - 'description' => 'Some deposit #' . random_int(1, 1000), + 'description' => 'Some deposit #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'deposit', 'piggy_bank_name' => $piggy->name, @@ -2240,7 +2240,7 @@ class TransactionControllerTest extends TestCase $piggy = $this->user()->piggyBanks()->first(); $data = [ - 'description' => 'Some transfer #' . random_int(1, 1000), + 'description' => 'Some transfer #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'transfer', 'piggy_bank_id' => $piggy->id, @@ -2280,7 +2280,7 @@ class TransactionControllerTest extends TestCase $piggy = $this->user()->piggyBanks()->first(); $data = [ - 'description' => 'Some transfer #' . random_int(1, 1000), + 'description' => 'Some transfer #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'transfer', 'piggy_bank_name' => $piggy->name, @@ -2316,7 +2316,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -2354,7 +2354,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'transactions' => [ @@ -2392,9 +2392,9 @@ class TransactionControllerTest extends TestCase public function testSuccessStoreTags(): void { $tags = [ - 'TagOne' . random_int(1, 1000), - 'TagTwoBlarg' . random_int(1, 1000), - 'SomeThreeTag' . random_int(1, 1000), + 'TagOne' . random_int(1, 10000), + 'TagTwoBlarg' . random_int(1, 10000), + 'SomeThreeTag' . random_int(1, 10000), ]; $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2406,7 +2406,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); $journalRepos->shouldReceive('store')->andReturn($journal)->once(); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'type' => 'withdrawal', 'tags' => implode(',', $tags), @@ -2442,7 +2442,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->withArgs([[$account->id]])->andReturn(new Collection([$account])); $data = [ - 'description' => 'Some deposit #' . random_int(1, 1000), + 'description' => 'Some deposit #' . random_int(1, 10000), 'date' => '2018-01-01', 'transactions' => [ [ @@ -2484,7 +2484,7 @@ class TransactionControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsById')->withArgs([[$account->id]])->andReturn(new Collection([$account])); $data = [ - 'description' => 'Some transaction #' . random_int(1, 1000), + 'description' => 'Some transaction #' . random_int(1, 10000), 'date' => '2018-01-01', 'transactions' => [ [ diff --git a/tests/Api/V1/Controllers/UserControllerTest.php b/tests/Api/V1/Controllers/UserControllerTest.php index 457b1e0e4c..a54d8db930 100644 --- a/tests/Api/V1/Controllers/UserControllerTest.php +++ b/tests/Api/V1/Controllers/UserControllerTest.php @@ -57,7 +57,7 @@ class UserControllerTest extends TestCase public function testDelete(): void { // create a user first: - $user = User::create(['email' => 'some@newu' . random_int(1, 1000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); + $user = User::create(['email' => 'some@newu' . random_int(1, 10000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); // call API $response = $this->delete('/api/v1/users/' . $user->id); @@ -76,7 +76,7 @@ class UserControllerTest extends TestCase Passport::actingAs($this->emptyUser()); // create a user first: - $user = User::create(['email' => 'some@newu' . random_int(1, 1000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); + $user = User::create(['email' => 'some@newu' . random_int(1, 10000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); // call API $response = $this->delete('/api/v1/users/' . $user->id); @@ -137,7 +137,7 @@ class UserControllerTest extends TestCase public function testStoreBasic(): void { $data = [ - 'email' => 'some_new@user' . random_int(1, 1000) . '.com', + 'email' => 'some_new@user' . random_int(1, 10000) . '.com', 'blocked' => 0, ]; @@ -192,11 +192,11 @@ class UserControllerTest extends TestCase public function testUpdate(): void { // create a user first: - $user = User::create(['email' => 'some@newu' . random_int(1, 1000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); + $user = User::create(['email' => 'some@newu' . random_int(1, 10000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); // data: $data = [ - 'email' => 'some-new@email' . random_int(1, 1000) . '.com', + 'email' => 'some-new@email' . random_int(1, 10000) . '.com', 'blocked' => 0, ]; diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php index ccae616e9c..6a14b4ea01 100644 --- a/tests/Feature/Controllers/Admin/LinkControllerTest.php +++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php @@ -162,9 +162,9 @@ class LinkControllerTest extends TestCase { $repository = $this->mock(LinkTypeRepositoryInterface::class); $data = [ - 'name' => 'test ' . random_int(1, 1000), - 'inward' => 'test inward' . random_int(1, 1000), - 'outward' => 'test outward' . random_int(1, 1000), + 'name' => 'test ' . random_int(1, 10000), + 'inward' => 'test inward' . random_int(1, 10000), + 'outward' => 'test outward' . random_int(1, 10000), ]; $repository->shouldReceive('store')->once()->andReturn(LinkType::first()); $repository->shouldReceive('findNull')->andReturn(LinkType::first()); @@ -184,9 +184,9 @@ class LinkControllerTest extends TestCase { $repository = $this->mock(LinkTypeRepositoryInterface::class); $data = [ - 'name' => 'test ' . random_int(1, 1000), - 'inward' => 'test inward' . random_int(1, 1000), - 'outward' => 'test outward' . random_int(1, 1000), + 'name' => 'test ' . random_int(1, 10000), + 'inward' => 'test inward' . random_int(1, 10000), + 'outward' => 'test outward' . random_int(1, 10000), 'create_another' => '1', ]; $repository->shouldReceive('store')->once()->andReturn(new LinkType); @@ -210,9 +210,9 @@ class LinkControllerTest extends TestCase $repository->shouldReceive('update')->once()->andReturn(new $linkType); $data = [ - 'name' => 'test ' . random_int(1, 1000), - 'inward' => 'test inward' . random_int(1, 1000), - 'outward' => 'test outward' . random_int(1, 1000), + 'name' => 'test ' . random_int(1, 10000), + 'inward' => 'test inward' . random_int(1, 10000), + 'outward' => 'test outward' . random_int(1, 10000), ]; $this->session(['link_types.edit.uri' => 'http://localhost']); $this->be($this->user()); @@ -231,9 +231,9 @@ class LinkControllerTest extends TestCase $linkType = LinkType::where('editable', 0)->first(); $data = [ - 'name' => 'test ' . random_int(1, 1000), - 'inward' => 'test inward' . random_int(1, 1000), - 'outward' => 'test outward' . random_int(1, 1000), + 'name' => 'test ' . random_int(1, 10000), + 'inward' => 'test inward' . random_int(1, 10000), + 'outward' => 'test outward' . random_int(1, 10000), 'return_to_edit' => '1', ]; $this->session(['link_types.edit.uri' => 'http://localhost']); @@ -254,9 +254,9 @@ class LinkControllerTest extends TestCase $linkType = LinkType::create(['editable' => 1, 'inward' => 'healox', 'outward' => 'byaex', 'name' => 'Test tyapeX']); $data = [ - 'name' => 'test ' . random_int(1, 1000), - 'inward' => 'test inward' . random_int(1, 1000), - 'outward' => 'test outward' . random_int(1, 1000), + 'name' => 'test ' . random_int(1, 10000), + 'inward' => 'test inward' . random_int(1, 10000), + 'outward' => 'test outward' . random_int(1, 10000), 'return_to_edit' => '1', ]; $repository->shouldReceive('update')->once()->andReturn(new $linkType); diff --git a/tests/Feature/Controllers/Import/IndexControllerTest.php b/tests/Feature/Controllers/Import/IndexControllerTest.php index e14c97e910..3d7a7b3d74 100644 --- a/tests/Feature/Controllers/Import/IndexControllerTest.php +++ b/tests/Feature/Controllers/Import/IndexControllerTest.php @@ -209,7 +209,7 @@ class IndexControllerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'dc_' . random_int(1, 1000); + $job->key = 'dc_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'go-for-import'; $job->provider = 'file'; diff --git a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php index da05848ba2..0dcc0fbf89 100644 --- a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php @@ -53,7 +53,7 @@ class JobConfigurationControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '1Afake_job_' . random_int(1, 1000); + $job->key = '1Afake_job_' . random_int(1, 10000); $job->status = 'has_prereq'; $job->provider = 'fake'; $job->file_type = ''; @@ -85,7 +85,7 @@ class JobConfigurationControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '2Bfake_job_' . random_int(1, 1000); + $job->key = '2Bfake_job_' . random_int(1, 10000); $job->status = 'some_bad_state'; $job->provider = 'fake'; $job->file_type = ''; @@ -111,7 +111,7 @@ class JobConfigurationControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '3Cfake_job_' . random_int(1, 1000); + $job->key = '3Cfake_job_' . random_int(1, 10000); $job->status = 'has_prereq'; $job->provider = 'fake'; $job->file_type = ''; @@ -140,7 +140,7 @@ class JobConfigurationControllerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '4Dfake_job_' . random_int(1, 1000); + $job->key = '4Dfake_job_' . random_int(1, 10000); $job->status = 'has_prereq'; $job->provider = 'fake'; $job->file_type = ''; @@ -174,7 +174,7 @@ class JobConfigurationControllerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '5Ffake_job_' . random_int(1, 1000); + $job->key = '5Ffake_job_' . random_int(1, 10000); $job->status = 'some_bad_state'; $job->provider = 'fake'; $job->file_type = ''; @@ -203,7 +203,7 @@ class JobConfigurationControllerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '6Efake_job_' . random_int(1, 1000); + $job->key = '6Efake_job_' . random_int(1, 10000); $job->status = 'has_prereq'; $job->provider = 'fake'; $job->file_type = ''; @@ -233,7 +233,7 @@ class JobConfigurationControllerTest extends TestCase $file = UploadedFile::fake()->image('avatar.jpg'); $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = '7Dfake_job_' . random_int(1, 1000); + $job->key = '7Dfake_job_' . random_int(1, 10000); $job->status = 'has_prereq'; $job->provider = 'fake'; $job->file_type = ''; diff --git a/tests/Feature/Controllers/Import/JobStatusControllerTest.php b/tests/Feature/Controllers/Import/JobStatusControllerTest.php index a966948dd2..fac1f6ac8b 100644 --- a/tests/Feature/Controllers/Import/JobStatusControllerTest.php +++ b/tests/Feature/Controllers/Import/JobStatusControllerTest.php @@ -58,7 +58,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Afake_job_' . random_int(1, 1000); + $job->key = 'Afake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->file_type = ''; @@ -78,7 +78,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Bfake_job_' . random_int(1, 1000); + $job->key = 'Bfake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'file'; $job->transactions = []; @@ -102,7 +102,7 @@ class JobStatusControllerTest extends TestCase $tag = $this->user()->tags()->first(); $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Cfake_job_' . random_int(1, 1000); + $job->key = 'Cfake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->transactions = []; @@ -132,7 +132,7 @@ class JobStatusControllerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Dfake_job_' . random_int(1, 1000); + $job->key = 'Dfake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->transactions = []; @@ -161,7 +161,7 @@ class JobStatusControllerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Efake_job_' . random_int(1, 1000); + $job->key = 'Efake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->transactions = []; @@ -185,7 +185,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Ffake_job_' . random_int(1, 1000); + $job->key = 'Ffake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->transactions = []; @@ -214,7 +214,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Gfake_job_' . random_int(1, 1000); + $job->key = 'Gfake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->transactions = []; @@ -244,7 +244,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Hfake_job_' . random_int(1, 1000); + $job->key = 'Hfake_job_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->provider = 'fake'; $job->transactions = []; @@ -274,7 +274,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Ifake_job_' . random_int(1, 1000); + $job->key = 'Ifake_job_' . random_int(1, 10000); $job->status = 'bad_state'; $job->provider = 'fake'; $job->transactions = []; @@ -295,7 +295,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Jfake_job_' . random_int(1, 1000); + $job->key = 'Jfake_job_' . random_int(1, 10000); $job->status = 'provider_finished'; $job->provider = 'fake'; $job->transactions = []; @@ -326,7 +326,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Lfake_job_' . random_int(1, 1000); + $job->key = 'Lfake_job_' . random_int(1, 10000); $job->status = 'provider_finished'; $job->provider = 'fake'; $job->transactions = []; @@ -357,7 +357,7 @@ class JobStatusControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Kfake_job_' . random_int(1, 1000); + $job->key = 'Kfake_job_' . random_int(1, 10000); $job->status = 'some_bad_state'; $job->provider = 'fake'; $job->transactions = []; diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php index 579d614f58..47e3da10d9 100644 --- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php +++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php @@ -55,7 +55,7 @@ class PrerequisitesControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'A_pre_job_' . random_int(1, 1000); + $job->key = 'A_pre_job_' . random_int(1, 10000); $job->status = 'new'; $job->provider = 'fake'; $job->transactions = []; @@ -85,7 +85,7 @@ class PrerequisitesControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'B_pre_job_' . random_int(1, 1000); + $job->key = 'B_pre_job_' . random_int(1, 10000); $job->status = 'some_Bad_state'; $job->provider = 'fake'; $job->transactions = []; @@ -105,7 +105,7 @@ class PrerequisitesControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'C_pre_job_' . random_int(1, 1000); + $job->key = 'C_pre_job_' . random_int(1, 10000); $job->status = 'new'; $job->provider = 'fake'; $job->transactions = []; @@ -136,7 +136,7 @@ class PrerequisitesControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'D_pre_job_' . random_int(1, 1000); + $job->key = 'D_pre_job_' . random_int(1, 10000); $job->status = 'new'; $job->provider = 'fake'; $job->transactions = []; @@ -166,7 +166,7 @@ class PrerequisitesControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'D_pre_job_' . random_int(1, 1000); + $job->key = 'D_pre_job_' . random_int(1, 10000); $job->status = 'badstate'; $job->provider = 'fake'; $job->transactions = []; @@ -213,7 +213,7 @@ class PrerequisitesControllerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'D_pre_job_' . random_int(1, 1000); + $job->key = 'D_pre_job_' . random_int(1, 10000); $job->status = 'new'; $job->provider = 'fake'; $job->transactions = []; diff --git a/tests/Unit/Factory/AccountFactoryTest.php b/tests/Unit/Factory/AccountFactoryTest.php index 8c3f61e24d..58068f4cc9 100644 --- a/tests/Unit/Factory/AccountFactoryTest.php +++ b/tests/Unit/Factory/AccountFactoryTest.php @@ -49,7 +49,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', @@ -88,7 +88,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => '', 'active' => true, 'accountRole' => 'defaultAsset', @@ -127,7 +127,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic CC account #' . random_int(1, 1000), + 'name' => 'Basic CC account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'ccAsset', @@ -174,7 +174,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'expense', 'iban' => null, - 'name' => 'Basic expense account #' . random_int(1, 1000), + 'name' => 'Basic expense account #' . random_int(1, 10000), 'virtualBalance' => '1243', 'active' => true, 'accountRole' => 'defaultAsset', @@ -213,7 +213,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'Expense account', 'iban' => null, - 'name' => 'Basic expense account #' . random_int(1, 1000), + 'name' => 'Basic expense account #' . random_int(1, 10000), 'virtualBalance' => '1243', 'active' => true, 'accountRole' => 'defaultAsset', @@ -251,7 +251,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', @@ -297,7 +297,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', @@ -342,7 +342,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => 'NL02ABNA0870809585', - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', @@ -381,7 +381,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => 'NL1XRABO032674X238', - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', @@ -420,7 +420,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', @@ -466,7 +466,7 @@ class AccountFactoryTest extends TestCase 'account_type_id' => null, 'accountType' => 'asset', 'iban' => null, - 'name' => 'Basic asset account #' . random_int(1, 1000), + 'name' => 'Basic asset account #' . random_int(1, 10000), 'virtualBalance' => null, 'active' => true, 'accountRole' => 'defaultAsset', diff --git a/tests/Unit/Factory/BillFactoryTest.php b/tests/Unit/Factory/BillFactoryTest.php index 74203bef86..af07cc5dda 100644 --- a/tests/Unit/Factory/BillFactoryTest.php +++ b/tests/Unit/Factory/BillFactoryTest.php @@ -42,7 +42,7 @@ class BillFactoryTest extends TestCase public function testCreateBasic(): void { $data = [ - 'name' => 'Some new bill #' . random_int(1, 1000), + 'name' => 'Some new bill #' . random_int(1, 10000), 'amount_min' => '5', 'transaction_currency_id' => 1, 'amount_max' => '10', @@ -76,7 +76,7 @@ class BillFactoryTest extends TestCase public function testCreateEmptyNotes(): void { $data = [ - 'name' => 'Some new bill #' . random_int(1, 1000), + 'name' => 'Some new bill #' . random_int(1, 10000), 'amount_min' => '5', 'amount_max' => '10', 'date' => '2018-01-01', @@ -144,7 +144,7 @@ class BillFactoryTest extends TestCase /** @var BillFactory $factory */ $factory = app(BillFactory::class); $factory->setUser($this->user()); - $piggy = $factory->find(null, 'I dont exist' . random_int(1, 1000)); + $piggy = $factory->find(null, 'I dont exist' . random_int(1, 10000)); $this->assertNull($piggy); } diff --git a/tests/Unit/Factory/BudgetFactoryTest.php b/tests/Unit/Factory/BudgetFactoryTest.php index 32397d5a4a..5544a4ba70 100644 --- a/tests/Unit/Factory/BudgetFactoryTest.php +++ b/tests/Unit/Factory/BudgetFactoryTest.php @@ -91,7 +91,7 @@ class BudgetFactoryTest extends TestCase /** @var BudgetFactory $factory */ $factory = app(BudgetFactory::class); $factory->setUser($this->user()); - $this->assertNull($factory->find(null, 'I dont exist.' . random_int(1, 1000))); + $this->assertNull($factory->find(null, 'I dont exist.' . random_int(1, 10000))); } } diff --git a/tests/Unit/Factory/CategoryFactoryTest.php b/tests/Unit/Factory/CategoryFactoryTest.php index 706f6dced3..f98e9b353d 100644 --- a/tests/Unit/Factory/CategoryFactoryTest.php +++ b/tests/Unit/Factory/CategoryFactoryTest.php @@ -80,7 +80,7 @@ class CategoryFactoryTest extends TestCase */ public function testFindOrCreateNewName(): void { - $name = 'Some new category #' . random_int(1, 1000); + $name = 'Some new category #' . random_int(1, 10000); /** @var CategoryFactory $factory */ $factory = app(CategoryFactory::class); diff --git a/tests/Unit/Factory/PiggyBankFactoryTest.php b/tests/Unit/Factory/PiggyBankFactoryTest.php index 042e63856a..ff36f2d594 100644 --- a/tests/Unit/Factory/PiggyBankFactoryTest.php +++ b/tests/Unit/Factory/PiggyBankFactoryTest.php @@ -91,6 +91,6 @@ class PiggyBankFactoryTest extends TestCase /** @var PiggyBankFactory $factory */ $factory = app(PiggyBankFactory::class); $factory->setUser($this->user()); - $this->assertNull($factory->find(null, 'I dont exist.' . random_int(1, 1000))); + $this->assertNull($factory->find(null, 'I dont exist.' . random_int(1, 10000))); } } diff --git a/tests/Unit/Factory/TagFactoryTest.php b/tests/Unit/Factory/TagFactoryTest.php index 67c3c0093e..284ac8c6c6 100644 --- a/tests/Unit/Factory/TagFactoryTest.php +++ b/tests/Unit/Factory/TagFactoryTest.php @@ -51,7 +51,7 @@ class TagFactoryTest extends TestCase */ public function testFindOrCreateNew(): void { - $tag = 'Some new tag#' . random_int(1, 1000); + $tag = 'Some new tag#' . random_int(1, 10000); /** @var TagFactory $factory */ $factory = app(TagFactory::class); $factory->setUser($this->user()); diff --git a/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php index c0ed25f96c..61dc12ba5a 100644 --- a/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php @@ -43,7 +43,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'A_unit_' . random_int(1, 1000); + $job->key = 'A_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -66,7 +66,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'B_unit_' . random_int(1, 1000); + $job->key = 'B_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'needs_config'; $job->provider = 'fake'; @@ -89,7 +89,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'C_unit_' . random_int(1, 1000); + $job->key = 'C_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -114,7 +114,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'D_unit_' . random_int(1, 1000); + $job->key = 'D_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'config'; $job->provider = 'fake'; @@ -142,7 +142,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'E_unit_' . random_int(1, 1000); + $job->key = 'E_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -169,7 +169,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'f_unit_' . random_int(1, 1000); + $job->key = 'f_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'config'; $job->provider = 'fake'; @@ -197,7 +197,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'g_unit_' . random_int(1, 1000); + $job->key = 'g_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -224,7 +224,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'h_unit_' . random_int(1, 1000); + $job->key = 'h_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -259,7 +259,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'i_unit_' . random_int(1, 1000); + $job->key = 'i_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -294,7 +294,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'j_unit_' . random_int(1, 1000); + $job->key = 'j_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -329,7 +329,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'k_unit_' . random_int(1, 1000); + $job->key = 'k_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -364,7 +364,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'l_unit_' . random_int(1, 1000); + $job->key = 'l_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -399,7 +399,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'm_unit_' . random_int(1, 1000); + $job->key = 'm_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -434,7 +434,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'n_unit_' . random_int(1, 1000); + $job->key = 'n_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -469,7 +469,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'o_unit_' . random_int(1, 1000); + $job->key = 'o_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -504,7 +504,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'p_unit_' . random_int(1, 1000); + $job->key = 'p_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'not_new'; $job->provider = 'fake'; @@ -528,7 +528,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'p_unit_' . random_int(1, 1000); + $job->key = 'p_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -552,7 +552,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'p_unit_' . random_int(1, 1000); + $job->key = 'p_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -576,7 +576,7 @@ class FakeJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'p_unit_' . random_int(1, 1000); + $job->key = 'p_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php index 8ee551a236..c927e5c229 100644 --- a/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php @@ -49,7 +49,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'File_A_unit_' . random_int(1, 1000); + $job->key = 'File_A_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -72,7 +72,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'File_B_unit_' . random_int(1, 1000); + $job->key = 'File_B_unit_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'ready_to_run'; $job->provider = 'fake'; @@ -95,7 +95,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'I-file_' . random_int(1, 1000); + $job->key = 'I-Cfile_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'map'; $job->provider = 'file'; @@ -103,8 +103,8 @@ class FileJobConfigurationTest extends TestCase $job->configuration = []; $job->save(); - $bag = new MessageBag; - $result = null; + $bag = new MessageBag; + $result = null; $configurator = new FileJobConfiguration; $configurator->setImportJob($job); @@ -130,7 +130,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'G-file_' . random_int(1, 1000); + $job->key = 'G-Dfile_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'configure-upload'; $job->provider = 'file'; @@ -163,7 +163,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'H-file_' . random_int(1, 1000); + $job->key = 'H-Efile_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'map'; $job->provider = 'file'; @@ -196,7 +196,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'F-file_' . random_int(1, 1000); + $job->key = 'F-fFile_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'file'; @@ -229,7 +229,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'H-file_' . random_int(1, 1000); + $job->key = 'H-fiGle_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'roles'; $job->provider = 'file'; @@ -262,7 +262,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Dfile_' . random_int(1, 1000); + $job->key = 'DfiHle_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'configure-upload'; $job->provider = 'file'; @@ -290,7 +290,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Ffile_' . random_int(1, 1000); + $job->key = 'FfilIe_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'map'; $job->provider = 'file'; @@ -318,7 +318,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Cfile_' . random_int(1, 1000); + $job->key = 'CfJile_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'file'; @@ -346,7 +346,7 @@ class FileJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'Efile_' . random_int(1, 1000); + $job->key = 'EfiKle_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'roles'; $job->provider = 'file'; diff --git a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php index 226a6e5dce..dc114e789a 100644 --- a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php @@ -46,7 +46,7 @@ class SpectreJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'spectre_jc_A' . random_int(1, 1000); + $job->key = 'spectre_jc_A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -75,7 +75,7 @@ class SpectreJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'spectre_jc_B' . random_int(1, 1000); + $job->key = 'spectre_jc_B' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'do-authenticate'; $job->provider = 'spectre'; @@ -107,7 +107,7 @@ class SpectreJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'spectre_jc_C' . random_int(1, 1000); + $job->key = 'spectre_jc_C' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'choose-login'; $job->provider = 'spectre'; @@ -137,7 +137,7 @@ class SpectreJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'spectre_jc_D' . random_int(1, 1000); + $job->key = 'spectre_jc_D' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'authenticated'; $job->provider = 'spectre'; @@ -166,7 +166,7 @@ class SpectreJobConfigurationTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'spectre_jc_E' . random_int(1, 1000); + $job->key = 'spectre_jc_E' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'choose-accounts'; $job->provider = 'spectre'; diff --git a/tests/Unit/Import/Routine/BunqRoutineTest.php b/tests/Unit/Import/Routine/BunqRoutineTest.php index eb53266989..a2a3b6f28a 100644 --- a/tests/Unit/Import/Routine/BunqRoutineTest.php +++ b/tests/Unit/Import/Routine/BunqRoutineTest.php @@ -45,7 +45,7 @@ class BunqRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'brY_' . random_int(1, 1000); + $job->key = 'brY_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'go-for-import'; $job->provider = 'bunq'; @@ -84,7 +84,7 @@ class BunqRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'brX_' . random_int(1, 1000); + $job->key = 'brX_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'new'; $job->provider = 'bunq'; diff --git a/tests/Unit/Import/Routine/FakeRoutineTest.php b/tests/Unit/Import/Routine/FakeRoutineTest.php index d85c8d5392..e1c87cb448 100644 --- a/tests/Unit/Import/Routine/FakeRoutineTest.php +++ b/tests/Unit/Import/Routine/FakeRoutineTest.php @@ -45,7 +45,7 @@ class FakeRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'a_route_' . random_int(1, 1000); + $job->key = 'a_route_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'ahoy'; $job->provider = 'fake'; @@ -81,7 +81,7 @@ class FakeRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'a_route_' . random_int(1, 1000); + $job->key = 'a_route_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'final'; $job->provider = 'fake'; @@ -118,7 +118,7 @@ class FakeRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'a_route_' . random_int(1, 1000); + $job->key = 'a_route_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Import/Routine/FileRoutineTest.php b/tests/Unit/Import/Routine/FileRoutineTest.php index 48a109030f..69e4dee94e 100644 --- a/tests/Unit/Import/Routine/FileRoutineTest.php +++ b/tests/Unit/Import/Routine/FileRoutineTest.php @@ -45,7 +45,7 @@ class FileRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'a_fr_' . random_int(1, 1000); + $job->key = 'a_fr_' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'ready_to_run'; $job->provider = 'file'; diff --git a/tests/Unit/Import/Routine/SpectreRoutineTest.php b/tests/Unit/Import/Routine/SpectreRoutineTest.php index 8267ed506c..557df164ae 100644 --- a/tests/Unit/Import/Routine/SpectreRoutineTest.php +++ b/tests/Unit/Import/Routine/SpectreRoutineTest.php @@ -46,7 +46,7 @@ class SpectreRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'SR1A' . random_int(1, 1000); + $job->key = 'SR1A' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'do-authenticate'; $job->provider = 'spectre'; @@ -77,7 +77,7 @@ class SpectreRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'SR2b' . random_int(1, 1000); + $job->key = 'SR2b' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'authenticated'; $job->provider = 'spectre'; @@ -115,7 +115,7 @@ class SpectreRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'SR3c' . random_int(1, 1000); + $job->key = 'SR3c' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'go-for-import'; $job->provider = 'spectre'; @@ -154,7 +154,7 @@ class SpectreRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'SR4A' . random_int(1, 1000); + $job->key = 'SR4A' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -194,7 +194,7 @@ class SpectreRoutineTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'SR5A' . random_int(1, 1000); + $job->key = 'SR5A' . random_int(1, 10000); $job->status = 'ready_to_run'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/Import/Storage/ImportArrayStorageTest.php b/tests/Unit/Import/Storage/ImportArrayStorageTest.php index 21b646e342..0b8a96b017 100644 --- a/tests/Unit/Import/Storage/ImportArrayStorageTest.php +++ b/tests/Unit/Import/Storage/ImportArrayStorageTest.php @@ -58,7 +58,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'a_storage' . random_int(1, 1000); + $job->key = 'a_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -99,7 +99,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'h_storage' . random_int(1, 1000); + $job->key = 'h_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -171,7 +171,7 @@ class ImportArrayStorageTest extends TestCase $transactions = [$this->singleWithdrawal(), $this->singleWithdrawal()]; $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'b_storage' . random_int(1, 1000); + $job->key = 'b_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -232,7 +232,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'c_storage' . random_int(1, 1000); + $job->key = 'c_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -271,7 +271,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'd_storage' . random_int(1, 1000); + $job->key = 'd_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -313,7 +313,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'e_storage' . random_int(1, 1000); + $job->key = 'e_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -364,7 +364,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'f_storage' . random_int(1, 1000); + $job->key = 'f_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -419,7 +419,7 @@ class ImportArrayStorageTest extends TestCase // make fake job $job = new ImportJob; $job->user()->associate($this->user()); - $job->key = 'g_storage' . random_int(1, 1000); + $job->key = 'g_storage' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php index 1777874cf8..e22adeee6d 100644 --- a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php +++ b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php @@ -40,7 +40,7 @@ class AccountDestroyServiceTest extends TestCase public function testDestroyBasic(): void { $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); /** @var AccountDestroyService $service */ @@ -57,7 +57,7 @@ class AccountDestroyServiceTest extends TestCase { // create objects: $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); Transaction::create(['account_id' => $account->id, 'transaction_journal_id' => 1, 'amount' => 10, 'transaction_currency_id' => 1]); @@ -79,11 +79,11 @@ class AccountDestroyServiceTest extends TestCase public function testDestroyMove(): void { $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); $move = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); $transaction = Transaction::create(['account_id' => $account->id, 'transaction_journal_id' => 1, 'amount' => 10, 'transaction_currency_id' => 1]); diff --git a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php index 20eb24074f..78d2873381 100644 --- a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php @@ -46,7 +46,7 @@ class AccountUpdateServiceTest extends TestCase { /** @var Account $account */ $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); $opposing = $this->user()->accounts()->first(); @@ -67,7 +67,7 @@ class AccountUpdateServiceTest extends TestCase $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, @@ -96,7 +96,7 @@ class AccountUpdateServiceTest extends TestCase /** @var Account $account */ $account = $this->user()->accounts()->first(); $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, @@ -119,7 +119,7 @@ class AccountUpdateServiceTest extends TestCase /** @var Account $account */ $account = $this->user()->accounts()->first(); $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, @@ -149,7 +149,7 @@ class AccountUpdateServiceTest extends TestCase $note->save(); $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, @@ -174,7 +174,7 @@ class AccountUpdateServiceTest extends TestCase { /** @var Account $account */ $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); $opposing = $this->user()->accounts()->first(); @@ -195,7 +195,7 @@ class AccountUpdateServiceTest extends TestCase $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, @@ -229,7 +229,7 @@ class AccountUpdateServiceTest extends TestCase /** @var Account $account */ $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); $opposing = $this->user()->accounts()->first(); @@ -250,7 +250,7 @@ class AccountUpdateServiceTest extends TestCase $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, @@ -281,11 +281,11 @@ class AccountUpdateServiceTest extends TestCase { /** @var Account $account */ $account = Account::create( - ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), + ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 10000), 'virtual_balance' => '0', 'iban' => null, 'active' => true] ); $data = [ - 'name' => 'Some new name #' . random_int(1, 1000), + 'name' => 'Some new name #' . random_int(1, 10000), 'active' => true, 'virtualBalance' => '0', 'iban' => null, diff --git a/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php index 170d960fdd..f7e4637fc0 100644 --- a/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php @@ -65,7 +65,7 @@ class JournalUpdateServiceTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->where('transaction_type_id', 2)->first(); $data = [ - 'description' => 'Updated journal #' . random_int(1, 1000), + 'description' => 'Updated journal #' . random_int(1, 10000), 'date' => new Carbon('2018-01-01'), 'bill_id' => null, 'bill_name' => null, @@ -107,7 +107,7 @@ class JournalUpdateServiceTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 2)->first(); $data = [ - 'description' => 'Updated journal #' . random_int(1, 1000), + 'description' => 'Updated journal #' . random_int(1, 10000), 'date' => new Carbon('2018-01-01'), 'bill_id' => null, 'bill_name' => null, @@ -199,7 +199,7 @@ class JournalUpdateServiceTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->skip(4)->where('transaction_type_id', 1)->first(); $data = [ - 'description' => 'Updated journal #' . random_int(1, 1000), + 'description' => 'Updated journal #' . random_int(1, 10000), 'date' => new Carbon('2018-01-01'), 'bill_id' => null, 'bill_name' => null, diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php index ce2bb7022f..427a848272 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php @@ -50,7 +50,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'caha' . random_int(1, 1000); + $job->key = 'caha' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -81,7 +81,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahb' . random_int(1, 1000); + $job->key = 'cahb' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -114,7 +114,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahc' . random_int(1, 1000); + $job->key = 'cahc' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -168,7 +168,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahd' . random_int(1, 1000); + $job->key = 'cahd' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -222,7 +222,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahe' . random_int(1, 1000); + $job->key = 'cahe' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -276,7 +276,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahf' . random_int(1, 1000); + $job->key = 'cahf' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -323,7 +323,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahg' . random_int(1, 1000); + $job->key = 'cahg' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -386,7 +386,7 @@ class ChooseAccountsHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cahg' . random_int(1, 1000); + $job->key = 'cahg' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php index cc407f65dc..089a87e92b 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php @@ -39,7 +39,7 @@ class NewBunqJobHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'cXha' . random_int(1, 1000); + $job->key = 'cXha' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php index eabd82eafa..a85ca2dda2 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php @@ -51,7 +51,7 @@ class ConfigureMappingHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapG' . random_int(1, 1000); + $job->key = 'mapG' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -118,7 +118,7 @@ class ConfigureMappingHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapA' . random_int(1, 1000); + $job->key = 'mapA' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -150,7 +150,7 @@ class ConfigureMappingHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapE' . random_int(1, 1000); + $job->key = 'mapE' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -214,7 +214,7 @@ class ConfigureMappingHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapC' . random_int(1, 1000); + $job->key = 'mapC' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -243,7 +243,7 @@ class ConfigureMappingHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapH' . random_int(1, 1000); + $job->key = 'mapH' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -324,7 +324,7 @@ class ConfigureMappingHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapD' . random_int(1, 1000); + $job->key = 'mapD' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -352,7 +352,7 @@ class ConfigureMappingHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapF' . random_int(1, 1000); + $job->key = 'mapF' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -439,7 +439,7 @@ class ConfigureMappingHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapB' . random_int(1, 1000); + $job->key = 'mapB' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -468,7 +468,7 @@ class ConfigureMappingHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'mapB' . random_int(1, 1000); + $job->key = 'mapB' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php index daf05e3553..0810a2971d 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php @@ -117,7 +117,7 @@ class ConfigureRolesHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'role-B' . random_int(1, 1000); + $job->key = 'role-B' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -193,7 +193,7 @@ class ConfigureRolesHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'role-x' . random_int(1, 1000); + $job->key = 'role-x' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -270,7 +270,7 @@ class ConfigureRolesHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'role-x' . random_int(1, 1000); + $job->key = 'role-x' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -340,7 +340,7 @@ class ConfigureRolesHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'role-x' . random_int(1, 1000); + $job->key = 'role-x' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -504,7 +504,7 @@ class ConfigureRolesHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'role-A' . random_int(1, 1000); + $job->key = 'role-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php index 51727b981d..caec067b68 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php @@ -43,7 +43,7 @@ class ConfigureUploadHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'upload-B' . random_int(1, 1000); + $job->key = 'upload-B' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -92,7 +92,7 @@ class ConfigureUploadHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'upload-B' . random_int(1, 1000); + $job->key = 'upload-B' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -140,7 +140,7 @@ class ConfigureUploadHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'upload-A' . random_int(1, 1000); + $job->key = 'upload-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php index e81a5c752c..947c80a591 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php @@ -46,7 +46,7 @@ class NewFileJobHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'newfile-A' . random_int(1, 1000); + $job->key = 'newfile-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -101,7 +101,7 @@ class NewFileJobHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'newfile-A' . random_int(1, 1000); + $job->key = 'newfile-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -159,7 +159,7 @@ class NewFileJobHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'newfile-A' . random_int(1, 1000); + $job->key = 'newfile-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -206,7 +206,7 @@ class NewFileJobHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'newfile-x' . random_int(1, 1000); + $job->key = 'newfile-x' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; @@ -254,7 +254,7 @@ class NewFileJobHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'newfile-x' . random_int(1, 1000); + $job->key = 'newfile-x' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php index 6defb45701..7e6089d9a9 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php @@ -54,7 +54,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-A' . random_int(1, 1000); + $job->key = 'sca-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -89,7 +89,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-B' . random_int(1, 1000); + $job->key = 'sca-B' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -128,7 +128,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-c' . random_int(1, 1000); + $job->key = 'sca-c' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -187,7 +187,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-E' . random_int(1, 1000); + $job->key = 'sca-E' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -246,7 +246,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-D' . random_int(1, 1000); + $job->key = 'sca-D' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -303,7 +303,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-E' . random_int(1, 1000); + $job->key = 'sca-E' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -433,7 +433,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-F' . random_int(1, 1000); + $job->key = 'sca-F' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -586,7 +586,7 @@ class ChooseAccountsHandlerTest extends TestCase // fake job: $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sca-F' . random_int(1, 1000); + $job->key = 'sca-F' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php index 7ecf6f9eb6..a565e7e6ca 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php @@ -51,7 +51,7 @@ class ChooseLoginHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'slh-A' . random_int(1, 1000); + $job->key = 'slh-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -74,7 +74,7 @@ class ChooseLoginHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'slh-B' . random_int(1, 1000); + $job->key = 'slh-B' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -98,7 +98,7 @@ class ChooseLoginHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'slh-C' . random_int(1, 1000); + $job->key = 'slh-C' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -138,7 +138,7 @@ class ChooseLoginHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'slh-C' . random_int(1, 1000); + $job->key = 'slh-C' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -256,7 +256,7 @@ class ChooseLoginHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'slh-C' . random_int(1, 1000); + $job->key = 'slh-C' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php index 2ed672d401..66d9073ae4 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php @@ -51,7 +51,7 @@ class DoAuthenticateHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sda-A' . random_int(1, 1000); + $job->key = 'sda-A' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php index 5377832253..5537abf7bb 100644 --- a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php @@ -57,7 +57,7 @@ class StageImportDataHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sidh_bbunq_' . random_int(1, 1000); + $job->key = 'sidh_bbunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -107,7 +107,7 @@ class StageImportDataHandlerTest extends TestCase $payment = new BunqPayment($amount, $pointer, 'Some descr', null, null); $payment->setAmount($amount); $payment->setCounterpartyAlias($labelMonetaryAccount); - $payment->setDescription('Random description #' . random_int(1, 1000)); + $payment->setDescription('Random description #' . random_int(1, 10000)); $value = [$payment]; $list = new BunqResponsePaymentList($value, [], null); @@ -191,7 +191,7 @@ class StageImportDataHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sidA_bbunq_' . random_int(1, 1000); + $job->key = 'sidA_bbunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -253,7 +253,7 @@ class StageImportDataHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sidh_bbunq_' . random_int(1, 1000); + $job->key = 'sidh_bbunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -295,7 +295,7 @@ class StageImportDataHandlerTest extends TestCase $payment = new BunqPayment($amount, $pointer, 'Some descr', null, null); $payment->setAmount($amount); - $payment->setDescription('Some random thing #' . random_int(1, 1000)); + $payment->setDescription('Some random thing #' . random_int(1, 10000)); $payment->setCounterpartyAlias($labelMonetaryAccount); $value = [$payment]; $list = new BunqResponsePaymentList($value, [], null); @@ -377,7 +377,7 @@ class StageImportDataHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sidh_bbunq_' . random_int(1, 1000); + $job->key = 'sidh_bbunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -427,7 +427,7 @@ class StageImportDataHandlerTest extends TestCase $payment = new BunqPayment($amount, $pointer, 'Some descr', null, null); $payment->setAmount($amount); $payment->setCounterpartyAlias($labelMonetaryAccount); - $payment->setDescription('Random transfer #' . random_int(1, 1000)); + $payment->setDescription('Random transfer #' . random_int(1, 10000)); $value = [$payment]; $list = new BunqResponsePaymentList($value, [], null); diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php index 46e26530f0..ccb76ea512 100644 --- a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php @@ -57,7 +57,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'snh_bunq_' . random_int(1, 1000); + $job->key = 'snh_bunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -143,7 +143,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'snha_bunq_' . random_int(1, 1000); + $job->key = 'snha_bunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; @@ -234,7 +234,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'snh_bbunq_' . random_int(1, 1000); + $job->key = 'snh_bbunq_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'bunq'; diff --git a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php index 1ca935f984..ae0eb7b245 100644 --- a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php +++ b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php @@ -45,7 +45,7 @@ class LineReaderTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'linerA' . random_int(1, 1000); + $job->key = 'linerA' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php index e6a56968aa..22fd281170 100644 --- a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php +++ b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php @@ -120,7 +120,7 @@ class MappingConvergerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'linerB' . random_int(1, 1000); + $job->key = 'linerB' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'fake'; diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php index 99bc1e4a3b..63576001d7 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php @@ -112,7 +112,7 @@ class StageAuthenticatedHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sa_a_' . random_int(1, 1000); + $job->key = 'sa_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -241,7 +241,7 @@ class StageAuthenticatedHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sa_a_' . random_int(1, 1000); + $job->key = 'sa_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -370,7 +370,7 @@ class StageAuthenticatedHandlerTest extends TestCase $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sa_a_' . random_int(1, 1000); + $job->key = 'sa_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php index a64cfcfb31..e620538173 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php @@ -113,7 +113,7 @@ class StageImportDataHandlerTest extends TestCase $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sid_a_' . random_int(1, 1000); + $job->key = 'sid_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -313,7 +313,7 @@ class StageImportDataHandlerTest extends TestCase $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sid_a_' . random_int(1, 1000); + $job->key = 'sid_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -510,7 +510,7 @@ class StageImportDataHandlerTest extends TestCase $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sid_a_' . random_int(1, 1000); + $job->key = 'sid_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php index 2aeb598c0f..e254ee89bd 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php @@ -59,7 +59,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sn_a_' . random_int(1, 1000); + $job->key = 'sn_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -126,7 +126,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sn_a_' . random_int(1, 1000); + $job->key = 'sn_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -179,7 +179,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sn_a_' . random_int(1, 1000); + $job->key = 'sn_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; @@ -248,7 +248,7 @@ class StageNewHandlerTest extends TestCase { $job = new ImportJob; $job->user_id = $this->user()->id; - $job->key = 'sn_a_' . random_int(1, 1000); + $job->key = 'sn_a_' . random_int(1, 10000); $job->status = 'new'; $job->stage = 'new'; $job->provider = 'spectre'; diff --git a/tests/Unit/TransactionRules/Actions/AddTagTest.php b/tests/Unit/TransactionRules/Actions/AddTagTest.php index 2957cf143b..d208ee8131 100644 --- a/tests/Unit/TransactionRules/Actions/AddTagTest.php +++ b/tests/Unit/TransactionRules/Actions/AddTagTest.php @@ -59,7 +59,7 @@ class AddTagTest extends TestCase { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $ruleAction = new RuleAction; - $ruleAction->action_value = 'TestTag-' . random_int(1, 1000); + $ruleAction->action_value = 'TestTag-' . random_int(1, 10000); $action = new AddTag($ruleAction); $result = $action->act($journal); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php b/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php index 118873e738..606851f858 100644 --- a/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php +++ b/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php @@ -39,7 +39,7 @@ class PrependDescriptionTest extends TestCase public function testAct(): void { // get journal, give fixed description - $description = 'text' . random_int(1, 1000); + $description = 'text' . random_int(1, 10000); $prepend = 'prepend' . random_int(1, 1234); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->description = $description; diff --git a/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php b/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php index fc6691c67d..c43fa41e7b 100644 --- a/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php +++ b/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php @@ -39,7 +39,7 @@ class SetDescriptionTest extends TestCase public function testAct(): void { // get journal, give fixed description - $description = 'text' . random_int(1, 1000); + $description = 'text' . random_int(1, 10000); $newDescription = 'new description' . random_int(1, 1234); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->description = $description; diff --git a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php index 0cd9b5594e..96d59797da 100644 --- a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php +++ b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php @@ -103,7 +103,7 @@ class SetDestinationAccountTest extends TestCase // fire the action: $ruleAction = new RuleAction; - $ruleAction->action_value = 'Not existing asset account #' . random_int(1, 1000); + $ruleAction->action_value = 'Not existing asset account #' . random_int(1, 10000); $action = new SetDestinationAccount($ruleAction); $result = $action->act($journal); $this->assertFalse($result); @@ -134,7 +134,7 @@ class SetDestinationAccountTest extends TestCase // fire the action: $ruleAction = new RuleAction; - $ruleAction->action_value = 'Not existing expense account #' . random_int(1, 1000); + $ruleAction->action_value = 'Not existing expense account #' . random_int(1, 10000); $action = new SetDestinationAccount($ruleAction); $result = $action->act($journal); @@ -202,7 +202,7 @@ class SetDestinationAccountTest extends TestCase // fire the action: $ruleAction = new RuleAction; - $ruleAction->action_value = 'Some new asset ' . random_int(1, 1000); + $ruleAction->action_value = 'Some new asset ' . random_int(1, 10000); $action = new SetDestinationAccount($ruleAction); $result = $action->act($journal); $this->assertFalse($result); diff --git a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php index 4e5fbf69d5..b56271d315 100644 --- a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php +++ b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php @@ -104,7 +104,7 @@ class SetSourceAccountTest extends TestCase // fire the action: $ruleAction = new RuleAction; - $ruleAction->action_value = 'Some new revenue #' . random_int(1, 1000); + $ruleAction->action_value = 'Some new revenue #' . random_int(1, 10000); $action = new SetSourceAccount($ruleAction); $result = $action->act($journal); $this->assertTrue($result); @@ -173,7 +173,7 @@ class SetSourceAccountTest extends TestCase // fire the action: $ruleAction = new RuleAction; - $ruleAction->action_value = 'Some new account #' . random_int(1, 1000); + $ruleAction->action_value = 'Some new account #' . random_int(1, 10000); $action = new SetSourceAccount($ruleAction); $result = $action->act($journal); $this->assertFalse($result); @@ -196,7 +196,7 @@ class SetSourceAccountTest extends TestCase $accountRepos->shouldReceive('setUser'); // fire the action: $ruleAction = new RuleAction; - $ruleAction->action_value = 'Some new asset ' . random_int(1, 1000); + $ruleAction->action_value = 'Some new asset ' . random_int(1, 10000); $action = new SetSourceAccount($ruleAction); $result = $action->act($journal); $this->assertFalse($result); diff --git a/tests/Unit/Transformers/AccountTransformerTest.php b/tests/Unit/Transformers/AccountTransformerTest.php index 4e7bd534d9..2ceb1039ca 100644 --- a/tests/Unit/Transformers/AccountTransformerTest.php +++ b/tests/Unit/Transformers/AccountTransformerTest.php @@ -142,7 +142,7 @@ class AccountTransformerTest extends TestCase 'noteable_id' => $account->id, 'noteable_type' => Account::class, 'title' => null, - 'text' => 'I am a note #' . random_int(1, 1000), + 'text' => 'I am a note #' . random_int(1, 10000), ] ); @@ -233,7 +233,7 @@ class AccountTransformerTest extends TestCase 'noteable_id' => $account->id, 'noteable_type' => Account::class, 'title' => null, - 'text' => 'I am a note #' . random_int(1, 1000), + 'text' => 'I am a note #' . random_int(1, 10000), ] ); @@ -421,7 +421,7 @@ class AccountTransformerTest extends TestCase 'noteable_id' => $account->id, 'noteable_type' => Account::class, 'title' => null, - 'text' => 'I am a note #' . random_int(1, 1000), + 'text' => 'I am a note #' . random_int(1, 10000), ] ); diff --git a/tests/Unit/Transformers/TagTransformerTest.php b/tests/Unit/Transformers/TagTransformerTest.php index de3e80cb64..c5bbcdb3cf 100644 --- a/tests/Unit/Transformers/TagTransformerTest.php +++ b/tests/Unit/Transformers/TagTransformerTest.php @@ -44,7 +44,7 @@ class TagTransformerTest extends TestCase $tag = Tag::create( [ 'user_id' => $this->user()->id, - 'tag' => 'Some tag ' . random_int(1, 1000), + 'tag' => 'Some tag ' . random_int(1, 10000), 'tagMode' => 'nothing', 'date' => '2018-01-01', 'description' => 'Some tag', diff --git a/tests/Unit/Transformers/TransactionTransformerTest.php b/tests/Unit/Transformers/TransactionTransformerTest.php index a75ddcdce1..4ffaeff0e2 100644 --- a/tests/Unit/Transformers/TransactionTransformerTest.php +++ b/tests/Unit/Transformers/TransactionTransformerTest.php @@ -280,7 +280,7 @@ class TransactionTransformerTest extends TestCase $budget = Budget::create( [ 'user_id' => $this->user()->id, - 'name' => 'Random budget #' . random_int(1, 1000), + 'name' => 'Random budget #' . random_int(1, 10000), 'active' => 1, ] ); @@ -464,7 +464,7 @@ class TransactionTransformerTest extends TestCase $budget = Budget::create( [ 'user_id' => $this->user()->id, - 'name' => 'Random budget #' . random_int(1, 1000), + 'name' => 'Random budget #' . random_int(1, 10000), 'active' => 1, ] ); @@ -566,7 +566,7 @@ class TransactionTransformerTest extends TestCase $category = Category::create( [ 'user_id' => $this->user()->id, - 'name' => 'Random category #' . random_int(1, 1000), + 'name' => 'Random category #' . random_int(1, 10000), 'active' => 1, ] ); @@ -1024,7 +1024,7 @@ class TransactionTransformerTest extends TestCase $budget = Budget::create( [ 'user_id' => $this->user()->id, - 'name' => 'Random budget #' . random_int(1, 1000), + 'name' => 'Random budget #' . random_int(1, 10000), 'active' => 1, ] ); @@ -1128,7 +1128,7 @@ class TransactionTransformerTest extends TestCase $category = Category::create( [ 'user_id' => $this->user()->id, - 'name' => 'Random category #' . random_int(1, 1000), + 'name' => 'Random category #' . random_int(1, 10000), 'active' => 1, ] ); From 780e365a7887736023b3defa8b9d643461c55150 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 17:23:44 +0200 Subject: [PATCH 11/86] Possible fix for #1527 --- .../Controllers/Budget/AmountController.php | 19 ++-- .../Controllers/Budget/IndexController.php | 56 +++--------- .../Controllers/Budget/ShowController.php | 90 ++++++++++--------- .../Http/Controllers/DateCalculation.php | 56 ++++++++++++ resources/views/budgets/index.twig | 2 +- resources/views/budgets/no-budget.twig | 8 +- routes/breadcrumbs.php | 27 +++--- routes/web.php | 4 +- 8 files changed, 141 insertions(+), 121 deletions(-) diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index f4e912cd50..0696a387d6 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -74,6 +74,8 @@ class AmountController extends Controller * @param Budget $budget * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget): JsonResponse { @@ -128,16 +130,13 @@ class AmountController extends Controller public function infoIncome(Carbon $start, Carbon $end) { $range = app('preferences')->get('viewRange', '1M')->data; - /** @var Carbon $searchBegin */ $searchBegin = app('navigation')->subtractPeriod($start, $range, 3); $searchEnd = app('navigation')->addPeriod($end, $range, 3); $daysInPeriod = $start->diffInDays($end); $daysInSearchPeriod = $searchBegin->diffInDays($searchEnd); - - // get average available budget from repository: - $average = $this->repository->getAverageAvailable($start, $end); - $available = bcmul($average, (string)$daysInPeriod); + $average = $this->repository->getAverageAvailable($start, $end); + $available = bcmul($average, (string)$daysInPeriod); // amount earned in this period: /** @var JournalCollectorInterface $collector */ @@ -159,17 +158,11 @@ class AmountController extends Controller $suggested = $spentAverage; // if the user makes less per period, suggest that amount instead. - if (bccomp($spentAverage, $earnedAverage) === 1) { + if (1 === bccomp($spentAverage, $earnedAverage)) { $suggested = $earnedAverage; } - $result - = [ - 'available' => $available, - 'earned' => $earnedAverage, - 'spent' => $spentAverage, - 'suggested' => $suggested, - ]; + $result = ['available' => $available, 'earned' => $earnedAverage, 'spent' => $spentAverage, 'suggested' => $suggested,]; return view('budgets.info', compact('result', 'searchBegin', 'searchEnd', 'start', 'end')); } diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index f1db2e95a4..602d665f58 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -70,6 +70,8 @@ class IndexController extends Controller * @param string|null $moment * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function index(Request $request, string $moment = null) { @@ -78,11 +80,10 @@ class IndexController extends Controller $end = session('end', new Carbon); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; - $days = 0; + $moment = $moment ?? ''; - - // make date if present: - if (null !== $moment || '' !== (string)$moment) { + // make date if the data is given. + if ('' !== (string)$moment) { try { $start = new Carbon($moment); $end = app('navigation')->endOfPeriod($start, $range); @@ -94,15 +95,7 @@ class IndexController extends Controller // if today is between start and end, use the diff in days between end and today (days left) // otherwise, use diff between start and end. - $today = new Carbon; - if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); - } - if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); - } - $days = 0 === $days ? 1 : $days; - + $dayDifference = $this->getDayDifference($start, $end); $next = clone $end; $next->addDay(); @@ -122,39 +115,12 @@ class IndexController extends Controller $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); $spent = array_sum(array_column($budgetInformation, 'spent')); $budgeted = array_sum(array_column($budgetInformation, 'budgeted')); + $previousLoop = $this->getPreviousPeriods($start, $range); + $nextLoop = $this->getNextPeriods($end, $range); // paginate budgets $budgets = new LengthAwarePaginator($budgets, $total, $pageSize, $page); $budgets->setPath(route('budgets.index')); - - // select thing for last 12 periods: - $previousLoop = []; - /** @var Carbon $previousDate */ - $previousDate = clone $start; - $count = 0; - while ($count < 12) { - $previousDate->subDay(); - $previousDate = app('navigation')->startOfPeriod($previousDate, $range); - $format = $previousDate->format('Y-m-d'); - $previousLoop[$format] = app('navigation')->periodShow($previousDate, $range); - ++$count; - } - - // select thing for next 12 periods: - $nextLoop = []; - /** @var Carbon $nextDate */ - $nextDate = clone $end; - $nextDate->addDay(); - $count = 0; - - while ($count < 12) { - $format = $nextDate->format('Y-m-d'); - $nextLoop[$format] = app('navigation')->periodShow($nextDate, $range); - $nextDate = app('navigation')->endOfPeriod($nextDate, $range); - ++$count; - $nextDate->addDay(); - } - // display info $currentMonth = app('navigation')->periodShow($start, $range); $nextText = app('navigation')->periodShow($next, $range); @@ -162,7 +128,8 @@ class IndexController extends Controller return view( 'budgets.index', compact( - 'available', 'currentMonth', 'next', 'nextText', 'prev', 'allBudgets', 'prevText', 'periodStart', 'periodEnd', 'days', 'page', + 'available', 'currentMonth', 'next', 'nextText', 'prev', 'allBudgets', 'prevText', 'periodStart', 'periodEnd', 'dayDifference', + 'page', 'budgetInformation', 'daysPassed', 'inactive', 'budgets', 'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end' ) @@ -170,7 +137,4 @@ class IndexController extends Controller } - - - } \ No newline at end of file diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 168c3c9ebc..bbb9939df2 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -68,52 +68,23 @@ class ShowController extends Controller } /** - * @param Request $request - * @param JournalRepositoryInterface $repository - * @param string|null $moment + * @param Request $request + * @param Carbon|null $start + * @param Carbon|null $end * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function noBudget(Request $request, JournalRepositoryInterface $repository, string $moment = null) + public function noBudget(Request $request, Carbon $start = null, Carbon $end = null) { - // default values: - $moment = $moment ?? ''; - $range = app('preferences')->get('viewRange', '1M')->data; - $start = null; - $end = null; - $periods = new Collection; - - // prep for "all" view. - if ('all' === $moment) { - $subTitle = trans('firefly.all_journals_without_budget'); - $first = $repository->firstNull(); - $start = null === $first ? new Carbon : $first->date; - $end = new Carbon; - } - - // prep for "specific date" view. - if ('all' !== $moment && \strlen($moment) > 0) { - $start = new Carbon($moment); - /** @var Carbon $end */ - $end = app('navigation')->endOfPeriod($start, $range); - $subTitle = trans( - 'firefly.without_budget_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - $periods = $this->getPeriodOverview(); - } - - // prep for current period - if ('' === $moment) { - $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); - $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); - $periods = $this->getPeriodOverview(); - $subTitle = trans( - 'firefly.without_budget_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - } - + /** @var Carbon $start */ + $start = $start ?? session('start'); + /** @var Carbon $end */ + $end = $end ?? session('end'); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->getPeriodOverview(); $page = (int)$request->get('page'); $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; @@ -124,9 +95,36 @@ class ShowController extends Controller $transactions = $collector->getPaginatedJournals(); $transactions->setPath(route('budgets.no-budget')); + return view('budgets.no-budget', compact('transactions', 'subTitle', 'periods', 'start', 'end')); + } + + /** + * @param Request $request + * @param JournalRepositoryInterface $repository + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function noBudgetAll(Request $request, JournalRepositoryInterface $repository) + { + $subTitle = trans('firefly.all_journals_without_budget'); + $first = $repository->firstNull(); + $start = null === $first ? new Carbon : $first->date; + $end = new Carbon; + $page = (int)$request->get('page'); + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $moment = 'all'; + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) + ->withoutBudget()->withOpposingAccount(); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.no-budget')); + return view('budgets.no-budget', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); } + /** * @param Request $request * @param Budget $budget @@ -262,7 +260,13 @@ class ShowController extends Controller /** @noinspection PhpUndefinedMethodInspection */ $dateStr = $date['end']->format('Y-m-d'); $dateName = app('navigation')->periodShow($date['end'], $date['period']); - $entries->push(['string' => $dateStr, 'name' => $dateName, 'count' => $journals, 'sum' => $sum, 'date' => clone $date['end']]); + $entries->push( + ['string' => $dateStr, 'name' => $dateName, 'count' => $journals, 'sum' => $sum, 'date' => clone $date['end'], + 'start' => $date['start'], + 'end' => $date['end'], + + ] + ); } $cache->store($entries); diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.php index 353c695ef2..14b7616d49 100644 --- a/app/Support/Http/Controllers/DateCalculation.php +++ b/app/Support/Http/Controllers/DateCalculation.php @@ -90,4 +90,60 @@ trait DateCalculation } + /** + * Get a list of the periods that will occur after this date. For example, + * March 2018, April 2018, etc. + * + * @param Carbon $date + * @param string $range + * + * @return array + */ + protected function getNextPeriods(Carbon $date, string $range): array + { + // select thing for next 12 periods: + $loop = []; + /** @var Carbon $current */ + $current = clone $date; + $current->addDay(); + $count = 0; + + while ($count < 12) { + $format = $current->format('Y-m-d'); + $loop[$format] = app('navigation')->periodShow($current, $range); + $current = app('navigation')->endOfPeriod($current, $range); + ++$count; + $current->addDay(); + } + + return $loop; + } + + /** + * Get a list of the periods that occurred before the start date. For example, + * March 2018, February 2018, etc. + * + * @param Carbon $date + * @param string $range + * + * @return array + */ + protected function getPreviousPeriods(Carbon $date, string $range): array + { + // select thing for last 12 periods: + $loop = []; + /** @var Carbon $current */ + $current = clone $date; + $count = 0; + while ($count < 12) { + $current->subDay(); + $current = app('navigation')->startOfPeriod($current, $range); + $format = $current->format('Y-m-d'); + $loop[$format] = app('navigation')->periodShow($current, $range); + ++$count; + } + + return $loop; + } + } \ No newline at end of file diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 89f02a1877..c5d57c0cb4 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -194,7 +194,7 @@ data-value="{{ (repAmount + budgetInformation[budget.id]['spent']) }}"> {{ (repAmount + budgetInformation[budget.id]['spent'])|formatAmount }} {% if repAmount + budgetInformation[budget.id]['spent'] > 0 %} - ({{ ((repAmount + budgetInformation[budget.id]['spent']) / days)|formatAmount }}) + ({{ ((repAmount + budgetInformation[budget.id]['spent']) / daysPassed)|formatAmount }}) {% endif %} diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index 6b1c5fb6dc..99e99236fe 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, moment, start, end) }} + {{ Breadcrumbs.render(Route.getCurrentRoute.getName, '', start, end) }} {% endblock %} {% block content %} @@ -26,7 +26,7 @@ {% if periods.count > 0 %}

                                                                          - {{ 'show_all_no_filter'|_ }} + {{ 'show_all_no_filter'|_ }}

                                                                          {% else %}

                                                                          @@ -44,7 +44,7 @@ {% if period.count > 0 %}

                                                                          -

                                                                          {{ period.name }} +

                                                                          {{ period.name }}

                                                                          @@ -71,7 +71,7 @@ {% if periods.count > 0 %}
                                                                          -

                                                                          {{ 'showEverything'|_ }}

                                                                          +

                                                                          {{ 'showEverything'|_ }}

                                                                          {% endif %} diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 5a895da18c..dce4573a4c 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -359,20 +359,21 @@ try { function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('budgets.no-budget', ['a', 'b'])); + } + ); - // push when is all: - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget', ['all'])); - } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] - ); - $breadcrumbs->push($title, route('budgets.no-budget', [$moment])); - } + Breadcrumbs::register( + 'budgets.no-budget-all', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('budgets.index'); + $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); + $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget-all')); } ); diff --git a/routes/web.php b/routes/web.php index d971cf5344..ad10cd6236 100755 --- a/routes/web.php +++ b/routes/web.php @@ -205,7 +205,9 @@ Route::group( // show Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']); Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']); - Route::get('list/no-budget/{moment?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']); + Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']); + Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']); + // index Route::get('{moment?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index']); From e4b1760b20cc30159593bb84c890cab522a32ac4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 17:33:10 +0200 Subject: [PATCH 12/86] Remove exit clause from test. --- tests/Feature/Controllers/Budget/AmountControllerTest.php | 2 ++ tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Feature/Controllers/Budget/AmountControllerTest.php b/tests/Feature/Controllers/Budget/AmountControllerTest.php index e42ea09c1e..5e1ea56dd3 100644 --- a/tests/Feature/Controllers/Budget/AmountControllerTest.php +++ b/tests/Feature/Controllers/Budget/AmountControllerTest.php @@ -149,6 +149,7 @@ class AmountControllerTest extends TestCase $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); $accountRepos->shouldReceive('setUser'); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + $repository->shouldReceive('getAverageAvailable')->andReturn('100.123')->once(); $this->be($this->user()); $response = $this->get(route('budgets.income.info', ['20170101', '20170131'])); @@ -170,6 +171,7 @@ class AmountControllerTest extends TestCase $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); $accountRepos->shouldReceive('setUser'); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + $repository->shouldReceive('getAverageAvailable')->andReturn('100.123')->once(); $this->be($this->user()); $this->changeDateRange($this->user(), $range); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index a193001169..8c765570e7 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -70,7 +70,6 @@ class FromAccountStartsTest extends TestCase $trigger = FromAccountStarts::makeFromStrings(substr($account->name, 0, -3), false); $result = $trigger->triggered($journal); $this->assertTrue($result); - exit; } /** From c424bb097d5488062458ae025228e343f0dfd49a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 22:48:22 +0200 Subject: [PATCH 13/86] Improve category code quality. --- .../V1/Controllers/BudgetLimitController.php | 3 + .../Controllers/Budget/ShowController.php | 2 + .../Category/NoCategoryController.php | 225 ++++++++++++ .../Controllers/Category/ShowController.php | 217 ++++++++++++ app/Http/Controllers/CategoryController.php | 295 +--------------- resources/views/categories/no-category.twig | 6 +- resources/views/categories/show.twig | 8 +- routes/breadcrumbs.php | 55 +-- routes/web.php | 25 +- .../Category/NoCategoryControllerTest.php | 175 ++++++++++ .../Category/ShowControllerTest.php | 236 +++++++++++++ .../Controllers/CategoryControllerTest.php | 327 +----------------- 12 files changed, 922 insertions(+), 652 deletions(-) create mode 100644 app/Http/Controllers/Category/NoCategoryController.php create mode 100644 app/Http/Controllers/Category/ShowController.php create mode 100644 tests/Feature/Controllers/Category/NoCategoryControllerTest.php create mode 100644 tests/Feature/Controllers/Category/ShowControllerTest.php diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php index d4cf2dd75c..1acbae59d5 100644 --- a/app/Api/V1/Controllers/BudgetLimitController.php +++ b/app/Api/V1/Controllers/BudgetLimitController.php @@ -97,8 +97,11 @@ class BudgetLimitController extends Controller $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; $budgetId = (int)($request->get('budget_id') ?? 0); $budget = $this->repository->findNull($budgetId); + $start = null; + $end = null; $this->parameters->set('budget_id', $budgetId); + try { $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); $this->parameters->set('start', $start->format('Y-m-d')); diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index bbb9939df2..1d815d8f5f 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -228,6 +228,8 @@ class ShowController extends Controller /** * @return Collection + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function getPeriodOverview(): Collection { diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php new file mode 100644 index 0000000000..d98a546e75 --- /dev/null +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -0,0 +1,225 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Category; + + +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Support\CacheProperties; +use Illuminate\Http\Request; +use Illuminate\Support\Collection; +use Log; + +/** + * + * Class NoCategoryController + */ +class NoCategoryController extends Controller +{ + + /** @var JournalRepositoryInterface */ + private $journalRepos; + /** @var CategoryRepositoryInterface */ + private $repository; + + /** + * CategoryController constructor. + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.categories')); + app('view')->share('mainTitleIcon', 'fa-bar-chart'); + $this->journalRepos = app(JournalRepositoryInterface::class); + $this->repository = app(CategoryRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param string|null $moment + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function show(Request $request, Carbon $start = null, Carbon $end = null) + { + Log::debug('Start of noCategory()'); + /** @var Carbon $start */ + $start = $start ?? session('start'); + /** @var Carbon $end */ + $end = $end ?? session('end'); + $moment = ''; + $page = (int)$request->get('page'); + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $subTitle = trans( + 'firefly.without_category_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->getNoCategoryPeriodOverview($start); + + Log::debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d'))); + Log::debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d'))); + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount() + ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); + $collector->removeFilter(InternalTransferFilter::class); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('categories.no-category')); + + return view('categories.no-category', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); + } + + + /** + * @param Request $request + * @param string|null $moment + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function showAll(Request $request, string $moment = null) + { + // default values: + $moment = $moment ?? ''; + $start = null; + $end = null; + $periods = new Collection; + $page = (int)$request->get('page'); + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + Log::debug('Start of noCategory()'); + $subTitle = trans('firefly.all_journals_without_category'); + $first = $this->journalRepos->firstNull(); + $start = null === $first ? new Carbon : $first->date; + $end = new Carbon; + Log::debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d'))); + Log::debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d'))); + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount() + ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); + $collector->removeFilter(InternalTransferFilter::class); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('categories.no-category')); + + return view('categories.no-category', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); + } + + + /** + * @param Carbon $theDate + * + * @return Collection + */ + private function getNoCategoryPeriodOverview(Carbon $theDate): Collection + { + Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d'))); + $range = app('preferences')->get('viewRange', '1M')->data; + $first = $this->journalRepos->firstNull(); + $start = null === $first ? new Carbon : $first->date; + $end = $theDate ?? new Carbon; + + Log::debug(sprintf('Start for getNoCategoryPeriodOverview() is %s', $start->format('Y-m-d'))); + Log::debug(sprintf('End for getNoCategoryPeriodOverview() is %s', $end->format('Y-m-d'))); + + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('no-category-period-entries'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + $dates = app('navigation')->blockPeriods($start, $end, $range); + $entries = new Collection; + + foreach ($dates as $date) { + + // count journals without category in this period: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() + ->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); + $collector->removeFilter(InternalTransferFilter::class); + $count = $collector->getJournals()->count(); + + // amount transferred + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() + ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); + $collector->removeFilter(InternalTransferFilter::class); + $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount')); + + // amount spent + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()->withOpposingAccount()->setTypes( + [TransactionType::WITHDRAWAL] + ); + $spent = $collector->getJournals()->sum('transaction_amount'); + + // amount earned + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()->withOpposingAccount()->setTypes( + [TransactionType::DEPOSIT] + ); + $earned = $collector->getJournals()->sum('transaction_amount'); + /** @noinspection PhpUndefinedMethodInspection */ + $dateStr = $date['end']->format('Y-m-d'); + $dateName = app('navigation')->periodShow($date['end'], $date['period']); + $entries->push( + [ + 'string' => $dateStr, + 'name' => $dateName, + 'count' => $count, + 'spent' => $spent, + 'earned' => $earned, + 'transferred' => $transferred, + 'start' => clone $date['start'], + 'end' => clone $date['end'], + ] + ); + } + Log::debug('End of loops'); + $cache->store($entries); + + return $entries; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php new file mode 100644 index 0000000000..824600dc2e --- /dev/null +++ b/app/Http/Controllers/Category/ShowController.php @@ -0,0 +1,217 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Category; + +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\Category; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Support\CacheProperties; +use Illuminate\Http\Request; +use Illuminate\Support\Collection; + + +/** + * + * Class ShowController + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class ShowController extends Controller +{ + + /** @var AccountRepositoryInterface */ + private $accountRepos; + /** @var JournalRepositoryInterface */ + private $journalRepos; + /** @var CategoryRepositoryInterface */ + private $repository; + + /** + * CategoryController constructor. + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', trans('firefly.categories')); + app('view')->share('mainTitleIcon', 'fa-bar-chart'); + $this->journalRepos = app(JournalRepositoryInterface::class); + $this->repository = app(CategoryRepositoryInterface::class); + $this->accountRepos = app(AccountRepositoryInterface::class); + + return $next($request); + } + ); + } + + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * @param Request $request + * @param Category $category + * @param Carbon|null $start + * @param Carbon|null $end + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) + { + /** @var Carbon $start */ + $start = $start ?? session('start'); + /** @var Carbon $end */ + $end = $end ?? session('end'); + $subTitleIcon = 'fa-bar-chart'; + $moment = ''; + $page = (int)$request->get('page'); + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $periods = $this->getPeriodOverview($category, $start); + $path = route('categories.show', [$category->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); + $subTitle = trans( + 'firefly.journals_in_period_for_category', + ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), + 'end' => $end->formatLocalized($this->monthAndDayFormat),] + ); + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() + ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); + $collector->removeFilter(InternalTransferFilter::class); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath($path); + + return view('categories.show', compact('category', 'transactions', 'moment', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); + } + + /** + * @param Request $request + * @param Category $category + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function showAll(Request $request, Category $category) + { + // default values: + $subTitleIcon = 'fa-bar-chart'; + $page = (int)$request->get('page'); + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $start = null; + $end = null; + $periods = new Collection; + $moment = 'all'; + + $subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]); + $first = $this->repository->firstUseDate($category); + /** @var Carbon $start */ + $start = $first ?? new Carbon; + $end = new Carbon; + $path = route('categories.show-all', [$category->id]); + + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() + ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); + $collector->removeFilter(InternalTransferFilter::class); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath($path); + + return view('categories.show', compact('category', 'moment', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); + } + + /** + * @param Category $category + * + * @param Carbon $date + * + * @return Collection + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + private function getPeriodOverview(Category $category, Carbon $date): Collection + { + $range = app('preferences')->get('viewRange', '1M')->data; + $first = $this->journalRepos->firstNull(); + $start = null === $first ? new Carbon : $first->date; + $end = $date ?? new Carbon; + $accounts = $this->accountRepos->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + + // properties for entries with their amounts. + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty($range); + $cache->addProperty('categories.entries'); + $cache->addProperty($category->id); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + /** @var array $dates */ + $dates = app('navigation')->blockPeriods($start, $end, $range); + $entries = new Collection; + + foreach ($dates as $currentDate) { + $spent = $this->repository->spentInPeriod(new Collection([$category]), $accounts, $currentDate['start'], $currentDate['end']); + $earned = $this->repository->earnedInPeriod(new Collection([$category]), $accounts, $currentDate['start'], $currentDate['end']); + /** @noinspection PhpUndefinedMethodInspection */ + $dateStr = $currentDate['end']->format('Y-m-d'); + $dateName = app('navigation')->periodShow($currentDate['end'], $currentDate['period']); + + // amount transferred + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category) + ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); + $collector->removeFilter(InternalTransferFilter::class); + $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount')); + + $entries->push( + [ + 'string' => $dateStr, + 'name' => $dateName, + 'spent' => $spent, + 'earned' => $earned, + 'sum' => bcadd($earned, $spent), + 'transferred' => $transferred, + 'start' => clone $currentDate['start'], + 'end' => clone $currentDate['end'], + ] + ); + } + $cache->store($entries); + + return $entries; + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 184a04e6bd..233cc93f34 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -22,31 +22,18 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; -use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Http\Requests\CategoryFormRequest; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Category; -use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; -use Log; /** * Class CategoryController. */ class CategoryController extends Controller { - /** @var AccountRepositoryInterface */ - private $accountRepos; - /** @var JournalRepositoryInterface */ - private $journalRepos; /** @var CategoryRepositoryInterface */ private $repository; @@ -61,9 +48,7 @@ class CategoryController extends Controller function ($request, $next) { app('view')->share('title', trans('firefly.categories')); app('view')->share('mainTitleIcon', 'fa-bar-chart'); - $this->journalRepos = app(JournalRepositoryInterface::class); - $this->repository = app(CategoryRepositoryInterface::class); - $this->accountRepos = app(AccountRepositoryInterface::class); + $this->repository = app(CategoryRepositoryInterface::class); return $next($request); } @@ -163,139 +148,6 @@ class CategoryController extends Controller return view('categories.index', compact('categories')); } - /** - * @param Request $request - * @param string|null $moment - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function noCategory(Request $request, string $moment = null) - { - // default values: - $moment = $moment ?? ''; - $range = app('preferences')->get('viewRange', '1M')->data; - $start = null; - $end = null; - $periods = new Collection; - $page = (int)$request->get('page'); - $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; - Log::debug('Start of noCategory()'); - // prep for "all" view. - if ('all' === $moment) { - $subTitle = trans('firefly.all_journals_without_category'); - $first = $this->journalRepos->firstNull(); - $start = null === $first ? new Carbon : $first->date; - $end = new Carbon; - Log::debug('Moment is all()'); - } - - // prep for "specific date" view. - if ('all' !== $moment && \strlen($moment) > 0) { - /** @var Carbon $start */ - $start = app('navigation')->startOfPeriod(new Carbon($moment), $range); - /** @var Carbon $end */ - $end = app('navigation')->endOfPeriod($start, $range); - $subTitle = trans( - 'firefly.without_category_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - $periods = $this->getNoCategoryPeriodOverview($start); - - } - - // prep for current period - if ('' === $moment) { - $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); - $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); - $periods = $this->getNoCategoryPeriodOverview($start); - $subTitle = trans( - 'firefly.without_category_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - } - Log::debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d'))); - Log::debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d'))); - - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount() - ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); - $collector->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); - $transactions->setPath(route('categories.no-category')); - - return view('categories.no-category', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); - } - - /** - * @param Request $request - * @param Category $category - * @param string|null $moment - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function show(Request $request, Category $category, string $moment = null) - { - // default values: - $moment = $moment ?? ''; - $subTitle = $category->name; - $subTitleIcon = 'fa-bar-chart'; - $page = (int)$request->get('page'); - $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; - $range = app('preferences')->get('viewRange', '1M')->data; - $start = null; - $end = null; - $periods = new Collection; - $path = route('categories.show', [$category->id]); - - // prep for "all" view. - if ('all' === $moment) { - $subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]); - $first = $this->repository->firstUseDate($category); - /** @var Carbon $start */ - $start = $first ?? new Carbon; - $end = new Carbon; - $path = route('categories.show', [$category->id, 'all']); - } - - // prep for "specific date" view. - if ('all' !== $moment && \strlen($moment) > 0) { - $start = app('navigation')->startOfPeriod(new Carbon($moment), $range); - /** @var Carbon $end */ - $end = app('navigation')->endOfPeriod($start, $range); - $subTitle = trans( - 'firefly.journals_in_period_for_category', - ['name' => $category->name, - 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat),] - ); - $periods = $this->getPeriodOverview($category, $start); - $path = route('categories.show', [$category->id, $moment]); - } - - // prep for current period - if ('' === $moment) { - /** @var Carbon $start */ - $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); - /** @var Carbon $end */ - $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); - $periods = $this->getPeriodOverview($category, $start); - $subTitle = trans( - 'firefly.journals_in_period_for_category', - ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), - 'end' => $end->formatLocalized($this->monthAndDayFormat),] - ); - } - - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() - ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); - $collector->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); - $transactions->setPath($path); - - return view('categories.show', compact('category', 'moment', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); - } /** * @param CategoryFormRequest $request @@ -353,149 +205,4 @@ class CategoryController extends Controller } - /** - * @param Carbon $theDate - * - * @return Collection - */ - private function getNoCategoryPeriodOverview(Carbon $theDate): Collection - { - Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d'))); - $range = app('preferences')->get('viewRange', '1M')->data; - $first = $this->journalRepos->firstNull(); - $start = null === $first ? new Carbon : $first->date; - $end = $theDate ?? new Carbon; - - Log::debug(sprintf('Start for getNoCategoryPeriodOverview() is %s', $start->format('Y-m-d'))); - Log::debug(sprintf('End for getNoCategoryPeriodOverview() is %s', $end->format('Y-m-d'))); - - // properties for cache - $cache = new CacheProperties; - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty('no-category-period-entries'); - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - - $dates = app('navigation')->blockPeriods($start, $end, $range); - $entries = new Collection; - - foreach ($dates as $date) { - - // count journals without category in this period: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() - ->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); - $collector->removeFilter(InternalTransferFilter::class); - $count = $collector->getJournals()->count(); - - // amount transferred - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() - ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); - $collector->removeFilter(InternalTransferFilter::class); - $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount')); - - // amount spent - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()->withOpposingAccount()->setTypes( - [TransactionType::WITHDRAWAL] - ); - $spent = $collector->getJournals()->sum('transaction_amount'); - - // amount earned - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()->withOpposingAccount()->setTypes( - [TransactionType::DEPOSIT] - ); - $earned = $collector->getJournals()->sum('transaction_amount'); - /** @noinspection PhpUndefinedMethodInspection */ - $dateStr = $date['end']->format('Y-m-d'); - $dateName = app('navigation')->periodShow($date['end'], $date['period']); - $entries->push( - [ - 'string' => $dateStr, - 'name' => $dateName, - 'count' => $count, - 'spent' => $spent, - 'earned' => $earned, - 'transferred' => $transferred, - 'date' => clone $date['end'], - ] - ); - } - Log::debug('End of loops'); - $cache->store($entries); - - return $entries; - } - - - /** - * @param Category $category - * - * @param Carbon $date - * - * @return Collection - */ - private function getPeriodOverview(Category $category, Carbon $date): Collection - { - $range = app('preferences')->get('viewRange', '1M')->data; - $first = $this->journalRepos->firstNull(); - $start = null === $first ? new Carbon : $first->date; - $end = $date ?? new Carbon; - $accounts = $this->accountRepos->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - - // properties for entries with their amounts. - $cache = new CacheProperties(); - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty($range); - $cache->addProperty('categories.entries'); - $cache->addProperty($category->id); - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - /** @var array $dates */ - $dates = app('navigation')->blockPeriods($start, $end, $range); - $entries = new Collection; - - foreach ($dates as $currentDate) { - $spent = $this->repository->spentInPeriod(new Collection([$category]), $accounts, $currentDate['start'], $currentDate['end']); - $earned = $this->repository->earnedInPeriod(new Collection([$category]), $accounts, $currentDate['start'], $currentDate['end']); - /** @noinspection PhpUndefinedMethodInspection */ - $dateStr = $currentDate['end']->format('Y-m-d'); - $dateName = app('navigation')->periodShow($currentDate['end'], $currentDate['period']); - - // amount transferred - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category) - ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); - $collector->removeFilter(InternalTransferFilter::class); - $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount')); - - $entries->push( - [ - 'string' => $dateStr, - 'name' => $dateName, - 'spent' => $spent, - 'earned' => $earned, - 'sum' => bcadd($earned, $spent), - 'transferred' => $transferred, - 'date' => clone $currentDate['end'], - ] - ); - } - $cache->store($entries); - - return $entries; - } } diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig index caefb483b1..da8077c8b7 100644 --- a/resources/views/categories/no-category.twig +++ b/resources/views/categories/no-category.twig @@ -10,7 +10,7 @@ {% if periods.count > 0 %}
                                                                          -

                                                                          {{ 'showEverything'|_ }}

                                                                          +

                                                                          {{ 'showEverything'|_ }}

                                                                          {% endif %} @@ -26,7 +26,7 @@ {% if periods.count > 0 %}

                                                                          - {{ 'show_all_no_filter'|_ }} + {{ 'show_all_no_filter'|_ }}

                                                                          {% else %}

                                                                          @@ -44,7 +44,7 @@ {% if period.count > 0 %}

                                                                          -

                                                                          {{ period.name }} +

                                                                          {{ period.name }}

                                                                          diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index e456ed03c4..d3ccd0f5e6 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, moment, start, end) }} + {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, '', start, end) }} {% endblock %} {% block content %} @@ -52,7 +52,7 @@ {% if periods.count > 0 %}
                                                                          -

                                                                          {{ 'showEverything'|_ }}

                                                                          +

                                                                          {{ 'showEverything'|_ }}

                                                                          {% endif %} @@ -69,7 +69,7 @@ {% if periods.count > 0 %}

                                                                          - + {{ 'show_all_no_filter'|_ }}

                                                                          @@ -90,7 +90,7 @@ {% if period.spent != 0 or period.earned != 0 or period.sum != 0 %}
                                                                          -

                                                                          {{ period.name }} +

                                                                          {{ period.name }}

                                                                          diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index dce4573a4c..3c8cfa7263 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -441,20 +441,21 @@ try { function (BreadCrumbsGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push($category->name, route('categories.show', [$category->id])); + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('categories.show', [$category->id, $moment])); + } + ); - // push when is all: - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('categories.show', [$category->id, 'all'])); - } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] - ); - $breadcrumbs->push($title, route('categories.show', [$category->id, $moment])); - } + Breadcrumbs::register( + 'categories.show-all', + function (BreadCrumbsGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('categories.index'); + $breadcrumbs->push($category->name, route('categories.show', [$category->id])); + $breadcrumbs->push(trans('firefly.everything'), route('categories.show', [$category->id, 'all'])); } ); @@ -463,20 +464,22 @@ try { function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('categories.no-category', [$moment])); + } + ); - // push when is all: - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category', ['all'])); - } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] - ); - $breadcrumbs->push($title, route('categories.no-category', [$moment])); - } + + Breadcrumbs::register( + 'categories.no-category-all', + function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('categories.index'); + $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); + $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category-all')); } ); diff --git a/routes/web.php b/routes/web.php index ad10cd6236..b401f43fb5 100755 --- a/routes/web.php +++ b/routes/web.php @@ -225,17 +225,30 @@ Route::group( */ Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'categories', 'as' => 'categories.'], function () { + + // index: Route::get('', ['uses' => 'CategoryController@index', 'as' => 'index']); + + // create Route::get('create', ['uses' => 'CategoryController@create', 'as' => 'create']); - Route::get('edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'edit']); - Route::get('delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'delete']); - - Route::get('show/{category}/{moment?}', ['uses' => 'CategoryController@show', 'as' => 'show']); - Route::get('list/no-category/{moment?}', ['uses' => 'CategoryController@noCategory', 'as' => 'no-category']); - Route::post('store', ['uses' => 'CategoryController@store', 'as' => 'store']); + + // edit + Route::get('edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'edit']); Route::post('update/{category}', ['uses' => 'CategoryController@update', 'as' => 'update']); + + // delete + Route::get('delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'delete']); Route::post('destroy/{category}', ['uses' => 'CategoryController@destroy', 'as' => 'destroy']); + + // show category: + Route::get('show/{category}/all', ['uses' => 'Category\ShowController@showAll', 'as' => 'show-all']); + Route::get('show/{category}/{start_date?}/{end_date?}', ['uses' => 'Category\ShowController@show', 'as' => 'show']); + + // no category controller: + Route::get('list/no-category/all', ['uses' => 'Category\NoCategoryController@showAll', 'as' => 'no-category-all']); + Route::get('list/no-category/{start_date?}/{end_date?}', ['uses' => 'Category\NoCategoryController@show', 'as' => 'no-category']); + } ); diff --git a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php new file mode 100644 index 0000000000..970bebd2c7 --- /dev/null +++ b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php @@ -0,0 +1,175 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Category; + + +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; +use Log; +use Navigation; +use Tests\TestCase; + +/** + * + * Class NoCategoryControllerTest + */ +class NoCategoryControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Category\NoCategoryController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoCategory(string $range): void + { + Log::debug(sprintf('Test noCategory(%s)', $range)); + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + + // get the journal with the most recent date for firstNull: + $journal = $this->user()->transactionJournals()->orderBy('date', 'DESC')->first(); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn($journal); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('withoutCategory')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.no-category')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Category\NoCategoryController + * @dataProvider dateRangeProvider + * + * @param string $range + * + */ + public function testNoCategoryAll(string $range): void + { + Log::debug('Test nocategoryAll()'); + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('withoutCategory')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.no-category', ['all'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Category\NoCategoryController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoCategoryDate(string $range): void + { + Log::debug('Test nocategorydate()'); + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('withoutCategory')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + + Navigation::shouldReceive('updateStartDate')->andReturn(new Carbon); + Navigation::shouldReceive('updateEndDate')->andReturn(new Carbon); + Navigation::shouldReceive('startOfPeriod')->andReturn(new Carbon); + Navigation::shouldReceive('endOfPeriod')->andReturn(new Carbon); + Navigation::shouldReceive('periodShow')->andReturn('Some date'); + Navigation::shouldReceive('blockPeriods')->andReturn([['period' => '1M', 'start' => new Carbon, 'end' => new Carbon]])->once(); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.no-category', ['2016-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                '); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php new file mode 100644 index 0000000000..d40057c0ff --- /dev/null +++ b/tests/Feature/Controllers/Category/ShowControllerTest.php @@ -0,0 +1,236 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Category; + + +use Tests\TestCase; +use Log; + +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; +use FireflyIII\Models\Category; +use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; +use Navigation; +/** + * + * Class ShowControllerTest + */ +class ShowControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Category\ShowController + * + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShow(string $range): void + { + Log::debug('Test show()'); + $transaction = factory(Transaction::class)->make(); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); + + // mock stuff + $categoryRepos->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepos->shouldReceive('earnedInPeriod')->andReturn('0'); + + $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); + + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->atLeast(2); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(2); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); + + $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); + + Navigation::shouldReceive('updateStartDate')->andReturn(new Carbon); + Navigation::shouldReceive('updateEndDate')->andReturn(new Carbon); + Navigation::shouldReceive('startOfPeriod')->andReturn(new Carbon); + Navigation::shouldReceive('endOfPeriod')->andReturn(new Carbon); + Navigation::shouldReceive('periodShow')->andReturn('Some date'); + Navigation::shouldReceive('blockPeriods')->andReturn([['period' => '1M', 'start' => new Carbon, 'end' => new Carbon]])->once(); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Category\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowAll(string $range): void + { + Log::debug('Test showAll()'); + // mock stuff + $transaction = factory(Transaction::class)->make(); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(CategoryRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setRange')->andReturnSelf()->once(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->once(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->once(); + + $collector->shouldReceive('setCategory')->andReturnSelf()->once(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); + + $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); + $repository->shouldReceive('firstUseDate')->andReturn(new Carbon); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.show', [1, 'all'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Category\ShowController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowByDate(string $range): void + { + Log::debug('Test showbydate()'); + // mock stuff + $transaction = factory(Transaction::class)->make(); + $repository = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $month = new Carbon(); + $month->startOfMonth(); + $journal = TransactionJournal::where('date', '>=', $month->format('Y-m-d') . ' 00:00:00')->first(); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn($journal); + + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); + + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('earnedInPeriod')->andReturn('1'); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $today = new Carbon(); + $today->subDay(); + $response = $this->get(route('categories.show', [1, $today->format('Y-m-d')])); + $response->assertStatus(200); + $response->assertSee('
                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Category\ShowController + * + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowEmpty(string $range): void + { + Log::debug('Test showempty()'); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); + + // mock stuff + $repository = $this->mock(CategoryRepositoryInterface::class); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('earnedInPeriod')->andReturn('0'); + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); + + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->atLeast(1); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); + $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); + + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->atLeast(1); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                        '); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index 3f6122bd90..d187148674 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -23,18 +23,13 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; -use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Category; -use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Log; -use Navigation; use Tests\TestCase; /** @@ -49,14 +44,14 @@ class CategoryControllerTest extends TestCase /** * */ - public function setUp() + public function setUp(): void { parent::setUp(); Log::debug(sprintf('Now in %s.', \get_class($this))); } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::create + * @covers \FireflyIII\Http\Controllers\CategoryController */ public function testCreate(): void { @@ -75,7 +70,7 @@ class CategoryControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::delete + * @covers \FireflyIII\Http\Controllers\CategoryController */ public function testDelete(): void { @@ -94,7 +89,7 @@ class CategoryControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::destroy + * @covers \FireflyIII\Http\Controllers\CategoryController */ public function testDestroy(): void { @@ -115,7 +110,7 @@ class CategoryControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::edit + * @covers \FireflyIII\Http\Controllers\CategoryController */ public function testEdit(): void { @@ -134,8 +129,7 @@ class CategoryControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::index - * @covers \FireflyIII\Http\Controllers\CategoryController::__construct + * @covers \FireflyIII\Http\Controllers\CategoryController */ public function testIndex(): void { @@ -157,312 +151,7 @@ class CategoryControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory - * @covers \FireflyIII\Http\Controllers\CategoryController::getNoCategoryPeriodOverview - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testNoCategory(string $range): void - { - Log::debug(sprintf('Test noCategory(%s)', $range)); - // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - - - // get the journal with the most recent date for firstNull: - $journal = $this->user()->transactionJournals()->orderBy('date','DESC')->first(); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn($journal); - - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('withoutCategory')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('categories.no-category')); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory - * @covers \FireflyIII\Http\Controllers\CategoryController::getNoCategoryPeriodOverview - * @dataProvider dateRangeProvider - * - * @param string $range - * - */ - public function testNoCategoryAll(string $range): void - { - Log::debug('Test nocategoryAll()'); - // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); - - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('withoutCategory')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('categories.no-category', ['all'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory - * @covers \FireflyIII\Http\Controllers\CategoryController::getNoCategoryPeriodOverview - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testNoCategoryDate(string $range): void - { - Log::debug('Test nocategorydate()'); - // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); - - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('withoutCategory')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - - Navigation::shouldReceive('updateStartDate')->andReturn(new Carbon); - Navigation::shouldReceive('updateEndDate')->andReturn(new Carbon); - Navigation::shouldReceive('startOfPeriod')->andReturn(new Carbon); - Navigation::shouldReceive('endOfPeriod')->andReturn(new Carbon); - Navigation::shouldReceive('periodShow')->andReturn('Some date'); - Navigation::shouldReceive('blockPeriods')->andReturn([['period' => '1M', 'start' => new Carbon, 'end' => new Carbon]])->once(); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('categories.no-category', ['2016-01-01'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::show - * @covers \FireflyIII\Http\Controllers\CategoryController::getPeriodOverview - * - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShow(string $range): void - { - Log::debug('Test show()'); - $transaction = factory(Transaction::class)->make(); - $categoryRepos = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); - - // mock stuff - $categoryRepos->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepos->shouldReceive('earnedInPeriod')->andReturn('0'); - - $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); - - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(2); - $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(2); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->atLeast(2); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(2); - $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(2); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); - - $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); - - Navigation::shouldReceive('updateStartDate')->andReturn(new Carbon); - Navigation::shouldReceive('updateEndDate')->andReturn(new Carbon); - Navigation::shouldReceive('startOfPeriod')->andReturn(new Carbon); - Navigation::shouldReceive('endOfPeriod')->andReturn(new Carbon); - Navigation::shouldReceive('periodShow')->andReturn('Some date'); - Navigation::shouldReceive('blockPeriods')->andReturn([['period' => '1M', 'start' => new Carbon, 'end' => new Carbon]])->once(); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('categories.show', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::show - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowAll(string $range): void - { - Log::debug('Test showAll()'); - // mock stuff - $transaction = factory(Transaction::class)->make(); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $repository = $this->mock(CategoryRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); - $collector->shouldReceive('setRange')->andReturnSelf()->once(); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->once(); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->once(); - - $collector->shouldReceive('setCategory')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); - - $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); - $repository->shouldReceive('firstUseDate')->andReturn(new Carbon); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('categories.show', [1, 'all'])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::show - * @covers \FireflyIII\Http\Controllers\CategoryController::getPeriodOverview - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowByDate(string $range): void - { - Log::debug('Test showbydate()'); - // mock stuff - $transaction = factory(Transaction::class)->make(); - $repository = $this->mock(CategoryRepositoryInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $month = new Carbon(); - $month->startOfMonth(); - $journal = TransactionJournal::where('date', '>=', $month->format('Y-m-d') . ' 00:00:00')->first(); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn($journal); - - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->atLeast(1); - $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); - - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('earnedInPeriod')->andReturn('1'); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $today = new Carbon(); - $today->subDay(); - $response = $this->get(route('categories.show', [1, $today->format('Y-m-d')])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::show - * @covers \FireflyIII\Http\Controllers\CategoryController::getPeriodOverview - * - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowEmpty(string $range): void - { - Log::debug('Test showempty()'); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); - - // mock stuff - $repository = $this->mock(CategoryRepositoryInterface::class); - $repository->shouldReceive('spentInPeriod')->andReturn('0'); - $repository->shouldReceive('earnedInPeriod')->andReturn('0'); - - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); - - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('setRange')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->atLeast(1); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); - - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->atLeast(1); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $response = $this->get(route('categories.show', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::store + * @covers \FireflyIII\Http\Controllers\CategoryController * @covers \FireflyIII\Http\Requests\CategoryFormRequest */ public function testStore(): void @@ -487,7 +176,7 @@ class CategoryControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\CategoryController::update + * @covers \FireflyIII\Http\Controllers\CategoryController * @covers \FireflyIII\Http\Requests\CategoryFormRequest */ public function testUpdate(): void From 5dad569d62964c450794a50ed34b79a517bb597e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 23:04:05 +0200 Subject: [PATCH 14/86] Add some method annotators, see if this helps with Scrutinizer issues. --- app/Helpers/Attachments/AttachmentHelper.php | 2 +- .../LinkType/LinkTypeRepository.php | 2 +- .../LinkType/LinkTypeRepositoryInterface.php | 8 ++++++ app/Support/Facades/Amount.php | 4 +++ app/Support/Facades/Navigation.php | 3 +++ app/Support/Facades/Preferences.php | 7 +++++ app/Support/Facades/Steam.php | 1 + app/Support/Navigation.php | 2 +- app/Support/Preferences.php | 26 +++++++++---------- 9 files changed, 38 insertions(+), 17 deletions(-) diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 849705f2da..12c61e22b5 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -166,7 +166,7 @@ class AttachmentHelper implements AttachmentHelperInterface $attachment->md5 = md5_file($path); $attachment->mime = $mime; $attachment->size = \strlen($content); - $attachment->uploaded = 1; + $attachment->uploaded = true; $attachment->save(); return true; diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index a7c79b891a..117bcaa6e9 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -210,7 +210,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index 617cb45b59..eb584560dc 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\LinkType; use FireflyIII\Models\LinkType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -62,6 +63,13 @@ interface LinkTypeRepositoryInterface */ public function find(int $id): LinkType; + /** + * Set the user for this instance. + * + * @param User $user + */ + public function setUser(User $user): void; + /** * Find link type by name. * diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php index 24bb3d89c6..f575f3ac01 100644 --- a/app/Support/Facades/Amount.php +++ b/app/Support/Facades/Amount.php @@ -22,11 +22,15 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\User; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Amount. + * + * @method TransactionCurrency getDefaultCurrencyByUser(User $user) */ class Amount extends Facade { diff --git a/app/Support/Facades/Navigation.php b/app/Support/Facades/Navigation.php index f54c32e414..2b2fe45e7d 100644 --- a/app/Support/Facades/Navigation.php +++ b/app/Support/Facades/Navigation.php @@ -27,6 +27,9 @@ use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Navigation. + * + * @method array blockPeriods(\Carbon\Carbon $start, \Carbon\Carbon $end, string $range) + * @method string periodShow(\Carbon\Carbon $theDate, string $repeatFrequency) */ class Navigation extends Facade { diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index a166989cbb..d438f999f8 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -22,11 +22,18 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use FireflyIII\Models\Preference; +use FireflyIII\User; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Preferences. + * + * @method Preference set(string $name, $value) + * @method Preference get(string $name, $value) + * @method Preference|null getForUser(User $user, string $name, $default) + * @method void mark() */ class Preferences extends Facade { diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index d59b93b9b8..33b8c847df 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -27,6 +27,7 @@ use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Steam. + * @method string positive(string $amount) */ class Steam extends Facade { diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index af6392144a..0a3a5caadd 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -298,7 +298,7 @@ class Navigation * * @throws \FireflyIII\Exceptions\FireflyException */ - public function periodShow(Carbon $theDate, string $repeatFrequency): string + public function periodShow(\Carbon\Carbon $theDate, string $repeatFrequency): string { $date = clone $theDate; $formatMap = [ diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 8774c29d6e..e57cb53b3f 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -79,12 +79,12 @@ class Preferences } /** - * @param $name - * @param null $default + * @param string $name + * @param null $default * * @return \FireflyIII\Models\Preference|null */ - public function get($name, $default = null) + public function get(string $name, $default = null): ?Preference { /** @var User $user */ $user = auth()->user(); @@ -125,7 +125,7 @@ class Preferences * * @return \FireflyIII\Models\Preference|null */ - public function getForUser(User $user, $name, $default = null): ?Preference + public function getForUser(User $user, string $name, $default = null): ?Preference { $fullName = sprintf('preference%s%s', $user->id, $name); if (Cache::has($fullName)) { @@ -177,23 +177,21 @@ class Preferences } /** - * @return bool + * */ - public function mark(): bool + public function mark(): void { $this->set('lastActivity', microtime()); Session::forget('first'); - - return true; } /** - * @param $name - * @param $value + * @param string $name + * @param mixed $value * - * @return Preference + * @return \FireflyIII\Models\Preference */ - public function set($name, $value): Preference + public function set(string $name, $value): Preference { $user = auth()->user(); if (null === $user) { @@ -210,12 +208,12 @@ class Preferences /** * @param \FireflyIII\User $user - * @param $name + * @param string $name * @param mixed $value * * @return Preference */ - public function setForUser(User $user, $name, $value): Preference + public function setForUser(User $user, string $name, $value): Preference { $fullName = sprintf('preference%s%s', $user->id, $name); Cache::forget($fullName); From f1462dbd3dbbb2311e44ad6d199c99a1b0ec3672 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 23:22:08 +0200 Subject: [PATCH 15/86] Small code quality improvements. --- .../Category/NoCategoryController.php | 1 + .../Controllers/Chart/AccountController.php | 28 ++++++++++--------- .../Controllers/Chart/BudgetController.php | 14 ++-------- .../Controllers/Chart/PiggyBankController.php | 14 ++-------- app/Support/Facades/Preferences.php | 2 +- .../Http/Controllers/DateCalculation.php | 26 ++++++++++++++++- app/Validation/FireflyValidator.php | 2 +- 7 files changed, 49 insertions(+), 38 deletions(-) diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index d98a546e75..a02b20dc95 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -143,6 +143,7 @@ class NoCategoryController extends Controller * @param Carbon $theDate * * @return Collection + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function getNoCategoryPeriodOverview(Carbon $theDate): Collection { diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index fc1af1ff91..d5aa05d78f 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -36,15 +36,22 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; +use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; use Log; -/** checked +/** * Class AccountController. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class AccountController extends Controller { + use DateCalculation; + /** @var GeneratorInterface */ protected $generator; @@ -310,6 +317,8 @@ class AccountController extends Controller * @param Carbon $end * * @return JsonResponse + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function period(Account $account, Carbon $start, Carbon $end): JsonResponse { @@ -321,18 +330,8 @@ class AccountController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - // depending on diff, do something with range of chart. - $step = '1D'; - $months = $start->diffInMonths($end); - if ($months > 3) { - $step = '1W'; // @codeCoverageIgnore - } - if ($months > 24) { - $step = '1M'; // @codeCoverageIgnore - } - if ($months > 100) { - $step = '1Y'; // @codeCoverageIgnore - } + + $step = $this->calculateStep($start, $end); $chartData = []; $current = clone $start; switch ($step) { @@ -433,6 +432,9 @@ class AccountController extends Controller * @param Carbon $end * * @return array + * + * @SuppressWarnigns(PHPMD.CyclomaticComplexity) + * @SuppressWarnigns(PHPMD.ExcessiveMethodLength) */ private function accountBalanceChart(Collection $accounts, Carbon $start, Carbon $end): array { diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index d954ab92b0..f91c99a4b0 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -36,6 +36,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; +use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; @@ -45,6 +46,7 @@ use Illuminate\Support\Collection; */ class BudgetController extends Controller { + use DateCalculation; /** @var GeneratorInterface */ protected $generator; @@ -89,17 +91,7 @@ class BudgetController extends Controller } // depending on diff, do something with range of chart. - $step = '1D'; - $months = $start->diffInMonths($end); - if ($months > 3) { - $step = '1W'; - } - if ($months > 24) { - $step = '1M'; - } - if ($months > 60) { - $step = '1Y'; // @codeCoverageIgnore - } + $step = $this->calculateStep($start, $end); $budgetCollection = new Collection([$budget]); $chartData = []; $current = clone $start; diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index c023656ed6..fa0fa29105 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -29,6 +29,7 @@ use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Support\CacheProperties; +use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; @@ -37,6 +38,7 @@ use Illuminate\Support\Collection; */ class PiggyBankController extends Controller { + use DateCalculation; /** @var GeneratorInterface */ protected $generator; @@ -81,17 +83,7 @@ class PiggyBankController extends Controller $oldest = $startDate->lt($firstDate) ? $startDate : $firstDate; $today = new Carbon; // depending on diff, do something with range of chart. - $step = '1D'; - $months = $oldest->diffInMonths($today); - if ($months > 3) { - $step = '1W'; // @codeCoverageIgnore - } - if ($months > 24) { - $step = '1M'; // @codeCoverageIgnore - } - if ($months > 100) { - $step = '1Y'; // @codeCoverageIgnore - } + $step = $this->calculateStep($oldest, $today); $chartData = []; while ($oldest <= $today) { diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index d438f999f8..98ae01a5d0 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Facade; * * @method Preference set(string $name, $value) * @method Preference get(string $name, $value) - * @method Preference|null getForUser(User $user, string $name, $default) + * @method Preference|null getForUser(User $user, string $name, $default = null) * @method void mark() */ class Preferences extends Facade diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.php index 14b7616d49..13cb1e221a 100644 --- a/app/Support/Http/Controllers/DateCalculation.php +++ b/app/Support/Http/Controllers/DateCalculation.php @@ -33,6 +33,30 @@ use Log; */ trait DateCalculation { + /** + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + protected function calculateStep(Carbon $start, Carbon $end): string + { + + $step = '1D'; + $months = $start->diffInMonths($end); + if ($months > 3) { + $step = '1W'; // @codeCoverageIgnore + } + if ($months > 24) { + $step = '1M'; // @codeCoverageIgnore + } + if ($months > 100) { + $step = '1Y'; // @codeCoverageIgnore + } + + return $step; + } + /** * Returns the number of days between the two given dates. * - If today is within the two dates, give the number of days between today and the end date. @@ -111,7 +135,7 @@ trait DateCalculation while ($count < 12) { $format = $current->format('Y-m-d'); $loop[$format] = app('navigation')->periodShow($current, $range); - $current = app('navigation')->endOfPeriod($current, $range); + $current = app('navigation')->endOfPeriod($current, $range); ++$count; $current->addDay(); } diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index f0aab84bf0..ff0669a98c 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -55,7 +55,7 @@ class FireflyValidator extends Validator */ public function validate2faCode($attribute, $value): bool { - if (!\is_string($value) || null === $value || 6 != \strlen($value)) { + if (!\is_string($value) || null === $value || 6 !== \strlen($value)) { return false; } From 8fde16422e8ee7f71d58e9fdc1b0e2a8570e0022 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 23:32:03 +0200 Subject: [PATCH 16/86] See if this is the solution in Scrutinizer as well. --- .../Controllers/Chart/BudgetController.php | 1 + .../Triggers/ToAccountEndsTest.php | 73 ++++++++++++++----- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index f91c99a4b0..6d2cfa8088 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -79,6 +79,7 @@ class BudgetController extends Controller public function budget(Budget $budget): JsonResponse { $start = $this->repository->firstUseDate($budget); + /** @var Carbon $end */ $end = session('end', new Carbon); $cache = new CacheProperties(); $cache->addProperty($start); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php index 022d4fdaf0..32617ec83d 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php @@ -24,6 +24,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\ToAccountEnds; +use Log; use Tests\TestCase; /** @@ -36,14 +37,26 @@ class ToAccountEndsTest extends TestCase */ public function testTriggered(): void { - $count = 0; - $account = null; - while ($count === 0 && $account === null) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '>', 0)->count(); + $loops = 0; // FINAL LOOP METHOD. + do { + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); $account = $transaction->account; - } + $count = $journal->transactions()->count(); + $name = $account->name ?? ''; + + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); + + $loops++; + + // do this while the following is untrue: + // 1) account is not null, + // 2) journal has two transactions + // 3) loops is less than 30 + // 4) $name is longer than 3 + } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); + $trigger = ToAccountEnds::makeFromStrings(substr($account->name, -3), false); $result = $trigger->triggered($journal); @@ -55,13 +68,25 @@ class ToAccountEndsTest extends TestCase */ public function testTriggeredLonger(): void { - $count = 0; - while ($count === 0) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '>', 0)->count(); + $loops = 0; // FINAL LOOP METHOD. + do { + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - } - $account = $transaction->account; + $account = $transaction->account; + $count = $journal->transactions()->count(); + $name = $account->name ?? ''; + + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); + + $loops++; + + // do this while the following is untrue: + // 1) account is not null, + // 2) journal has two transactions + // 3) loops is less than 30 + // 4) $name is longer than 3 + } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); $trigger = ToAccountEnds::makeFromStrings('bla-bla-bla' . $account->name, false); $result = $trigger->triggered($journal); @@ -73,11 +98,25 @@ class ToAccountEndsTest extends TestCase */ public function testTriggeredNot(): void { - $count = 0; - while ($count === 0) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '>', 0)->count(); - } + $loops = 0; // FINAL LOOP METHOD. + do { + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); + $transaction = $journal->transactions()->where('amount', '>', 0)->first(); + $account = $transaction->account; + $count = $journal->transactions()->count(); + $name = $account->name ?? ''; + + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); + + $loops++; + + // do this while the following is untrue: + // 1) account is not null, + // 2) journal has two transactions + // 3) loops is less than 30 + // 4) $name is longer than 3 + } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); $trigger = ToAccountEnds::makeFromStrings((string)random_int(1, 1234), false); $result = $trigger->triggered($journal); From 369839e01219c7a3c843bd442c17d68f6688c002 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Jul 2018 09:27:38 +0200 Subject: [PATCH 17/86] Clean up references to static Facade. --- .../V1/Controllers/PreferenceController.php | 5 ++-- app/Console/Commands/CreateImport.php | 3 +-- app/Console/Commands/UpgradeDatabase.php | 7 +++-- app/Console/Commands/VerifiesAccessToken.php | 3 +-- app/Console/Commands/VerifyDatabase.php | 5 ++-- app/Handlers/Events/UserEventHandler.php | 5 ++-- app/Helpers/FiscalHelper.php | 5 ++-- app/Models/AccountType.php | 2 +- app/Models/Bill.php | 2 +- app/Models/Budget.php | 8 +++--- app/Models/ImportJob.php | 2 +- app/Models/Note.php | 2 +- app/Models/RecurrenceTransaction.php | 4 +-- app/Models/RuleGroup.php | 16 ++++++------ app/Models/TransactionJournal.php | 3 +-- app/Models/TransactionJournalMeta.php | 4 +-- .../Currency/CurrencyRepository.php | 3 +-- .../Journal/JournalRepository.php | 3 +-- .../LinkType/LinkTypeRepositoryInterface.php | 14 +++++----- app/Repositories/User/UserRepository.php | 17 ++++++------ .../Import/Information/BunqInformation.php | 26 +++++++++---------- 21 files changed, 64 insertions(+), 75 deletions(-) diff --git a/app/Api/V1/Controllers/PreferenceController.php b/app/Api/V1/Controllers/PreferenceController.php index e7d40c0091..a954ef90ec 100644 --- a/app/Api/V1/Controllers/PreferenceController.php +++ b/app/Api/V1/Controllers/PreferenceController.php @@ -34,7 +34,6 @@ use League\Fractal\Manager; use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Item; use League\Fractal\Serializer\JsonApiSerializer; -use Preferences; /** * @@ -60,7 +59,7 @@ class PreferenceController extends Controller ]; $preferences = new Collection; foreach ($available as $name) { - $pref = Preferences::getForUser($user, $name); + $pref = app('preferences')->getForUser($user, $name); if (null !== $pref) { $preferences->push($pref); } @@ -130,7 +129,7 @@ class PreferenceController extends Controller $newValue = 1 === (int)$data['data']; break; } - $result = Preferences::set($preference->name, $newValue); + $result = app('preferences')->set($preference->name, $newValue); // create some objects: $manager = new Manager; diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index f9a8fb8633..8831fa56b9 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -34,7 +34,6 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Console\Command; use Log; -use Preferences; /** * Class CreateImport. @@ -232,7 +231,7 @@ class CreateImport extends Command } } // clear cache for user: - Preferences::setForUser($user, 'lastActivity', microtime()); + app('preferences')->setForUser($user, 'lastActivity', microtime()); return 0; } diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index 37f72b8db4..5c328ac60f 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -54,7 +54,6 @@ use Illuminate\Console\Command; use Illuminate\Database\QueryException; use Illuminate\Support\Collection; use Log; -use Preferences; use Schema; use UnexpectedValueException; @@ -110,10 +109,10 @@ class UpgradeDatabase extends Command { foreach (User::get() as $user) { /** @var Preference $lang */ - $lang = Preferences::getForUser($user, 'language', 'en_US'); + $lang = app('preferences')->getForUser($user, 'language', 'en_US'); $groupName = (string)trans('firefly.rulegroup_for_bills_title', [], $lang->data); $ruleGroup = $user->ruleGroups()->where('title', $groupName)->first(); - $currencyPreference = Preferences::getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR')); + $currencyPreference = app('preferences')->getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR')); if (null === $currencyPreference) { $this->error('User has no currency preference. Impossible.'); @@ -294,7 +293,7 @@ class UpgradeDatabase extends Command function (Account $account) use ($repository) { $repository->setUser($account->user); // get users preference, fall back to system pref. - $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data; + $defaultCurrencyCode = app('preferences')->getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data; $defaultCurrency = TransactionCurrency::where('code', $defaultCurrencyCode)->first(); $accountCurrency = (int)$repository->getMetaValue($account, 'currency_id'); $openingBalance = $account->getOpeningBalance(); diff --git a/app/Console/Commands/VerifiesAccessToken.php b/app/Console/Commands/VerifiesAccessToken.php index b82beee8ab..857aeaa30b 100644 --- a/app/Console/Commands/VerifiesAccessToken.php +++ b/app/Console/Commands/VerifiesAccessToken.php @@ -25,7 +25,6 @@ namespace FireflyIII\Console\Commands; use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; -use Preferences; /** * Trait VerifiesAccessToken. @@ -61,7 +60,7 @@ trait VerifiesAccessToken return false; } - $accessToken = Preferences::getForUser($user, 'access_token', null); + $accessToken = app('preferences')->getForUser($user, 'access_token', null); if (null === $accessToken) { Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId)); diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 8ca22eef33..dc43c373bb 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -42,7 +42,6 @@ use Illuminate\Console\Command; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Database\Eloquent\Builder; use Log; -use Preferences; use Schema; use stdClass; @@ -106,10 +105,10 @@ class VerifyDatabase extends Command $users = User::get(); /** @var User $user */ foreach ($users as $user) { - $pref = Preferences::getForUser($user, 'access_token', null); + $pref = app('preferences')->getForUser($user, 'access_token', null); if (null === $pref) { $token = $user->generateAccessToken(); - Preferences::setForUser($user, 'access_token', $token); + app('preferences')->setForUser($user, 'access_token', $token); $this->line(sprintf('Generated access token for user %s', $user->email)); ++$count; } diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 530562ab60..e40ff67b55 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -36,7 +36,6 @@ use FireflyIII\User; use Illuminate\Auth\Events\Login; use Log; use Mail; -use Preferences; /** * Class UserEventHandler. @@ -138,7 +137,7 @@ class UserEventHandler $oldEmail = $event->oldEmail; $user = $event->user; $ipAddress = $event->ipAddress; - $token = Preferences::getForUser($user, 'email_change_confirm_token', 'invalid'); + $token = app('preferences')->getForUser($user, 'email_change_confirm_token', 'invalid'); $uri = route('profile.confirm-email-change', [$token->data]); try { Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress)); @@ -164,7 +163,7 @@ class UserEventHandler $oldEmail = $event->oldEmail; $user = $event->user; $ipAddress = $event->ipAddress; - $token = Preferences::getForUser($user, 'email_change_undo_token', 'invalid'); + $token = app('preferences')->getForUser($user, 'email_change_undo_token', 'invalid'); $uri = route('profile.undo-email-change', [$token->data, hash('sha256', $oldEmail)]); try { Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress)); diff --git a/app/Helpers/FiscalHelper.php b/app/Helpers/FiscalHelper.php index b34de8da9f..b3641939bc 100644 --- a/app/Helpers/FiscalHelper.php +++ b/app/Helpers/FiscalHelper.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Helpers; use Carbon\Carbon; -use Preferences; /** * Class FiscalHelper. @@ -38,7 +37,7 @@ class FiscalHelper implements FiscalHelperInterface */ public function __construct() { - $this->useCustomFiscalYear = Preferences::get('customFiscalYear', false)->data; + $this->useCustomFiscalYear = app('preferences')->get('customFiscalYear', false)->data; } /** @@ -72,7 +71,7 @@ class FiscalHelper implements FiscalHelperInterface // get start mm-dd. Then create a start date in the year passed. $startDate = clone $date; if (true === $this->useCustomFiscalYear) { - $prefStartStr = Preferences::get('fiscalYearStart', '01-01')->data; + $prefStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data; [$mth, $day] = explode('-', $prefStartStr); $startDate->month((int)$mth)->day((int)$day); diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index c4a1c4d19e..2a0c2fa7ca 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -30,7 +30,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; * * @property string $type * @method whereType(string $type) - * @property int $id + * @property int $id * */ class AccountType extends Model diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 668f8f0d2d..73b5ad5426 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -50,7 +50,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $skip * @property bool $automatch * @property User $user - * @property string $match + * @property string $match */ class Bill extends Model { diff --git a/app/Models/Budget.php b/app/Models/Budget.php index eb46d21f79..1ee29963e0 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -32,10 +32,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class Budget. * - * @property int $id - * @property string $name - * @property bool $active - * @property int $user_id + * @property int $id + * @property string $name + * @property bool $active + * @property int $user_id * @property-read string $email */ class Budget extends Model diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index 58256cd9a5..29715e55ba 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $file_type * @property int $tag_id * @property Tag $tag - * @property array $errors + * @property array $errors */ class ImportJob extends Model { diff --git a/app/Models/Note.php b/app/Models/Note.php index 59d786d642..487dca8146 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -34,7 +34,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property Carbon $updated_at * @property string $text * @property string $title - * @property int $noteable_id + * @property int $noteable_id */ class Note extends Model { diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index bea0b38ff6..a38f0a09b6 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -73,7 +73,7 @@ class RecurrenceTransaction extends Model */ public function destinationAccount(): BelongsTo { - return $this->belongsTo(Account::class,'destination_id'); + return $this->belongsTo(Account::class, 'destination_id'); } /** @@ -109,7 +109,7 @@ class RecurrenceTransaction extends Model */ public function sourceAccount(): BelongsTo { - return $this->belongsTo(Account::class,'source_id'); + return $this->belongsTo(Account::class, 'source_id'); } /** diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 142ec71bda..bc3ba014fe 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -32,14 +32,14 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class RuleGroup. * - * @property bool $active - * @property User $user - * @property Carbon $created_at - * @property Carbon $updated_at - * @property string $title - * @property string $text - * @property int $id - * @property int $order + * @property bool $active + * @property User $user + * @property Carbon $created_at + * @property Carbon $updated_at + * @property string $title + * @property string $text + * @property int $id + * @property int $order * @property Collection $rules */ class RuleGroup extends Model diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 25df6439cc..dc00497da4 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Log; -use Preferences; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -396,7 +395,7 @@ class TransactionJournal extends Model } $entry->data = $value; $entry->save(); - Preferences::mark(); + app('preferences')->mark(); return $entry; } diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 5f12ed1567..0842e5d2d1 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -32,8 +32,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property string $name * @property int $transaction_journal_id * @property TransactionJournal $transactionJournal - * @property string $data - * @property int $id + * @property string $data + * @property int $id */ class TransactionJournalMeta extends Model { diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index f754c1bf0a..f3a0ea12d1 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -32,7 +32,6 @@ use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use FireflyIII\User; use Illuminate\Support\Collection; use Log; -use Preferences; /** * Class CurrencyRepository. @@ -66,7 +65,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface } // is the default currency for the user or the system - $defaultCode = Preferences::getForUser($this->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data; + $defaultCode = app('preferences')->getForUser($this->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data; if ($currency->code === $defaultCode) { return false; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index f3397e1d6b..e79df9d0a5 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -42,7 +42,6 @@ use FireflyIII\User; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Log; -use Preferences; /** * Class JournalRepository. @@ -107,7 +106,7 @@ class JournalRepository implements JournalRepositoryInterface $journal->save(); } - Preferences::mark(); + app('preferences')->mark(); return new MessageBag; } diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index eb584560dc..a43ddaaefd 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -63,13 +63,6 @@ interface LinkTypeRepositoryInterface */ public function find(int $id): LinkType; - /** - * Set the user for this instance. - * - * @param User $user - */ - public function setUser(User $user): void; - /** * Find link type by name. * @@ -128,6 +121,13 @@ interface LinkTypeRepositoryInterface */ public function getLinks(TransactionJournal $journal): Collection; + /** + * Set the user for this instance. + * + * @param User $user + */ + public function setUser(User $user): void; + /** * @param array $data * diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 8b26d88ef5..95df481da5 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -27,7 +27,6 @@ use FireflyIII\Models\Role; use FireflyIII\User; use Illuminate\Support\Collection; use Log; -use Preferences; /** * Class UserRepository. @@ -73,12 +72,12 @@ class UserRepository implements UserRepositoryInterface $oldEmail = $user->email; // save old email as pref - Preferences::setForUser($user, 'previous_email_latest', $oldEmail); - Preferences::setForUser($user, 'previous_email_' . date('Y-m-d-H-i-s'), $oldEmail); + app('preferences')->setForUser($user, 'previous_email_latest', $oldEmail); + app('preferences')->setForUser($user, 'previous_email_' . date('Y-m-d-H-i-s'), $oldEmail); // set undo and confirm token: - Preferences::setForUser($user, 'email_change_undo_token', (string)bin2hex(random_bytes(16))); - Preferences::setForUser($user, 'email_change_confirm_token', (string)bin2hex(random_bytes(16))); + app('preferences')->setForUser($user, 'email_change_undo_token', (string)bin2hex(random_bytes(16))); + app('preferences')->setForUser($user, 'email_change_confirm_token', (string)bin2hex(random_bytes(16))); // update user $user->email = $newEmail; @@ -222,8 +221,8 @@ class UserRepository implements UserRepositoryInterface $return = []; // two factor: - $is2faEnabled = Preferences::getForUser($user, 'twoFactorAuthEnabled', false)->data; - $has2faSecret = null !== Preferences::getForUser($user, 'twoFactorAuthSecret'); + $is2faEnabled = app('preferences')->getForUser($user, 'twoFactorAuthEnabled', false)->data; + $has2faSecret = null !== app('preferences')->getForUser($user, 'twoFactorAuthSecret'); $return['has_2fa'] = false; if ($is2faEnabled && $has2faSecret) { $return['has_2fa'] = true; @@ -329,8 +328,8 @@ class UserRepository implements UserRepositoryInterface $oldEmail = $user->email; // save old email as pref - Preferences::setForUser($user, 'admin_previous_email_latest', $oldEmail); - Preferences::setForUser($user, 'admin_previous_email_' . date('Y-m-d-H-i-s'), $oldEmail); + app('preferences')->setForUser($user, 'admin_previous_email_latest', $oldEmail); + app('preferences')->setForUser($user, 'admin_previous_email_' . date('Y-m-d-H-i-s'), $oldEmail); $user->email = $newEmail; $user->save(); diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php index afd170c1b5..33dbf1a273 100644 --- a/app/Support/Import/Information/BunqInformation.php +++ b/app/Support/Import/Information/BunqInformation.php @@ -123,9 +123,9 @@ class BunqInformation implements InformationInterface private function closeSession(SessionToken $sessionToken): void { Log::debug('Going to close session'); - $apiKey = Preferences::getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = Preferences::getForUser($this->user, 'bunq_private_key')->data; + $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; + $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; + $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; $request = new DeleteDeviceSessionRequest(); $request->setSecret($apiKey); $request->setPrivateKey($privateKey); @@ -144,9 +144,9 @@ class BunqInformation implements InformationInterface */ private function getMonetaryAccounts(SessionToken $sessionToken, int $userId): Collection { - $apiKey = Preferences::getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = Preferences::getForUser($this->user, 'bunq_private_key')->data; + $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; + $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; + $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; $request = new ListMonetaryAccountRequest; $request->setSessionToken($sessionToken); @@ -168,9 +168,9 @@ class BunqInformation implements InformationInterface */ private function getUserInformation(SessionToken $sessionToken): int { - $apiKey = Preferences::getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = Preferences::getForUser($this->user, 'bunq_private_key')->data; + $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; + $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; + $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; $request = new ListUserRequest; $request->setSessionToken($sessionToken); $request->setSecret($apiKey); @@ -196,10 +196,10 @@ class BunqInformation implements InformationInterface private function startSession(): SessionToken { Log::debug('Now in startSession.'); - $apiKey = Preferences::getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = Preferences::getForUser($this->user, 'bunq_private_key')->data; - $installationToken = Preferences::getForUser($this->user, 'bunq_installation_token')->data; + $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; + $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; + $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; + $installationToken = app('preferences')->getForUser($this->user, 'bunq_installation_token')->data; $request = new DeviceSessionRequest(); $request->setSecret($apiKey); $request->setServerPublicKey($serverPublicKey); From 7b41c5b30102ed20d50c3a226e9c5b7985855688 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Jul 2018 09:38:49 +0200 Subject: [PATCH 18/86] Cast all translations to strings. --- app/Api/V1/Requests/BillRequest.php | 2 +- app/Api/V1/Requests/RuleRequest.php | 4 +- .../Controllers/Account/CreateController.php | 4 +- .../Controllers/Account/DeleteController.php | 4 +- .../Controllers/Account/EditController.php | 4 +- .../Controllers/Account/IndexController.php | 4 +- .../Account/ReconcileController.php | 14 +++--- .../Controllers/Account/ShowController.php | 6 +-- app/Http/Controllers/Admin/LinkController.php | 12 ++--- .../Controllers/Admin/UpdateController.php | 8 ++-- app/Http/Controllers/Admin/UserController.php | 2 +- app/Http/Controllers/AttachmentController.php | 6 +-- .../Auth/ForgotPasswordController.php | 2 +- app/Http/Controllers/BillController.php | 10 ++-- .../Controllers/Budget/AmountController.php | 2 +- .../Controllers/Budget/CreateController.php | 2 +- .../Controllers/Budget/DeleteController.php | 4 +- .../Controllers/Budget/EditController.php | 4 +- .../Controllers/Budget/IndexController.php | 2 +- .../Controllers/Budget/ShowController.php | 6 +-- .../Category/NoCategoryController.php | 4 +- .../Controllers/Category/ShowController.php | 4 +- app/Http/Controllers/CategoryController.php | 8 ++-- .../Controllers/Chart/AccountController.php | 4 +- app/Http/Controllers/Chart/BillController.php | 6 +-- .../Controllers/Chart/BudgetController.php | 2 +- .../Controllers/Chart/ReportController.php | 6 +-- app/Http/Controllers/CurrencyController.php | 34 +++++++------- app/Http/Controllers/DebugController.php | 2 +- app/Http/Controllers/ExportController.php | 4 +- app/Http/Controllers/HomeController.php | 2 +- .../Controllers/Import/IndexController.php | 6 +-- .../Import/JobConfigurationController.php | 8 ++-- .../Import/JobStatusController.php | 12 ++--- .../Import/PrerequisitesController.php | 8 ++-- app/Http/Controllers/Json/IntroController.php | 6 +-- .../Controllers/Json/ReconcileController.php | 2 +- app/Http/Controllers/JsonController.php | 4 +- app/Http/Controllers/NewUserController.php | 2 +- app/Http/Controllers/PiggyBankController.php | 8 ++-- .../Controllers/PreferencesController.php | 2 +- app/Http/Controllers/ProfileController.php | 2 +- .../Recurring/CreateController.php | 18 ++++---- .../Recurring/DeleteController.php | 4 +- .../Controllers/Recurring/EditController.php | 18 ++++---- .../Controllers/Recurring/IndexController.php | 14 +++--- app/Http/Controllers/ReportController.php | 24 +++++----- app/Http/Controllers/RuleController.php | 46 +++++++++---------- app/Http/Controllers/RuleGroupController.php | 8 ++-- app/Http/Controllers/SearchController.php | 4 +- app/Http/Controllers/TagController.php | 8 ++-- .../Transaction/BulkController.php | 6 +-- .../Transaction/ConvertController.php | 14 +++--- .../Transaction/LinkController.php | 14 +++--- .../Transaction/MassController.php | 10 ++-- .../Transaction/SingleController.php | 8 ++-- .../Transaction/SplitController.php | 4 +- .../Controllers/TransactionController.php | 8 ++-- app/Http/Middleware/Range.php | 2 +- app/Http/Requests/JournalFormRequest.php | 10 ++-- app/Http/Requests/SplitJournalFormRequest.php | 4 +- .../JobConfiguration/FakeJobConfiguration.php | 4 +- app/Import/Mapper/AssetAccountIbans.php | 2 +- app/Import/Mapper/AssetAccounts.php | 2 +- app/Import/Mapper/Bills.php | 2 +- app/Import/Mapper/Budgets.php | 2 +- app/Import/Mapper/Categories.php | 2 +- app/Import/Mapper/OpposingAccountIbans.php | 2 +- app/Import/Mapper/OpposingAccounts.php | 2 +- app/Import/Mapper/Tags.php | 2 +- app/Import/Mapper/TransactionCurrencies.php | 2 +- app/Import/Specifics/AbnAmroDescription.php | 2 +- app/Import/Storage/ImportArrayStorage.php | 2 +- app/Jobs/CreateRecurringTransactions.php | 2 +- .../Journal/JournalRepository.php | 16 +++---- .../Recurring/RecurringRepository.php | 10 ++-- app/Rules/BelongsUser.php | 2 +- app/Rules/IsValidAttachmentModel.php | 2 +- app/Rules/UniqueIban.php | 2 +- app/Rules/ValidRecurrenceRepetitionType.php | 2 +- app/Rules/ValidRecurrenceRepetitionValue.php | 2 +- app/Rules/ValidTransactions.php | 2 +- app/Services/Spectre/Object/Transaction.php | 2 +- app/Support/Amount.php | 2 +- app/Support/Binder/SimpleJournalList.php | 8 ++-- app/Support/ExpandedForm.php | 6 +-- .../Import/Information/BunqInformation.php | 1 - .../Bunq/ChooseAccountsHandler.php | 2 +- .../File/ConfigureRolesHandler.php | 2 +- .../File/ConfigureUploadHandler.php | 8 ++-- .../File/NewFileJobHandler.php | 4 +- .../Spectre/ChooseAccountsHandler.php | 2 +- .../Import/Placeholder/ImportTransaction.php | 2 +- app/Support/Navigation.php | 26 +++++------ app/Support/Twig/Extension/Transaction.php | 14 +++--- app/Support/Twig/Rule.php | 8 ++-- app/User.php | 4 +- app/Validation/RecurrenceValidation.php | 22 ++++----- app/Validation/TransactionValidation.php | 30 ++++++------ 99 files changed, 335 insertions(+), 336 deletions(-) diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php index cdb6801365..79775b0c0a 100644 --- a/app/Api/V1/Requests/BillRequest.php +++ b/app/Api/V1/Requests/BillRequest.php @@ -115,7 +115,7 @@ class BillRequest extends Request $min = (float)($data['amount_min'] ?? 0); $max = (float)($data['amount_max'] ?? 0); if ($min > $max) { - $validator->errors()->add('amount_min', trans('validation.amount_min_over_max')); + $validator->errors()->add('amount_min', (string)trans('validation.amount_min_over_max')); } } ); diff --git a/app/Api/V1/Requests/RuleRequest.php b/app/Api/V1/Requests/RuleRequest.php index 7bc6b2b1be..fb32c34c97 100644 --- a/app/Api/V1/Requests/RuleRequest.php +++ b/app/Api/V1/Requests/RuleRequest.php @@ -141,7 +141,7 @@ class RuleRequest extends Request $repetitions = $data['rule-actions'] ?? []; // need at least one transaction if (0 === \count($repetitions)) { - $validator->errors()->add('title', trans('validation.at_least_one_action')); + $validator->errors()->add('title', (string)trans('validation.at_least_one_action')); } } @@ -156,7 +156,7 @@ class RuleRequest extends Request $repetitions = $data['rule-triggers'] ?? []; // need at least one transaction if (0 === \count($repetitions)) { - $validator->errors()->add('title', trans('validation.at_least_one_trigger')); + $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger')); } } } \ No newline at end of file diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 3d2be2799b..df4af66bb9 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -50,7 +50,7 @@ class CreateController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(AccountRepositoryInterface::class); @@ -70,7 +70,7 @@ class CreateController extends Controller $what = $what ?? 'asset'; $defaultCurrency = app('amount')->getDefaultCurrency(); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); - $subTitle = trans('firefly.make_new_' . $what . '_account'); + $subTitle = (string)trans('firefly.make_new_' . $what . '_account'); $roles = []; foreach (config('firefly.accountRoles') as $role) { $roles[$role] = (string)trans('firefly.account_role_' . $role); diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index cdae3afeee..0aa7532b17 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -50,7 +50,7 @@ class DeleteController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(AccountRepositoryInterface::class); @@ -67,7 +67,7 @@ class DeleteController extends Controller public function delete(Account $account) { $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type); - $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); + $subTitle = (string)trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); $accountList = ExpandedForm::makeSelectListWithEmpty($this->repository->getAccountsByType([$account->accountType->type])); unset($accountList[$account->id]); diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index d55afb0d69..570113b762 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -53,7 +53,7 @@ class EditController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(AccountRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class); @@ -76,7 +76,7 @@ class EditController extends Controller public function edit(Request $request, Account $account, AccountRepositoryInterface $repository) { $what = config('firefly.shortNamesByFullName')[$account->accountType->type]; - $subTitle = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]); + $subTitle = (string)trans('firefly.edit_' . $what . '_account', ['name' => $account->name]); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); $roles = []; foreach (config('firefly.accountRoles') as $role) { diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 07ac0643e1..2eaa3f49d6 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -50,7 +50,7 @@ class IndexController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(AccountRepositoryInterface::class); @@ -68,7 +68,7 @@ class IndexController extends Controller public function index(Request $request, string $what) { $what = $what ?? 'asset'; - $subTitle = trans('firefly.' . $what . '_accounts'); + $subTitle = (string)trans('firefly.' . $what . '_accounts'); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); $types = config('firefly.accountTypesByIdentifier.' . $what); $collection = $this->repository->getAccountsByType($types); diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index f0596f4b05..62c670e23f 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -64,7 +64,7 @@ class ReconcileController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(JournalRepositoryInterface::class); $this->accountRepos = app(AccountRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class); @@ -85,7 +85,7 @@ class ReconcileController extends Controller return redirect(route('transactions.edit', [$journal->id])); } // view related code - $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); + $subTitle = (string)trans('breadcrumbs.edit_journal', ['description' => $journal->description]); // journal related code $pTransaction = $this->repository->getFirstPosTransaction($journal); @@ -126,7 +126,7 @@ class ReconcileController extends Controller return $this->redirectToOriginalAccount($account); } if (AccountType::ASSET !== $account->accountType->type) { - session()->flash('error', trans('firefly.must_be_asset_account')); + session()->flash('error', (string)trans('firefly.must_be_asset_account')); return redirect(route('accounts.index', [config('firefly.shortNamesByFullName.' . $account->accountType->type)])); } @@ -153,7 +153,7 @@ class ReconcileController extends Controller $startBalance = round(app('steam')->balance($account, $startDate), $currency->decimal_places); $endBalance = round(app('steam')->balance($account, $end), $currency->decimal_places); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type); - $subTitle = trans('firefly.reconcile_account', ['account' => $account->name]); + $subTitle = (string)trans('firefly.reconcile_account', ['account' => $account->name]); // various links $transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']); @@ -180,7 +180,7 @@ class ReconcileController extends Controller if (TransactionType::RECONCILIATION !== $journal->transactionType->type) { return redirect(route('transactions.show', [$journal->id])); } - $subTitle = trans('firefly.reconciliation') . ' "' . $journal->description . '"'; + $subTitle = (string)trans('firefly.reconciliation') . ' "' . $journal->description . '"'; // get main transaction: $transaction = $this->repository->getAssetTransaction($journal); @@ -272,7 +272,7 @@ class ReconcileController extends Controller } Log::debug('End of routine.'); app('preferences')->mark(); - session()->flash('success', trans('firefly.reconciliation_stored')); + session()->flash('success', (string)trans('firefly.reconciliation_stored')); return redirect(route('accounts.show', [$account->id])); } @@ -293,7 +293,7 @@ class ReconcileController extends Controller return redirect(route('transactions.show', [$journal->id])); } if (0 === bccomp('0', $request->get('amount'))) { - session()->flash('error', trans('firefly.amount_cannot_be_zero')); + session()->flash('error', (string)trans('firefly.amount_cannot_be_zero')); return redirect(route('accounts.reconcile.edit', [$journal->id]))->withInput(); } diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index ba1d440ed4..e174fea0b9 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -61,7 +61,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(AccountRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class); @@ -107,7 +107,7 @@ class ShowController extends Controller } $fStart = $start->formatLocalized($this->monthAndDayFormat); $fEnd = $end->formatLocalized($this->monthAndDayFormat); - $subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]); + $subTitle = (string)trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]); $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); $periods = $this->getPeriodOverview($account, $end); /** @var JournalCollectorInterface $collector */ @@ -151,7 +151,7 @@ class ShowController extends Controller if (0 === $currencyId) { $currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore } - $subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]); + $subTitle = (string)trans('firefly.all_journals_for_account', ['name' => $account->name]); $periods = new Collection; /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index 1515260fd4..d0ab421605 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -58,7 +58,7 @@ class LinkController extends Controller */ public function create() { - $subTitle = trans('firefly.create_new_link_type'); + $subTitle = (string)trans('firefly.create_new_link_type'); $subTitleIcon = 'fa-link'; // put previous url in session if not redirect from store (not "create another"). @@ -84,11 +84,11 @@ class LinkController extends Controller return redirect(route('admin.links.index')); } - $subTitle = trans('firefly.delete_link_type', ['name' => $linkType->name]); + $subTitle = (string)trans('firefly.delete_link_type', ['name' => $linkType->name]); $otherTypes = $repository->get(); $count = $repository->countJournals($linkType); $moveTo = []; - $moveTo[0] = trans('firefly.do_not_save_connection'); + $moveTo[0] = (string)trans('firefly.do_not_save_connection'); /** @var LinkType $otherType */ foreach ($otherTypes as $otherType) { if ($otherType->id !== $linkType->id) { @@ -133,7 +133,7 @@ class LinkController extends Controller return redirect(route('admin.links.index')); } - $subTitle = trans('firefly.edit_link_type', ['name' => $linkType->name]); + $subTitle = (string)trans('firefly.edit_link_type', ['name' => $linkType->name]); $subTitleIcon = 'fa-link'; // put previous url in session if not redirect from store (not "return_to_edit"). @@ -152,7 +152,7 @@ class LinkController extends Controller */ public function index(LinkTypeRepositoryInterface $repository) { - $subTitle = trans('firefly.journal_link_configuration'); + $subTitle = (string)trans('firefly.journal_link_configuration'); $subTitleIcon = 'fa-link'; $linkTypes = $repository->get(); $linkTypes->each( @@ -171,7 +171,7 @@ class LinkController extends Controller */ public function show(LinkType $linkType) { - $subTitle = trans('firefly.overview_for_link', ['name' => $linkType->name]); + $subTitle = (string)trans('firefly.overview_for_link', ['name' => $linkType->name]); $subTitleIcon = 'fa-link'; $links = $linkType->transactionJournalLinks()->get(); diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 9c4adfa4f7..5c8c7f54c9 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -62,14 +62,14 @@ class UpdateController extends Controller */ public function index() { - $subTitle = trans('firefly.update_check_title'); + $subTitle = (string)trans('firefly.update_check_title'); $subTitleIcon = 'fa-star'; $permission = app('fireflyconfig')->get('permission_update_check', -1); $selected = $permission->data; $options = [ - -1 => trans('firefly.updates_ask_me_later'), - 0 => trans('firefly.updates_do_not_check'), - 1 => trans('firefly.updates_enable_check'), + -1 => (string)trans('firefly.updates_ask_me_later'), + 0 => (string)trans('firefly.updates_do_not_check'), + 1 => (string)trans('firefly.updates_enable_check'), ]; return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options')); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index ba8b994ad9..b5772a8def 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -61,7 +61,7 @@ class UserController extends Controller */ public function delete(User $user) { - $subTitle = trans('firefly.delete_user', ['email' => $user->email]); + $subTitle = (string)trans('firefly.delete_user', ['email' => $user->email]); return view('admin.users.delete', compact('user', 'subTitle')); } diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 0e9fc5f01c..aa6f1bd32b 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -50,7 +50,7 @@ class AttachmentController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-paperclip'); - app('view')->share('title', trans('firefly.attachments')); + app('view')->share('title', (string)trans('firefly.attachments')); $this->repository = app(AttachmentRepositoryInterface::class); return $next($request); @@ -65,7 +65,7 @@ class AttachmentController extends Controller */ public function delete(Attachment $attachment) { - $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]); + $subTitle = (string)trans('firefly.delete_attachment', ['name' => $attachment->filename]); // put previous url in session $this->rememberPreviousUri('attachments.delete.uri'); @@ -131,7 +131,7 @@ class AttachmentController extends Controller public function edit(Request $request, Attachment $attachment) { $subTitleIcon = 'fa-pencil'; - $subTitle = trans('firefly.edit_attachment', ['name' => $attachment->filename]); + $subTitle = (string)trans('firefly.edit_attachment', ['name' => $attachment->filename]); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('attachments.edit.fromUpdate')) { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index d5b28d405f..26b56d0928 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -75,7 +75,7 @@ class ForgotPasswordController extends Controller $user = User::where('email', $request->get('email'))->first(); if (null !== $user && $repository->hasRole($user, 'demo')) { - return back()->withErrors(['email' => trans('firefly.cannot_reset_demo_user')]); + return back()->withErrors(['email' => (string)trans('firefly.cannot_reset_demo_user')]); } // We will send the password reset link to this user. Once we have attempted diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 9c29c05fe0..f190177da3 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -67,7 +67,7 @@ class BillController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.bills')); + app('view')->share('title', (string)trans('firefly.bills')); app('view')->share('mainTitleIcon', 'fa-calendar-o'); $this->attachments = app(AttachmentHelperInterface::class); $this->billRepository = app(BillRepositoryInterface::class); @@ -91,7 +91,7 @@ class BillController extends Controller foreach ($billPeriods as $current) { $periods[$current] = strtolower((string)trans('firefly.repeat_freq_' . $current)); } - $subTitle = trans('firefly.create_new_bill'); + $subTitle = (string)trans('firefly.create_new_bill'); $defaultCurrency = app('amount')->getDefaultCurrency(); // put previous url in session if not redirect from store (not "create another"). @@ -112,7 +112,7 @@ class BillController extends Controller { // put previous url in session $this->rememberPreviousUri('bills.delete.uri'); - $subTitle = trans('firefly.delete_bill', ['name' => $bill->name]); + $subTitle = (string)trans('firefly.delete_bill', ['name' => $bill->name]); return view('bills.delete', compact('bill', 'subTitle')); } @@ -147,10 +147,10 @@ class BillController extends Controller $billPeriods = config('firefly.bill_periods'); foreach ($billPeriods as $current) { - $periods[$current] = trans('firefly.' . $current); + $periods[$current] = (string)trans('firefly.' . $current); } - $subTitle = trans('firefly.edit_bill', ['name' => $bill->name]); + $subTitle = (string)trans('firefly.edit_bill', ['name' => $bill->name]); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('bills.edit.fromUpdate')) { diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index 0696a387d6..4dc5fad5dd 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -58,7 +58,7 @@ class AmountController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); + app('view')->share('title', (string)trans('firefly.budgets')); app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index cbcc7c4d8b..3b671f255e 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -49,7 +49,7 @@ class CreateController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); + app('view')->share('title', (string)trans('firefly.budgets')); app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index d1c0e9ab25..bbe5d688eb 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -49,7 +49,7 @@ class DeleteController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); + app('view')->share('title', (string)trans('firefly.budgets')); app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); @@ -66,7 +66,7 @@ class DeleteController extends Controller */ public function delete(Budget $budget) { - $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]); + $subTitle = (string)trans('firefly.delete_budget', ['name' => $budget->name]); // put previous url in session $this->rememberPreviousUri('budgets.delete.uri'); diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index 8ccb72f71b..c621b47478 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -51,7 +51,7 @@ class EditController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); + app('view')->share('title', (string)trans('firefly.budgets')); app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); @@ -68,7 +68,7 @@ class EditController extends Controller */ public function edit(Request $request, Budget $budget) { - $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]); + $subTitle = (string)trans('firefly.edit_budget', ['name' => $budget->name]); // code to handle active-checkboxes $hasOldInput = null !== $request->old('_token'); diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 602d665f58..f3a7b43188 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -55,7 +55,7 @@ class IndexController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); + app('view')->share('title', (string)trans('firefly.budgets')); app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 1d815d8f5f..7d666382fb 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -58,7 +58,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.budgets')); + app('view')->share('title', (string)trans('firefly.budgets')); app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); @@ -106,7 +106,7 @@ class ShowController extends Controller */ public function noBudgetAll(Request $request, JournalRepositoryInterface $repository) { - $subTitle = trans('firefly.all_journals_without_budget'); + $subTitle = (string)trans('firefly.all_journals_without_budget'); $first = $repository->firstNull(); $start = null === $first ? new Carbon : $first->date; $end = new Carbon; @@ -148,7 +148,7 @@ class ShowController extends Controller $transactions = $collector->getPaginatedJournals(); $transactions->setPath(route('budgets.show', [$budget->id])); - $subTitle = trans('firefly.all_journals_for_budget', ['name' => $budget->name]); + $subTitle = (string)trans('firefly.all_journals_for_budget', ['name' => $budget->name]); return view('budgets.show', compact('limits', 'budget', 'repetition', 'transactions', 'subTitle')); } diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index a02b20dc95..9e4a098619 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -57,7 +57,7 @@ class NoCategoryController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.categories')); + app('view')->share('title', (string)trans('firefly.categories')); app('view')->share('mainTitleIcon', 'fa-bar-chart'); $this->journalRepos = app(JournalRepositoryInterface::class); $this->repository = app(CategoryRepositoryInterface::class); @@ -120,7 +120,7 @@ class NoCategoryController extends Controller $page = (int)$request->get('page'); $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; Log::debug('Start of noCategory()'); - $subTitle = trans('firefly.all_journals_without_category'); + $subTitle = (string)trans('firefly.all_journals_without_category'); $first = $this->journalRepos->firstNull(); $start = null === $first ? new Carbon : $first->date; $end = new Carbon; diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 824600dc2e..b7712d54de 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -63,7 +63,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.categories')); + app('view')->share('title', (string)trans('firefly.categories')); app('view')->share('mainTitleIcon', 'fa-bar-chart'); $this->journalRepos = app(JournalRepositoryInterface::class); $this->repository = app(CategoryRepositoryInterface::class); @@ -130,7 +130,7 @@ class ShowController extends Controller $periods = new Collection; $moment = 'all'; - $subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]); + $subTitle = (string)trans('firefly.all_journals_for_category', ['name' => $category->name]); $first = $this->repository->firstUseDate($category); /** @var Carbon $start */ $start = $first ?? new Carbon; diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 233cc93f34..1940a8b439 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -46,7 +46,7 @@ class CategoryController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.categories')); + app('view')->share('title', (string)trans('firefly.categories')); app('view')->share('mainTitleIcon', 'fa-bar-chart'); $this->repository = app(CategoryRepositoryInterface::class); @@ -66,7 +66,7 @@ class CategoryController extends Controller $this->rememberPreviousUri('categories.create.uri'); } $request->session()->forget('categories.create.fromStore'); - $subTitle = trans('firefly.create_new_category'); + $subTitle =(string)trans('firefly.create_new_category'); return view('categories.create', compact('subTitle')); } @@ -78,7 +78,7 @@ class CategoryController extends Controller */ public function delete(Category $category) { - $subTitle = trans('firefly.delete_category', ['name' => $category->name]); + $subTitle = (string)trans('firefly.delete_category', ['name' => $category->name]); // put previous url in session $this->rememberPreviousUri('categories.delete.uri'); @@ -111,7 +111,7 @@ class CategoryController extends Controller */ public function edit(Request $request, Category $category) { - $subTitle = trans('firefly.edit_category', ['name' => $category->name]); + $subTitle = (string)trans('firefly.edit_category', ['name' => $category->name]); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('categories.edit.fromUpdate')) { diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index d5aa05d78f..433a773d0b 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -500,7 +500,7 @@ class AccountController extends Controller $return[$budgetId] = $grouped[$budgetId][0]['name']; } } - $return[0] = trans('firefly.no_budget'); + $return[0] = (string)trans('firefly.no_budget'); return $return; } @@ -524,7 +524,7 @@ class AccountController extends Controller $return[$categoryId] = $grouped[$categoryId][0]['name']; } } - $return[0] = trans('firefly.noCategory'); + $return[0] = (string)trans('firefly.noCategory'); return $return; } diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 4a9a3bf3b1..2fb9bb408e 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -106,9 +106,9 @@ class BillController extends Controller } ); $chartData = [ - ['type' => 'bar', 'label' => trans('firefly.min-amount'), 'entries' => []], - ['type' => 'bar', 'label' => trans('firefly.max-amount'), 'entries' => []], - ['type' => 'line', 'label' => trans('firefly.journal-amount'), 'entries' => []], + ['type' => 'bar', 'label' => (string)trans('firefly.min-amount'), 'entries' => []], + ['type' => 'bar', 'label' => (string)trans('firefly.max-amount'), 'entries' => []], + ['type' => 'line', 'label' => (string)trans('firefly.journal-amount'), 'entries' => []], ]; /** @var Transaction $entry */ diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 6d2cfa8088..1b8dba0c61 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -510,7 +510,7 @@ class BudgetController extends Controller $return[$categoryId] = $grouped[$categoryId][0]['name']; } } - $return[0] = trans('firefly.noCategory'); + $return[0] = (string)trans('firefly.noCategory'); return $return; } diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 600fc46020..53aaefee34 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -111,13 +111,13 @@ class ReportController extends Controller $source = $this->getChartData($accounts, $start, $end); $chartData = [ [ - 'label' => trans('firefly.income'), + 'label' => (string)trans('firefly.income'), 'type' => 'bar', 'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green 'entries' => [], ], [ - 'label' => trans('firefly.expenses'), + 'label' => (string)trans('firefly.expenses'), 'type' => 'bar', 'backgroundColor' => 'rgba(219, 68, 55, 0.5)', // red 'entries' => [], @@ -199,7 +199,7 @@ class ReportController extends Controller ], ], [ - 'label' => trans('firefly.expenses'), + 'label' => (string)trans('firefly.expenses'), 'type' => 'bar', 'backgroundColor' => 'rgba(219, 68, 55, 0.5)', // red 'entries' => [ diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 59051c9226..a655adfdf6 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -53,7 +53,7 @@ class CurrencyController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.currencies')); + app('view')->share('title', (string)trans('firefly.currencies')); app('view')->share('mainTitleIcon', 'fa-usd'); $this->repository = app(CurrencyRepositoryInterface::class); $this->userRepository = app(UserRepositoryInterface::class); @@ -74,13 +74,13 @@ class CurrencyController extends Controller /** @var User $user */ $user = auth()->user(); if (!$this->userRepository->hasRole($user, 'owner')) { - $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); return redirect(route('currencies.index')); } $subTitleIcon = 'fa-plus'; - $subTitle = trans('firefly.create_currency'); + $subTitle = (string)trans('firefly.create_currency'); // put previous url in session if not redirect from store (not "create another"). if (true !== session('currencies.create.fromStore')) { @@ -102,7 +102,7 @@ class CurrencyController extends Controller app('preferences')->set('currencyPreference', $currency->code); app('preferences')->mark(); - $request->session()->flash('success', trans('firefly.new_default_currency', ['name' => $currency->name])); + $request->session()->flash('success', (string)trans('firefly.new_default_currency', ['name' => $currency->name])); Cache::forget('FFCURRENCYSYMBOL'); Cache::forget('FFCURRENCYCODE'); @@ -122,21 +122,21 @@ class CurrencyController extends Controller $user = auth()->user(); if (!$this->userRepository->hasRole($user, 'owner')) { // @codeCoverageIgnoreStart - $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); return redirect(route('currencies.index')); // @codeCoverageIgnoreEnd } if (!$this->repository->canDeleteCurrency($currency)) { - $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); + $request->session()->flash('error', (string)trans('firefly.cannot_delete_currency', ['name' => $currency->name])); return redirect(route('currencies.index')); } // put previous url in session $this->rememberPreviousUri('currencies.delete.uri'); - $subTitle = trans('form.delete_currency', ['name' => $currency->name]); + $subTitle = (string)trans('form.delete_currency', ['name' => $currency->name]); return view('currencies.delete', compact('currency', 'subTitle')); } @@ -154,20 +154,20 @@ class CurrencyController extends Controller $user = auth()->user(); if (!$this->userRepository->hasRole($user, 'owner')) { // @codeCoverageIgnoreStart - $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); return redirect(route('currencies.index')); // @codeCoverageIgnoreEnd } if (!$this->repository->canDeleteCurrency($currency)) { - $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); + $request->session()->flash('error', (string)trans('firefly.cannot_delete_currency', ['name' => $currency->name])); return redirect(route('currencies.index')); } $this->repository->destroy($currency); - $request->session()->flash('success', trans('firefly.deleted_currency', ['name' => $currency->name])); + $request->session()->flash('success', (string)trans('firefly.deleted_currency', ['name' => $currency->name])); return redirect($this->getPreviousUri('currencies.delete.uri')); } @@ -185,14 +185,14 @@ class CurrencyController extends Controller $user = auth()->user(); if (!$this->userRepository->hasRole($user, 'owner')) { // @codeCoverageIgnoreStart - $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); return redirect(route('currencies.index')); // @codeCoverageIgnoreEnd } $subTitleIcon = 'fa-pencil'; - $subTitle = trans('breadcrumbs.edit_currency', ['name' => $currency->name]); + $subTitle = (string)trans('breadcrumbs.edit_currency', ['name' => $currency->name]); $currency->symbol = htmlentities($currency->symbol); // put previous url in session if not redirect from store (not "return_to_edit"). @@ -229,7 +229,7 @@ class CurrencyController extends Controller $defaultCurrency = $this->repository->getCurrencyByPreference(app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR'))); $isOwner = true; if (!$this->userRepository->hasRole($user, 'owner')) { - $request->session()->flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('info', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); $isOwner = false; } @@ -258,7 +258,7 @@ class CurrencyController extends Controller $currency = $this->repository->store($data); $redirect = redirect($this->getPreviousUri('currencies.create.uri')); if (null !== $currency) { - $request->session()->flash('success', trans('firefly.created_currency', ['name' => $currency->name])); + $request->session()->flash('success', (string)trans('firefly.created_currency', ['name' => $currency->name])); if (1 === (int)$request->get('create_another')) { // @codeCoverageIgnoreStart @@ -269,7 +269,7 @@ class CurrencyController extends Controller } } if (null === $currency) { - $request->session()->flash('error', trans('firefly.could_not_store_currency')); + $request->session()->flash('error', (string)trans('firefly.could_not_store_currency')); } @@ -289,7 +289,7 @@ class CurrencyController extends Controller $user = auth()->user(); if (!$this->userRepository->hasRole($user, 'owner')) { // @codeCoverageIgnoreStart - $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); return redirect(route('currencies.index')); // @codeCoverageIgnoreEnd @@ -297,7 +297,7 @@ class CurrencyController extends Controller $data = $request->getCurrencyData(); $currency = $this->repository->update($currency, $data); - $request->session()->flash('success', trans('firefly.updated_currency', ['name' => $currency->name])); + $request->session()->flash('success', (string)trans('firefly.updated_currency', ['name' => $currency->name])); app('preferences')->mark(); if (1 === (int)$request->get('return_to_edit')) { diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index dbdad0512d..989b4c2ea6 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -130,7 +130,7 @@ class DebugController extends Controller // set languages, see what happens: $original = setlocale(LC_ALL, 0); $localeAttempts = []; - $parts = explode(',', trans('config.locale')); + $parts = explode(',', (string)trans('config.locale')); foreach ($parts as $code) { $code = trim($code); $localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true); diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index aa7f320b10..6b45211868 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -48,7 +48,7 @@ class ExportController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-file-archive-o'); - app('view')->share('title', trans('firefly.export_and_backup_data')); + app('view')->share('title', (string)trans('firefly.export_and_backup_data')); return $next($request); } @@ -100,7 +100,7 @@ class ExportController extends Controller */ public function getStatus(ExportJob $job): JsonResponse { - return response()->json(['status' => trans('firefly.' . $job->status)]); + return response()->json(['status' => (string)trans('firefly.' . $job->status)]); } /** diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index ef151d2c02..71d3ec36a3 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -108,7 +108,7 @@ class HomeController extends Controller if (0 === $count) { return redirect(route('new-user.index')); } - $subTitle = trans('firefly.welcomeBack'); + $subTitle = (string)trans('firefly.welcomeBack'); $transactions = []; $frontPage = app('preferences')->get( 'frontPageAccounts', diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php index 21a41c2a7d..5c5b8dddc6 100644 --- a/app/Http/Controllers/Import/IndexController.php +++ b/app/Http/Controllers/Import/IndexController.php @@ -53,7 +53,7 @@ class IndexController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-archive'); - app('view')->share('title', trans('firefly.import_index_title')); + app('view')->share('title', (string)trans('firefly.import_index_title')); $this->repository = app(ImportJobRepositoryInterface::class); $this->userRepository = app(UserRepositoryInterface::class); @@ -78,7 +78,7 @@ class IndexController extends Controller $providers = array_keys($this->getProviders()); if (!\in_array($importProvider, $providers, true)) { Log::error(sprintf('%s-provider is disabled. Cannot create job.', $importProvider)); - session()->flash('warning', trans('import.cannot_create_for_provider', ['provider' => $importProvider])); + session()->flash('warning', (string)trans('import.cannot_create_for_provider', ['provider' => $importProvider])); return redirect(route('import.index')); } @@ -185,7 +185,7 @@ class IndexController extends Controller public function index() { $providers = $this->getProviders(); - $subTitle = trans('import.index_breadcrumb'); + $subTitle = (string)trans('import.index_breadcrumb'); $subTitleIcon = 'fa-home'; return view('import.index', compact('subTitle', 'subTitleIcon', 'providers')); diff --git a/app/Http/Controllers/Import/JobConfigurationController.php b/app/Http/Controllers/Import/JobConfigurationController.php index fc11df8284..e68cafc78a 100644 --- a/app/Http/Controllers/Import/JobConfigurationController.php +++ b/app/Http/Controllers/Import/JobConfigurationController.php @@ -50,7 +50,7 @@ class JobConfigurationController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-archive'); - app('view')->share('title', trans('firefly.import_index_title')); + app('view')->share('title', (string)trans('firefly.import_index_title')); $this->repository = app(ImportJobRepositoryInterface::class); return $next($request); @@ -74,7 +74,7 @@ class JobConfigurationController extends Controller $allowed = ['has_prereq', 'need_job_config']; if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { Log::debug(sprintf('Job has state "%s", but we only accept %s', $importJob->status, json_encode($allowed))); - session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + session()->flash('error', (string)trans('import.bad_job_status', ['status' => $importJob->status])); return redirect(route('import.index')); } @@ -104,7 +104,7 @@ class JobConfigurationController extends Controller $view = $configurator->getNextView(); $data = $configurator->getNextData(); - $subTitle = trans('import.job_configuration_breadcrumb', ['key' => $importJob->key]); + $subTitle = (string)trans('import.job_configuration_breadcrumb', ['key' => $importJob->key]); $subTitleIcon = 'fa-wrench'; return view($view, compact('data', 'importJob', 'subTitle', 'subTitleIcon')); @@ -125,7 +125,7 @@ class JobConfigurationController extends Controller // catch impossible status: $allowed = ['has_prereq', 'need_job_config']; if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { - session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + session()->flash('error', (string)trans('import.bad_job_status', ['status' => $importJob->status])); return redirect(route('import.index')); } diff --git a/app/Http/Controllers/Import/JobStatusController.php b/app/Http/Controllers/Import/JobStatusController.php index 8cae35eb92..fea52a3f06 100644 --- a/app/Http/Controllers/Import/JobStatusController.php +++ b/app/Http/Controllers/Import/JobStatusController.php @@ -50,7 +50,7 @@ class JobStatusController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-archive'); - app('view')->share('title', trans('firefly.import_index_title')); + app('view')->share('title', (string)trans('firefly.import_index_title')); $this->repository = app(ImportJobRepositoryInterface::class); return $next($request); @@ -66,7 +66,7 @@ class JobStatusController extends Controller public function index(ImportJob $importJob) { $subTitleIcon = 'fa-gear'; - $subTitle = trans('import.job_status_breadcrumb', ['key' => $importJob->key]); + $subTitle = (string)trans('import.job_status_breadcrumb', ['key' => $importJob->key]); return view('import.status', compact('importJob', 'subTitle', 'subTitleIcon')); } @@ -85,7 +85,7 @@ class JobStatusController extends Controller 'count' => $count, 'tag_id' => $importJob->tag_id, 'tag_name' => null === $importJob->tag_id ? null : $importJob->tag->tag, - 'report_txt' => trans('import.unknown_import_result'), + 'report_txt' => (string)trans('import.unknown_import_result'), 'download_config' => false, 'download_config_text' => '', ]; @@ -93,8 +93,8 @@ class JobStatusController extends Controller if ('file' === $importJob->provider) { $json['download_config'] = true; $json['download_config_text'] - = trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' - . trans('import.share_config_file'); + = (string)trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' + . (string)trans('import.share_config_file'); } // if count is zero: @@ -102,7 +102,7 @@ class JobStatusController extends Controller $count = $importJob->tag->transactionJournals->count(); } if (0 === $count) { - $json['report_txt'] = trans('import.result_no_transactions'); + $json['report_txt'] = (string)trans('import.result_no_transactions'); } if (1 === $count && null !== $importJob->tag_id) { $json['report_txt'] = trans( diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php index 8b37e1178b..709d0cc2fe 100644 --- a/app/Http/Controllers/Import/PrerequisitesController.php +++ b/app/Http/Controllers/Import/PrerequisitesController.php @@ -50,7 +50,7 @@ class PrerequisitesController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-archive'); - app('view')->share('title', trans('firefly.import_index_title')); + app('view')->share('title', (string)trans('firefly.import_index_title')); app('view')->share('subTitleIcon', 'fa-check'); $this->repository = app(ImportJobRepositoryInterface::class); @@ -76,12 +76,12 @@ class PrerequisitesController extends Controller $allowed = ['new']; if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { Log::error(sprintf('Job has state "%s" but this Prerequisites::index() only accepts %s', $importJob->status, json_encode($allowed))); - session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + session()->flash('error', (string)trans('import.bad_job_status', ['status' => $importJob->status])); return redirect(route('import.index')); } - app('view')->share('subTitle', trans('import.prerequisites_breadcrumb_' . $importProvider)); + app('view')->share('subTitle', (string)trans('import.prerequisites_breadcrumb_' . $importProvider)); $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); if (!class_exists($class)) { throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore @@ -132,7 +132,7 @@ class PrerequisitesController extends Controller $allowed = ['new']; if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { Log::error(sprintf('Job has state "%s" but this Prerequisites::post() only accepts %s', $importJob->status, json_encode($allowed))); - session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + session()->flash('error', (string)trans('import.bad_job_status', ['status' => $importJob->status])); return redirect(route('import.index')); } diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 70870db0d5..13dd03262c 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -105,7 +105,7 @@ class IntroController Log::debug(sprintf('Going to mark the following route as NOT done: %s with special "%s" (%s)', $route, $specialPage, $key)); app('preferences')->set($key, false); - return response()->json(['message' => trans('firefly.intro_boxes_after_refresh')]); + return response()->json(['message' => (string)trans('firefly.intro_boxes_after_refresh')]); } /** @@ -142,7 +142,7 @@ class IntroController $currentStep = $options; // get the text: - $currentStep['intro'] = trans('intro.' . $route . '_' . $key); + $currentStep['intro'] = (string)trans('intro.' . $route . '_' . $key); // save in array: $steps[] = $currentStep; @@ -173,7 +173,7 @@ class IntroController $currentStep = $options; // get the text: - $currentStep['intro'] = trans('intro.' . $route . '_' . $specificPage . '_' . $key); + $currentStep['intro'] = (string)trans('intro.' . $route . '_' . $specificPage . '_' . $key); // save in array: $steps[] = $currentStep; diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index cfea152bea..a837a210c4 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -64,7 +64,7 @@ class ReconcileController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-credit-card'); - app('view')->share('title', trans('firefly.accounts')); + app('view')->share('title', (string)trans('firefly.accounts')); $this->repository = app(JournalRepositoryInterface::class); $this->accountRepos = app(AccountRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class); diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 86340617f1..ee26ffcc0a 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -42,7 +42,7 @@ class JsonController extends Controller $keys = array_keys(config('firefly.rule-actions')); $actions = []; foreach ($keys as $key) { - $actions[$key] = trans('firefly.rule_action_' . $key . '_choice'); + $actions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice'); } $view = view('rules.partials.action', compact('actions', 'count'))->render(); @@ -62,7 +62,7 @@ class JsonController extends Controller $triggers = []; foreach ($keys as $key) { if ('user_action' !== $key) { - $triggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice'); + $triggers[$key] = (string)trans('firefly.rule_trigger_' . $key . '_choice'); } } asort($triggers); diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index a6c8ac24bc..267d96beaf 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -58,7 +58,7 @@ class NewUserController extends Controller */ public function index() { - app('view')->share('title', trans('firefly.welcome')); + app('view')->share('title', (string)trans('firefly.welcome')); app('view')->share('mainTitleIcon', 'fa-fire'); $types = config('firefly.accountTypesByIdentifier.asset'); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 8d03d667e1..f5133285a6 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -60,7 +60,7 @@ class PiggyBankController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.piggyBanks')); + app('view')->share('title', (string)trans('firefly.piggyBanks')); app('view')->share('mainTitleIcon', 'fa-sort-amount-asc'); $this->piggyRepos = app(PiggyBankRepositoryInterface::class); @@ -129,7 +129,7 @@ class PiggyBankController extends Controller */ public function create() { - $subTitle = trans('firefly.new_piggy_bank'); + $subTitle = (string)trans('firefly.new_piggy_bank'); $subTitleIcon = 'fa-plus'; // put previous url in session if not redirect from store (not "create another"). @@ -148,7 +148,7 @@ class PiggyBankController extends Controller */ public function delete(PiggyBank $piggyBank) { - $subTitle = trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]); + $subTitle = (string)trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]); // put previous url in session $this->rememberPreviousUri('piggy-banks.delete.uri'); @@ -177,7 +177,7 @@ class PiggyBankController extends Controller */ public function edit(PiggyBank $piggyBank) { - $subTitle = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]); + $subTitle = (string)trans('firefly.update_piggy_title', ['name' => $piggyBank->name]); $subTitleIcon = 'fa-pencil'; $targetDate = null; $startDate = null; diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 92bdfb547e..be0d1cc62c 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -40,7 +40,7 @@ class PreferencesController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.preferences')); + app('view')->share('title', (string)trans('firefly.preferences')); app('view')->share('mainTitleIcon', 'fa-gear'); return $next($request); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index a1e33f6855..db0e0b3023 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -61,7 +61,7 @@ class ProfileController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.profile')); + app('view')->share('title', (string)trans('firefly.profile')); app('view')->share('mainTitleIcon', 'fa-user'); return $next($request); diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 559ad1b444..4cc9c77251 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -54,8 +54,8 @@ class CreateController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-paint-brush'); - app('view')->share('title', trans('firefly.recurrences')); - app('view')->share('subTitle', trans('firefly.create_new_recurrence')); + app('view')->share('title', (string)trans('firefly.recurrences')); + app('view')->share('subTitle', (string)trans('firefly.create_new_recurrence')); $this->recurring = app(RecurringRepositoryInterface::class); $this->budgets = app(BudgetRepositoryInterface::class); @@ -86,16 +86,16 @@ class CreateController extends Controller // when will it end? $repetitionEnds = [ - 'forever' => trans('firefly.repeat_forever'), - 'until_date' => trans('firefly.repeat_until_date'), - 'times' => trans('firefly.repeat_times'), + 'forever' => (string)trans('firefly.repeat_forever'), + 'until_date' => (string)trans('firefly.repeat_until_date'), + 'times' => (string)trans('firefly.repeat_times'), ]; // what to do in the weekend? $weekendResponses = [ - RecurrenceRepetition::WEEKEND_DO_NOTHING => trans('firefly.do_nothing'), - RecurrenceRepetition::WEEKEND_SKIP_CREATION => trans('firefly.skip_transaction'), - RecurrenceRepetition::WEEKEND_TO_FRIDAY => trans('firefly.jump_to_friday'), - RecurrenceRepetition::WEEKEND_TO_MONDAY => trans('firefly.jump_to_monday'), + RecurrenceRepetition::WEEKEND_DO_NOTHING => (string)trans('firefly.do_nothing'), + RecurrenceRepetition::WEEKEND_SKIP_CREATION => (string)trans('firefly.skip_transaction'), + RecurrenceRepetition::WEEKEND_TO_FRIDAY => (string)trans('firefly.jump_to_friday'), + RecurrenceRepetition::WEEKEND_TO_MONDAY => (string)trans('firefly.jump_to_monday'), ]; // flash some data: diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index a36a0ce018..2081551457 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -48,7 +48,7 @@ class DeleteController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-paint-brush'); - app('view')->share('title', trans('firefly.recurrences')); + app('view')->share('title', (string)trans('firefly.recurrences')); $this->recurring = app(RecurringRepositoryInterface::class); @@ -64,7 +64,7 @@ class DeleteController extends Controller */ public function delete(Recurrence $recurrence) { - $subTitle = trans('firefly.delete_recurring', ['title' => $recurrence->title]); + $subTitle = (string)trans('firefly.delete_recurring', ['title' => $recurrence->title]); // put previous url in session $this->rememberPreviousUri('recurrences.delete.uri'); diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 6438361472..1305516655 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -56,8 +56,8 @@ class EditController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-paint-brush'); - app('view')->share('title', trans('firefly.recurrences')); - app('view')->share('subTitle', trans('firefly.recurrences')); + app('view')->share('title', (string)trans('firefly.recurrences')); + app('view')->share('subTitle', (string)trans('firefly.recurrences')); $this->recurring = app(RecurringRepositoryInterface::class); $this->budgets = app(BudgetRepositoryInterface::class); @@ -105,9 +105,9 @@ class EditController extends Controller $repetitionEnd = 'forever'; // types of repetitions: $repetitionEnds = [ - 'forever' => trans('firefly.repeat_forever'), - 'until_date' => trans('firefly.repeat_until_date'), - 'times' => trans('firefly.repeat_times'), + 'forever' => (string)trans('firefly.repeat_forever'), + 'until_date' => (string)trans('firefly.repeat_until_date'), + 'times' => (string)trans('firefly.repeat_times'), ]; if (null !== $recurrence->repeat_until) { $repetitionEnd = 'until_date'; @@ -118,10 +118,10 @@ class EditController extends Controller // what to do in the weekend? $weekendResponses = [ - RecurrenceRepetition::WEEKEND_DO_NOTHING => trans('firefly.do_nothing'), - RecurrenceRepetition::WEEKEND_SKIP_CREATION => trans('firefly.skip_transaction'), - RecurrenceRepetition::WEEKEND_TO_FRIDAY => trans('firefly.jump_to_friday'), - RecurrenceRepetition::WEEKEND_TO_MONDAY => trans('firefly.jump_to_monday'), + RecurrenceRepetition::WEEKEND_DO_NOTHING => (string)trans('firefly.do_nothing'), + RecurrenceRepetition::WEEKEND_SKIP_CREATION => (string)trans('firefly.skip_transaction'), + RecurrenceRepetition::WEEKEND_TO_FRIDAY => (string)trans('firefly.jump_to_friday'), + RecurrenceRepetition::WEEKEND_TO_MONDAY => (string)trans('firefly.jump_to_monday'), ]; // code to handle active-checkboxes diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index e2c75c1e8a..a731fd61ea 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -55,7 +55,7 @@ class IndexController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-paint-brush'); - app('view')->share('title', trans('firefly.recurrences')); + app('view')->share('title', (string)trans('firefly.recurrences')); $this->recurring = app(RecurringRepositoryInterface::class); @@ -201,7 +201,7 @@ class IndexController extends Controller } } - $subTitle = trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]); + $subTitle = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]); return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'transactions')); } @@ -225,12 +225,12 @@ class IndexController extends Controller $yearly = sprintf('yearly,%s', $date->format('Y-m-d')); $yearlyDate = $date->formatLocalized(trans('config.month_and_day_no_year')); $result = [ - 'daily' => ['label' => trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], - $weekly => ['label' => trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), 'selected' => 0 === strpos($preSelected, 'weekly')], - $monthly => ['label' => trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), 'selected' => 0 === strpos($preSelected, 'monthly')], - $ndom => ['label' => trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), + 'daily' => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], + $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), 'selected' => 0 === strpos($preSelected, 'weekly')], + $monthly => ['label' => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), 'selected' => 0 === strpos($preSelected, 'monthly')], + $ndom => ['label' => (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), 'selected' => 0 === strpos($preSelected, 'ndom')], - $yearly => ['label' => trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], + $yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], ]; } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 169e17ff84..5f00bded10 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -58,7 +58,7 @@ class ReportController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.reports')); + app('view')->share('title', (string)trans('firefly.reports')); app('view')->share('mainTitleIcon', 'fa-line-chart'); app('view')->share('subTitleIcon', 'fa-calendar'); $this->helper = app(ReportHelperInterface::class); @@ -81,7 +81,7 @@ class ReportController extends Controller public function accountReport(Collection $accounts, Collection $expense, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { @@ -115,7 +115,7 @@ class ReportController extends Controller public function auditReport(Collection $accounts, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); @@ -152,7 +152,7 @@ class ReportController extends Controller public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); @@ -190,7 +190,7 @@ class ReportController extends Controller public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); @@ -227,7 +227,7 @@ class ReportController extends Controller public function defaultReport(Collection $accounts, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); } if ($start < session('first')) { @@ -322,31 +322,31 @@ class ReportController extends Controller if (0 === $request->getAccountList()->count()) { Log::debug('Account count is zero'); - session()->flash('error', trans('firefly.select_more_than_one_account')); + session()->flash('error', (string)trans('firefly.select_more_than_one_account')); return redirect(route('reports.index')); } if ('category' === $reportType && 0 === $request->getCategoryList()->count()) { - session()->flash('error', trans('firefly.select_more_than_one_category')); + session()->flash('error', (string)trans('firefly.select_more_than_one_category')); return redirect(route('reports.index')); } if ('budget' === $reportType && 0 === $request->getBudgetList()->count()) { - session()->flash('error', trans('firefly.select_more_than_one_budget')); + session()->flash('error', (string)trans('firefly.select_more_than_one_budget')); return redirect(route('reports.index')); } if ('tag' === $reportType && 0 === $request->getTagList()->count()) { - session()->flash('error', trans('firefly.select_more_than_one_tag')); + session()->flash('error', (string)trans('firefly.select_more_than_one_tag')); return redirect(route('reports.index')); } if ($request->getEndDate() < $request->getStartDate()) { - return view('error')->with('message', trans('firefly.end_after_start_date')); + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); } switch ($reportType) { @@ -386,7 +386,7 @@ class ReportController extends Controller public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore + return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 24ca0a01de..7083fa714e 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -69,7 +69,7 @@ class RuleController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.rules')); + app('view')->share('title', (string)trans('firefly.rules')); app('view')->share('mainTitleIcon', 'fa-random'); $this->accountRepos = app(AccountRepositoryInterface::class); @@ -121,8 +121,8 @@ class RuleController extends Controller if (null !== $bill && !$request->old()) { // create some sensible defaults: - $preFilled['title'] = trans('firefly.new_rule_for_bill_title', ['name' => $bill->name]); - $preFilled['description'] = trans('firefly.new_rule_for_bill_description', ['name' => $bill->name]); + $preFilled['title'] = (string)trans('firefly.new_rule_for_bill_title', ['name' => $bill->name]); + $preFilled['description'] = (string)trans('firefly.new_rule_for_bill_description', ['name' => $bill->name]); // get triggers and actions for bill: @@ -133,7 +133,7 @@ class RuleController extends Controller $triggerCount = \count($oldTriggers); $actionCount = \count($oldActions); $subTitleIcon = 'fa-clone'; - $subTitle = trans('firefly.make_new_rule', ['title' => $ruleGroup->title]); + $subTitle = (string)trans('firefly.make_new_rule', ['title' => $ruleGroup->title]); $request->session()->flash('preFilled', $preFilled); @@ -161,7 +161,7 @@ class RuleController extends Controller */ public function delete(Rule $rule) { - $subTitle = trans('firefly.delete_rule', ['title' => $rule->title]); + $subTitle = (string)trans('firefly.delete_rule', ['title' => $rule->title]); // put previous url in session $this->rememberPreviousUri('rules.delete.uri'); @@ -181,7 +181,7 @@ class RuleController extends Controller $title = $rule->title; $this->ruleRepos->destroy($rule); - session()->flash('success', trans('firefly.deleted_rule', ['title' => $title])); + session()->flash('success', (string)trans('firefly.deleted_rule', ['title' => $title])); app('preferences')->mark(); return redirect($this->getPreviousUri('rules.delete.uri')); @@ -237,7 +237,7 @@ class RuleController extends Controller // get rule trigger for update / store-journal: $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule); - $subTitle = trans('firefly.edit_rule', ['title' => $rule->title]); + $subTitle = (string)trans('firefly.edit_rule', ['title' => $rule->title]); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('rules.edit.fromUpdate')) { @@ -357,7 +357,7 @@ class RuleController extends Controller { $data = $request->getRuleData(); $rule = $this->ruleRepos->store($data); - session()->flash('success', trans('firefly.stored_new_rule', ['title' => $rule->title])); + session()->flash('success', (string)trans('firefly.stored_new_rule', ['title' => $rule->title])); app('preferences')->mark(); // redirect to show bill. @@ -400,7 +400,7 @@ class RuleController extends Controller $triggers = $this->getValidTriggerList($request); if (0 === \count($triggers)) { - return response()->json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore + return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore } $limit = (int)config('firefly.test-triggers.limit'); @@ -424,10 +424,10 @@ class RuleController extends Controller // Warn the user if only a subset of transactions is returned $warning = ''; if ($matchingTransactions->count() === $limit) { - $warning = trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore + $warning = (string)trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore } if (0 === $matchingTransactions->count()) { - $warning = trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore + $warning = (string)trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore } // Return json response @@ -462,7 +462,7 @@ class RuleController extends Controller $triggers = $rule->ruleTriggers; if (0 === \count($triggers)) { - return response()->json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore + return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore } $limit = (int)config('firefly.test-triggers.limit'); @@ -486,10 +486,10 @@ class RuleController extends Controller // Warn the user if only a subset of transactions is returned $warning = ''; if ($matchingTransactions->count() === $limit) { - $warning = trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore + $warning = (string)trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore } if (0 === $matchingTransactions->count()) { - $warning = trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore + $warning = (string)trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore } // Return json response @@ -530,7 +530,7 @@ class RuleController extends Controller $data = $request->getRuleData(); $this->ruleRepos->update($rule, $data); - session()->flash('success', trans('firefly.updated_rule', ['title' => $rule->title])); + session()->flash('success', (string)trans('firefly.updated_rule', ['title' => $rule->title])); app('preferences')->mark(); $redirect = redirect($this->getPreviousUri('rules.edit.uri')); if (1 === (int)$request->get('return_to_edit')) { @@ -553,20 +553,20 @@ class RuleController extends Controller $data = [ 'rule_group_id' => $this->ruleRepos->getFirstRuleGroup()->id, 'stop-processing' => 0, - 'title' => trans('firefly.default_rule_name'), - 'description' => trans('firefly.default_rule_description'), + 'title' => (string)trans('firefly.default_rule_name'), + 'description' => (string)trans('firefly.default_rule_description'), 'trigger' => 'store-journal', 'strict' => true, 'rule-triggers' => [ [ 'name' => 'description_is', - 'value' => trans('firefly.default_rule_trigger_description'), + 'value' => (string)trans('firefly.default_rule_trigger_description'), 'stop-processing' => false, ], [ 'name' => 'from_account_is', - 'value' => trans('firefly.default_rule_trigger_from_account'), + 'value' => (string)trans('firefly.default_rule_trigger_from_account'), 'stop-processing' => false, ], @@ -575,12 +575,12 @@ class RuleController extends Controller 'rule-actions' => [ [ 'name' => 'prepend_description', - 'value' => trans('firefly.default_rule_action_prepend'), + 'value' => (string)trans('firefly.default_rule_action_prepend'), 'stop-processing' => false, ], [ 'name' => 'set_category', - 'value' => trans('firefly.default_rule_action_set_category'), + 'value' => (string)trans('firefly.default_rule_action_set_category'), 'stop-processing' => false, ], ], @@ -597,8 +597,8 @@ class RuleController extends Controller { if (0 === $this->ruleGroupRepos->count()) { $data = [ - 'title' => trans('firefly.default_rule_group_name'), - 'description' => trans('firefly.default_rule_group_description'), + 'title' => (string)trans('firefly.default_rule_group_name'), + 'description' => (string)trans('firefly.default_rule_group_description'), ]; $this->ruleGroupRepos->store($data); diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 50e4e2833f..2516ad77ea 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -47,7 +47,7 @@ class RuleGroupController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.rules')); + app('view')->share('title', (string)trans('firefly.rules')); app('view')->share('mainTitleIcon', 'fa-random'); return $next($request); @@ -61,7 +61,7 @@ class RuleGroupController extends Controller public function create() { $subTitleIcon = 'fa-clone'; - $subTitle = trans('firefly.make_new_rule_group'); + $subTitle = (string)trans('firefly.make_new_rule_group'); // put previous url in session if not redirect from store (not "create another"). if (true !== session('rule-groups.create.fromStore')) { @@ -79,7 +79,7 @@ class RuleGroupController extends Controller */ public function delete(RuleGroup $ruleGroup) { - $subTitle = trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]); + $subTitle = (string)trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]); // put previous url in session $this->rememberPreviousUri('rule-groups.delete.uri'); @@ -132,7 +132,7 @@ class RuleGroupController extends Controller */ public function edit(Request $request, RuleGroup $ruleGroup) { - $subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); + $subTitle = (string)trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); $hasOldInput = null !== $request->old('_token'); $preFilled = [ diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 9e97fae2a2..21f0115c12 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -43,7 +43,7 @@ class SearchController extends Controller $this->middleware( function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-search'); - app('view')->share('title', trans('firefly.search')); + app('view')->share('title', (string)trans('firefly.search')); return $next($request); } @@ -63,7 +63,7 @@ class SearchController extends Controller // parse search terms: $searcher->parseQuery($fullQuery); $query = $searcher->getWordsAsString(); - $subTitle = trans('breadcrumbs.search_result', ['query' => $query]); + $subTitle = (string)trans('breadcrumbs.search_result', ['query' => $query]); return view('search.index', compact('query', 'fullQuery', 'subTitle')); } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 529a26d4c1..cb43bbb42a 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -67,7 +67,7 @@ class TagController extends Controller */ public function create() { - $subTitle = trans('firefly.new_tag'); + $subTitle = (string)trans('firefly.new_tag'); $subTitleIcon = 'fa-tag'; // put previous url in session if not redirect from store (not "create another"). @@ -88,7 +88,7 @@ class TagController extends Controller */ public function delete(Tag $tag) { - $subTitle = trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]); + $subTitle = (string)trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]); // put previous url in session $this->rememberPreviousUri('tags.delete.uri'); @@ -121,7 +121,7 @@ class TagController extends Controller */ public function edit(Tag $tag) { - $subTitle = trans('firefly.edit_tag', ['tag' => $tag->tag]); + $subTitle = (string)trans('firefly.edit_tag', ['tag' => $tag->tag]); $subTitleIcon = 'fa-tag'; // put previous url in session if not redirect from store (not "return_to_edit"). @@ -184,7 +184,7 @@ class TagController extends Controller // prep for "all" view. if ('all' === $moment) { - $subTitle = trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]); + $subTitle = (string)trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]); $start = $this->repository->firstUseDate($tag); $end = new Carbon; $path = route('tags.show', [$tag->id, 'all']); diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index a2648b35e1..6237993e00 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -52,7 +52,7 @@ class BulkController extends Controller $this->middleware( function ($request, $next) { $this->repository = app(JournalRepositoryInterface::class); - app('view')->share('title', trans('firefly.transactions')); + app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-repeat'); return $next($request); @@ -67,7 +67,7 @@ class BulkController extends Controller */ public function edit(Collection $journals) { - $subTitle = trans('firefly.mass_bulk_journals'); + $subTitle = (string)trans('firefly.mass_bulk_journals'); // get list of budgets: /** @var BudgetRepositoryInterface $repository */ @@ -128,7 +128,7 @@ class BulkController extends Controller } app('preferences')->mark(); - $request->session()->flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count])); + $request->session()->flash('success', (string)trans('firefly.mass_edited_transactions_success', ['amount' => $count])); // redirect to previous URL: return redirect($this->getPreviousUri('transactions.bulk-edit.uri')); diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index c6f45d7790..ca11f83e21 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -53,7 +53,7 @@ class ConvertController extends Controller function ($request, $next) { $this->repository = app(JournalRepositoryInterface::class); - app('view')->share('title', trans('firefly.transactions')); + app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-exchange'); return $next($request); @@ -79,13 +79,13 @@ class ConvertController extends Controller // @codeCoverageIgnoreEnd $positiveAmount = $this->repository->getJournalTotal($journal); $sourceType = $journal->transactionType; - $subTitle = trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]); + $subTitle = (string)trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]); $subTitleIcon = 'fa-exchange'; // cannot convert to its own type. if ($sourceType->type === $destinationType->type) { Log::debug('This is already a transaction of the expected type..'); - session()->flash('info', trans('firefly.convert_is_already_type_' . $destinationType->type)); + session()->flash('info', (string)trans('firefly.convert_is_already_type_' . $destinationType->type)); return redirect(route('transactions.show', [$journal->id])); } @@ -93,7 +93,7 @@ class ConvertController extends Controller // cannot convert split. if ($journal->transactions()->count() > 2) { Log::info('This journal has more than two transactions.'); - session()->flash('error', trans('firefly.cannot_convert_split_journal')); + session()->flash('error', (string)trans('firefly.cannot_convert_split_journal')); return redirect(route('transactions.show', [$journal->id])); } @@ -135,14 +135,14 @@ class ConvertController extends Controller if ($journal->transactionType->type === $destinationType->type) { Log::info('Journal is already of the desired type.'); - session()->flash('error', trans('firefly.convert_is_already_type_' . $destinationType->type)); + session()->flash('error', (string)trans('firefly.convert_is_already_type_' . $destinationType->type)); return redirect(route('transactions.show', [$journal->id])); } if ($journal->transactions()->count() > 2) { Log::info('Journal has more than two transactions.'); - session()->flash('error', trans('firefly.cannot_convert_split_journal')); + session()->flash('error', (string)trans('firefly.cannot_convert_split_journal')); return redirect(route('transactions.show', [$journal->id])); } @@ -158,7 +158,7 @@ class ConvertController extends Controller return redirect(route('transactions.convert.index', [strtolower($destinationType->type), $journal->id]))->withErrors($errors)->withInput(); } - session()->flash('success', trans('firefly.converted_to_' . $destinationType->type)); + session()->flash('success', (string)trans('firefly.converted_to_' . $destinationType->type)); return redirect(route('transactions.show', [$journal->id])); } diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index 0d5a3d4998..34cb561004 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -50,7 +50,7 @@ class LinkController extends Controller // some useful repositories: $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.transactions')); + app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-repeat'); $this->journalRepository = app(JournalRepositoryInterface::class); @@ -69,7 +69,7 @@ class LinkController extends Controller public function delete(TransactionJournalLink $link) { $subTitleIcon = 'fa-link'; - $subTitle = trans('breadcrumbs.delete_journal_link'); + $subTitle = (string)trans('breadcrumbs.delete_journal_link'); $this->rememberPreviousUri('journal_links.delete.uri'); return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon')); @@ -102,14 +102,14 @@ class LinkController extends Controller Log::debug('We are here (store)'); $linkInfo = $request->getLinkInfo(); if (0 === $linkInfo['transaction_journal_id']) { - session()->flash('error', trans('firefly.invalid_link_selection')); + session()->flash('error', (string)trans('firefly.invalid_link_selection')); return redirect(route('transactions.show', [$journal->id])); } $other = $this->journalRepository->findNull($linkInfo['transaction_journal_id']); if (null === $other) { - session()->flash('error', trans('firefly.invalid_link_selection')); + session()->flash('error', (string)trans('firefly.invalid_link_selection')); return redirect(route('transactions.show', [$journal->id])); } @@ -117,19 +117,19 @@ class LinkController extends Controller $alreadyLinked = $this->repository->findLink($journal, $other); if ($other->id === $journal->id) { - session()->flash('error', trans('firefly.journals_link_to_self')); + session()->flash('error', (string)trans('firefly.journals_link_to_self')); return redirect(route('transactions.show', [$journal->id])); } if ($alreadyLinked) { - session()->flash('error', trans('firefly.journals_error_linked')); + session()->flash('error', (string)trans('firefly.journals_error_linked')); return redirect(route('transactions.show', [$journal->id])); } Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id)); $this->repository->storeLink($linkInfo, $other, $journal); - session()->flash('success', trans('firefly.journals_linked')); + session()->flash('success', (string)trans('firefly.journals_linked')); return redirect(route('transactions.show', [$journal->id])); } diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 77063142f0..e8bb3ea05a 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -57,7 +57,7 @@ class MassController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.transactions')); + app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-repeat'); $this->repository = app(JournalRepositoryInterface::class); @@ -73,7 +73,7 @@ class MassController extends Controller */ public function delete(Collection $journals): IlluminateView { - $subTitle = trans('firefly.mass_delete_journals'); + $subTitle = (string)trans('firefly.mass_delete_journals'); // put previous url in session $this->rememberPreviousUri('transactions.mass-delete.uri'); @@ -110,7 +110,7 @@ class MassController extends Controller } app('preferences')->mark(); - session()->flash('success', trans('firefly.mass_deleted_transactions_success', ['amount' => $count])); + session()->flash('success', (string)trans('firefly.mass_deleted_transactions_success', ['amount' => $count])); // redirect to previous URL: return redirect($this->getPreviousUri('transactions.mass-delete.uri')); @@ -125,7 +125,7 @@ class MassController extends Controller { /** @var User $user */ $user = auth()->user(); - $subTitle = trans('firefly.mass_edit_journals'); + $subTitle = (string)trans('firefly.mass_edit_journals'); /** @var AccountRepositoryInterface $repository */ @@ -240,7 +240,7 @@ class MassController extends Controller } } app('preferences')->mark(); - session()->flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count])); + session()->flash('success', (string)trans('firefly.mass_edited_transactions_success', ['amount' => $count])); // redirect to previous URL: return redirect($this->getPreviousUri('transactions.mass-edit.uri')); diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 6ebe79d23d..3fa181ec25 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -71,7 +71,7 @@ class SingleController extends Controller $this->attachments = app(AttachmentHelperInterface::class); $this->repository = app(JournalRepositoryInterface::class); - app('view')->share('title', trans('firefly.transactions')); + app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-repeat'); return $next($request); @@ -145,7 +145,7 @@ class SingleController extends Controller $what = (string)($request->old('what') ?? $what); $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); $preFilled = session()->has('preFilled') ? session('preFilled') : []; - $subTitle = trans('form.add_new_' . $what); + $subTitle = (string)trans('form.add_new_' . $what); $subTitleIcon = 'fa-plus'; $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; $source = (int)$request->get('source'); @@ -192,7 +192,7 @@ class SingleController extends Controller // @codeCoverageIgnoreEnd $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); - $subTitle = trans('firefly.delete_' . $what, ['description' => $journal->description]); + $subTitle = (string)trans('firefly.delete_' . $what, ['description' => $journal->description]); // put previous url in session $this->rememberPreviousUri('transactions.delete.uri'); @@ -253,7 +253,7 @@ class SingleController extends Controller $budgetList = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets()); // view related code - $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); + $subTitle = (string)trans('breadcrumbs.edit_journal', ['description' => $journal->description]); // journal related code $sourceAccounts = $repository->getJournalSourceAccounts($journal); diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 42772721e4..86e75acede 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -72,7 +72,7 @@ class SplitController extends Controller $this->currencies = app(CurrencyRepositoryInterface::class); $this->repository = app(JournalRepositoryInterface::class); app('view')->share('mainTitleIcon', 'fa-share-alt'); - app('view')->share('title', trans('firefly.split-transactions')); + app('view')->share('title', (string)trans('firefly.split-transactions')); return $next($request); } @@ -93,7 +93,7 @@ class SplitController extends Controller } // basic fields: $uploadSize = min(app('steam')->phpBytes(ini_get('upload_max_filesize')), app('steam')->phpBytes(ini_get('post_max_size'))); - $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); + $subTitle = (string)trans('breadcrumbs.edit_journal', ['description' => $journal->description]); $subTitleIcon = 'fa-pencil'; // lists and collections diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 7c18e342a3..df344675b4 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -60,7 +60,7 @@ class TransactionController extends Controller $this->middleware( function ($request, $next) { - app('view')->share('title', trans('firefly.transactions')); + app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-repeat'); $this->repository = app(JournalRepositoryInterface::class); @@ -101,7 +101,7 @@ class TransactionController extends Controller $startStr = $start->formatLocalized($this->monthAndDayFormat); $endStr = $end->formatLocalized($this->monthAndDayFormat); - $subTitle = trans('firefly.title_' . $what . '_between', ['start' => $startStr, 'end' => $endStr]); + $subTitle = (string)trans('firefly.title_' . $what . '_between', ['start' => $startStr, 'end' => $endStr]); $periods = $this->getPeriodOverview($what, $end); /** @var JournalCollectorInterface $collector */ @@ -134,7 +134,7 @@ class TransactionController extends Controller $first = $this->repository->firstNull(); $start = null === $first ? new Carbon : $first->date; $end = new Carbon; - $subTitle = trans('firefly.all_' . $what); + $subTitle = (string)trans('firefly.all_' . $what); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); @@ -230,7 +230,7 @@ class TransactionController extends Controller $events = $this->repository->getPiggyBankEvents($journal); $what = strtolower($transactionType); - $subTitle = trans('firefly.' . $what) . ' "' . $journal->description . '"'; + $subTitle = (string)trans('firefly.' . $what) . ' "' . $journal->description . '"'; return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links')); } diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 868d69a767..03aaa1aade 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -80,7 +80,7 @@ class Range $lang = $pref->data; App::setLocale($lang); Carbon::setLocale(substr($lang, 0, 2)); - $locale = explode(',', trans('config.locale')); + $locale = explode(',', (string)trans('config.locale')); $locale = array_map('trim', $locale); setlocale(LC_TIME, $locale); diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index ac2068bbea..7c14013d74 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -250,7 +250,7 @@ class JournalFormRequest extends Request && 0 !== $accountCurrency ) { Log::debug('ADD validation error on native_amount'); - $validator->errors()->add('native_amount', trans('validation.numeric_native')); + $validator->errors()->add('native_amount', (string)trans('validation.numeric_native')); return; } @@ -265,7 +265,7 @@ class JournalFormRequest extends Request && 0 !== $selectedCurrency && 0 !== $accountCurrency ) { - $validator->errors()->add('native_amount', trans('validation.numeric_native')); + $validator->errors()->add('native_amount', (string)trans('validation.numeric_native')); return; } @@ -285,15 +285,15 @@ class JournalFormRequest extends Request && 0 !== $sourceCurrency && 0 !== $destinationCurrency ) { - $validator->errors()->add('source_amount', trans('validation.numeric_source')); + $validator->errors()->add('source_amount', (string)trans('validation.numeric_source')); } if ($sourceCurrency !== $destinationCurrency && '' === $destinationAmount && 0 !== $sourceCurrency && 0 !== $destinationCurrency ) { - $validator->errors()->add('destination_amount', trans('validation.numeric_destination')); - $validator->errors()->add('destination_amount', trans('validation.numeric', ['attribute' => 'destination_amount'])); + $validator->errors()->add('destination_amount', (string)trans('validation.numeric_destination')); + $validator->errors()->add('destination_amount', (string)trans('validation.numeric', ['attribute' => 'destination_amount'])); } return; diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index ec7b6316a3..fec9c93519 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -155,8 +155,8 @@ class SplitJournalFormRequest extends Request /** @var array $array */ foreach ($transactions as $array) { if (null !== $array['destination_id'] && null !== $array['source_id'] && $array['destination_id'] === $array['source_id']) { - $validator->errors()->add('journal_source_id', trans('validation.source_equals_destination')); - $validator->errors()->add('journal_destination_id', trans('validation.source_equals_destination')); + $validator->errors()->add('journal_source_id', (string)trans('validation.source_equals_destination')); + $validator->errors()->add('journal_destination_id', (string)trans('validation.source_equals_destination')); } } diff --git a/app/Import/JobConfiguration/FakeJobConfiguration.php b/app/Import/JobConfiguration/FakeJobConfiguration.php index 5408b030ad..2003a2b230 100644 --- a/app/Import/JobConfiguration/FakeJobConfiguration.php +++ b/app/Import/JobConfiguration/FakeJobConfiguration.php @@ -114,8 +114,8 @@ class FakeJobConfiguration implements JobConfigurationInterface { return [ 'rulesOptions' => [ - 1 => trans('firefly.yes'), - 0 => trans('firefly.no'), + 1 => (string)trans('firefly.yes'), + 0 => (string)trans('firefly.no'), ], ]; } diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php index 9460771bd6..3d166184b7 100644 --- a/app/Import/Mapper/AssetAccountIbans.php +++ b/app/Import/Mapper/AssetAccountIbans.php @@ -56,7 +56,7 @@ class AssetAccountIbans implements MapperInterface /** @noinspection AdditionOperationOnArraysInspection */ $list = $topList + $list; asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/AssetAccounts.php b/app/Import/Mapper/AssetAccounts.php index 23d8b23322..c5754a3717 100644 --- a/app/Import/Mapper/AssetAccounts.php +++ b/app/Import/Mapper/AssetAccounts.php @@ -52,7 +52,7 @@ class AssetAccounts implements MapperInterface $list[$accountId] = $name; } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php index 8caa0f76a3..8e8c8efa2e 100644 --- a/app/Import/Mapper/Bills.php +++ b/app/Import/Mapper/Bills.php @@ -46,7 +46,7 @@ class Bills implements MapperInterface $list[$billId] = $bill->name; } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/Budgets.php b/app/Import/Mapper/Budgets.php index 4c566611b4..d8399dce85 100644 --- a/app/Import/Mapper/Budgets.php +++ b/app/Import/Mapper/Budgets.php @@ -46,7 +46,7 @@ class Budgets implements MapperInterface $list[$budgetId] = $budget->name; } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/Categories.php b/app/Import/Mapper/Categories.php index e8cddc8c2c..bb840743e5 100644 --- a/app/Import/Mapper/Categories.php +++ b/app/Import/Mapper/Categories.php @@ -46,7 +46,7 @@ class Categories implements MapperInterface $list[$categoryId] = $category->name; } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php index a567648563..a8b3d4eb99 100644 --- a/app/Import/Mapper/OpposingAccountIbans.php +++ b/app/Import/Mapper/OpposingAccountIbans.php @@ -61,7 +61,7 @@ class OpposingAccountIbans implements MapperInterface } $list = $topList + $list; asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/OpposingAccounts.php b/app/Import/Mapper/OpposingAccounts.php index b5ee6089b5..e887078758 100644 --- a/app/Import/Mapper/OpposingAccounts.php +++ b/app/Import/Mapper/OpposingAccounts.php @@ -58,7 +58,7 @@ class OpposingAccounts implements MapperInterface $list[$accountId] = $name; } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/Tags.php b/app/Import/Mapper/Tags.php index b2cfa3f630..e81fb2a2be 100644 --- a/app/Import/Mapper/Tags.php +++ b/app/Import/Mapper/Tags.php @@ -46,7 +46,7 @@ class Tags implements MapperInterface $list[$tagId] = $tag->tag; } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Mapper/TransactionCurrencies.php b/app/Import/Mapper/TransactionCurrencies.php index e9fa683bce..b0eaf956bd 100644 --- a/app/Import/Mapper/TransactionCurrencies.php +++ b/app/Import/Mapper/TransactionCurrencies.php @@ -44,7 +44,7 @@ class TransactionCurrencies implements MapperInterface } asort($list); - $list = [0 => trans('import.map_do_not_map')] + $list; + $list = [0 => (string)trans('import.map_do_not_map')] + $list; return $list; } diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index b714734836..dcdb8600c3 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -72,7 +72,7 @@ class AbnAmroDescription implements SpecificInterface // If the description could not be parsed, specify an unknown opposing // account, as an opposing account is required if (!$parsed) { - $this->row[8] = trans('firefly.unknown'); // opposing-account-name + $this->row[8] = (string)trans('firefly.unknown'); // opposing-account-name } return $this->row; diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 15d5ae58fa..551bec3d14 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -260,7 +260,7 @@ class ImportArrayStorage $repository = app(TagRepositoryInterface::class); $repository->setUser($this->importJob->user); $data = [ - 'tag' => trans('import.import_with_key', ['key' => $this->importJob->key]), + 'tag' => (string)trans('import.import_with_key', ['key' => $this->importJob->key]), 'date' => new Carbon, 'description' => null, 'latitude' => null, diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index d4a09795af..2240394ec2 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -255,7 +255,7 @@ class CreateRecurringTransactions implements ShouldQueue 'date' => $date, 'tags' => $this->repository->getTags($recurrence), 'user' => $recurrence->user_id, - 'notes' => trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]), + 'notes' => (string)trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]), // journal data: 'description' => $recurrence->recurrenceTransactions()->first()->description, diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index e79df9d0a5..d5e58f96f6 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -64,10 +64,10 @@ class JournalRepository implements JournalRepositoryInterface if ($source->id === $destination->id || null === $source->id || null === $destination->id) { // default message bag that shows errors for everything. $messages = new MessageBag; - $messages->add('source_account_revenue', trans('firefly.invalid_convert_selection')); - $messages->add('destination_account_asset', trans('firefly.invalid_convert_selection')); - $messages->add('destination_account_expense', trans('firefly.invalid_convert_selection')); - $messages->add('source_account_asset', trans('firefly.invalid_convert_selection')); + $messages->add('source_account_revenue', (string)trans('firefly.invalid_convert_selection')); + $messages->add('destination_account_asset', (string)trans('firefly.invalid_convert_selection')); + $messages->add('destination_account_expense', (string)trans('firefly.invalid_convert_selection')); + $messages->add('source_account_asset', (string)trans('firefly.invalid_convert_selection')); return $messages; } @@ -78,10 +78,10 @@ class JournalRepository implements JournalRepositoryInterface // default message bag that shows errors for everything. $messages = new MessageBag; - $messages->add('source_account_revenue', trans('firefly.source_or_dest_invalid')); - $messages->add('destination_account_asset', trans('firefly.source_or_dest_invalid')); - $messages->add('destination_account_expense', trans('firefly.source_or_dest_invalid')); - $messages->add('source_account_asset', trans('firefly.source_or_dest_invalid')); + $messages->add('source_account_revenue', (string)trans('firefly.source_or_dest_invalid')); + $messages->add('destination_account_asset', (string)trans('firefly.source_or_dest_invalid')); + $messages->add('destination_account_expense', (string)trans('firefly.source_or_dest_invalid')); + $messages->add('source_account_asset', (string)trans('firefly.source_or_dest_invalid')); return $messages; } diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 43be804321..31b6a3b8d9 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -526,23 +526,23 @@ class RecurringRepository implements RecurringRepositoryInterface throw new FireflyException(sprintf('Cannot translate recurring transaction repetition type "%s"', $repetition->repetition_type)); break; case 'daily': - return trans('firefly.recurring_daily', [], $language); + return (string)trans('firefly.recurring_daily', [], $language); break; case 'weekly': $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $language); - return trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language); + return (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language); break; case 'monthly': // format a date: - return trans('firefly.recurring_monthly', ['dayOfMonth' => $repetition->repetition_moment], $language); + return (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $repetition->repetition_moment], $language); break; case 'ndom': $parts = explode(',', $repetition->repetition_moment); // first part is number of week, second is weekday. $dayOfWeek = trans(sprintf('config.dow_%s', $parts[1]), [], $language); - return trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language); + return (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language); break; case 'yearly': // @@ -553,7 +553,7 @@ class RecurringRepository implements RecurringRepositoryInterface $repDate->addYears($diffInYears); // technically not necessary. $string = $repDate->formatLocalized(trans('config.month_and_day_no_year')); - return trans('firefly.recurring_yearly', ['date' => $string], $language); + return (string)trans('firefly.recurring_yearly', ['date' => $string], $language); break; } diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index c96ba66a19..bc1ee68f3e 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -54,7 +54,7 @@ class BelongsUser implements Rule */ public function message() { - return trans('validation.belongs_user'); + return (string)trans('validation.belongs_user'); } /** diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.php index 954e5a2151..9e817f22d1 100644 --- a/app/Rules/IsValidAttachmentModel.php +++ b/app/Rules/IsValidAttachmentModel.php @@ -54,7 +54,7 @@ class IsValidAttachmentModel implements Rule */ public function message(): string { - return trans('validation.model_id_invalid'); + return (string)trans('validation.model_id_invalid'); } /** diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.php index 5af463b6b4..a710ae78ad 100644 --- a/app/Rules/UniqueIban.php +++ b/app/Rules/UniqueIban.php @@ -59,7 +59,7 @@ class UniqueIban implements Rule */ public function message() { - return trans('validation.unique_iban_for_user'); + return (string)trans('validation.unique_iban_for_user'); } /** diff --git a/app/Rules/ValidRecurrenceRepetitionType.php b/app/Rules/ValidRecurrenceRepetitionType.php index c8aa3eedbd..06b3d07cad 100644 --- a/app/Rules/ValidRecurrenceRepetitionType.php +++ b/app/Rules/ValidRecurrenceRepetitionType.php @@ -38,7 +38,7 @@ class ValidRecurrenceRepetitionType implements Rule */ public function message(): string { - return trans('validation.valid_recurrence_rep_type'); + return (string)trans('validation.valid_recurrence_rep_type'); } /** diff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.php index 3e2afe32a5..8c838a8991 100644 --- a/app/Rules/ValidRecurrenceRepetitionValue.php +++ b/app/Rules/ValidRecurrenceRepetitionValue.php @@ -41,7 +41,7 @@ class ValidRecurrenceRepetitionValue implements Rule */ public function message(): string { - return trans('validation.valid_recurrence_rep_type'); + return (string)trans('validation.valid_recurrence_rep_type'); } /** diff --git a/app/Rules/ValidTransactions.php b/app/Rules/ValidTransactions.php index 888c98adf7..17a8e714ee 100644 --- a/app/Rules/ValidTransactions.php +++ b/app/Rules/ValidTransactions.php @@ -51,7 +51,7 @@ class ValidTransactions implements Rule */ public function message() { - return trans('validation.invalid_selection'); + return (string)trans('validation.invalid_selection'); } /** diff --git a/app/Services/Spectre/Object/Transaction.php b/app/Services/Spectre/Object/Transaction.php index 58739d23e9..0ebd50cd2e 100644 --- a/app/Services/Spectre/Object/Transaction.php +++ b/app/Services/Spectre/Object/Transaction.php @@ -186,7 +186,7 @@ class Transaction extends SpectreObject switch ($key) { case 'account_number': $data['number'] = $value; - $data['name'] = $data['name'] ?? trans('import.spectre_account_with_number', ['number' => $value]); + $data['name'] = $data['name'] ?? (string)trans('import.spectre_account_with_number', ['number' => $value]); break; case 'payee': $data['name'] = $value; diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 5426d27ece..01973c203d 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -118,7 +118,7 @@ class Amount */ public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string { - $locale = explode(',', trans('config.locale')); + $locale = explode(',', (string)trans('config.locale')); $locale = array_map('trim', $locale); setlocale(LC_MONETARY, $locale); $float = round($amount, 12); diff --git a/app/Support/Binder/SimpleJournalList.php b/app/Support/Binder/SimpleJournalList.php index 070aa6dd06..6375208c1c 100644 --- a/app/Support/Binder/SimpleJournalList.php +++ b/app/Support/Binder/SimpleJournalList.php @@ -74,22 +74,22 @@ class SimpleJournalList implements BinderInterface $sources = $repository->getJournalSourceAccounts($journal); $destinations = $repository->getJournalDestinationAccounts($journal); if ($sources->count() > 1) { - $messages[] = trans('firefly.cannot_edit_multiple_source', ['description' => $journal->description, 'id' => $journal->id]); + $messages[] = (string)trans('firefly.cannot_edit_multiple_source', ['description' => $journal->description, 'id' => $journal->id]); continue; } if ($destinations->count() > 1) { - $messages[] = trans('firefly.cannot_edit_multiple_dest', ['description' => $journal->description, 'id' => $journal->id]); + $messages[] = (string)trans('firefly.cannot_edit_multiple_dest', ['description' => $journal->description, 'id' => $journal->id]); continue; } if (TransactionType::OPENING_BALANCE === $repository->getTransactionType($journal)) { - $messages[] = trans('firefly.cannot_edit_opening_balance'); + $messages[] = (string)trans('firefly.cannot_edit_opening_balance'); continue; } // cannot edit reconciled transactions / journals: if ($repository->isJournalReconciled($journal)) { - $messages[] = trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]); + $messages[] = (string)trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]); continue; } diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 24669d64a0..487a5d4da9 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -302,7 +302,7 @@ class ExpandedForm // get all currencies: $list = $currencyRepos->get(); $array = [ - 0 => trans('firefly.no_currency'), + 0 => (string)trans('firefly.no_currency'), ]; /** @var TransactionCurrency $currency */ foreach ($list as $currency) { @@ -593,7 +593,7 @@ class ExpandedForm $repository = app(PiggyBankRepositoryInterface::class); $piggyBanks = $repository->getPiggyBanksWithAmount(); $array = [ - 0 => trans('firefly.none_in_select_list'), + 0 => (string)trans('firefly.none_in_select_list'), ]; /** @var PiggyBank $piggy */ foreach ($piggyBanks as $piggy) { @@ -644,7 +644,7 @@ class ExpandedForm // get all currencies: $list = $groupRepos->get(); $array = [ - 0 => trans('firefly.none_in_select_list'), + 0 => (string)trans('firefly.none_in_select_list'), ]; /** @var RuleGroup $group */ foreach ($list as $group) { diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php index 33dbf1a273..fe45cba550 100644 --- a/app/Support/Import/Information/BunqInformation.php +++ b/app/Support/Import/Information/BunqInformation.php @@ -34,7 +34,6 @@ use FireflyIII\Support\CacheProperties; use FireflyIII\User; use Illuminate\Support\Collection; use Log; -use Preferences; /** * @codeCoverageIgnore diff --git a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php index ff8764cb52..c73f214b66 100644 --- a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php @@ -86,7 +86,7 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface } if (\count($mapping) === 0) { $messages = new MessageBag; - $messages->add('nomap', trans('import.bunq_no_mapping')); + $messages->add('nomap', (string)trans('import.bunq_no_mapping')); return $messages; } diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php index 699917e711..0c73e691df 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php @@ -296,7 +296,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface { $roles = []; foreach (array_keys(config('csv.import_roles')) as $role) { - $roles[$role] = trans('import.column_' . $role); + $roles[$role] = (string)trans('import.column_' . $role); } asort($roles); diff --git a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php index 76962d0132..7e521e527c 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php @@ -80,7 +80,7 @@ class ConfigureUploadHandler implements FileConfigurationInterface } if (!$complete) { $messages = new MessageBag; - $messages->add('account', trans('import.invalid_import_account')); + $messages->add('account', (string)trans('import.invalid_import_account')); return $messages; } @@ -96,9 +96,9 @@ class ConfigureUploadHandler implements FileConfigurationInterface public function getNextData(): array { $delimiters = [ - ',' => trans('form.csv_comma'), - ';' => trans('form.csv_semicolon'), - 'tab' => trans('form.csv_tab'), + ',' => (string)trans('form.csv_comma'), + ';' => (string)trans('form.csv_semicolon'), + 'tab' => (string)trans('form.csv_tab'), ]; $config = $this->importJob->configuration; $config['date-format'] = $config['date-format'] ?? 'Ymd'; diff --git a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php index 40c9ac8888..34f79e92c9 100644 --- a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php +++ b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php @@ -91,7 +91,7 @@ class NewFileJobHandler implements FileConfigurationInterface $importFileTypes = []; $defaultImportType = config('import.options.file.default_import_format'); foreach ($allowedTypes as $type) { - $importFileTypes[$type] = trans('import.import_file_type_' . $type); + $importFileTypes[$type] = (string)trans('import.import_file_type_' . $type); } return [ @@ -145,7 +145,7 @@ class NewFileJobHandler implements FileConfigurationInterface // check if content is UTF8: if (!$this->isUTF8($attachment)) { - $message = trans('import.file_not_utf8'); + $message = (string)trans('import.file_not_utf8'); Log::error($message); $messages->add('import_file', $message); // delete attachment: diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php index 8dcabdf64b..186993d99f 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php @@ -100,7 +100,7 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface $config['apply-rules'] = $applyRules; $this->repository->setConfiguration($this->importJob, $config); if ($final === [0 => 0] || \count($final) === 0) { - $messages->add('count', trans('import.spectre_no_mapping')); + $messages->add('count', (string)trans('import.spectre_no_mapping')); } return $messages; diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index 4d070a3393..2f110b781a 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -236,7 +236,7 @@ class ImportTransaction $this->note = trim($this->note . ' ' . $columnValue->getValue()); break; case 'opposing-id': - $mappedValue = $this->getMappedValue($columnValue); + $mappedValue = $this->getMappedValue($columnValue); $this->opposingId = $mappedValue; Log::debug(sprintf('Going to set the OPPOSING-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue)); break; diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 0a3a5caadd..5e348990af 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -302,19 +302,19 @@ class Navigation { $date = clone $theDate; $formatMap = [ - '1D' => trans('config.specific_day'), - 'daily' => trans('config.specific_day'), - 'custom' => trans('config.specific_day'), - '1W' => trans('config.week_in_year'), - 'week' => trans('config.week_in_year'), - 'weekly' => trans('config.week_in_year'), - '1M' => trans('config.month'), - 'month' => trans('config.month'), - 'monthly' => trans('config.month'), - '1Y' => trans('config.year'), - 'year' => trans('config.year'), - 'yearly' => trans('config.year'), - '6M' => trans('config.half_year'), + '1D' => (string)trans('config.specific_day'), + 'daily' => (string)trans('config.specific_day'), + 'custom' => (string)trans('config.specific_day'), + '1W' => (string)trans('config.week_in_year'), + 'week' => (string)trans('config.week_in_year'), + 'weekly' => (string)trans('config.week_in_year'), + '1M' => (string)trans('config.month'), + 'month' => (string)trans('config.month'), + 'monthly' => (string)trans('config.month'), + '1Y' => (string)trans('config.year'), + 'year' => (string)trans('config.year'), + 'yearly' => (string)trans('config.year'), + '6M' => (string)trans('config.half_year'), ]; if (isset($formatMap[$repeatFrequency])) { diff --git a/app/Support/Twig/Extension/Transaction.php b/app/Support/Twig/Extension/Transaction.php index 5294840ac7..cd5b488956 100644 --- a/app/Support/Twig/Extension/Transaction.php +++ b/app/Support/Twig/Extension/Transaction.php @@ -261,7 +261,7 @@ class Transaction extends Twig_Extension } if (AccountType::CASH === $type) { - $txt = '(' . trans('firefly.cash') . ')'; + $txt = '(' . (string)trans('firefly.cash') . ')'; return $txt; } @@ -310,19 +310,19 @@ class Transaction extends Twig_Extension { switch ($transaction->transaction_type_type) { case TransactionType::WITHDRAWAL: - $txt = sprintf('', trans('firefly.withdrawal')); + $txt = sprintf('', (string)trans('firefly.withdrawal')); break; case TransactionType::DEPOSIT: - $txt = sprintf('', trans('firefly.deposit')); + $txt = sprintf('', (string)trans('firefly.deposit')); break; case TransactionType::TRANSFER: - $txt = sprintf('', trans('firefly.transfer')); + $txt = sprintf('', (string)trans('firefly.transfer')); break; case TransactionType::OPENING_BALANCE: - $txt = sprintf('', trans('firefly.opening_balance')); + $txt = sprintf('', (string)trans('firefly.opening_balance')); break; case TransactionType::RECONCILIATION: - $txt = sprintf('', trans('firefly.reconciliation_transaction')); + $txt = sprintf('', (string)trans('firefly.reconciliation_transaction')); break; default: $txt = ''; @@ -412,7 +412,7 @@ class Transaction extends Twig_Extension } if (AccountType::CASH === $type) { - $txt = '(' . trans('firefly.cash') . ')'; + $txt = '(' . (string)trans('firefly.cash') . ')'; return $txt; } diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php index bb6830bc92..72d531796c 100644 --- a/app/Support/Twig/Rule.php +++ b/app/Support/Twig/Rule.php @@ -43,7 +43,7 @@ class Rule extends Twig_Extension $ruleActions = array_keys(Config::get('firefly.rule-actions')); $possibleActions = []; foreach ($ruleActions as $key) { - $possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice'); + $possibleActions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice'); } unset($key, $ruleActions); asort($possibleActions); @@ -62,8 +62,8 @@ class Rule extends Twig_Extension 'allJournalTriggers', function () { return [ - 'store-journal' => trans('firefly.rule_trigger_store_journal'), - 'update-journal' => trans('firefly.rule_trigger_update_journal'), + 'store-journal' => (string)trans('firefly.rule_trigger_store_journal'), + 'update-journal' => (string)trans('firefly.rule_trigger_update_journal'), ]; } ); @@ -81,7 +81,7 @@ class Rule extends Twig_Extension $possibleTriggers = []; foreach ($ruleTriggers as $key) { if ('user_action' !== $key) { - $possibleTriggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice'); + $possibleTriggers[$key] = (string)trans('firefly.rule_trigger_' . $key . '_choice'); } } unset($key, $ruleTriggers); diff --git a/app/User.php b/app/User.php index aad71c773e..9e0963ad36 100644 --- a/app/User.php +++ b/app/User.php @@ -60,8 +60,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $id * @property string $email * @property bool $isAdmin used in admin user controller. - * @property bool $has2FA used in admin user controller. - * @property array $prefs used in admin user controller. + * @property bool $has2FA used in admin user controller. + * @property array $prefs used in admin user controller. * @property mixed password */ class User extends Authenticatable diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.php index 42f46d3d3e..71ee97daec 100644 --- a/app/Validation/RecurrenceValidation.php +++ b/app/Validation/RecurrenceValidation.php @@ -51,7 +51,7 @@ trait RecurrenceValidation foreach ($repetitions as $index => $repetition) { switch ($repetition['type']) { default: - $validator->errors()->add(sprintf('repetitions.%d.type', $index), trans('validation.valid_recurrence_rep_type')); + $validator->errors()->add(sprintf('repetitions.%d.type', $index), (string)trans('validation.valid_recurrence_rep_type')); return; case 'daily': @@ -84,7 +84,7 @@ trait RecurrenceValidation $repetitions = $data['repetitions'] ?? []; // need at least one transaction if (\count($repetitions) === 0) { - $validator->errors()->add('description', trans('validation.at_least_one_repetition')); + $validator->errors()->add('description', (string)trans('validation.at_least_one_repetition')); } } @@ -101,8 +101,8 @@ trait RecurrenceValidation $repeatUntil = $data['repeat_until'] ?? null; if (null !== $repetitions && null !== $repeatUntil) { // expect a date OR count: - $validator->errors()->add('repeat_until', trans('validation.require_repeat_until')); - $validator->errors()->add('nr_of_repetitions', trans('validation.require_repeat_until')); + $validator->errors()->add('repeat_until', (string)trans('validation.require_repeat_until')); + $validator->errors()->add('nr_of_repetitions', (string)trans('validation.require_repeat_until')); } } @@ -116,7 +116,7 @@ trait RecurrenceValidation protected function validateDaily(Validator $validator, int $index, string $moment): void { if ('' !== $moment) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); } } @@ -130,7 +130,7 @@ trait RecurrenceValidation protected function validateMonthly(Validator $validator, int $index, int $dayOfMonth): void { if ($dayOfMonth < 1 || $dayOfMonth > 31) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); } } @@ -146,19 +146,19 @@ trait RecurrenceValidation { $parameters = explode(',', $moment); if (\count($parameters) !== 2) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); return; } $nthDay = (int)($parameters[0] ?? 0.0); $dayOfWeek = (int)($parameters[1] ?? 0.0); if ($nthDay < 1 || $nthDay > 5) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); return; } if ($dayOfWeek < 1 || $dayOfWeek > 7) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); } } @@ -172,7 +172,7 @@ trait RecurrenceValidation protected function validateWeekly(Validator $validator, int $index, int $dayOfWeek): void { if ($dayOfWeek < 1 || $dayOfWeek > 7) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); } } @@ -188,7 +188,7 @@ trait RecurrenceValidation try { Carbon::createFromFormat('Y-m-d', $moment); } catch (InvalidArgumentException|Exception $e) { - $validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment')); + $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); } } } \ No newline at end of file diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index af397a7e0e..f4ef17b211 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -92,14 +92,14 @@ trait TransactionValidation $destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField); break; default: - $validator->errors()->add($idField, trans('validation.invalid_account_info')); + $validator->errors()->add($idField, (string)trans('validation.invalid_account_info')); return; } // add some errors in case of same account submitted: if (null !== $sourceAccount && null !== $destinationAccount && $sourceAccount->id === $destinationAccount->id) { - $validator->errors()->add($idField, trans('validation.source_equals_destination')); + $validator->errors()->add($idField, (string)trans('validation.source_equals_destination')); } } } @@ -124,7 +124,7 @@ trait TransactionValidation // no valid descriptions and empty journal description? error. if ($validDescriptions === 0 && '' === $journalDescription) { - $validator->errors()->add('description', trans('validation.filled', ['attribute' => trans('validation.attributes.description')])); + $validator->errors()->add('description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])); } } @@ -144,7 +144,7 @@ trait TransactionValidation || isset($transaction['foreign_currency_code']))) { $validator->errors()->add( 'transactions.' . $index . '.foreign_amount', - trans('validation.require_currency_info') + (string)trans('validation.require_currency_info') ); } } @@ -164,7 +164,7 @@ trait TransactionValidation $description = (string)($transaction['description'] ?? ''); // description cannot be equal to journal description. if ($description === $journalDescription) { - $validator->errors()->add('transactions.' . $index . '.description', trans('validation.equal_description')); + $validator->errors()->add('transactions.' . $index . '.description', (string)trans('validation.equal_description')); } } } @@ -180,7 +180,7 @@ trait TransactionValidation $transactions = $data['transactions'] ?? []; // need at least one transaction if (\count($transactions) === 0) { - $validator->errors()->add('description', trans('validation.at_least_one_transaction')); + $validator->errors()->add('description', (string)trans('validation.at_least_one_transaction')); } } @@ -223,18 +223,18 @@ trait TransactionValidation switch ($data['type']) { case 'withdrawal': if (\count($sources) > 1) { - $validator->errors()->add('transactions.0.source_id', trans('validation.all_accounts_equal')); + $validator->errors()->add('transactions.0.source_id', (string)trans('validation.all_accounts_equal')); } break; case 'deposit': if (\count($destinations) > 1) { - $validator->errors()->add('transactions.0.destination_id', trans('validation.all_accounts_equal')); + $validator->errors()->add('transactions.0.destination_id', (string)trans('validation.all_accounts_equal')); } break; case 'transfer': if (\count($sources) > 1 || \count($destinations) > 1) { - $validator->errors()->add('transactions.0.source_id', trans('validation.all_accounts_equal')); - $validator->errors()->add('transactions.0.destination_id', trans('validation.all_accounts_equal')); + $validator->errors()->add('transactions.0.source_id', (string)trans('validation.all_accounts_equal')); + $validator->errors()->add('transactions.0.destination_id', (string)trans('validation.all_accounts_equal')); } break; } @@ -256,7 +256,7 @@ trait TransactionValidation if ('' === $description && \count($transactions) > 1) { $validator->errors()->add( 'transactions.' . $index . '.description', - trans('validation.filled', ['attribute' => trans('validation.attributes.transaction_description')]) + (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.transaction_description')]) ); } } @@ -283,7 +283,7 @@ trait TransactionValidation $accountName = (string)$accountName; // both empty? hard exit. if ($accountId < 1 && '' === $accountName) { - $validator->errors()->add($idField, trans('validation.filled', ['attribute' => $idField])); + $validator->errors()->add($idField, (string)trans('validation.filled', ['attribute' => $idField])); return null; } @@ -297,7 +297,7 @@ trait TransactionValidation /** @var Account $first */ $first = $set->first(); if ($first->accountType->type !== AccountType::ASSET) { - $validator->errors()->add($idField, trans('validation.belongs_user')); + $validator->errors()->add($idField, (string)trans('validation.belongs_user')); return null; } @@ -308,7 +308,7 @@ trait TransactionValidation $account = $repository->findByName($accountName, [AccountType::ASSET]); if (null === $account) { - $validator->errors()->add($nameField, trans('validation.belongs_user')); + $validator->errors()->add($nameField, (string)trans('validation.belongs_user')); return null; } @@ -350,7 +350,7 @@ trait TransactionValidation /** @var Account $first */ $first = $set->first(); if ($first->accountType->type !== $type) { - $validator->errors()->add($idField, trans('validation.belongs_user')); + $validator->errors()->add($idField, (string)trans('validation.belongs_user')); return null; } From ac8776aea42d21f2eae9185205a10ee20a87d89e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Jul 2018 10:00:08 +0200 Subject: [PATCH 19/86] Add annotated methods. --- app/Api/V1/Requests/LinkTypeRequest.php | 1 - app/Exceptions/Handler.php | 4 ++-- app/Generator/Report/Support.php | 2 ++ app/Models/Transaction.php | 2 +- app/Support/ExpandedForm.php | 1 + app/Support/Facades/Amount.php | 7 +++++++ app/Support/Facades/ExpandedForm.php | 4 ++++ app/Support/Facades/Navigation.php | 18 ++++++++++++++++-- app/Support/Facades/Preferences.php | 9 ++++++++- app/Support/Facades/Steam.php | 14 ++++++++++++++ app/Support/Navigation.php | 5 +++-- app/Support/Steam.php | 4 ++-- app/Validation/TransactionValidation.php | 6 +++--- 13 files changed, 63 insertions(+), 14 deletions(-) diff --git a/app/Api/V1/Requests/LinkTypeRequest.php b/app/Api/V1/Requests/LinkTypeRequest.php index 3692bc5ea6..34cb49dd57 100644 --- a/app/Api/V1/Requests/LinkTypeRequest.php +++ b/app/Api/V1/Requests/LinkTypeRequest.php @@ -71,7 +71,6 @@ class LinkTypeRequest extends Request 'outward' => 'required|unique:link_types,outward|min:1|different:inward', 'inward' => 'required|unique:link_types,inward|min:1|different:outward', ]; - // Rule::unique('users')->ignore($user->id), switch ($this->method()) { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 46aec0c792..5d6899c52b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -31,7 +31,7 @@ use Exception; use FireflyIII\Jobs\MailError; use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Illuminate\Validation\ValidationException; +use Illuminate\Validation\ValidationException as LaravelValidationException; use League\OAuth2\Server\Exception\OAuthServerException; use Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -54,7 +54,7 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $exception) { - if ($exception instanceof ValidationException && $request->expectsJson()) { + if ($exception instanceof LaravelValidationException && $request->expectsJson()) { // ignore it: controller will handle it. return parent::render($request, $exception); } diff --git a/app/Generator/Report/Support.php b/app/Generator/Report/Support.php index f3d757e63d..0d5e42f4f2 100644 --- a/app/Generator/Report/Support.php +++ b/app/Generator/Report/Support.php @@ -29,6 +29,8 @@ use Illuminate\Support\Collection; /** * Class Support. + * @method Collection getExpenses() + * @method Collection getIncome() */ class Support { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 58b3ac5e9a..7e5d34ac17 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -64,6 +64,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $transaction_journal_category_name * @property int $bill_id * @property string $bill_name + * @property string $bill_name_encrypted * @property string $notes * @property string $tags * @property string $transaction_currency_symbol @@ -87,7 +88,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $after // used in audit reports. * @property int $opposing_id // ID of the opposing transaction, used in collector * @property bool $encrypted // is the journal encrypted - * @property $bill_name_encrypted */ class Transaction extends Model { diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 487a5d4da9..bb2bc9c25c 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -43,6 +43,7 @@ use Session; /** * Class ExpandedForm. + * */ class ExpandedForm { diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php index f575f3ac01..2dc79c0dc9 100644 --- a/app/Support/Facades/Amount.php +++ b/app/Support/Facades/Amount.php @@ -24,13 +24,20 @@ namespace FireflyIII\Support\Facades; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Amount. * + * @method string formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true) + * @method Collection getAllCurrencies() + * @method string getCurrencyCode() + * @method string getCurrencySymbol() + * @method TransactionCurrency getDefaultCurrency() * @method TransactionCurrency getDefaultCurrencyByUser(User $user) + * @method array getJsConfig(array $config) */ class Amount extends Facade { diff --git a/app/Support/Facades/ExpandedForm.php b/app/Support/Facades/ExpandedForm.php index 909313f951..983373509d 100644 --- a/app/Support/Facades/ExpandedForm.php +++ b/app/Support/Facades/ExpandedForm.php @@ -22,11 +22,15 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class ExpandedForm. + * + * @method array makeSelectList(Collection $set) + * @method array makeSelectListWithEmpty(Collection $set) */ class ExpandedForm extends Facade { diff --git a/app/Support/Facades/Navigation.php b/app/Support/Facades/Navigation.php index 2b2fe45e7d..49e1a22e62 100644 --- a/app/Support/Facades/Navigation.php +++ b/app/Support/Facades/Navigation.php @@ -22,14 +22,28 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use Carbon\Carbon; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Navigation. * - * @method array blockPeriods(\Carbon\Carbon $start, \Carbon\Carbon $end, string $range) - * @method string periodShow(\Carbon\Carbon $theDate, string $repeatFrequency) + * @method Carbon addPeriod(Carbon $theDate, string $repeatFreq, int $skip) + * @method array blockPeriods(Carbon $start, Carbon $end, string $range) + * @method Carbon endOfPeriod(Carbon $end, string $repeatFreq) + * @method Carbon endOfX(Carbon $theCurrentEnd, string $repeatFreq, Carbon $maxDate = null) + * @method array listOfPeriods(Carbon $start, Carbon $end) + * @method string periodShow(Carbon $theDate, string $repeatFrequency) + * @method string preferredCarbonFormat(Carbon $start, Carbon $end) + * @method string preferredCarbonLocalizedFormat(Carbon $start, Carbon $end) + * @method string preferredEndOfPeriod(Carbon $start, Carbon $end) + * @method string preferredRangeFormat(Carbon $start, Carbon $end) + * @method string preferredSqlFormat(Carbon $start, Carbon $end) + * @method Carbon startOfPeriod(Carbon $theDate, string $repeatFreq) + * @method Carbon subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = 1) + * @method Carbon updateEndDate(string $range, Carbon $start) + * @method Carbon updateStartDate(string $range, Carbon $start) */ class Navigation extends Facade { diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index 98ae01a5d0..b5d6eacafb 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -24,16 +24,23 @@ namespace FireflyIII\Support\Facades; use FireflyIII\Models\Preference; use FireflyIII\User; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Preferences. * - * @method Preference set(string $name, $value) + * @method Collection beginsWith(User $user, string $search) + * @method bool delete(string $name) + * @method Collection findByName(string $name) * @method Preference get(string $name, $value) + * @method array getArrayForUser(User $user, array $list) * @method Preference|null getForUser(User $user, string $name, $default = null) + * @method string lastActivity() * @method void mark() + * @method Preference set(string $name, $value) + * @method Preference setForUser(User $user, string $name, $value) */ class Preferences extends Facade { diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index 33b8c847df..7a9bee11e8 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -22,12 +22,26 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use Carbon\Carbon; +use FireflyIII\Models\Account; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class Steam. + * @method string balance(Account $account, Carbon $date) + * @method string balanceIgnoreVirtual(Account $account, Carbon $date) + * @method array balanceInRange(Account $account, Carbon $start, Carbon $end) + * @method array balancesByAccounts(Collection $accounts, Carbon $date) + * @method decrypt(int $isEncrypted, string $value) + * @method array getLastActivities(array $accounts) + * @method string negative(string $amount) + * @method string|null opposite(string $amount = null) + * @method int phpBytes(string $string) + * @method tryDecrypt($value) * @method string positive(string $amount) + * */ class Steam extends Facade { diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 5e348990af..3e1fc6b818 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -505,9 +505,10 @@ class Navigation * * @throws \FireflyIII\Exceptions\FireflyException */ - public function subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = 1): Carbon + public function subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = null): Carbon { - $date = clone $theDate; + $subtract = $subtract ?? 1; + $date = clone $theDate; // 1D 1W 1M 3M 6M 1Y Log::debug(sprintf('subtractPeriod: date is %s, repeat frequency is %s and subtract is %d', $date->format('Y-m-d'), $repeatFreq, $subtract)); $functionMap = [ diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 6c6003e6d2..6dd329cf86 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -302,11 +302,11 @@ class Steam } /** - * @param $string + * @param string $string * * @return int */ - public function phpBytes($string): int + public function phpBytes(string $string): int { $string = strtolower($string); diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index f4ef17b211..128c740131 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -123,7 +123,7 @@ trait TransactionValidation } // no valid descriptions and empty journal description? error. - if ($validDescriptions === 0 && '' === $journalDescription) { + if (0 === $validDescriptions && '' === $journalDescription) { $validator->errors()->add('description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])); } } @@ -179,7 +179,7 @@ trait TransactionValidation $data = $validator->getData(); $transactions = $data['transactions'] ?? []; // need at least one transaction - if (\count($transactions) === 0) { + if (0 === \count($transactions)) { $validator->errors()->add('description', (string)trans('validation.at_least_one_transaction')); } } @@ -293,7 +293,7 @@ trait TransactionValidation $repository->setUser($admin); $set = $repository->getAccountsById([$accountId]); Log::debug(sprintf('Count of accounts found by ID %d is: %d', $accountId, $set->count())); - if ($set->count() === 1) { + if (1 === $set->count()) { /** @var Account $first */ $first = $set->first(); if ($first->accountType->type !== AccountType::ASSET) { From 73e32ecdcbaefeae9fe5b8dbabc6ac69dbd45e95 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Jul 2018 15:45:45 +0200 Subject: [PATCH 20/86] Refer to correct repositories. --- app/Http/Controllers/Account/DeleteController.php | 3 +-- app/Http/Controllers/Account/ReconcileController.php | 5 ++--- app/Http/Controllers/Category/ShowController.php | 2 +- app/Http/Controllers/CategoryController.php | 2 +- app/Http/Controllers/Recurring/IndexController.php | 6 ++++-- app/Http/Controllers/Transaction/BulkController.php | 3 +-- app/Http/Controllers/Transaction/SingleController.php | 5 ++--- app/Http/Controllers/Transaction/SplitController.php | 3 +-- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index 0aa7532b17..e74cd1264b 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; -use ExpandedForm; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -68,7 +67,7 @@ class DeleteController extends Controller { $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type); $subTitle = (string)trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); - $accountList = ExpandedForm::makeSelectListWithEmpty($this->repository->getAccountsByType([$account->accountType->type])); + $accountList = app('expandedform')->makeSelectListWithEmpty($this->repository->getAccountsByType([$account->accountType->type])); unset($accountList[$account->id]); // put previous url in session diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 62c670e23f..ee8cfce3c6 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -36,7 +36,6 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use Log; /** @@ -46,9 +45,9 @@ use Log; */ class ReconcileController extends Controller { - /** @var CurrencyUpdateService */ - private $accountRepos; /** @var AccountRepositoryInterface */ + private $accountRepos; + /** @var CurrencyRepositoryInterface */ private $currencyRepos; /** @var JournalRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index b7712d54de..81132d4b69 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -127,7 +127,7 @@ class ShowController extends Controller $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $start = null; $end = null; - $periods = new Collection; + $periods = new Collection; $moment = 'all'; $subTitle = (string)trans('firefly.all_journals_for_category', ['name' => $category->name]); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 1940a8b439..c8924e0c7f 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -66,7 +66,7 @@ class CategoryController extends Controller $this->rememberPreviousUri('categories.create.uri'); } $request->session()->forget('categories.create.fromStore'); - $subTitle =(string)trans('firefly.create_new_category'); + $subTitle = (string)trans('firefly.create_new_category'); return view('categories.create', compact('subTitle')); } diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index a731fd61ea..07d6489d5f 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -226,8 +226,10 @@ class IndexController extends Controller $yearlyDate = $date->formatLocalized(trans('config.month_and_day_no_year')); $result = [ 'daily' => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], - $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), 'selected' => 0 === strpos($preSelected, 'weekly')], - $monthly => ['label' => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), 'selected' => 0 === strpos($preSelected, 'monthly')], + $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), + 'selected' => 0 === strpos($preSelected, 'weekly')], + $monthly => ['label' => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), + 'selected' => 0 === strpos($preSelected, 'monthly')], $ndom => ['label' => (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), 'selected' => 0 === strpos($preSelected, 'ndom')], $yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index 6237993e00..2a2a603779 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; -use ExpandedForm; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BulkEditJournalRequest; use FireflyIII\Models\TransactionJournal; @@ -72,7 +71,7 @@ class BulkController extends Controller // get list of budgets: /** @var BudgetRepositoryInterface $repository */ $repository = app(BudgetRepositoryInterface::class); - $budgetList = ExpandedForm::makeSelectListWithEmpty($repository->getActiveBudgets()); + $budgetList = app('expandedform')->makeSelectListWithEmpty($repository->getActiveBudgets()); // collect some useful meta data for the mass edit: $journals->each( function (TransactionJournal $journal) { diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 3fa181ec25..1b7547ba20 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Events\StoredTransactionJournal; use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; @@ -143,7 +142,7 @@ class SingleController extends Controller { $what = strtolower($what ?? TransactionType::DEPOSIT); $what = (string)($request->old('what') ?? $what); - $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); + $budgets = app('expandedform')->makeSelectListWithEmpty($this->budgets->getActiveBudgets()); $preFilled = session()->has('preFilled') ? session('preFilled') : []; $subTitle = (string)trans('form.add_new_' . $what); $subTitleIcon = 'fa-plus'; @@ -250,7 +249,7 @@ class SingleController extends Controller } $what = strtolower($transactionType); - $budgetList = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets()); + $budgetList = app('expandedform')->makeSelectListWithEmpty($this->budgets->getBudgets()); // view related code $subTitle = (string)trans('breadcrumbs.edit_journal', ['description' => $journal->description]); diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 86e75acede..5b8c69b9c6 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -22,7 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; -use ExpandedForm; use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; @@ -98,7 +97,7 @@ class SplitController extends Controller // lists and collections $currencies = $this->currencies->get(); - $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); + $budgets = app('expandedform')->makeSelectListWithEmpty($this->budgets->getActiveBudgets()); // other fields $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; From 1502aa3b207ca297009247eeb7b784d5c13ed278 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Jul 2018 19:17:26 +0200 Subject: [PATCH 21/86] Small code cleanup [skip ci] --- .../Controllers/Budget/IndexController.php | 3 ++ .../Controllers/Chart/AccountController.php | 4 +-- .../Controllers/Chart/BudgetController.php | 34 ++++++++++++------- .../Chart/BudgetReportController.php | 6 ++++ 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index f3a7b43188..557da042eb 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -76,7 +76,9 @@ class IndexController extends Controller public function index(Request $request, string $moment = null) { $range = app('preferences')->get('viewRange', '1M')->data; + /** @var Carbon $start */ $start = session('start', new Carbon); + /** @var Carbon $end */ $end = session('end', new Carbon); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; @@ -86,6 +88,7 @@ class IndexController extends Controller if ('' !== (string)$moment) { try { $start = new Carbon($moment); + /** @var Carbon $end */ $end = app('navigation')->endOfPeriod($start, $range); } catch (Exception $e) { // start and end are already defined. diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 433a773d0b..a89db85f0c 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -433,8 +433,8 @@ class AccountController extends Controller * * @return array * - * @SuppressWarnigns(PHPMD.CyclomaticComplexity) - * @SuppressWarnigns(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function accountBalanceChart(Collection $accounts, Carbon $start, Carbon $end): array { diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 1b8dba0c61..9586e0fe54 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -43,6 +43,9 @@ use Illuminate\Support\Collection; /** * Class BudgetController. * + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * */ class BudgetController extends Controller { @@ -91,13 +94,11 @@ class BudgetController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - // depending on diff, do something with range of chart. - $step = $this->calculateStep($start, $end); + $step = $this->calculateStep($start, $end); // depending on diff, do something with range of chart. $budgetCollection = new Collection([$budget]); $chartData = []; $current = clone $start; $current = app('navigation')->startOfPeriod($current, $step); - while ($end >= $current) { /** @var Carbon $currentEnd */ $currentEnd = app('navigation')->endOfPeriod($current, $step); @@ -172,6 +173,8 @@ class BudgetController extends Controller * @param BudgetLimit|null $budgetLimit * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse { @@ -218,6 +221,8 @@ class BudgetController extends Controller * @param BudgetLimit|null $budgetLimit * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse { @@ -253,7 +258,6 @@ class BudgetController extends Controller foreach ($result as $categoryId => $amount) { $chartData[$names[$categoryId]] = $amount; } - $data = $this->generator->pieChart($chartData); $cache->store($data); @@ -266,6 +270,8 @@ class BudgetController extends Controller * @param BudgetLimit|null $budgetLimit * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit): JsonResponse { @@ -312,6 +318,9 @@ class BudgetController extends Controller * Shows a budget list with spent/left/overspent. * * @return \Symfony\Component\HttpFoundation\Response + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function frontpage(): \Symfony\Component\HttpFoundation\Response { @@ -524,6 +533,8 @@ class BudgetController extends Controller * @param Carbon $end * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getExpensesForBudget(Collection $limits, Budget $budget, Carbon $start, Carbon $end): array { @@ -564,6 +575,9 @@ class BudgetController extends Controller * @param Collection $limits * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * */ private function spentInPeriodMulti(Budget $budget, Collection $limits): array { @@ -584,18 +598,12 @@ class BudgetController extends Controller ] ); } - /* - * amount: amount of budget limit - * left: amount of budget limit min spent, or 0 when < 0. - * spent: spent, or amount of budget limit when > amount - */ $amount = $budgetLimit->amount; $leftInLimit = bcsub($amount, $expenses); $hasOverspent = bccomp($leftInLimit, '0') === -1; - - $left = $hasOverspent ? '0' : bcsub($amount, $expenses); - $spent = $hasOverspent ? $amount : $expenses; - $overspent = $hasOverspent ? app('steam')->positive($leftInLimit) : '0'; + $left = $hasOverspent ? '0' : bcsub($amount, $expenses); + $spent = $hasOverspent ? $amount : $expenses; + $overspent = $hasOverspent ? app('steam')->positive($leftInLimit) : '0'; $return[$name] = [ 'left' => $left, diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index 8927ecf773..3d2f2aba80 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -43,6 +43,8 @@ use Illuminate\Support\Collection; * Separate controller because many helper functions are shared. * * Class BudgetReportController + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class BudgetReportController extends Controller { @@ -76,6 +78,8 @@ class BudgetReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function accountExpense(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -101,6 +105,8 @@ class BudgetReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function budgetExpense(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end, string $others): JsonResponse { From 9299efd08604b8765f0ac2345306e2ae2ee39239 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 17 Jul 2018 16:36:36 +0200 Subject: [PATCH 22/86] Fix #1553 --- app/Http/Controllers/ReportController.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 5f00bded10..730ec0f0de 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -84,9 +84,6 @@ class ReportController extends Controller return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } - if ($start < session('first')) { - $start = session('first'); - } $this->repository->cleanupBudgets(); app('view')->share( @@ -117,9 +114,6 @@ class ReportController extends Controller if ($end < $start) { return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } - if ($start < session('first')) { - $start = session('first'); - } $this->repository->cleanupBudgets(); app('view')->share( @@ -154,9 +148,6 @@ class ReportController extends Controller if ($end < $start) { return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } - if ($start < session('first')) { - $start = session('first'); - } $this->repository->cleanupBudgets(); app('view')->share( @@ -192,9 +183,6 @@ class ReportController extends Controller if ($end < $start) { return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } - if ($start < session('first')) { - $start = session('first'); - } $this->repository->cleanupBudgets(); app('view')->share( @@ -230,9 +218,6 @@ class ReportController extends Controller return view('error')->with('message', (string)trans('firefly.end_after_start_date')); } - if ($start < session('first')) { - $start = session('first'); - } $this->repository->cleanupBudgets(); app('view')->share( @@ -388,9 +373,6 @@ class ReportController extends Controller if ($end < $start) { return view('error')->with('message', (string)trans('firefly.end_after_start_date')); // @codeCoverageIgnore } - if ($start < session('first')) { - $start = session('first'); - } $this->repository->cleanupBudgets(); app('view')->share( From b886cc1333f4b561e0819fbd5de999ac9c58848b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 17 Jul 2018 22:21:03 +0200 Subject: [PATCH 23/86] Optimize some code. --- .../Controllers/Budget/ShowController.php | 2 + .../Chart/BudgetReportController.php | 3 + .../Controllers/Chart/CategoryController.php | 27 +++--- .../Chart/CategoryReportController.php | 13 +++ .../Chart/ExpenseReportController.php | 5 + .../Controllers/Chart/PiggyBankController.php | 3 + .../Controllers/Chart/ReportController.php | 8 +- .../Controllers/Chart/TagReportController.php | 29 ++++++ app/Http/Controllers/Controller.php | 77 +++++++++++---- app/Http/Controllers/CurrencyController.php | 3 +- app/Http/Controllers/DebugController.php | 10 +- app/Http/Middleware/Authenticate.php | 3 + app/Http/Middleware/AuthenticateTwoFactor.php | 6 +- app/Http/Middleware/Binder.php | 3 +- app/Http/Middleware/Installer.php | 3 + app/Http/Middleware/IsSandStormUser.php | 2 +- app/Http/Middleware/Range.php | 23 ++--- .../RedirectIfTwoFactorAuthenticated.php | 7 +- app/Http/Middleware/Sandstorm.php | 94 ++++++------------- 19 files changed, 194 insertions(+), 127 deletions(-) diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 7d666382fb..72013035ba 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -103,6 +103,8 @@ class ShowController extends Controller * @param JournalRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ public function noBudgetAll(Request $request, JournalRepositoryInterface $repository) { diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index 3d2f2aba80..386c910663 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -131,6 +131,9 @@ class BudgetReportController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function mainChart(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): JsonResponse { diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index f7b020d66c..a942eb8125 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -60,6 +60,8 @@ class CategoryController extends Controller * @param Category $category * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function all(CategoryRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Category $category): JsonResponse { @@ -69,13 +71,8 @@ class CategoryController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - - $start = $repository->firstUseDate($category); - - if (null === $start) { - $start = new Carbon; // @codeCoverageIgnore - } - + $start = $repository->firstUseDate($category); + $start = $start ?? new Carbon; $range = app('preferences')->get('viewRange', '1M')->data; $start = app('navigation')->startOfPeriod($start, $range); $end = new Carbon; @@ -83,19 +80,15 @@ class CategoryController extends Controller $chartData = [ [ 'label' => (string)trans('firefly.spent'), - 'entries' => [], - 'type' => 'bar', + 'entries' => [], 'type' => 'bar', ], [ 'label' => (string)trans('firefly.earned'), - 'entries' => [], - 'type' => 'bar', + 'entries' => [], 'type' => 'bar', ], [ 'label' => (string)trans('firefly.sum'), - 'entries' => [], - 'type' => 'line', - 'fill' => false, + 'entries' => [], 'type' => 'line', 'fill' => false, ], ]; @@ -167,6 +160,8 @@ class CategoryController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function reportPeriod(Category $category, Collection $accounts, Carbon $start, Carbon $end): JsonResponse { @@ -225,6 +220,8 @@ class CategoryController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { @@ -297,6 +294,8 @@ class CategoryController extends Controller * @param Carbon $end * * @return array + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function makePeriodChart(Category $category, Carbon $start, Carbon $end): array { diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index ea2d1f22ce..1b5d8f6099 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -72,6 +72,8 @@ class CategoryReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function accountExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -94,6 +96,8 @@ class CategoryReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function accountIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -119,6 +123,8 @@ class CategoryReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function categoryExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -144,6 +150,7 @@ class CategoryReportController extends Controller * @param string $others * * @return JsonResponse + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function categoryIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -169,6 +176,10 @@ class CategoryReportController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function mainChart(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): JsonResponse { @@ -276,6 +287,8 @@ class CategoryReportController extends Controller * @param Carbon $end * * @return Collection + * + * */ private function getExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): Collection { diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index 3bb7d264fc..40576c6ef6 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -64,6 +64,7 @@ class ExpenseReportController extends Controller ); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $expense @@ -71,6 +72,10 @@ class ExpenseReportController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.NPathComplexity) */ public function mainChart(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): JsonResponse { diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index fa0fa29105..f9b2aba5db 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -59,6 +59,9 @@ class PiggyBankController extends Controller * @param PiggyBank $piggyBank * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse { diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 53aaefee34..492013e393 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -94,6 +94,8 @@ class ReportController extends Controller * @param Carbon $end * * @return \Illuminate\Http\JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { @@ -123,7 +125,6 @@ class ReportController extends Controller 'entries' => [], ], ]; - foreach ($source['earned'] as $date => $amount) { $carbon = new Carbon($date); $label = $carbon->formatLocalized($format); @@ -151,6 +152,9 @@ class ReportController extends Controller * @param Collection $accounts * * @return \Illuminate\Http\JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function sum(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { @@ -238,6 +242,8 @@ class ReportController extends Controller * @param Carbon $end * * @return array + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function getChartData(Collection $accounts, Carbon $start, Carbon $end): array { diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php index 8488049c85..09b1583aec 100644 --- a/app/Http/Controllers/Chart/TagReportController.php +++ b/app/Http/Controllers/Chart/TagReportController.php @@ -57,6 +57,7 @@ class TagReportController extends Controller $this->generator = app(GeneratorInterface::class); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -65,6 +66,8 @@ class TagReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function accountExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -81,6 +84,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -89,6 +93,8 @@ class TagReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function accountIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -105,6 +111,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -112,6 +119,8 @@ class TagReportController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function budgetExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse { @@ -128,6 +137,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -135,6 +145,8 @@ class TagReportController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function categoryExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse { @@ -151,6 +163,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -158,6 +171,10 @@ class TagReportController extends Controller * @param Carbon $end * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function mainChart(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse { @@ -257,6 +274,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -265,6 +283,8 @@ class TagReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function tagExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -281,6 +301,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -289,6 +310,8 @@ class TagReportController extends Controller * @param string $others * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function tagIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse { @@ -305,6 +328,7 @@ class TagReportController extends Controller return response()->json($data); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -312,6 +336,8 @@ class TagReportController extends Controller * @param Carbon $end * * @return Collection + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ private function getExpenses(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection { @@ -327,6 +353,7 @@ class TagReportController extends Controller return $collector->getJournals(); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -334,6 +361,8 @@ class TagReportController extends Controller * @param Carbon $end * * @return Collection + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ private function getIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 4107419f72..5ca4b3f940 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -37,6 +37,8 @@ use URL; /** * Class Controller. + * + * @SuppressWarnings(PHPMD.NumberOfChildren) */ class Controller extends BaseController { @@ -78,26 +80,9 @@ class Controller extends BaseController // get shown-intro-preference: if (auth()->check()) { - // some routes have a "what" parameter, which indicates a special page: - $specificPage = null === Route::current()->parameter('what') ? '' : '_' . Route::current()->parameter('what'); - $page = str_replace('.', '_', Route::currentRouteName()); - - // indicator if user has seen the help for this page ( + special page): - $key = 'shown_demo_' . $page . $specificPage; - // is there an intro for this route? - $intro = config('intro.' . $page); - $specialIntro = config('intro.' . $page . $specificPage); - $shownDemo = true; - - // either must be array and either must be > 0 - if ((\is_array($intro) || \is_array($specialIntro)) && (\count($intro) > 0 || \count($specialIntro) > 0)) { - $shownDemo = app('preferences')->get($key, false)->data; - Log::debug(sprintf('Check if user has already seen intro with key "%s". Result is %d', $key, $shownDemo)); - } - - // share language - $language = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; - + $language = $this->getLanguage(); + $page = $this->getPageName(); + $shownDemo = $this->hasSeenDemo(); app('view')->share('language', $language); app('view')->share('shownDemo', $shownDemo); app('view')->share('current_route_name', $page); @@ -174,4 +159,56 @@ class Controller extends BaseController { session()->put($identifier, URL::previous()); } + + /** + * @return string + */ + private function getLanguage(): string + { + /** @var string $language */ + $language = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; + + return $language; + } + + /** + * @return string + */ + private function getPageName(): string + { + return str_replace('.', '_', Route::currentRouteName()); + } + + /** + * @return string + */ + private function getSpecificPageName(): string + { + return null === Route::current()->parameter('what') ? '' : '_' . Route::current()->parameter('what'); + } + + /** + * @return bool + */ + private function hasSeenDemo(): bool + { + $page = $this->getPageName(); + $specificPage = $this->getSpecificPageName(); + + // indicator if user has seen the help for this page ( + special page): + $key = 'shown_demo_' . $page . $specificPage; + // is there an intro for this route? + $intro = config('intro.' . $page) ?? []; + $specialIntro = config('intro.' . $page . $specificPage) ?? []; + // some routes have a "what" parameter, which indicates a special page: + + $shownDemo = true; + // both must be array and either must be > 0 + if (\count($intro) > 0 || \count($specialIntro) > 0) { + $shownDemo = app('preferences')->get($key, false)->data; + Log::debug(sprintf('Check if user has already seen intro with key "%s". Result is %d', $key, $shownDemo)); + } + + return $shownDemo; + } } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index a655adfdf6..67172255b2 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -241,6 +241,8 @@ class CurrencyController extends Controller * @param CurrencyFormRequest $request * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function store(CurrencyFormRequest $request) { @@ -270,7 +272,6 @@ class CurrencyController extends Controller } if (null === $currency) { $request->session()->flash('error', (string)trans('firefly.could_not_store_currency')); - } return $redirect; diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 989b4c2ea6..7a70eb50cd 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -37,6 +37,8 @@ use Route as RouteFacade; /** * Class DebugController + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class DebugController extends Controller { @@ -100,6 +102,9 @@ class DebugController extends Controller * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function index(Request $request) { @@ -191,9 +196,8 @@ class DebugController extends Controller $return = ' '; /** @var Route $route */ foreach ($set as $route) { - $name = $route->getName(); - if (null !== $name && \strlen($name) > 0 && \in_array('GET', $route->methods(), true)) { - + $name = (string)$route->getName(); + if (\in_array('GET', $route->methods(), true)) { $found = false; foreach ($ignore as $string) { if (!(false === stripos($name, $string))) { diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index d3ca0e6c55..51e954ebe5 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -82,6 +82,9 @@ class Authenticate * @return mixed * @throws \Illuminate\Auth\AuthenticationException * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function authenticate(array $guards) { diff --git a/app/Http/Middleware/AuthenticateTwoFactor.php b/app/Http/Middleware/AuthenticateTwoFactor.php index b47affcf0f..078261add4 100644 --- a/app/Http/Middleware/AuthenticateTwoFactor.php +++ b/app/Http/Middleware/AuthenticateTwoFactor.php @@ -52,17 +52,17 @@ class AuthenticateTwoFactor } - /** @noinspection PhpUnusedParameterInspection */ /** * @param $request * @param Closure $next - * @param array ...$guards * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|mixed * @throws \Psr\Container\NotFoundExceptionInterface * @throws \Psr\Container\ContainerExceptionInterface + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function handle($request, Closure $next, ...$guards) + public function handle($request, Closure $next) { /** @noinspection PhpUndefinedMethodInspection */ if ($this->auth->guest()) { diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php index e6e702a564..323dcd4a57 100644 --- a/app/Http/Middleware/Binder.php +++ b/app/Http/Middleware/Binder.php @@ -60,12 +60,11 @@ class Binder * * @param \Illuminate\Http\Request $request * @param \Closure $next - * @param string[] ...$guards * * @return mixed * */ - public function handle($request, Closure $next, ...$guards) + public function handle($request, Closure $next) { foreach ($request->route()->parameters() as $key => $value) { if (isset($this->binders[$key])) { diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index 11dfbae057..b78e966a23 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -45,6 +45,9 @@ class Installer * @param \Closure $next * * @return mixed + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function handle($request, Closure $next) { diff --git a/app/Http/Middleware/IsSandStormUser.php b/app/Http/Middleware/IsSandStormUser.php index 227151199b..03590d4b64 100644 --- a/app/Http/Middleware/IsSandStormUser.php +++ b/app/Http/Middleware/IsSandStormUser.php @@ -49,7 +49,7 @@ class IsSandStormUser } if (1 === (int)getenv('SANDSTORM')) { - Session::flash('warning', (string)trans('firefly.sandstorm_not_available')); + app('session')->flash('warning', (string)trans('firefly.sandstorm_not_available')); return response()->redirectTo(route('index')); } diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 03aaa1aade..4f7314fa3f 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -27,7 +27,6 @@ use Carbon\Carbon; use Closure; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Http\Request; -use Session; /** * Class SessionFilter. @@ -114,25 +113,21 @@ class Range } /** - * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function setRange(): void { // ignore preference. set the range to be the current month: - if (!Session::has('start') && !Session::has('end')) { + if (!app('session')->has('start') && !app('session')->has('end')) { $viewRange = app('preferences')->get('viewRange', '1M')->data; - if (null === $viewRange) { - $viewRange = '1M'; - app('preferences')->set('viewRange', '1M'); - } - $start = new Carbon; - $start = app('navigation')->updateStartDate($viewRange, $start); - $end = app('navigation')->updateEndDate($viewRange, $start); + $start = new Carbon; + $start = app('navigation')->updateStartDate($viewRange, $start); + $end = app('navigation')->updateEndDate($viewRange, $start); - Session::put('start', $start); - Session::put('end', $end); + app('session')->put('start', $start); + app('session')->put('end', $end); } - if (!Session::has('first')) { + if (!app('session')->has('first')) { /** @var JournalRepositoryInterface $repository */ $repository = app(JournalRepositoryInterface::class); $journal = $repository->firstNull(); @@ -141,7 +136,7 @@ class Range if (null !== $journal) { $first = $journal->date ?? $first; } - Session::put('first', $first); + app('session')->put('first', $first); } } } diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php index c585018bf3..f6bcefab69 100644 --- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php +++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php @@ -38,16 +38,15 @@ class RedirectIfTwoFactorAuthenticated * @param string|null $guard * * @return mixed + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function handle($request, Closure $next, $guard = null) { if (Auth::guard($guard)->check()) { $is2faEnabled = app('preferences')->get('twoFactorAuthEnabled', false)->data; - $has2faSecret = null !== app('preferences')->get('twoFactorAuthSecret'); - - // grab 2auth information from cookie. - $is2faAuthed = 'true' === $request->cookie('twoFactorAuthenticated'); + $is2faAuthed = 'true' === $request->cookie('twoFactorAuthenticated'); if ($is2faEnabled && $has2faSecret && $is2faAuthed) { return response()->redirectTo(route('index')); diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 208ee3f08b..5614c7adb2 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -62,73 +62,39 @@ class Sandstorm /** @var UserRepositoryInterface $repository */ $repository = app(UserRepositoryInterface::class); $userId = (string)$request->header('X-Sandstorm-User-Id'); - Log::debug(sprintf('Sandstorm user ID is "%s"', $userId)); - $count = $repository->count(); + // catch anonymous: + $userId = $userId === '' ? 'anonymous' : $userId; + $email = $userId . '@firefly'; + $user = $repository->findByEmail($email) ?? $this->createUser($email); + Log::debug(sprintf('Sandstorm user email is "%s"', $email)); - // if there already is one user in this instance, we assume this is - // the "main" user. Firefly's nature does not allow other users to - // access the same data so we have no choice but to simply login - // the new user to the same account and just forget about Bob and Alice - // and any other differences there may be between these users. - if (1 === $count && \strlen($userId) > 0) { - // login as first user user. - $user = $repository->first(); - /** @noinspection NullPointerExceptionInspection */ - Auth::guard($guard)->login($user); - app('view')->share('SANDSTORM_ANON', false); - - return $next($request); - } - - if (1 === $count && '' === $userId) { - // login but indicate anonymous - $user = User::first(); - /** @noinspection NullPointerExceptionInspection */ - Auth::guard($guard)->login($user); - app('view')->share('SANDSTORM_ANON', true); - - return $next($request); - } - - if (0 === $count && \strlen($userId) > 0) { - // create new user. - $email = $userId . '@firefly'; - /** @var User $user */ - $user = $repository->store( - [ - 'blocked' => false, - 'blocked_code' => null, - 'email' => $email, - ] - ); - Auth::guard($guard)->login($user); - - // also make the user an admin - $repository->attachRole($user, 'owner'); - - // share value. - app('view')->share('SANDSTORM_ANON', false); - - return $next($request); - } - - if (0 === $count && '' === $userId) { - throw new FireflyException('The first visit to a new Firefly III administration cannot be by a guest user.'); - } - - if ($count > 1) { - throw new FireflyException('Your Firefly III installation has more than one user, which is weird.'); - } + Auth::guard($guard)->login($user); + $repository->attachRole($user, 'owner'); + app('view')->share('SANDSTORM_ANON', false); } - // if in Sandstorm, user logged in, still must check if user is anon. - $userId = (string)$request->header('X-Sandstorm-User-Id'); - if ('' === $userId) { - app('view')->share('SANDSTORM_ANON', true); - - return $next($request); - } - app('view')->share('SANDSTORM_ANON', false); return $next($request); } + + + /** + * @param string $email + * + * @return User + */ + private function createUser(string $email): User + { + $repository = app(UserRepositoryInterface::class); + + return $repository->store( + [ + 'blocked' => false, + 'blocked_code' => null, + 'email' => $email, + ] + ); + + } } + + From 5a5f4e816151014631892ca4e886e5e7f4b62650 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 06:30:56 +0200 Subject: [PATCH 24/86] Small update for Sandstorm release. --- .sandstorm/setup.sh | 3 -- Dockerfile | 2 +- app/Http/Middleware/Sandstorm.php | 3 -- composer.lock | 46 +++++++++++++++---------------- config/firefly.php | 5 ---- readme.md | 4 +-- 6 files changed, 26 insertions(+), 37 deletions(-) diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 288379743e..17f08e3a54 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -14,10 +14,7 @@ apt-get install -y python-software-properties software-properties-common # install all languages sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen - -sed -i 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen -sed -i 's/# id_ID.UTF-8 UTF-8/id_ID.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen diff --git a/Dockerfile b/Dockerfile index 4eb3f9cb1d..6d6ca1799b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ RUN (crontab -l ; echo "* * * * * root $FIREFLY_PATH/artisan schedule:run >> /va RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql # Generate locales supported by Firefly III -RUN echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8pt_BR.UTF-8 UTF-8ru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen +RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen # copy Apache config to correct spot. COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 5614c7adb2..017595baa2 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -25,7 +25,6 @@ namespace FireflyIII\Http\Middleware; use Auth; use Closure; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Http\Request; @@ -45,8 +44,6 @@ class Sandstorm * @param string|null $guard * * @return mixed - * - * @throws FireflyException */ public function handle(Request $request, Closure $next, $guard = null) { diff --git a/composer.lock b/composer.lock index 56cfa6fd17..e30d20069c 100644 --- a/composer.lock +++ b/composer.lock @@ -1020,16 +1020,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.27", + "version": "v5.6.28", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2fe661f2444410a576aa40054ad9b7fe0bb5cee5" + "reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2fe661f2444410a576aa40054ad9b7fe0bb5cee5", - "reference": "2fe661f2444410a576aa40054ad9b7fe0bb5cee5", + "url": "https://api.github.com/repos/laravel/framework/zipball/40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f", + "reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f", "shasum": "" }, "require": { @@ -1155,7 +1155,7 @@ "framework", "laravel" ], - "time": "2018-07-10T13:47:01+00:00" + "time": "2018-07-17T14:15:36+00:00" }, { "name": "laravel/passport", @@ -4389,22 +4389,22 @@ }, { "name": "phar-io/manifest", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^1.0.1", + "phar-io/version": "^2.0", "php": "^5.6 || ^7.0" }, "type": "library", @@ -4440,20 +4440,20 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" + "time": "2018-07-08T19:23:20+00:00" }, { "name": "phar-io/version", - "version": "1.0.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", "shasum": "" }, "require": { @@ -4487,7 +4487,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2018-07-08T19:19:57+00:00" }, { "name": "php-coveralls/php-coveralls", @@ -5038,16 +5038,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.2.6", + "version": "7.2.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "400a3836ee549ae6f665323ac3f21e27eac7155f" + "reference": "8e878aff7917ef66e702e03d1359b16eee254e2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/400a3836ee549ae6f665323ac3f21e27eac7155f", - "reference": "400a3836ee549ae6f665323ac3f21e27eac7155f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e878aff7917ef66e702e03d1359b16eee254e2c", + "reference": "8e878aff7917ef66e702e03d1359b16eee254e2c", "shasum": "" }, "require": { @@ -5058,8 +5058,8 @@ "ext-mbstring": "*", "ext-xml": "*", "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.1", - "phar-io/version": "^1.0", + "phar-io/manifest": "^1.0.2", + "phar-io/version": "^2.0", "php": "^7.1", "phpspec/prophecy": "^1.7", "phpunit/php-code-coverage": "^6.0.7", @@ -5118,7 +5118,7 @@ "testing", "xunit" ], - "time": "2018-06-21T13:13:39+00:00" + "time": "2018-07-15T05:20:50+00:00" }, { "name": "roave/security-advisories", diff --git a/config/firefly.php b/config/firefly.php index d1d8476010..288f8bcf62 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -225,19 +225,14 @@ return [ 'languages' => [ // completed languages 'en_US' => ['name_locale' => 'English', 'name_english' => 'English'], - 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'], 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'], 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'], - 'id_ID' => ['name_locale' => 'Bahasa Indonesia', 'name_english' => 'Indonesian'], 'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'], 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'], 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '], 'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'], 'ru_RU' => ['name_locale' => 'Русский', 'name_english' => 'Russian'], 'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'], - - // incomplete languages: - // 'ca_ES' => ['name_locale' => 'Català', 'name_english' => 'Catalan'], ], 'transactionTypesByWhat' => [ 'expenses' => ['Withdrawal'], diff --git a/readme.md b/readme.md index f6cb936fa2..d42a949511 100644 --- a/readme.md +++ b/readme.md @@ -75,7 +75,7 @@ But actually, it features: * 2 factor authentication for extra security 🔒 * Supports any currency you want, including [crypto currencies](https://firefly-iii.readthedocs.io/en/latest/concepts/currencies.html) such as ₿itcoin and Ξthereum * Lots of help text in case you don’t get it -* Translations into 10(!) languages, proudly powered by Crowdin +* Translations into 10(!) languages, proudly powered by [Crowdin](https://crowdin.com/project/firefly-iii). Everything is organised: @@ -102,7 +102,7 @@ There are many ways to run Firefly III 9. *Even more options are on the way!* ### Update your instance -Make sure you check for updates regularly. Your Firefly III instance will ask you to do this. Upgrade instructions can be found with the installation instructions. +Make sure you check for updates regularly. Your Firefly III instance will ask you to do this. [Upgrade instructions](https://firefly-iii.readthedocs.io/en/latest/installation/upgrading.html) can be found in the [official documentation](https://firefly-iii.readthedocs.io/en/latest/index.html). ## Contribute Your help is always welcome! Feel free to open issues, ask questions, talk about it and discuss this tool. I've create several social media accounts and I invite you to follow them, tweet at them and post to them. There's [reddit](https://www.reddit.com/r/FireflyIII/), [Twitter](https://twitter.com/Firefly_III) and [Facebook](https://www.facebook.com/FireflyIII/) just to start. It's not very active but it's a start! From 7359ed2ba242a48a5049b82193b4c4e8b83113f1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 06:35:27 +0200 Subject: [PATCH 25/86] Updated file list for Sandstorm. --- .sandstorm/sandstorm-files.list | 256 +++++++++++++++++--------------- 1 file changed, 138 insertions(+), 118 deletions(-) diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index d311a31fcf..793fc5da89 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -242,15 +242,41 @@ opt/app/LICENSE opt/app/app.json opt/app/app/Api/V1/Controllers/AboutController.php opt/app/app/Api/V1/Controllers/AccountController.php +opt/app/app/Api/V1/Controllers/AttachmentController.php +opt/app/app/Api/V1/Controllers/AvailableBudgetController.php opt/app/app/Api/V1/Controllers/BillController.php +opt/app/app/Api/V1/Controllers/BudgetController.php +opt/app/app/Api/V1/Controllers/BudgetLimitController.php +opt/app/app/Api/V1/Controllers/CategoryController.php +opt/app/app/Api/V1/Controllers/ConfigurationController.php opt/app/app/Api/V1/Controllers/Controller.php opt/app/app/Api/V1/Controllers/CurrencyController.php +opt/app/app/Api/V1/Controllers/CurrencyExchangeRateController.php +opt/app/app/Api/V1/Controllers/JournalLinkController.php +opt/app/app/Api/V1/Controllers/LinkTypeController.php +opt/app/app/Api/V1/Controllers/PiggyBankController.php +opt/app/app/Api/V1/Controllers/PreferenceController.php +opt/app/app/Api/V1/Controllers/RecurrenceController.php +opt/app/app/Api/V1/Controllers/RuleController.php +opt/app/app/Api/V1/Controllers/RuleGroupController.php opt/app/app/Api/V1/Controllers/TransactionController.php opt/app/app/Api/V1/Controllers/UserController.php opt/app/app/Api/V1/Requests/AccountRequest.php +opt/app/app/Api/V1/Requests/AttachmentRequest.php +opt/app/app/Api/V1/Requests/AvailableBudgetRequest.php opt/app/app/Api/V1/Requests/BillRequest.php +opt/app/app/Api/V1/Requests/BudgetLimitRequest.php +opt/app/app/Api/V1/Requests/BudgetRequest.php +opt/app/app/Api/V1/Requests/CategoryRequest.php opt/app/app/Api/V1/Requests/CurrencyRequest.php +opt/app/app/Api/V1/Requests/JournalLinkRequest.php +opt/app/app/Api/V1/Requests/LinkTypeRequest.php +opt/app/app/Api/V1/Requests/PiggyBankRequest.php +opt/app/app/Api/V1/Requests/PreferenceRequest.php +opt/app/app/Api/V1/Requests/RecurrenceRequest.php opt/app/app/Api/V1/Requests/Request.php +opt/app/app/Api/V1/Requests/RuleGroupRequest.php +opt/app/app/Api/V1/Requests/RuleRequest.php opt/app/app/Api/V1/Requests/TransactionRequest.php opt/app/app/Api/V1/Requests/UserRequest.php opt/app/app/Console/Commands/CreateExport.php @@ -269,6 +295,7 @@ opt/app/app/Events/AdminRequestedTestMessage.php opt/app/app/Events/Event.php opt/app/app/Events/RegisteredUser.php opt/app/app/Events/RequestedNewPassword.php +opt/app/app/Events/RequestedReportOnJournals.php opt/app/app/Events/RequestedVersionCheckStatus.php opt/app/app/Events/StoredTransactionJournal.php opt/app/app/Events/UpdatedTransactionJournal.php @@ -289,11 +316,13 @@ opt/app/app/Export/Exporter/ExporterInterface.php opt/app/app/Export/ProcessorInterface.php opt/app/app/Factory/AccountFactory.php opt/app/app/Factory/AccountMetaFactory.php +opt/app/app/Factory/AttachmentFactory.php opt/app/app/Factory/BillFactory.php opt/app/app/Factory/BudgetFactory.php opt/app/app/Factory/CategoryFactory.php opt/app/app/Factory/PiggyBankEventFactory.php opt/app/app/Factory/PiggyBankFactory.php +opt/app/app/Factory/RecurrenceFactory.php opt/app/app/Factory/TagFactory.php opt/app/app/Factory/TransactionCurrencyFactory.php opt/app/app/Factory/TransactionFactory.php @@ -325,6 +354,7 @@ opt/app/app/Generator/Report/Tag/MultiYearReportGenerator.php opt/app/app/Generator/Report/Tag/YearReportGenerator.php opt/app/app/Handlers/Events/APIEventHandler.php opt/app/app/Handlers/Events/AdminEventHandler.php +opt/app/app/Handlers/Events/AutomationHandler.php opt/app/app/Handlers/Events/StoredJournalEventHandler.php opt/app/app/Handlers/Events/UpdatedJournalEventHandler.php opt/app/app/Handlers/Events/UserEventHandler.php @@ -365,8 +395,13 @@ opt/app/app/Helpers/Report/PopupReport.php opt/app/app/Helpers/Report/PopupReportInterface.php opt/app/app/Helpers/Report/ReportHelper.php opt/app/app/Helpers/Report/ReportHelperInterface.php +opt/app/app/Helpers/Update/UpdateTrait.php +opt/app/app/Http/Controllers/Account/CreateController.php +opt/app/app/Http/Controllers/Account/DeleteController.php +opt/app/app/Http/Controllers/Account/EditController.php +opt/app/app/Http/Controllers/Account/IndexController.php opt/app/app/Http/Controllers/Account/ReconcileController.php -opt/app/app/Http/Controllers/AccountController.php +opt/app/app/Http/Controllers/Account/ShowController.php opt/app/app/Http/Controllers/Admin/ConfigurationController.php opt/app/app/Http/Controllers/Admin/HomeController.php opt/app/app/Http/Controllers/Admin/LinkController.php @@ -379,7 +414,14 @@ opt/app/app/Http/Controllers/Auth/RegisterController.php opt/app/app/Http/Controllers/Auth/ResetPasswordController.php opt/app/app/Http/Controllers/Auth/TwoFactorController.php opt/app/app/Http/Controllers/BillController.php -opt/app/app/Http/Controllers/BudgetController.php +opt/app/app/Http/Controllers/Budget/AmountController.php +opt/app/app/Http/Controllers/Budget/CreateController.php +opt/app/app/Http/Controllers/Budget/DeleteController.php +opt/app/app/Http/Controllers/Budget/EditController.php +opt/app/app/Http/Controllers/Budget/IndexController.php +opt/app/app/Http/Controllers/Budget/ShowController.php +opt/app/app/Http/Controllers/Category/NoCategoryController.php +opt/app/app/Http/Controllers/Category/ShowController.php opt/app/app/Http/Controllers/CategoryController.php opt/app/app/Http/Controllers/Chart/AccountController.php opt/app/app/Http/Controllers/Chart/BillController.php @@ -407,12 +449,17 @@ opt/app/app/Http/Controllers/Json/BoxController.php opt/app/app/Http/Controllers/Json/ExchangeController.php opt/app/app/Http/Controllers/Json/FrontpageController.php opt/app/app/Http/Controllers/Json/IntroController.php +opt/app/app/Http/Controllers/Json/ReconcileController.php opt/app/app/Http/Controllers/JsonController.php opt/app/app/Http/Controllers/NewUserController.php opt/app/app/Http/Controllers/PiggyBankController.php opt/app/app/Http/Controllers/Popup/ReportController.php opt/app/app/Http/Controllers/PreferencesController.php opt/app/app/Http/Controllers/ProfileController.php +opt/app/app/Http/Controllers/Recurring/CreateController.php +opt/app/app/Http/Controllers/Recurring/DeleteController.php +opt/app/app/Http/Controllers/Recurring/EditController.php +opt/app/app/Http/Controllers/Recurring/IndexController.php opt/app/app/Http/Controllers/Report/AccountController.php opt/app/app/Http/Controllers/Report/BalanceController.php opt/app/app/Http/Controllers/Report/BudgetController.php @@ -471,6 +518,7 @@ opt/app/app/Http/Requests/PiggyBankFormRequest.php opt/app/app/Http/Requests/ProfileFormRequest.php opt/app/app/Http/Requests/ReconciliationStoreRequest.php opt/app/app/Http/Requests/ReconciliationUpdateRequest.php +opt/app/app/Http/Requests/RecurrenceFormRequest.php opt/app/app/Http/Requests/ReportFormRequest.php opt/app/app/Http/Requests/Request.php opt/app/app/Http/Requests/RuleFormRequest.php @@ -482,8 +530,6 @@ opt/app/app/Http/Requests/TestRuleFormRequest.php opt/app/app/Http/Requests/TokenFormRequest.php opt/app/app/Http/Requests/UserFormRequest.php opt/app/app/Http/Requests/UserRegistrationRequest.php -opt/app/app/Import/Configuration/BunqConfigurator.php -opt/app/app/Import/Configuration/ConfiguratorInterface.php opt/app/app/Import/Converter/Amount.php opt/app/app/Import/Converter/AmountCredit.php opt/app/app/Import/Converter/AmountDebit.php @@ -508,12 +554,6 @@ opt/app/app/Import/Mapper/TransactionCurrencies.php opt/app/app/Import/MapperPreProcess/PreProcessorInterface.php opt/app/app/Import/MapperPreProcess/TagsComma.php opt/app/app/Import/MapperPreProcess/TagsSpace.php -opt/app/app/Import/Object/ImportAccount.php -opt/app/app/Import/Object/ImportBill.php -opt/app/app/Import/Object/ImportBudget.php -opt/app/app/Import/Object/ImportCategory.php -opt/app/app/Import/Object/ImportCurrency.php -opt/app/app/Import/Object/ImportJournal.php opt/app/app/Import/Prerequisites/BunqPrerequisites.php opt/app/app/Import/Prerequisites/FakePrerequisites.php opt/app/app/Import/Prerequisites/FilePrerequisites.php @@ -531,6 +571,7 @@ opt/app/app/Import/Specifics/RabobankDescription.php opt/app/app/Import/Specifics/SnsDescription.php opt/app/app/Import/Specifics/SpecificInterface.php opt/app/app/Import/Storage/ImportArrayStorage.php +opt/app/app/Jobs/CreateRecurringTransactions.php opt/app/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php opt/app/app/Jobs/ExecuteRuleOnExistingTransactions.php opt/app/app/Jobs/Job.php @@ -540,6 +581,7 @@ opt/app/app/Mail/AdminTestMail.php opt/app/app/Mail/ConfirmEmailChangeMail.php opt/app/app/Mail/OAuthTokenCreatedMail.php opt/app/app/Mail/RegisteredUser.php +opt/app/app/Mail/ReportNewJournalsMail.php opt/app/app/Mail/RequestedNewPassword.php opt/app/app/Mail/UndoEmailChangeMail.php opt/app/app/Models/Account.php @@ -561,6 +603,11 @@ opt/app/app/Models/PiggyBank.php opt/app/app/Models/PiggyBankEvent.php opt/app/app/Models/PiggyBankRepetition.php opt/app/app/Models/Preference.php +opt/app/app/Models/Recurrence.php +opt/app/app/Models/RecurrenceMeta.php +opt/app/app/Models/RecurrenceRepetition.php +opt/app/app/Models/RecurrenceTransaction.php +opt/app/app/Models/RecurrenceTransactionMeta.php opt/app/app/Models/Role.php opt/app/app/Models/Rule.php opt/app/app/Models/RuleAction.php @@ -590,6 +637,7 @@ opt/app/app/Providers/FireflySessionProvider.php opt/app/app/Providers/JournalServiceProvider.php opt/app/app/Providers/LogServiceProvider.php opt/app/app/Providers/PiggyBankServiceProvider.php +opt/app/app/Providers/RecurringServiceProvider.php opt/app/app/Providers/RouteServiceProvider.php opt/app/app/Providers/RuleGroupServiceProvider.php opt/app/app/Providers/RuleServiceProvider.php @@ -621,6 +669,8 @@ opt/app/app/Repositories/LinkType/LinkTypeRepository.php opt/app/app/Repositories/LinkType/LinkTypeRepositoryInterface.php opt/app/app/Repositories/PiggyBank/PiggyBankRepository.php opt/app/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +opt/app/app/Repositories/Recurring/RecurringRepository.php +opt/app/app/Repositories/Recurring/RecurringRepositoryInterface.php opt/app/app/Repositories/Rule/RuleRepository.php opt/app/app/Repositories/Rule/RuleRepositoryInterface.php opt/app/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -632,7 +682,11 @@ opt/app/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php opt/app/app/Repositories/User/UserRepository.php opt/app/app/Repositories/User/UserRepositoryInterface.php opt/app/app/Rules/BelongsUser.php +opt/app/app/Rules/IsAssetAccountId.php +opt/app/app/Rules/IsValidAttachmentModel.php opt/app/app/Rules/UniqueIban.php +opt/app/app/Rules/ValidRecurrenceRepetitionType.php +opt/app/app/Rules/ValidRecurrenceRepetitionValue.php opt/app/app/Rules/ValidTransactions.php opt/app/app/Services/Bunq/ApiContext.php opt/app/app/Services/Bunq/MonetaryAccount.php @@ -650,16 +704,20 @@ opt/app/app/Services/Internal/Destroy/BillDestroyService.php opt/app/app/Services/Internal/Destroy/CategoryDestroyService.php opt/app/app/Services/Internal/Destroy/CurrencyDestroyService.php opt/app/app/Services/Internal/Destroy/JournalDestroyService.php +opt/app/app/Services/Internal/Destroy/RecurrenceDestroyService.php opt/app/app/Services/Internal/File/EncryptService.php opt/app/app/Services/Internal/Support/AccountServiceTrait.php opt/app/app/Services/Internal/Support/BillServiceTrait.php opt/app/app/Services/Internal/Support/JournalServiceTrait.php +opt/app/app/Services/Internal/Support/RecurringTransactionTrait.php opt/app/app/Services/Internal/Support/TransactionServiceTrait.php +opt/app/app/Services/Internal/Support/TransactionTypeTrait.php opt/app/app/Services/Internal/Update/AccountUpdateService.php opt/app/app/Services/Internal/Update/BillUpdateService.php opt/app/app/Services/Internal/Update/CategoryUpdateService.php opt/app/app/Services/Internal/Update/CurrencyUpdateService.php opt/app/app/Services/Internal/Update/JournalUpdateService.php +opt/app/app/Services/Internal/Update/RecurrenceUpdateService.php opt/app/app/Services/Internal/Update/TransactionUpdateService.php opt/app/app/Services/Password/PwndVerifierV2.php opt/app/app/Services/Password/Verifier.php @@ -705,6 +763,7 @@ opt/app/app/Support/Facades/Navigation.php opt/app/app/Support/Facades/Preferences.php opt/app/app/Support/Facades/Steam.php opt/app/app/Support/FireflyConfig.php +opt/app/app/Support/Http/Controllers/DateCalculation.php opt/app/app/Support/Import/Information/BunqInformation.php opt/app/app/Support/Import/Information/GetSpectreCustomerTrait.php opt/app/app/Support/Import/Information/GetSpectreTokenTrait.php @@ -823,18 +882,32 @@ opt/app/app/TransactionRules/Triggers/TriggerInterface.php opt/app/app/TransactionRules/Triggers/UserAction.php opt/app/app/Transformers/AccountTransformer.php opt/app/app/Transformers/AttachmentTransformer.php +opt/app/app/Transformers/AvailableBudgetTransformer.php opt/app/app/Transformers/BillTransformer.php +opt/app/app/Transformers/BudgetLimitTransformer.php opt/app/app/Transformers/BudgetTransformer.php opt/app/app/Transformers/CategoryTransformer.php +opt/app/app/Transformers/CurrencyExchangeRateTransformer.php opt/app/app/Transformers/CurrencyTransformer.php +opt/app/app/Transformers/JournalLinkTransformer.php opt/app/app/Transformers/JournalMetaTransformer.php +opt/app/app/Transformers/LinkTypeTransformer.php +opt/app/app/Transformers/NoteTransformer.php opt/app/app/Transformers/PiggyBankEventTransformer.php opt/app/app/Transformers/PiggyBankTransformer.php +opt/app/app/Transformers/PreferenceTransformer.php +opt/app/app/Transformers/RecurrenceTransformer.php +opt/app/app/Transformers/RuleActionTransformer.php +opt/app/app/Transformers/RuleGroupTransformer.php +opt/app/app/Transformers/RuleTransformer.php +opt/app/app/Transformers/RuleTriggerTransformer.php opt/app/app/Transformers/TagTransformer.php opt/app/app/Transformers/TransactionTransformer.php opt/app/app/Transformers/UserTransformer.php opt/app/app/User.php opt/app/app/Validation/FireflyValidator.php +opt/app/app/Validation/RecurrenceValidation.php +opt/app/app/Validation/TransactionValidation.php opt/app/artisan opt/app/bootstrap/app.php opt/app/bootstrap/cache/packages.php @@ -887,6 +960,7 @@ opt/app/database/migrations/2018_01_01_000005_create_oauth_personal_access_clien opt/app/database/migrations/2018_03_19_141348_changes_for_v472.php opt/app/database/migrations/2018_04_07_210913_changes_for_v473.php opt/app/database/migrations/2018_04_29_174524_changes_for_v474.php +opt/app/database/migrations/2018_06_08_200526_changes_for_v475.php opt/app/database/seeds/AccountTypeSeeder.php opt/app/database/seeds/ConfigSeeder.php opt/app/database/seeds/DatabaseSeeder.php @@ -1105,6 +1179,8 @@ opt/app/public/js/ff/piggy-banks/edit.js opt/app/public/js/ff/piggy-banks/index.js opt/app/public/js/ff/piggy-banks/show.js opt/app/public/js/ff/preferences/index.js +opt/app/public/js/ff/recurring/create.js +opt/app/public/js/ff/recurring/edit.js opt/app/public/js/ff/reports/account/month.js opt/app/public/js/ff/reports/all.js opt/app/public/js/ff/reports/audit/all.js @@ -1153,6 +1229,12 @@ opt/app/public/lib/adminlte/css/skins/skin-blue-light.min.css opt/app/public/lib/adminlte/img/icons.png opt/app/public/lib/adminlte/js/app.js opt/app/public/lib/adminlte/js/app.min.js +opt/app/public/lib/fc/fullcalendar.css +opt/app/public/lib/fc/fullcalendar.js +opt/app/public/lib/fc/fullcalendar.min.css +opt/app/public/lib/fc/fullcalendar.min.js +opt/app/public/lib/fc/fullcalendar.print.css +opt/app/public/lib/fc/fullcalendar.print.min.css opt/app/public/lib/intro/intro.min.js opt/app/public/lib/intro/introjs-rtl.min.css opt/app/public/lib/intro/introjs.min.css @@ -1419,6 +1501,8 @@ opt/app/resources/views/demo/import/index.twig opt/app/resources/views/demo/index.twig opt/app/resources/views/demo/no-demo-text.twig opt/app/resources/views/demo/piggy-banks/index.twig +opt/app/resources/views/demo/recurring/index.twig +opt/app/resources/views/demo/recurring/recurring-create.twig opt/app/resources/views/demo/reports/index.twig opt/app/resources/views/demo/transactions/index.twig opt/app/resources/views/emails/access-token-created-html.twig @@ -1441,6 +1525,8 @@ opt/app/resources/views/emails/password-html.twig opt/app/resources/views/emails/password-text.twig opt/app/resources/views/emails/registered-html.twig opt/app/resources/views/emails/registered-text.twig +opt/app/resources/views/emails/report-new-journals-html.twig +opt/app/resources/views/emails/report-new-journals-text.twig opt/app/resources/views/emails/undo-email-change-html.twig opt/app/resources/views/emails/undo-email-change-text.twig opt/app/resources/views/error.twig @@ -1538,6 +1624,11 @@ opt/app/resources/views/profile/change-password.twig opt/app/resources/views/profile/code.twig opt/app/resources/views/profile/delete-account.twig opt/app/resources/views/profile/index.twig +opt/app/resources/views/recurring/create.twig +opt/app/resources/views/recurring/delete.twig +opt/app/resources/views/recurring/edit.twig +opt/app/resources/views/recurring/index.twig +opt/app/resources/views/recurring/show.twig opt/app/resources/views/reports/account/report.twig opt/app/resources/views/reports/audit/report.twig opt/app/resources/views/reports/budget/month.twig @@ -2060,30 +2151,6 @@ opt/app/vendor/defuse/php-encryption/src/Key.php opt/app/vendor/defuse/php-encryption/src/KeyOrPassword.php opt/app/vendor/defuse/php-encryption/src/KeyProtectedByPassword.php opt/app/vendor/defuse/php-encryption/src/RuntimeTests.php -opt/app/vendor/doctrine/annotations/CHANGELOG.md -opt/app/vendor/doctrine/annotations/LICENSE -opt/app/vendor/doctrine/annotations/README.md -opt/app/vendor/doctrine/annotations/composer.json -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php -opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php -opt/app/vendor/doctrine/annotations/phpstan.neon opt/app/vendor/doctrine/cache/LICENSE opt/app/vendor/doctrine/cache/README.md opt/app/vendor/doctrine/cache/UPGRADE.md @@ -2118,89 +2185,11 @@ opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php -opt/app/vendor/doctrine/collections/CONTRIBUTING.md -opt/app/vendor/doctrine/collections/LICENSE -opt/app/vendor/doctrine/collections/README.md -opt/app/vendor/doctrine/collections/composer.json -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/CompositeExpression.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Expression.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Value.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php -opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php -opt/app/vendor/doctrine/common/LICENSE -opt/app/vendor/doctrine/common/README.md -opt/app/vendor/doctrine/common/UPGRADE_TO_2_1 -opt/app/vendor/doctrine/common/UPGRADE_TO_2_2 -opt/app/vendor/doctrine/common/composer.json -opt/app/vendor/doctrine/common/humbug.json.dist -opt/app/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/CommonException.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Comparable.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventArgs.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventSubscriber.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Lexer.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LifecycleEventArgs.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LoadClassMetadataEventArgs.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/MappingException.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerAware.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerDecorator.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Proxy.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/ProxyException.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Proxy.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyDefinition.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ClassFinderInterface.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/Psr0FindFile.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ReflectionProviderInterface.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionMethod.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Util/ClassUtils.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Util/Inflector.php -opt/app/vendor/doctrine/common/lib/Doctrine/Common/Version.php -opt/app/vendor/doctrine/common/phpstan.neon +opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/BC_Break.md +opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/Bug.md +opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/Feature_Request.md +opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/Support_Question.md +opt/app/vendor/doctrine/dbal/.github/PULL_REQUEST_TEMPLATE.md opt/app/vendor/doctrine/dbal/LICENSE opt/app/vendor/doctrine/dbal/README.md opt/app/vendor/doctrine/dbal/SECURITY.md @@ -2324,6 +2313,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.ph opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MariaDb102Keywords.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MsSQLKeywords.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQL57Keywords.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQL80Keywords.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL100Keywords.php @@ -2343,6 +2333,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLServerKeywo opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySQL57Platform.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySQL80Platform.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSQL100Platform.php @@ -2367,7 +2358,6 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/CompositeExpress opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryException.php -opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/README.markdown opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtilsException.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractAsset.php @@ -2421,6 +2411,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWor opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Helper/ConnectionHelper.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Dumper.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/TransactionIsolationLevel.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/ArrayType.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/BigIntType.php @@ -2455,6 +2446,16 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/VarDateTimeImmutableType.ph opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/VarDateTimeType.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/VersionAwarePlatformDriver.php +opt/app/vendor/doctrine/dbal/phpstan.neon.dist +opt/app/vendor/doctrine/event-manager/LICENSE +opt/app/vendor/doctrine/event-manager/README.md +opt/app/vendor/doctrine/event-manager/composer.json +opt/app/vendor/doctrine/event-manager/docs/en/index.rst +opt/app/vendor/doctrine/event-manager/docs/en/reference/index.rst +opt/app/vendor/doctrine/event-manager/docs/en/sidebar.rst +opt/app/vendor/doctrine/event-manager/lib/Doctrine/Common/EventArgs.php +opt/app/vendor/doctrine/event-manager/lib/Doctrine/Common/EventManager.php +opt/app/vendor/doctrine/event-manager/lib/Doctrine/Common/EventSubscriber.php opt/app/vendor/doctrine/inflector/LICENSE opt/app/vendor/doctrine/inflector/README.md opt/app/vendor/doctrine/inflector/composer.json @@ -2904,6 +2905,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/Refr opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub @@ -3176,6 +3178,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddle opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/stubs/facade.stub +opt/app/vendor/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashManager.php @@ -4532,6 +4535,10 @@ opt/app/vendor/swiftmailer/swiftmailer/doc/messages.rst opt/app/vendor/swiftmailer/swiftmailer/doc/plugins.rst opt/app/vendor/swiftmailer/swiftmailer/doc/sending.rst opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php @@ -4594,6 +4601,7 @@ opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.ph opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php @@ -4670,6 +4678,8 @@ opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/Pl opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php @@ -6327,6 +6337,7 @@ opt/app/vendor/symfony/var-dumper/Resources/bin/var-dump-server opt/app/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css opt/app/vendor/symfony/var-dumper/Resources/functions/dump.php opt/app/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js +opt/app/vendor/symfony/var-dumper/Server/Connection.php opt/app/vendor/symfony/var-dumper/Server/DumpServer.php opt/app/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php opt/app/vendor/symfony/var-dumper/Tests/Caster/CasterTest.php @@ -6351,6 +6362,7 @@ opt/app/vendor/symfony/var-dumper/Tests/Fixtures/Twig.php opt/app/vendor/symfony/var-dumper/Tests/Fixtures/dumb-var.php opt/app/vendor/symfony/var-dumper/Tests/Fixtures/dump_server.php opt/app/vendor/symfony/var-dumper/Tests/Fixtures/xml_reader.xml +opt/app/vendor/symfony/var-dumper/Tests/Server/ConnectionTest.php opt/app/vendor/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php opt/app/vendor/symfony/var-dumper/VarDumper.php opt/app/vendor/symfony/var-dumper/composer.json @@ -7259,6 +7271,14 @@ opt/app/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php opt/app/vendor/zendframework/zend-diactoros/src/Stream.php opt/app/vendor/zendframework/zend-diactoros/src/UploadedFile.php opt/app/vendor/zendframework/zend-diactoros/src/Uri.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/create_uploaded_file.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/normalize_server.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php +opt/app/vendor/zendframework/zend-diactoros/src/functions/parse_cookie_header.php proc/cpuinfo sandstorm-http-bridge sandstorm-http-bridge-config From 0adacac269f67c74fbff1664f75358b6f5eb546f Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 06:58:51 +0200 Subject: [PATCH 26/86] Remove switches, add if-statement. --- .../Import/Placeholder/ImportTransaction.php | 101 ++++++------------ 1 file changed, 34 insertions(+), 67 deletions(-) diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index 2f110b781a..b955430646 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -131,6 +131,38 @@ class ImportTransaction */ public function addColumnValue(ColumnValue $columnValue): void { + $role = $columnValue->getRole(); + $basics = [ + 'account-iban' => 'accountIban', + 'account-name' => 'accountName', + 'account-bic' => 'accountBic', + 'account-number' => 'accountNumber', + 'amount_debit' => 'amountDebit', + 'amount_credit' => 'amountCredit', + 'amount' => 'amount', + 'amount_foreign' => 'foreignAmount', + 'bill-name' => 'billName', + 'budget-name' => 'budgetName', + 'category-name' => 'categoryName', + 'currency-name' => 'currencyName', + 'currency-code' => 'currencyCode', + 'currency-symbol' => 'currencySymbol', + 'external-id' => 'externalId', + 'foreign-currency-code' => 'foreignCurrencyCode', + 'date-transaction' => 'date', + 'opposing-iban' => 'opposingIban', + 'opposing-name' => 'opposingName', + 'opposing-bic' => 'opposingBic', + 'opposing-number' => 'opposingNumber', + ]; + if (isset($basics[$role])) { + $field = $basics[$role]; + $this->$field = $columnValue->getValue(); + + return; + } + + switch ($columnValue->getRole()) { default: // @codeCoverageIgnoreStart @@ -144,65 +176,20 @@ class ImportTransaction $this->accountId = $mappedValue; Log::debug(sprintf('Going to set the account-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue)); break; - case 'account-iban': - $this->accountIban = $columnValue->getValue(); - break; - case 'account-name': - $this->accountName = $columnValue->getValue(); - break; - case 'account-bic': - $this->accountBic = $columnValue->getValue(); - break; - case 'account-number': - $this->accountNumber = $columnValue->getValue(); - break; - case 'amount_debit': - $this->amountDebit = $columnValue->getValue(); - break; - case 'amount_credit': - $this->amountCredit = $columnValue->getValue(); - break; - case 'amount': - $this->amount = $columnValue->getValue(); - break; - case 'amount_foreign': - $this->foreignAmount = $columnValue->getValue(); - break; case 'bill-id': $this->billId = $this->getMappedValue($columnValue); break; - case 'bill-name': - $this->billName = $columnValue->getValue(); - break; case 'budget-id': $this->budgetId = $this->getMappedValue($columnValue); break; - case 'budget-name': - $this->budgetName = $columnValue->getValue(); - break; case 'category-id': $value = $this->getMappedValue($columnValue); Log::debug(sprintf('Set category ID to %d in ImportTransaction object', $value)); $this->categoryId = $value; break; - case 'category-name': - $this->categoryName = $columnValue->getValue(); - break; case 'currency-id': $this->currencyId = $this->getMappedValue($columnValue); break; - case 'currency-name': - $this->currencyName = $columnValue->getValue(); - break; - case 'currency-code': - $this->currencyCode = $columnValue->getValue(); - break; - case 'currency-symbol': - $this->currencySymbol = $columnValue->getValue(); - break; - case 'external-id': - $this->externalId = $columnValue->getValue(); - break; case 'sepa-ct-id': case 'sepa-ct-op': case 'sepa-db': @@ -218,17 +205,13 @@ class ImportTransaction case 'date-payment': case 'date-process': case 'date-due': + case 'rabo-debit-credit': + case 'ing-debit-credit': $this->meta[$columnValue->getRole()] = $columnValue->getValue(); break; case 'foreign-currency-id': $this->foreignCurrencyId = $this->getMappedValue($columnValue); break; - case 'foreign-currency-code': - $this->foreignCurrencyCode = $columnValue->getValue(); - break; - case 'date-transaction': - $this->date = $columnValue->getValue(); - break; case 'description': $this->description = trim($this->description . ' ' . $columnValue->getValue()); break; @@ -240,22 +223,6 @@ class ImportTransaction $this->opposingId = $mappedValue; Log::debug(sprintf('Going to set the OPPOSING-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue)); break; - case 'opposing-iban': - $this->opposingIban = $columnValue->getValue(); - break; - case 'opposing-name': - $this->opposingName = $columnValue->getValue(); - break; - case 'opposing-bic': - $this->opposingBic = $columnValue->getValue(); - break; - case 'opposing-number': - $this->opposingNumber = $columnValue->getValue(); - break; - case 'rabo-debit-credit': - case 'ing-debit-credit': - $this->modifiers[$columnValue->getRole()] = $columnValue->getValue(); - break; case 'tags-comma': $tags = explode(',', $columnValue->getValue()); $this->tags = array_unique(array_merge($this->tags, $tags)); From a3306bb26f5cc587f12dc745698755cfe87aece1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 07:16:32 +0200 Subject: [PATCH 27/86] Leaving only the specials. --- .../Import/Placeholder/ImportTransaction.php | 76 +++++++------------ 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index b955430646..26b831388a 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -162,67 +162,45 @@ class ImportTransaction return; } + $mapped = [ + 'account-id' => 'accountId', + 'bill-id' => 'billId', + 'budget-id' => 'budgetId', + 'category-id' => 'categoryId', + 'currency-id' => 'currencyId', + 'foreign-currency-id' => 'foreignCurrencyId', + 'opposing-id' => 'opposingId', + ]; + if (isset($mapped[$role])) { + $field = $basics[$role]; + $mappedValue = $this->getMappedValue($columnValue); + $this->$field = $mappedValue; + Log::debug(sprintf('Going to set the %s. Original value is "%s", mapped value is "%s".', $role, $columnValue->getValue(), $mappedValue)); - switch ($columnValue->getRole()) { + return; + } + + $meta = ['sepa-ct-id', 'sepa-ct-op', 'sepa-db', 'sepa-cc', 'sepa-country', 'sepa-batch-id', 'sepa-ep', 'sepa-ci', 'internal-reference', 'date-interest', + 'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due', 'rabo-debit-credit', 'ing-debit-credit',]; + if (isset($meta[$role])) { + $this->meta[$role] = $columnValue->getValue(); + + return; + } + + switch ($role) { default: // @codeCoverageIgnoreStart throw new FireflyException( - sprintf('ImportTransaction cannot handle role "%s" with value "%s"', $columnValue->getRole(), $columnValue->getValue()) + sprintf('ImportTransaction cannot handle role "%s" with value "%s"', $role, $columnValue->getValue()) ); // @codeCoverageIgnoreEnd - case 'account-id': - $mappedValue = $this->getMappedValue($columnValue); - // could be the result of a mapping? - $this->accountId = $mappedValue; - Log::debug(sprintf('Going to set the account-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue)); - break; - case 'bill-id': - $this->billId = $this->getMappedValue($columnValue); - break; - case 'budget-id': - $this->budgetId = $this->getMappedValue($columnValue); - break; - case 'category-id': - $value = $this->getMappedValue($columnValue); - Log::debug(sprintf('Set category ID to %d in ImportTransaction object', $value)); - $this->categoryId = $value; - break; - case 'currency-id': - $this->currencyId = $this->getMappedValue($columnValue); - break; - case 'sepa-ct-id': - case 'sepa-ct-op': - case 'sepa-db': - case 'sepa-cc': - case 'sepa-country': - case 'sepa-batch-id': - case 'sepa-ep': - case 'sepa-ci': - case 'internal-reference': - case 'date-interest': - case 'date-invoice': - case 'date-book': - case 'date-payment': - case 'date-process': - case 'date-due': - case 'rabo-debit-credit': - case 'ing-debit-credit': - $this->meta[$columnValue->getRole()] = $columnValue->getValue(); - break; - case 'foreign-currency-id': - $this->foreignCurrencyId = $this->getMappedValue($columnValue); - break; case 'description': $this->description = trim($this->description . ' ' . $columnValue->getValue()); break; case 'note': $this->note = trim($this->note . ' ' . $columnValue->getValue()); break; - case 'opposing-id': - $mappedValue = $this->getMappedValue($columnValue); - $this->opposingId = $mappedValue; - Log::debug(sprintf('Going to set the OPPOSING-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue)); - break; case 'tags-comma': $tags = explode(',', $columnValue->getValue()); $this->tags = array_unique(array_merge($this->tags, $tags)); From f22b54de30833ae8e479439f50be523d0cc03edd Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 07:16:46 +0200 Subject: [PATCH 28/86] Clean up sandstorm tests. --- resources/views/test/test.twig | 1 + tests/Unit/Middleware/SandstormTest.php | 126 ++---------------------- 2 files changed, 9 insertions(+), 118 deletions(-) diff --git a/resources/views/test/test.twig b/resources/views/test/test.twig index d2ab74c2d7..05aea8e64e 100644 --- a/resources/views/test/test.twig +++ b/resources/views/test/test.twig @@ -1,2 +1,3 @@ list-length: {{ listLength }} sandstorm-anon: {% if SANDSTORM_ANON %}true{% else %}false{% endif %} +user-email: {{ Auth.user.email }} diff --git a/tests/Unit/Middleware/SandstormTest.php b/tests/Unit/Middleware/SandstormTest.php index 47ff386cd5..a367e101e9 100644 --- a/tests/Unit/Middleware/SandstormTest.php +++ b/tests/Unit/Middleware/SandstormTest.php @@ -24,11 +24,11 @@ declare(strict_types=1); namespace Tests\Unit\Middleware; use FireflyIII\Http\Middleware\Sandstorm; -use FireflyIII\Models\Role; use FireflyIII\Repositories\User\UserRepositoryInterface; use Route; use Symfony\Component\HttpFoundation\Response; use Tests\TestCase; +use Mockery; /** * Class RangeTest @@ -38,129 +38,19 @@ class SandstormTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Sandstorm::handle */ - public function testMiddlewareAnonEmpty(): void + public function testMiddlewareBasic(): void { putenv('SANDSTORM=1'); $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('count')->once()->andReturn(0); + $repository->shouldReceive('findByEmail')->withArgs(['anonymous@firefly'])->once()->andReturn($this->user()); + // single user, checks if user is admin + $repository->shouldReceive('count')->andReturn(1); + $repository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false)->once(); + $repository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->once(); + $repository->shouldReceive('attachRole')->withArgs([Mockery::any(), 'owner'])->once(); $response = $this->get('/_test/sandstorm'); - $this->assertEquals(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode()); - $response->assertSee('The first visit to a new Firefly III administration cannot be by a guest user.'); - - putenv('SANDSTORM=0'); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareAnonLoggedIn(): void - { - putenv('SANDSTORM=1'); - - $this->be($this->user()); - $response = $this->get('/_test/sandstorm'); - $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $response->assertSee('sandstorm-anon: true'); - - putenv('SANDSTORM=0'); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareAnonUser(): void - { - putenv('SANDSTORM=1'); - - $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('count')->twice()->andReturn(1); - $repository->shouldReceive('hasRole')->andReturn(true); - - $response = $this->get('/_test/sandstorm'); - $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $response->assertSee('sandstorm-anon: true'); - - putenv('SANDSTORM=0'); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareLoggedIn(): void - { - putenv('SANDSTORM=1'); - - $this->be($this->user()); - $response = $this->get('/_test/sandstorm', ['X-Sandstorm-User-Id' => 'abcd']); - $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $response->assertSee('sandstorm-anon: false'); - - putenv('SANDSTORM=0'); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareMultiUser(): void - { - putenv('SANDSTORM=1'); - - $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('count')->once()->andReturn(2); - - $response = $this->get('/_test/sandstorm'); - $this->assertEquals(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode()); - $response->assertSee('Your Firefly III installation has more than one user, which is weird.'); - - putenv('SANDSTORM=0'); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareNoUser(): void - { - putenv('SANDSTORM=1'); - - $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('count')->twice()->andReturn(0); - $repository->shouldReceive('store')->once()->andReturn($this->user()); - $repository->shouldReceive('attachRole')->once()->andReturn(true); - //$repository->shouldReceive('getRole')->once()->andReturn(new Role); - $repository->shouldReceive('hasRole')->andReturn(false); - - $response = $this->get('/_test/sandstorm', ['X-Sandstorm-User-Id' => 'abcd']); - $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $response->assertSee('sandstorm-anon: false'); - - putenv('SANDSTORM=0'); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareNotSandstorm(): void - { - $this->withoutExceptionHandling(); - $response = $this->get('/_test/sandstorm'); - $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - } - - /** - * @covers \FireflyIII\Http\Middleware\Sandstorm::handle - */ - public function testMiddlewareOneUser(): void - { - putenv('SANDSTORM=1'); - - $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('count')->twice()->andReturn(1); - $repository->shouldReceive('first')->once()->andReturn($this->user()); - $repository->shouldReceive('hasRole')->andReturn(true); - - $response = $this->get('/_test/sandstorm', ['X-Sandstorm-User-Id' => 'abcd']); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); $response->assertSee('sandstorm-anon: false'); From 5b83931b019c4f055787f9ca11f16df2a2439459 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 07:28:35 +0200 Subject: [PATCH 29/86] Clean up recurrence transformer. --- app/Models/RecurrenceTransaction.php | 1 + app/Transformers/RecurrenceTransformer.php | 245 +++++++++++++-------- 2 files changed, 151 insertions(+), 95 deletions(-) diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index a38f0a09b6..9ca7aa9ec5 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -46,6 +46,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property \FireflyIII\Models\Account $destinationAccount * @property \Illuminate\Support\Collection $recurrenceTransactionMeta * @property int $id + * @property Recurrence $recurrence */ class RecurrenceTransaction extends Model { diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php index f35df38ddd..af2f0863f2 100644 --- a/app/Transformers/RecurrenceTransformer.php +++ b/app/Transformers/RecurrenceTransformer.php @@ -65,7 +65,11 @@ class RecurrenceTransformer extends TransformerAbstract /** @var RecurringRepositoryInterface */ protected $repository; - + /** + * RecurrenceTransformer constructor. + * + * @param ParameterBag $parameters + */ public function __construct(ParameterBag $parameters) { $this->repository = app(RecurringRepositoryInterface::class); @@ -88,7 +92,7 @@ class RecurrenceTransformer extends TransformerAbstract } /** - * Transform the piggy bank. + * Transform the recurring transaction. * * @param Recurrence $recurrence * @@ -98,7 +102,9 @@ class RecurrenceTransformer extends TransformerAbstract public function transform(Recurrence $recurrence): array { $this->repository->setUser($recurrence->user); - $return = [ + + // basic data. + $return = [ 'id' => (int)$recurrence->id, 'updated_at' => $recurrence->updated_at->toAtomString(), 'created_at' => $recurrence->created_at->toAtomString(), @@ -113,9 +119,9 @@ class RecurrenceTransformer extends TransformerAbstract 'active' => $recurrence->active, 'repetitions' => $recurrence->repetitions, 'notes' => $this->repository->getNoteText($recurrence), - 'recurrence_repetitions' => [], - 'transactions' => [], - 'meta' => [], + 'recurrence_repetitions' => $this->getRepetitions($recurrence), + 'transactions' => $this->getTransactions($recurrence), + 'meta' => $this->getMeta($recurrence), 'links' => [ [ 'rel' => 'self', @@ -123,97 +129,20 @@ class RecurrenceTransformer extends TransformerAbstract ], ], ]; - $fromDate = $recurrence->latest_date ?? $recurrence->first_date; - // date in the past? use today: - $today = new Carbon; - $fromDate = $fromDate->lte($today) ? $today : $fromDate; - /** @var RecurrenceRepetition $repetition */ - foreach ($recurrence->recurrenceRepetitions as $repetition) { - $repetitionArray = [ - 'id' => $repetition->id, - 'updated_at' => $repetition->updated_at->toAtomString(), - 'created_at' => $repetition->created_at->toAtomString(), - 'repetition_type' => $repetition->repetition_type, - 'repetition_moment' => $repetition->repetition_moment, - 'repetition_skip' => (int)$repetition->repetition_skip, - 'weekend' => (int)$repetition->weekend, - 'description' => $this->repository->repetitionDescription($repetition), - 'occurrences' => [], - ]; - // get the (future) occurrences for this specific type of repetition: - $occurrences = $this->repository->getXOccurrences($repetition, $fromDate, 5); - /** @var Carbon $carbon */ - foreach ($occurrences as $carbon) { - $repetitionArray['occurrences'][] = $carbon->format('Y-m-d'); - } + return $return; + } - $return['recurrence_repetitions'][] = $repetitionArray; - } - unset($repetitionArray); - - // get all transactions: - /** @var RecurrenceTransaction $transaction */ - foreach ($recurrence->recurrenceTransactions as $transaction) { - $transactionArray = [ - 'currency_id' => $transaction->transaction_currency_id, - 'currency_code' => $transaction->transactionCurrency->code, - 'currency_symbol' => $transaction->transactionCurrency->symbol, - 'currency_dp' => $transaction->transactionCurrency->decimal_places, - 'foreign_currency_id' => $transaction->foreign_currency_id, - 'source_id' => $transaction->source_id, - 'source_name' => $transaction->sourceAccount->name, - 'destination_id' => $transaction->destination_id, - 'destination_name' => $transaction->destinationAccount->name, - 'amount' => $transaction->amount, - 'foreign_amount' => $transaction->foreign_amount, - 'description' => $transaction->description, - 'meta' => [], - ]; - if (null !== $transaction->foreign_currency_id) { - $transactionArray['foreign_currency_code'] = $transaction->foreignCurrency->code; - $transactionArray['foreign_currency_symbol'] = $transaction->foreignCurrency->symbol; - $transactionArray['foreign_currency_dp'] = $transaction->foreignCurrency->decimal_places; - } - - // get meta data for each transaction: - /** @var RecurrenceTransactionMeta $transactionMeta */ - foreach ($transaction->recurrenceTransactionMeta as $transactionMeta) { - $transactionMetaArray = [ - 'name' => $transactionMeta->name, - 'value' => $transactionMeta->value, - ]; - switch ($transactionMeta->name) { - default: - throw new FireflyException(sprintf('Recurrence transformer cannot handle transaction meta-field "%s"', $transactionMeta->name)); - case 'category_name': - /** @var CategoryFactory $factory */ - $factory = app(CategoryFactory::class); - $factory->setUser($recurrence->user); - $category = $factory->findOrCreate(null, $transactionMeta->value); - if (null !== $category) { - $transactionMetaArray['category_id'] = $category->id; - $transactionMetaArray['category_name'] = $category->name; - } - break; - case 'budget_id': - /** @var BudgetRepositoryInterface $repository */ - $repository = app(BudgetRepositoryInterface::class); - $budget = $repository->findNull((int)$transactionMeta->value); - if (null !== $budget) { - $transactionMetaArray['budget_id'] = $budget->id; - $transactionMetaArray['budget_name'] = $budget->name; - } - break; - } - // store transaction meta data in transaction - $transactionArray['meta'][] = $transactionMetaArray; - } - // store transaction in recurrence array. - $return['transactions'][] = $transactionArray; - } - // get all meta data for recurrence itself + /** + * @param Recurrence $recurrence + * + * @return array + * @throws FireflyException + */ + private function getMeta(Recurrence $recurrence): array + { + $return = []; /** @var RecurrenceMeta $recurrenceMeta */ foreach ($recurrence->recurrenceMeta as $recurrenceMeta) { $recurrenceMetaArray = [ @@ -248,8 +177,134 @@ class RecurrenceTransformer extends TransformerAbstract break; } // store meta date in recurring array - $return['meta'][] = $recurrenceMetaArray; + $return[] = $recurrenceMetaArray; + } + return $return; + } + + /** + * @param Recurrence $recurrence + * + * @return array + * @throws FireflyException + */ + private function getRepetitions(Recurrence $recurrence): array + { + $fromDate = $recurrence->latest_date ?? $recurrence->first_date; + // date in the past? use today: + $today = new Carbon; + $fromDate = $fromDate->lte($today) ? $today : $fromDate; + $return = []; + + /** @var RecurrenceRepetition $repetition */ + foreach ($recurrence->recurrenceRepetitions as $repetition) { + $repetitionArray = [ + 'id' => $repetition->id, + 'updated_at' => $repetition->updated_at->toAtomString(), + 'created_at' => $repetition->created_at->toAtomString(), + 'repetition_type' => $repetition->repetition_type, + 'repetition_moment' => $repetition->repetition_moment, + 'repetition_skip' => (int)$repetition->repetition_skip, + 'weekend' => (int)$repetition->weekend, + 'description' => $this->repository->repetitionDescription($repetition), + 'occurrences' => [], + ]; + + // get the (future) occurrences for this specific type of repetition: + $occurrences = $this->repository->getXOccurrences($repetition, $fromDate, 5); + /** @var Carbon $carbon */ + foreach ($occurrences as $carbon) { + $repetitionArray['occurrences'][] = $carbon->format('Y-m-d'); + } + + $return[] = $repetitionArray; + } + + return $return; + } + + /** + * @param RecurrenceTransaction $transaction + * + * @return array + * @throws FireflyException + */ + private function getTransactionMeta(RecurrenceTransaction $transaction): array + { + $return = []; + // get meta data for each transaction: + /** @var RecurrenceTransactionMeta $transactionMeta */ + foreach ($transaction->recurrenceTransactionMeta as $transactionMeta) { + $transactionMetaArray = [ + 'name' => $transactionMeta->name, + 'value' => $transactionMeta->value, + ]; + switch ($transactionMeta->name) { + default: + throw new FireflyException(sprintf('Recurrence transformer cannot handle transaction meta-field "%s"', $transactionMeta->name)); + case 'category_name': + /** @var CategoryFactory $factory */ + $factory = app(CategoryFactory::class); + $factory->setUser($transaction->recurrence->user); + $category = $factory->findOrCreate(null, $transactionMeta->value); + if (null !== $category) { + $transactionMetaArray['category_id'] = $category->id; + $transactionMetaArray['category_name'] = $category->name; + } + break; + case 'budget_id': + /** @var BudgetRepositoryInterface $repository */ + $repository = app(BudgetRepositoryInterface::class); + $budget = $repository->findNull((int)$transactionMeta->value); + if (null !== $budget) { + $transactionMetaArray['budget_id'] = $budget->id; + $transactionMetaArray['budget_name'] = $budget->name; + } + break; + } + // store transaction meta data in transaction + $return[] = $transactionMetaArray; + } + + return $return; + } + + /** + * @param Recurrence $recurrence + * + * @return array + * @throws FireflyException + */ + private function getTransactions(Recurrence $recurrence): array + { + $return = []; + // get all transactions: + /** @var RecurrenceTransaction $transaction */ + foreach ($recurrence->recurrenceTransactions as $transaction) { + $transactionArray = [ + 'currency_id' => $transaction->transaction_currency_id, + 'currency_code' => $transaction->transactionCurrency->code, + 'currency_symbol' => $transaction->transactionCurrency->symbol, + 'currency_dp' => $transaction->transactionCurrency->decimal_places, + 'foreign_currency_id' => $transaction->foreign_currency_id, + 'source_id' => $transaction->source_id, + 'source_name' => $transaction->sourceAccount->name, + 'destination_id' => $transaction->destination_id, + 'destination_name' => $transaction->destinationAccount->name, + 'amount' => $transaction->amount, + 'foreign_amount' => $transaction->foreign_amount, + 'description' => $transaction->description, + 'meta' => $this->getTransactionMeta($transaction), + ]; + if (null !== $transaction->foreign_currency_id) { + $transactionArray['foreign_currency_code'] = $transaction->foreignCurrency->code; + $transactionArray['foreign_currency_symbol'] = $transaction->foreignCurrency->symbol; + $transactionArray['foreign_currency_dp'] = $transaction->foreignCurrency->decimal_places; + } + + // store transaction in recurrence array. + $return[] = $transactionArray; } return $return; From b96d67a54ed6cb2518bb467cb4cdb4328330c171 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 18 Jul 2018 07:29:58 +0200 Subject: [PATCH 30/86] Referenced the wrong array. --- app/Support/Import/Placeholder/ImportTransaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index 26b831388a..5ec80bf981 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -172,7 +172,7 @@ class ImportTransaction 'opposing-id' => 'opposingId', ]; if (isset($mapped[$role])) { - $field = $basics[$role]; + $field = $mapped[$role]; $mappedValue = $this->getMappedValue($columnValue); $this->$field = $mappedValue; Log::debug(sprintf('Going to set the %s. Original value is "%s", mapped value is "%s".', $role, $columnValue->getValue(), $mappedValue)); From 633b357d7b71a697f5fb22a8c5d122f6248697c8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 19 Jul 2018 16:57:38 +0200 Subject: [PATCH 31/86] Clean up two big methods. --- .../Import/Placeholder/ImportTransaction.php | 11 +- .../Routine/File/ImportableConverter.php | 138 +++++++++--------- 2 files changed, 76 insertions(+), 73 deletions(-) diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index 5ec80bf981..6a2344fed9 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -181,13 +181,20 @@ class ImportTransaction } $meta = ['sepa-ct-id', 'sepa-ct-op', 'sepa-db', 'sepa-cc', 'sepa-country', 'sepa-batch-id', 'sepa-ep', 'sepa-ci', 'internal-reference', 'date-interest', - 'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due', 'rabo-debit-credit', 'ing-debit-credit',]; - if (isset($meta[$role])) { + 'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due',]; + if (\in_array($role, $meta, true)) { $this->meta[$role] = $columnValue->getValue(); return; } + $modifiers = ['rabo-debit-credit', 'ing-debit-credit']; + if (\in_array($role, $modifiers, true)) { + $this->modifiers[$role] = $columnValue->getValue(); + + return; + } + switch ($role) { default: // @codeCoverageIgnoreStart diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php index 42ab262aa3..2654a619c1 100644 --- a/app/Support/Import/Routine/File/ImportableConverter.php +++ b/app/Support/Import/Routine/File/ImportableConverter.php @@ -26,6 +26,7 @@ namespace FireflyIII\Support\Import\Routine\File; use Carbon\Carbon; use Carbon\Exceptions\InvalidDateException; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\ImportJob; use FireflyIII\Models\TransactionCurrency; @@ -132,23 +133,26 @@ class ImportableConverter /** * @param string|null $date * - * @return string|null + * @return string */ - private function convertDateValue(string $date = null): ?string + private function convertDateValue(string $date = null): string { - if (null === $date) { - return null; + $result = null; + if (null !== $date) { + try { + $object = Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $date); + $result = $object->format('Y-m-d'); + } catch (InvalidDateException|InvalidArgumentException $e) { + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); + } } - try { - $object = Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $date); - } catch (InvalidDateException|InvalidArgumentException $e) { - Log::error($e->getMessage()); - Log::error($e->getTraceAsString()); - - return null; + if (null === $result) { + $object = new Carbon; + $result = $object->format('Y-m-d'); } - return $object->format('Y-m-d'); + return $result; } /** @@ -160,8 +164,9 @@ class ImportableConverter private function convertSingle(ImportTransaction $importable): array { Log::debug(sprintf('Description is: "%s"', $importable->description)); - $amount = $importable->calculateAmount(); $foreignAmount = $importable->calculateForeignAmount(); + $amount = $importable->calculateAmount(); + if ('' === $amount) { $amount = $foreignAmount; } @@ -169,7 +174,6 @@ class ImportableConverter throw new FireflyException('No transaction amount information.'); } - $transactionType = 'unknown'; $source = $this->assetMapper->map($importable->accountId, $importable->getAccountData()); $destination = $this->opposingMapper->map($importable->opposingId, $amount, $importable->getOpposingAccountData()); $currency = $this->currencyMapper->map($importable->currencyId, $importable->getCurrencyData()); @@ -178,11 +182,6 @@ class ImportableConverter Log::debug(sprintf('"%s" (#%d) is source and "%s" (#%d) is destination.', $source->name, $source->id, $destination->name, $destination->id)); - if ($source->accountType->type === AccountType::ASSET && $destination->accountType->type === AccountType::ASSET) { - Log::debug('Source and destination are asset accounts. This is a transfer.'); - $transactionType = 'transfer'; - } - // amount is positive? Then switch: if (1 === bccomp($amount, '0')) { @@ -195,37 +194,6 @@ class ImportableConverter ); } - // get currency preference from source asset account (preferred) - // or destination asset account - if (null === $currency) { - if ($destination->accountType->type === AccountType::ASSET) { - // destination is asset, might have currency preference: - $destinationCurrencyId = (int)$this->accountRepository->getMetaValue($destination, 'currency_id'); - $currency = $destinationCurrencyId === 0 ? $this->defaultCurrency : $this->currencyMapper->map($destinationCurrencyId, []); - Log::debug(sprintf('Destination is an asset account, and has currency preference %s', $currency->code)); - } - - if ($source->accountType->type === AccountType::ASSET) { - // source is asset, might have currency preference: - $sourceCurrencyId = (int)$this->accountRepository->getMetaValue($source, 'currency_id'); - $currency = $sourceCurrencyId === 0 ? $this->defaultCurrency : $this->currencyMapper->map($sourceCurrencyId, []); - Log::debug(sprintf('Source is an asset account, and has currency preference %s', $currency->code)); - } - } - if (null === $currency) { - Log::debug(sprintf('Could not map currency, use default (%s)', $this->defaultCurrency->code)); - $currency = $this->defaultCurrency; - } - - - if ($source->accountType->type === AccountType::REVENUE) { - Log::debug('Source is a revenue account. This is a deposit.'); - $transactionType = 'deposit'; - } - if ($destination->accountType->type === AccountType::EXPENSE) { - Log::debug('Destination is an expense account. This is a withdrawal.'); - $transactionType = 'withdrawal'; - } if ($destination->id === $source->id) { throw new FireflyException( sprintf( @@ -234,6 +202,9 @@ class ImportableConverter ); } + $transactionType = $this->getTransactionType($source->accountType->type, $destination->accountType->type); + $currency = $currency ?? $this->getCurrency($source, $destination); + if ($transactionType === 'unknown') { $message = sprintf( 'Cannot determine transaction type. Source account is a %s, destination is a %s', $source->accountType->type, $destination->accountType->type @@ -242,16 +213,9 @@ class ImportableConverter throw new FireflyException($message); } - $dateStr = $this->convertDateValue($importable->date); - if (null === $dateStr) { - $date = new Carbon; - $dateStr = $date->format('Y-m-d'); - unset($date); - } - return [ 'type' => $transactionType, - 'date' => $dateStr, + 'date' => $this->convertDateValue($importable->date), 'tags' => $importable->tags, 'user' => $this->importJob->user_id, 'notes' => $importable->note, @@ -307,26 +271,58 @@ class ImportableConverter } /** - * A small function that verifies if this particular key (ID) is present in the list - * of valid keys. + * @param Account $source + * @param Account $destination * - * @param string $key - * @param int $objectId - * - * @return int|null + * @return TransactionCurrency */ - private function verifyObjectId(string $key, int $objectId): ?int + private function getCurrency(Account $source, Account $destination): TransactionCurrency { - if (isset($this->mappedValues[$key]) && \in_array($objectId, $this->mappedValues[$key], true)) { - Log::debug(sprintf('verifyObjectId(%s, %d) is valid!', $key, $objectId)); - - return $objectId; + $currency = null; + if ($destination->accountType->type === AccountType::ASSET) { + // destination is asset, might have currency preference: + $destinationCurrencyId = (int)$this->accountRepository->getMetaValue($destination, 'currency_id'); + $currency = $destinationCurrencyId === 0 ? $this->defaultCurrency : $this->currencyMapper->map($destinationCurrencyId, []); + Log::debug(sprintf('Destination is an asset account, and has currency preference %s', $currency->code)); } - Log::debug(sprintf('verifyObjectId(%s, %d) is NOT in the list, but it could still be valid.', $key, $objectId)); + if ($source->accountType->type === AccountType::ASSET) { + // source is asset, might have currency preference: + $sourceCurrencyId = (int)$this->accountRepository->getMetaValue($source, 'currency_id'); + $currency = $sourceCurrencyId === 0 ? $this->defaultCurrency : $this->currencyMapper->map($sourceCurrencyId, []); + Log::debug(sprintf('Source is an asset account, and has currency preference %s', $currency->code)); + } + if (null === $currency) { + Log::debug(sprintf('Could not map currency, use default (%s)', $this->defaultCurrency->code)); + $currency = $this->defaultCurrency; + } - return $objectId; + return $currency; } + /** + * @param string $source + * @param string $destination + * + * @return string + */ + private function getTransactionType(string $source, string $destination): string + { + $type = 'unknown'; + if ($source === AccountType::ASSET && $destination === AccountType::ASSET) { + Log::debug('Source and destination are asset accounts. This is a transfer.'); + $type = 'transfer'; + } + if ($source === AccountType::REVENUE) { + Log::debug('Source is a revenue account. This is a deposit.'); + $type = 'deposit'; + } + if ($destination === AccountType::EXPENSE) { + Log::debug('Destination is an expense account. This is a withdrawal.'); + $type = 'withdrawal'; + } + + return $type; + } } \ No newline at end of file From cf4a846312fd9b1af52bc63420582e674e9c8708 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 12:16:01 +0200 Subject: [PATCH 32/86] Show note of piggy bank [skip ci] --- resources/views/piggy-banks/show.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index 6dc2addc62..ec1a77b7aa 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -98,7 +98,7 @@
                                                                          - {% if note %} + {% if piggy.note %}
                                                                          @@ -106,7 +106,7 @@

                                                                          {{ trans('form.notes') }}

                                                                          -
                                                                          {{ note.text|markdown }} +
                                                                          {{ piggy.note|markdown }}
                                                                          From cfc2181a481a7b51c869f78a37c908314646c14f Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 12:17:43 +0200 Subject: [PATCH 33/86] Show note of piggy bank [skip ci] --- resources/views/piggy-banks/show.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index ec1a77b7aa..8855310748 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -98,7 +98,8 @@
                                                                          - {% if piggy.note %} + + {% if piggy.notes %}
                                                                          @@ -106,7 +107,7 @@

                                                                          {{ trans('form.notes') }}

                                                                          -
                                                                          {{ piggy.note|markdown }} +
                                                                          {{ piggy.notes|markdown }}
                                                                          From 44fb307da4975658ae56361505e27e4772ac97ad Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 14:34:56 +0200 Subject: [PATCH 34/86] Code cleanup. --- .../Report/Account/MonthReportGenerator.php | 2 +- .../Report/Audit/MonthReportGenerator.php | 2 +- .../Report/Budget/MonthReportGenerator.php | 2 +- .../Report/Category/MonthReportGenerator.php | 2 +- .../Report/Standard/MonthReportGenerator.php | 2 +- .../Standard/MultiYearReportGenerator.php | 2 +- .../Report/Standard/YearReportGenerator.php | 2 +- .../Report/Tag/MonthReportGenerator.php | 4 +- app/Helpers/Update/UpdateTrait.php | 1 - app/Http/Controllers/DebugController.php | 2 + app/Http/Controllers/ExportController.php | 2 + app/Http/Controllers/HelpController.php | 2 + app/Http/Controllers/HomeController.php | 20 +- .../Controllers/Import/IndexController.php | 120 +-- .../Import/JobConfigurationController.php | 9 +- .../Import/PrerequisitesController.php | 14 +- app/Http/Controllers/JavascriptController.php | 1 + .../Json/AutoCompleteController.php | 3 + app/Http/Controllers/Json/BoxController.php | 104 ++- .../Controllers/Json/FrontpageController.php | 2 +- app/Http/Controllers/Json/IntroController.php | 1 + .../Controllers/Json/ReconcileController.php | 9 +- .../Controllers/Json/RecurrenceController.php | 175 ++++ app/Http/Controllers/JsonController.php | 4 +- app/Http/Controllers/NewUserController.php | 24 +- app/Http/Controllers/PiggyBankController.php | 7 + .../Controllers/Popup/ReportController.php | 80 +- .../Controllers/PreferencesController.php | 3 + app/Http/Controllers/ProfileController.php | 14 +- .../Recurring/CreateController.php | 8 +- .../Controllers/Recurring/EditController.php | 29 +- .../Controllers/Recurring/IndexController.php | 125 +-- .../Controllers/Report/AccountController.php | 2 +- .../Controllers/Report/BalanceController.php | 2 +- .../Controllers/Report/BudgetController.php | 4 +- .../Controllers/Report/CategoryController.php | 35 +- .../Controllers/Report/ExpenseController.php | 78 +- .../Report/OperationsController.php | 6 +- app/Http/Controllers/ReportController.php | 19 +- .../Controllers/Rule/CreateController.php | 250 +++++ .../Controllers/Rule/DeleteController.php | 94 ++ app/Http/Controllers/Rule/EditController.php | 219 +++++ app/Http/Controllers/Rule/IndexController.php | 136 +++ .../Controllers/Rule/SelectController.php | 283 ++++++ app/Http/Controllers/RuleController.php | 875 ------------------ app/Http/Controllers/RuleGroupController.php | 4 + app/Http/Controllers/SearchController.php | 2 +- app/Http/Controllers/TagController.php | 7 + .../Transaction/BulkController.php | 2 + .../Transaction/ConvertController.php | 15 +- .../Transaction/LinkController.php | 8 +- .../Transaction/MassController.php | 30 +- .../Transaction/SingleController.php | 18 +- .../Transaction/SplitController.php | 9 + .../Controllers/TransactionController.php | 7 +- app/Http/Middleware/StartFireflySession.php | 2 +- app/Http/Middleware/TrustProxies.php | 15 +- app/Http/Requests/JournalFormRequest.php | 106 ++- app/Http/Requests/RecurrenceFormRequest.php | 9 + app/Http/Requests/Request.php | 4 + app/Http/Requests/RuleFormRequest.php | 3 + app/Http/Requests/SplitJournalFormRequest.php | 5 + .../RecurringRepositoryInterface.php | 1 - .../Support/RecurringTransactionTrait.php | 1 - .../Internal/Support/TransactionTypeTrait.php | 1 - app/Support/Binder/ImportProvider.php | 59 +- app/Support/ExpandedForm.php | 54 +- .../Http/Controllers/DateCalculation.php | 1 - .../Http/Controllers/RuleManagement.php | 177 ++++ .../Information/GetSpectreTokenTrait.php | 1 - app/Validation/RecurrenceValidation.php | 1 - app/Validation/TransactionValidation.php | 2 - composer.lock | 13 +- 73 files changed, 1914 insertions(+), 1423 deletions(-) create mode 100644 app/Http/Controllers/Json/RecurrenceController.php create mode 100644 app/Http/Controllers/Rule/CreateController.php create mode 100644 app/Http/Controllers/Rule/DeleteController.php create mode 100644 app/Http/Controllers/Rule/EditController.php create mode 100644 app/Http/Controllers/Rule/IndexController.php create mode 100644 app/Http/Controllers/Rule/SelectController.php delete mode 100644 app/Http/Controllers/RuleController.php create mode 100644 app/Support/Http/Controllers/RuleManagement.php diff --git a/app/Generator/Report/Account/MonthReportGenerator.php b/app/Generator/Report/Account/MonthReportGenerator.php index 49f0cbfbd7..4693e71c0d 100644 --- a/app/Generator/Report/Account/MonthReportGenerator.php +++ b/app/Generator/Report/Account/MonthReportGenerator.php @@ -44,7 +44,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * Generate the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 278190c1cb..666738d73a 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -51,7 +51,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index ff4229ab26..dc9d47c244 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -64,7 +64,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface * Generates the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index ef187a575b..8957ca3020 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -68,7 +68,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface * Generates the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index e27f4d79ed..987b0ec304 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -43,7 +43,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index ec507b9386..69174d06b8 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -42,7 +42,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index 47f92f47ad..ef844a4a85 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -42,7 +42,7 @@ class YearReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - * @throws \Throwable + */ public function generate(): string { diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index 1c5affa011..2242381c2d 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -70,8 +70,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface * Generate the report. * * @return string - * @throws \Throwable - * @throws \Throwable + + */ public function generate(): string { diff --git a/app/Helpers/Update/UpdateTrait.php b/app/Helpers/Update/UpdateTrait.php index 64a02b4a51..3d755163b7 100644 --- a/app/Helpers/Update/UpdateTrait.php +++ b/app/Helpers/Update/UpdateTrait.php @@ -32,7 +32,6 @@ use Log; /** * Trait UpdateTrait * - * @package FireflyIII\Helpers\Update */ trait UpdateTrait { diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 7a70eb50cd..1054918950 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -177,6 +177,8 @@ class DebugController extends Controller /** * @return string + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function routes(): string { diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 6b45211868..1a532a86ee 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -130,6 +130,8 @@ class ExportController extends Controller * @param ExportJobRepositoryInterface $jobs * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs): JsonResponse { diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 3ef04f6969..93ec561d28 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -68,6 +68,8 @@ class HelpController extends Controller * @param string $language * * @return string + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getHelpText(string $route, string $language): string { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 71d3ec36a3..0cb4a1472a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -26,8 +26,6 @@ use Carbon\Carbon; use FireflyIII\Events\RequestedVersionCheckStatus; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Middleware\Installer; -use FireflyIII\Http\Middleware\IsDemoUser; -use FireflyIII\Http\Middleware\IsSandStormUser; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -36,7 +34,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; -use View; /** * Class HomeController. @@ -52,9 +49,6 @@ class HomeController extends Controller app('view')->share('title', 'Firefly III'); app('view')->share('mainTitleIcon', 'fa-fire'); $this->middleware(Installer::class); - $this->middleware(IsDemoUser::class)->except(['dateRange', 'index']); - $this->middleware(IsSandStormUser::class)->only('routes'); - } /** @@ -98,7 +92,7 @@ class HomeController extends Controller /** * @param AccountRepositoryInterface $repository * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View */ public function index(AccountRepositoryInterface $repository) { @@ -110,10 +104,7 @@ class HomeController extends Controller } $subTitle = (string)trans('firefly.welcomeBack'); $transactions = []; - $frontPage = app('preferences')->get( - 'frontPageAccounts', - $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray() - ); + $frontPage = app('preferences')->get('frontPageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray()); /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ @@ -122,7 +113,6 @@ class HomeController extends Controller $accounts = $repository->getAccountsById($frontPage->data); $today = new Carbon; - // zero bills? Hide some elements from view. /** @var BillRepositoryInterface $billRepository */ $billRepository = app(BillRepositoryInterface::class); $billCount = $billRepository->getBills()->count(); @@ -134,15 +124,11 @@ class HomeController extends Controller $transactions[] = [$set, $account]; } - // fire check update event: /** @var User $user */ $user = auth()->user(); event(new RequestedVersionCheckStatus($user)); - return view( - 'index', - compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today') - ); + return view('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today')); } } diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php index 5c5b8dddc6..27c83fa0b6 100644 --- a/app/Http/Controllers/Import/IndexController.php +++ b/app/Http/Controllers/Import/IndexController.php @@ -22,13 +22,12 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Import; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Import\Prerequisites\PrerequisitesInterface; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\User; +use FireflyIII\Support\Binder\ImportProvider; use Illuminate\Http\Response as LaravelResponse; use Log; @@ -37,9 +36,10 @@ use Log; */ class IndexController extends Controller { + /** @var array */ + public $providers; /** @var ImportJobRepositoryInterface */ public $repository; - /** @var UserRepositoryInterface */ public $userRepository; @@ -56,6 +56,7 @@ class IndexController extends Controller app('view')->share('title', (string)trans('firefly.import_index_title')); $this->repository = app(ImportJobRepositoryInterface::class); $this->userRepository = app(UserRepositoryInterface::class); + $this->providers = ImportProvider::getProviders(); return $next($request); } @@ -69,57 +70,44 @@ class IndexController extends Controller * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * - * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function create(string $importProvider) { Log::debug(sprintf('Will create job for provider "%s"', $importProvider)); - // can only create "fake" for demo user. - $providers = array_keys($this->getProviders()); - if (!\in_array($importProvider, $providers, true)) { - Log::error(sprintf('%s-provider is disabled. Cannot create job.', $importProvider)); - session()->flash('warning', (string)trans('import.cannot_create_for_provider', ['provider' => $importProvider])); - - return redirect(route('import.index')); - } $importJob = $this->repository->create($importProvider); - Log::debug(sprintf('Created job #%d for provider %s', $importJob->id, $importProvider)); - $hasPreReq = (bool)config(sprintf('import.has_prereq.%s', $importProvider)); $hasConfig = (bool)config(sprintf('import.has_job_config.%s', $importProvider)); - // if job provider has no prerequisites: - if (false === $hasPreReq) { + + Log::debug(sprintf('Created job #%d for provider %s', $importJob->id, $importProvider)); + + // no prerequisites and no config: + if (false === $hasPreReq && false === $hasConfig) { + Log::debug('Provider needs no configuration for job. Job is ready to start.'); + $this->repository->updateStatus($importJob, 'ready_to_run'); + Log::debug('Redirect to status-page.'); + + return redirect(route('import.job.status.index', [$importJob->key])); + } + + // no prerequisites but job has config: + if (false === $hasPreReq && false !== $hasConfig) { Log::debug('Provider has no prerequisites. Continue.'); - // if job provider also has no configuration: - if (false === $hasConfig) { - // @codeCoverageIgnoreStart - Log::debug('Provider needs no configuration for job. Job is ready to start.'); - $this->repository->updateStatus($importJob, 'ready_to_run'); - Log::debug('Redirect to status-page.'); - - return redirect(route('import.job.status.index', [$importJob->key])); - // @codeCoverageIgnoreEnd - } - - // update job to say "has_prereq". $this->repository->setStatus($importJob, 'has_prereq'); - - // redirect to job configuration. Log::debug('Redirect to configuration.'); return redirect(route('import.job.configuration.index', [$importJob->key])); } + + // job has prerequisites: Log::debug('Job provider has prerequisites.'); - // if need to set prerequisites, do that first. - $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); - if (!class_exists($class)) { - throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore - } /** @var PrerequisitesInterface $providerPre */ - $providerPre = app($class); + $providerPre = app((string)config(sprintf('import.prerequisites.%s', $importProvider))); $providerPre->setUser($importJob->user); + // and are not filled in: if (!$providerPre->isComplete()) { Log::debug('Job provider prerequisites are not yet filled in. Redirect to prerequisites-page.'); @@ -128,8 +116,10 @@ class IndexController extends Controller } Log::debug('Prerequisites are complete.'); - // update job to say "has_prereq". + // but are filled in: $this->repository->setStatus($importJob, 'has_prereq'); + + // and has no config: if (false === $hasConfig) { // @codeCoverageIgnoreStart Log::debug('Provider has no configuration. Job is ready to start.'); @@ -139,6 +129,8 @@ class IndexController extends Controller return redirect(route('import.job.status.index', [$importJob->key])); // @codeCoverageIgnoreEnd } + + // but also needs config: Log::debug('Job has configuration. Redirect to job-config.'); // Otherwise just redirect to job configuration. @@ -184,62 +176,10 @@ class IndexController extends Controller */ public function index() { - $providers = $this->getProviders(); + $providers = $this->providers; $subTitle = (string)trans('import.index_breadcrumb'); $subTitleIcon = 'fa-home'; return view('import.index', compact('subTitle', 'subTitleIcon', 'providers')); } - - /** - * @return array - */ - private function getProviders(): array - { - // get and filter all import routines: - /** @var User $user */ - $user = auth()->user(); - /** @var array $config */ - $providerNames = array_keys(config('import.enabled')); - $providers = []; - $isDemoUser = $this->userRepository->hasRole($user, 'demo'); - $isDebug = (bool)config('app.debug'); - foreach ($providerNames as $providerName) { - //Log::debug(sprintf('Now with provider %s', $providerName)); - // only consider enabled providers - $enabled = (bool)config(sprintf('import.enabled.%s', $providerName)); - $allowedForDemo = (bool)config(sprintf('import.allowed_for_demo.%s', $providerName)); - $allowedForUser = (bool)config(sprintf('import.allowed_for_user.%s', $providerName)); - if (false === $enabled) { - //Log::debug('Provider is not enabled. NEXT!'); - continue; - } - - if (true === $isDemoUser && false === $allowedForDemo) { - //Log::debug('User is demo and this provider is not allowed for demo user. NEXT!'); - continue; - } - if (false === $isDemoUser && false === $allowedForUser && false === $isDebug) { - //Log::debug('User is not demo and this provider is not allowed for such users. NEXT!'); - continue; // @codeCoverageIgnore - } - - $providers[$providerName] = [ - 'has_prereq' => (bool)config('import.has_prereq.' . $providerName), - ]; - $class = (string)config(sprintf('import.prerequisites.%s', $providerName)); - $result = false; - if ('' !== $class && class_exists($class)) { - //Log::debug('Will not check prerequisites.'); - /** @var PrerequisitesInterface $object */ - $object = app($class); - $object->setUser($user); - $result = $object->isComplete(); - } - $providers[$providerName]['prereq_complete'] = $result; - } - Log::debug(sprintf('Enabled providers: %s', json_encode(array_keys($providers)))); - - return $providers; - } } diff --git a/app/Http/Controllers/Import/JobConfigurationController.php b/app/Http/Controllers/Import/JobConfigurationController.php index e68cafc78a..ae5daddcf3 100644 --- a/app/Http/Controllers/Import/JobConfigurationController.php +++ b/app/Http/Controllers/Import/JobConfigurationController.php @@ -66,11 +66,13 @@ class JobConfigurationController extends Controller * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View * * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * */ public function index(ImportJob $importJob) { Log::debug('Now in JobConfigurationController::index()'); - // catch impossible status: $allowed = ['has_prereq', 'need_job_config']; if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { Log::debug(sprintf('Job has state "%s", but we only accept %s', $importJob->status, json_encode($allowed))); @@ -91,10 +93,7 @@ class JobConfigurationController extends Controller // @codeCoverageIgnoreEnd } - // create configuration class: $configurator = $this->makeConfigurator($importJob); - - // is the job already configured? if ($configurator->configurationComplete()) { Log::debug('Config is complete, set status to ready_to_run.'); $this->repository->updateStatus($importJob, 'ready_to_run'); @@ -119,6 +118,8 @@ class JobConfigurationController extends Controller * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function post(Request $request, ImportJob $importJob) { diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php index 709d0cc2fe..c705286b95 100644 --- a/app/Http/Controllers/Import/PrerequisitesController.php +++ b/app/Http/Controllers/Import/PrerequisitesController.php @@ -22,7 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Import; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Import\Prerequisites\PrerequisitesInterface; use FireflyIII\Models\ImportJob; @@ -68,7 +67,8 @@ class PrerequisitesController extends Controller * @param ImportJob $importJob * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function index(string $importProvider, ImportJob $importJob = null) { @@ -83,9 +83,6 @@ class PrerequisitesController extends Controller app('view')->share('subTitle', (string)trans('import.prerequisites_breadcrumb_' . $importProvider)); $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); - if (!class_exists($class)) { - throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore - } /** @var User $user */ $user = auth()->user(); /** @var PrerequisitesInterface $object */ @@ -121,8 +118,8 @@ class PrerequisitesController extends Controller * @param ImportJob $importJob * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * - * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function post(Request $request, string $importProvider, ImportJob $importJob = null) { @@ -139,9 +136,6 @@ class PrerequisitesController extends Controller $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); - if (!class_exists($class)) { - throw new FireflyException(sprintf('Cannot find class %s', $class)); // @codeCoverageIgnore - } /** @var User $user */ $user = auth()->user(); /** @var PrerequisitesInterface $object */ diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 28568aedd1..fe38a461ae 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -136,6 +136,7 @@ class JavascriptController extends Controller /** * @return array + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function getDateRangeConfig(): array { diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index 9472195946..081a76641a 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -39,6 +39,9 @@ use Illuminate\Http\JsonResponse; /** * Class AutoCompleteController. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class AutoCompleteController extends Controller { diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 50302790a9..5b0a1f4275 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -22,13 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; -use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -47,6 +47,8 @@ class BoxController extends Controller * @param BudgetRepositoryInterface $repository * * @return JsonResponse + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function available(BudgetRepositoryInterface $repository): JsonResponse { @@ -99,6 +101,8 @@ class BoxController extends Controller * @param CurrencyRepositoryInterface $repository * * @return JsonResponse + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function balance(CurrencyRepositoryInterface $repository): JsonResponse { @@ -150,17 +154,18 @@ class BoxController extends Controller } // format amounts: - foreach ($sums as $currencyId => $amount) { + $keys = array_keys($sums); + foreach ($keys as $currencyId) { $currency = $repository->findNull($currencyId); - $sums[$currencyId] = Amount::formatAnything($currency, $sums[$currencyId], false); - $incomes[$currencyId] = Amount::formatAnything($currency, $incomes[$currencyId] ?? '0', false); - $expenses[$currencyId] = Amount::formatAnything($currency, $expenses[$currencyId] ?? '0', false); + $sums[$currencyId] = app('amount')->formatAnything($currency, $sums[$currencyId], false); + $incomes[$currencyId] = app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false); + $expenses[$currencyId] = app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false); } if (0 === \count($sums)) { $currency = app('amount')->getDefaultCurrency(); - $sums[$currency->id] = Amount::formatAnything($currency, '0', false); - $incomes[$currency->id] = Amount::formatAnything($currency, '0', false); - $expenses[$currency->id] = Amount::formatAnything($currency, '0', false); + $sums[$currency->id] = app('amount')->formatAnything($currency, '0', false); + $incomes[$currency->id] = app('amount')->formatAnything($currency, '0', false); + $expenses[$currency->id] = app('amount')->formatAnything($currency, '0', false); } $response = [ @@ -214,28 +219,23 @@ class BoxController extends Controller /** - * @param AccountRepositoryInterface $repository - * - * @param CurrencyRepositoryInterface $currencyRepos + * @param AccountRepositoryInterface $repository * * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function netWorth(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepos): JsonResponse + public function netWorth(AccountRepositoryInterface $repository): JsonResponse { $date = new Carbon(date('Y-m-d')); // needed so its per day. - /** @var Carbon $start */ - $start = session('start', Carbon::now()->startOfMonth()); - /** @var Carbon $end */ - $end = session('end', Carbon::now()->endOfMonth()); // start and end in the future? use $end - if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) { - $date = $end; - } - // start and end in the past? use $end - if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) { - $date = $end; + if ($this->notInSessionRange($date)) { + /** @var Carbon $date */ + $date = session('end', Carbon::now()->endOfMonth()); } + // start in the past, end in the future? use $date $cache = new CacheProperties; $cache->addProperty($date); @@ -245,20 +245,13 @@ class BoxController extends Controller } $netWorth = []; $accounts = $repository->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $currency = app('amount')->getDefaultCurrency(); + $balances = app('steam')->balancesByAccounts($accounts, $date); /** @var Account $account */ foreach ($accounts as $account) { - $accountCurrency = null; + $accountCurrency = $this->getCurrencyOrDefault($account); $balance = $balances[$account->id] ?? '0'; - $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); - if (0 !== $currencyId) { - $accountCurrency = $currencyRepos->findNull($currencyId); - } - if (null === $accountCurrency) { - $accountCurrency = $currency; - } // if the account is a credit card, subtract the virtual balance from the balance, // to better reflect that this is not money that is actually "yours". @@ -287,4 +280,53 @@ class BoxController extends Controller return response()->json($return); } + + /** + * @param Account $account + * + * @return TransactionCurrency + */ + private function getCurrencyOrDefault(Account $account): TransactionCurrency + { + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); + /** @var CurrencyRepositoryInterface $currencyRepos */ + $currencyRepos = app(CurrencyRepositoryInterface::class); + + $currency = app('amount')->getDefaultCurrency(); + $accountCurrency = null; + $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); + if (0 !== $currencyId) { + $accountCurrency = $currencyRepos->findNull($currencyId); + } + if (null === $accountCurrency) { + $accountCurrency = $currency; + } + + return $accountCurrency; + } + + /** + * @param Carbon $date + * + * @return bool + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function notInSessionRange(Carbon $date): bool + { + /** @var Carbon $start */ + $start = session('start', Carbon::now()->startOfMonth()); + /** @var Carbon $end */ + $end = session('end', Carbon::now()->endOfMonth()); + $result = false; + if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) { + $result = true; + } + // start and end in the past? use $end + if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) { + $result = true; + } + + return $result; + } } diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php index c7bf29ec73..b6021c3917 100644 --- a/app/Http/Controllers/Json/FrontpageController.php +++ b/app/Http/Controllers/Json/FrontpageController.php @@ -36,7 +36,7 @@ class FrontpageController extends Controller * @param PiggyBankRepositoryInterface $repository * * @return JsonResponse - * @throws \Throwable + */ public function piggyBanks(PiggyBankRepositoryInterface $repository): JsonResponse { diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 13dd03262c..354310e15a 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -158,6 +158,7 @@ class IntroController * @param string $specificPage * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getSpecificSteps(string $route, string $specificPage): array { diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index a837a210c4..f1e64fefda 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -42,6 +42,8 @@ use Illuminate\Support\Collection; /** * * Class ReconcileController + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ReconcileController extends Controller { @@ -84,7 +86,10 @@ class ReconcileController extends Controller * @return JsonResponse * * @throws FireflyException - * @throws \Throwable + + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function overview(Request $request, Account $account, Carbon $start, Carbon $end): JsonResponse { @@ -140,7 +145,7 @@ class ReconcileController extends Controller * @return mixed * * @throws FireflyException - * @throws \Throwable + */ public function transactions(Account $account, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php new file mode 100644 index 0000000000..0192e4f099 --- /dev/null +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -0,0 +1,175 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Json; + + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\RecurrenceRepetition; +use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; + +/** + * Class RecurrenceController + */ +class RecurrenceController extends Controller +{ + /** @var RecurringRepositoryInterface */ + private $recurring; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + // translations: + $this->middleware( + function ($request, $next) { + $this->recurring = app(RecurringRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * + * @throws FireflyException + * @return JsonResponse + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.NPathComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function events(Request $request): JsonResponse + { + $return = []; + $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); + $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); + $firstDate = Carbon::createFromFormat('Y-m-d', $request->get('first_date')); + $endDate = '' !== (string)$request->get('end_date') ? Carbon::createFromFormat('Y-m-d', $request->get('end_date')) : null; + $endsAt = (string)$request->get('ends'); + $repetitionType = explode(',', $request->get('type'))[0]; + $repetitions = (int)$request->get('reps'); + $repetitionMoment = ''; + $start->startOfDay(); + + // if $firstDate is beyond $end, simply return an empty array. + if ($firstDate->gt($end)) { + return response()->json([]); + } + // if $firstDate is beyond start, use that one: + $actualStart = clone $firstDate; + + if ($repetitionType === 'weekly' || $repetitionType === 'monthly') { + $repetitionMoment = explode(',', $request->get('type'))[1] ?? '1'; + } + if ($repetitionType === 'ndom') { + $repetitionMoment = str_ireplace('ndom,', '', $request->get('type')); + } + if ($repetitionType === 'yearly') { + $repetitionMoment = explode(',', $request->get('type'))[1] ?? '2018-01-01'; + } + $repetition = new RecurrenceRepetition; + $repetition->repetition_type = $repetitionType; + $repetition->repetition_moment = $repetitionMoment; + $repetition->repetition_skip = (int)$request->get('skip'); + $repetition->weekend = (int)$request->get('weekend'); + $actualEnd = clone $end; + + switch ($endsAt) { + default: + throw new FireflyException(sprintf('Cannot generate events for type that ends at "%s".', $endsAt)); + case 'forever': + // simply generate up until $end. No change from default behavior. + $occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd); + break; + case 'until_date': + $actualEnd = $endDate ?? clone $end; + $occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd); + break; + case 'times': + $occurrences = $this->recurring->getXOccurrences($repetition, $actualStart, $repetitions); + break; + } + + + /** @var Carbon $current */ + foreach ($occurrences as $current) { + if ($current->gte($start)) { + $event = [ + 'id' => $repetitionType . $firstDate->format('Ymd'), + 'title' => 'X', + 'allDay' => true, + 'start' => $current->format('Y-m-d'), + 'end' => $current->format('Y-m-d'), + 'editable' => false, + 'rendering' => 'background', + ]; + $return[] = $event; + } + } + + return response()->json($return); + } + + /** + * @param Request $request + * + * @return JsonResponse + */ + public function suggest(Request $request): JsonResponse + { + $today = new Carbon; + $date = Carbon::createFromFormat('Y-m-d', $request->get('date')); + $preSelected = (string)$request->get('pre_select'); + $result = []; + if ($date > $today || 'true' === (string)$request->get('past')) { + $weekly = sprintf('weekly,%s', $date->dayOfWeekIso); + $monthly = sprintf('monthly,%s', $date->day); + $dayOfWeek = trans(sprintf('config.dow_%s', $date->dayOfWeekIso)); + $ndom = sprintf('ndom,%s,%s', $date->weekOfMonth, $date->dayOfWeekIso); + $yearly = sprintf('yearly,%s', $date->format('Y-m-d')); + $yearlyDate = $date->formatLocalized(trans('config.month_and_day_no_year')); + $result = [ + 'daily' => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], + $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), + 'selected' => 0 === strpos($preSelected, 'weekly')], + $monthly => ['label' => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), + 'selected' => 0 === strpos($preSelected, 'monthly')], + $ndom => ['label' => (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), + 'selected' => 0 === strpos($preSelected, 'ndom')], + $yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], + ]; + } + + + return response()->json($result); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index ee26ffcc0a..e48fe6192e 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -34,7 +34,7 @@ class JsonController extends Controller * @param Request $request * * @return JsonResponse - * @throws \Throwable + */ public function action(Request $request): JsonResponse { @@ -53,7 +53,7 @@ class JsonController extends Controller * @param Request $request * * @return JsonResponse - * @throws \Throwable + */ public function trigger(Request $request): JsonResponse { diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 267d96beaf..4dee74940d 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -97,31 +97,17 @@ class NewUserController extends Controller $currency = $currencyRepository->findByCodeNull('EUR'); } - // create normal asset account: - $this->createAssetAccount($request, $currency); - - // create savings account - $this->createSavingsAccount($request, $currency, $language); - - // create cash wallet account - $this->createCashWalletAccount($currency, $language); + $this->createAssetAccount($request, $currency); // create normal asset account + $this->createSavingsAccount($request, $currency, $language); // create savings account + $this->createCashWalletAccount($currency, $language); // create cash wallet account // store currency preference: app('preferences')->set('currencyPreference', $currency->code); app('preferences')->mark(); // set default optional fields: - $visibleFields = [ - 'interest_date' => true, - 'book_date' => false, - 'process_date' => false, - 'due_date' => false, - 'payment_date' => false, - 'invoice_date' => false, - 'internal_reference' => false, - 'notes' => true, - 'attachments' => true, - ]; + $visibleFields = ['interest_date' => true, 'book_date' => false, 'process_date' => false, 'due_date' => false, 'payment_date' => false, + 'invoice_date' => false, 'internal_reference' => false, 'notes' => true, 'attachments' => true,]; app('preferences')->set('transaction_journal_optional_fields', $visibleFields); session()->flash('success', (string)trans('firefly.stored_new_accounts_new_user')); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index f5133285a6..7a450fb6ba 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -40,6 +40,9 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class PiggyBankController. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class PiggyBankController extends Controller { @@ -174,6 +177,8 @@ class PiggyBankController extends Controller * @param PiggyBank $piggyBank * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function edit(PiggyBank $piggyBank) { @@ -212,6 +217,8 @@ class PiggyBankController extends Controller * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function index(Request $request) { diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index e93e37755d..9be8443b0e 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Popup; use Carbon\Carbon; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collection\BalanceLine; use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Http\Controllers\Controller; @@ -35,9 +34,13 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Routing\Route; use InvalidArgumentException; +use Log; +use Throwable; /** * Class ReportController. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ReportController extends Controller { @@ -79,9 +82,7 @@ class ReportController extends Controller * @param Request $request * * @return JsonResponse - * - * @throws FireflyException - * @throws \Throwable + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function general(Request $request): JsonResponse { @@ -93,7 +94,8 @@ class ReportController extends Controller switch ($attributes['location']) { default: - throw new FireflyException('Firefly cannot handle "' . e($attributes['location']) . '" '); + $html = sprintf('Firefly III cannot handle "%s"-popups.', $attributes['location']); + break; case 'budget-spent-amount': $html = $this->budgetSpentAmount($attributes); break; @@ -119,8 +121,7 @@ class ReportController extends Controller * * @return string * - * @throws FireflyException - * @throws \Throwable + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function balanceAmount(array $attributes): string { @@ -141,51 +142,60 @@ class ReportController extends Controller break; case BalanceLine::ROLE_TAGROLE === $role: // row with tag info. - throw new FireflyException('Firefly cannot handle this type of info-button (BalanceLine::TagRole)'); + return 'Firefly cannot handle this type of info-button (BalanceLine::TagRole)'; + } + try { + $view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render: %s', $e->getMessage())); + $view = 'Firefly III could not render the view. Please see the log files.'; } - $view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render(); return $view; } /** - * Returns all expenses inside the given budget for the given accounts. - * * @param array $attributes * * @return string - * @throws \Throwable */ private function budgetSpentAmount(array $attributes): string { $budget = $this->budgetRepository->findNull((int)$attributes['budgetId']); if (null === $budget) { - throw new FireflyException('This is an unknown budget. Apologies.'); + return 'This is an unknown budget. Apologies.'; } $journals = $this->popupHelper->byBudget($budget, $attributes); - $view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render(); + try { + $view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render: %s', $e->getMessage())); + $view = 'Firefly III could not render the view. Please see the log files.'; + } return $view; } /** - * Returns all expenses in category in range. - * * @param array $attributes * * @return string - * @throws \Throwable */ private function categoryEntry(array $attributes): string { $category = $this->categoryRepository->findNull((int)$attributes['categoryId']); if (null === $category) { - throw new FireflyException('This is an unknown category. Apologies.'); + return 'This is an unknown category. Apologies.'; } $journals = $this->popupHelper->byCategory($category, $attributes); - $view = view('popup.report.category-entry', compact('journals', 'category'))->render(); + try { + $view = view('popup.report.category-entry', compact('journals', 'category'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render: %s', $e->getMessage())); + $view = 'Firefly III could not render the view. Please see the log files.'; + } return $view; } @@ -196,18 +206,22 @@ class ReportController extends Controller * @param array $attributes * * @return string - * @throws \Throwable */ private function expenseEntry(array $attributes): string { $account = $this->accountRepository->findNull((int)$attributes['accountId']); if (null === $account) { - throw new FireflyException('This is an unknown account. Apologies.'); + return 'This is an unknown account. Apologies.'; } $journals = $this->popupHelper->byExpenses($account, $attributes); - $view = view('popup.report.expense-entry', compact('journals', 'account'))->render(); + try { + $view = view('popup.report.expense-entry', compact('journals', 'account'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render: %s', $e->getMessage())); + $view = 'Firefly III could not render the view. Please see the log files.'; + } return $view; } @@ -218,18 +232,22 @@ class ReportController extends Controller * @param array $attributes * * @return string - * @throws \Throwable */ private function incomeEntry(array $attributes): string { $account = $this->accountRepository->findNull((int)$attributes['accountId']); if (null === $account) { - throw new FireflyException('This is an unknown category. Apologies.'); + return 'This is an unknown category. Apologies.'; } $journals = $this->popupHelper->byIncome($account, $attributes); - $view = view('popup.report.income-entry', compact('journals', 'account'))->render(); + try { + $view = view('popup.report.income-entry', compact('journals', 'account'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render: %s', $e->getMessage())); + $view = 'Firefly III could not render the view. Please see the log files.'; + } return $view; } @@ -238,8 +256,6 @@ class ReportController extends Controller * @param array $attributes * * @return array - * - * @throws FireflyException */ private function parseAttributes(array $attributes): array { @@ -248,13 +264,19 @@ class ReportController extends Controller try { $attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate']); } catch (InvalidArgumentException $e) { - throw new FireflyException(sprintf('Could not parse start date "%s": %s', $attributes['startDate'], $e->getMessage())); + Log::debug('Not important error message: %s', $e->getMessage()); + $date = new Carbon; + $date->startOfMonth(); + $attributes['startDate'] = $date; } try { $attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate']); } catch (InvalidArgumentException $e) { - throw new FireflyException(sprintf('Could not parse end date "%s": %s', $attributes['endDate'], $e->getMessage())); + Log::debug('Not important error message: %s', $e->getMessage()); + $date = new Carbon; + $date->startOfMonth(); + $attributes['endDate'] = $date; } return $attributes; diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index be0d1cc62c..0afca32757 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -86,6 +86,9 @@ class PreferencesController extends Controller * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function postIndex(Request $request) { diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index db0e0b3023..171809ba37 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -49,6 +49,8 @@ use phpseclib\Crypt\RSA; * Class ProfileController. * * @method Guard guard() + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class ProfileController extends Controller { @@ -185,10 +187,10 @@ class ProfileController extends Controller if ($repository->hasRole($user, 'demo')) { return redirect(route('profile.index')); } - $hasTwoFactorAuthSecret = (null !== app('preferences')->get('twoFactorAuthSecret')); + $hasSecret = (null !== app('preferences')->get('twoFactorAuthSecret')); // if we don't have a valid secret yet, redirect to the code page to get one. - if (!$hasTwoFactorAuthSecret) { + if (!$hasSecret) { return redirect(route('profile.code')); } @@ -308,6 +310,8 @@ class ProfileController extends Controller * @param TokenFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function postCode(TokenFormRequest $request) { @@ -316,7 +320,6 @@ class ProfileController extends Controller session()->flash('success', (string)trans('firefly.saved_preferences')); app('preferences')->mark(); - return redirect(route('profile.index')); } @@ -366,6 +369,8 @@ class ProfileController extends Controller * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function undoEmailChange(UserRepositoryInterface $repository, string $token, string $hash) { @@ -382,8 +387,7 @@ class ProfileController extends Controller throw new FireflyException('Invalid token.'); } - // found user. - // which email address to return to? + // found user.which email address to return to? $set = app('preferences')->beginsWith($user, 'previous_email_'); /** @var string $match */ $match = null; diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 4cc9c77251..6596075f05 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -69,6 +69,7 @@ class CreateController extends Controller * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function create(Request $request) { @@ -83,14 +84,11 @@ class CreateController extends Controller $this->rememberPreviousUri('recurring.create.uri'); } $request->session()->forget('recurring.create.fromStore'); - - // when will it end? $repetitionEnds = [ 'forever' => (string)trans('firefly.repeat_forever'), 'until_date' => (string)trans('firefly.repeat_until_date'), 'times' => (string)trans('firefly.repeat_times'), ]; - // what to do in the weekend? $weekendResponses = [ RecurrenceRepetition::WEEKEND_DO_NOTHING => (string)trans('firefly.do_nothing'), RecurrenceRepetition::WEEKEND_SKIP_CREATION => (string)trans('firefly.skip_transaction'), @@ -98,8 +96,8 @@ class CreateController extends Controller RecurrenceRepetition::WEEKEND_TO_MONDAY => (string)trans('firefly.jump_to_monday'), ]; - // flash some data: - $hasOldInput = null !== $request->old('_token'); + + $hasOldInput = null !== $request->old('_token'); // flash some data $preFilled = [ 'first_date' => $tomorrow->format('Y-m-d'), 'transaction_type' => $hasOldInput ? $request->old('transaction_type') : 'withdrawal', diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 1305516655..4eed6f3f09 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -68,31 +68,29 @@ class EditController extends Controller } /** + * todo move to repository + * todo handle old repetition type as well. + * * @param Request $request * @param Recurrence $recurrence * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws \FireflyIII\Exceptions\FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function edit(Request $request, Recurrence $recurrence) { - - - // use transformer: $transformer = new RecurrenceTransformer(new ParameterBag); $array = $transformer->transform($recurrence); $budgets = app('expandedform')->makeSelectListWithEmpty($this->budgets->getActiveBudgets()); - // get recurrence type: - // todo move to repository - // todo handle old repetition type as well. - - /** @var RecurrenceRepetition $repetition */ $repetition = $recurrence->recurrenceRepetitions()->first(); - $currentRepetitionType = $repetition->repetition_type; + $currentRepType = $repetition->repetition_type; if ('' !== $repetition->repetition_moment) { - $currentRepetitionType .= ',' . $repetition->repetition_moment; + $currentRepType .= ',' . $repetition->repetition_moment; } // put previous url in session if not redirect from store (not "return_to_edit"). @@ -101,9 +99,7 @@ class EditController extends Controller } $request->session()->forget('recurrences.edit.fromUpdate'); - // assume repeats forever: - $repetitionEnd = 'forever'; - // types of repetitions: + $repetitionEnd = 'forever'; $repetitionEnds = [ 'forever' => (string)trans('firefly.repeat_forever'), 'until_date' => (string)trans('firefly.repeat_until_date'), @@ -116,7 +112,6 @@ class EditController extends Controller $repetitionEnd = 'times'; } - // what to do in the weekend? $weekendResponses = [ RecurrenceRepetition::WEEKEND_DO_NOTHING => (string)trans('firefly.do_nothing'), RecurrenceRepetition::WEEKEND_SKIP_CREATION => (string)trans('firefly.skip_transaction'), @@ -124,10 +119,8 @@ class EditController extends Controller RecurrenceRepetition::WEEKEND_TO_MONDAY => (string)trans('firefly.jump_to_monday'), ]; - // code to handle active-checkboxes $hasOldInput = null !== $request->old('_token'); - // $hasOldInput = false; - $preFilled = [ + $preFilled = [ 'transaction_type' => strtolower($recurrence->transactionType->type), 'active' => $hasOldInput ? (bool)$request->old('active') : $recurrence->active, 'apply_rules' => $hasOldInput ? (bool)$request->old('apply_rules') : $recurrence->apply_rules, @@ -135,7 +128,7 @@ class EditController extends Controller return view( 'recurring.edit', - compact('recurrence', 'array', 'weekendResponses', 'budgets', 'preFilled', 'currentRepetitionType', 'repetitionEnd', 'repetitionEnds') + compact('recurrence', 'array', 'weekendResponses', 'budgets', 'preFilled', 'currentRepType', 'repetitionEnd', 'repetitionEnds') ); } diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index 07d6489d5f..51e4a0215f 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -28,10 +28,8 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Recurrence; -use FireflyIII\Models\RecurrenceRepetition; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; use FireflyIII\Transformers\RecurrenceTransformer; -use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\ParameterBag; @@ -64,98 +62,14 @@ class IndexController extends Controller ); } - /** - * @param Request $request + * TODO: split collection into pages * - * @throws FireflyException - * @return JsonResponse - */ - public function events(Request $request): JsonResponse - { - $return = []; - $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); - $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); - $firstDate = Carbon::createFromFormat('Y-m-d', $request->get('first_date')); - $endDate = '' !== (string)$request->get('end_date') ? Carbon::createFromFormat('Y-m-d', $request->get('end_date')) : null; - $endsAt = (string)$request->get('ends'); - $repetitionType = explode(',', $request->get('type'))[0]; - $repetitions = (int)$request->get('reps'); - $repetitionMoment = ''; - $start->startOfDay(); - - // if $firstDate is beyond $end, simply return an empty array. - if ($firstDate->gt($end)) { - return response()->json([]); - } - // if $firstDate is beyond start, use that one: - $actualStart = clone $firstDate; - - switch ($repetitionType) { - default: - throw new FireflyException(sprintf('Cannot handle repetition type "%s"', $repetitionType)); - case 'daily': - break; - case 'weekly': - case 'monthly': - $repetitionMoment = explode(',', $request->get('type'))[1] ?? '1'; - break; - case 'ndom': - $repetitionMoment = str_ireplace('ndom,', '', $request->get('type')); - break; - case 'yearly': - $repetitionMoment = explode(',', $request->get('type'))[1] ?? '2018-01-01'; - break; - } - $repetition = new RecurrenceRepetition; - $repetition->repetition_type = $repetitionType; - $repetition->repetition_moment = $repetitionMoment; - $repetition->repetition_skip = (int)$request->get('skip'); - $repetition->weekend = (int)$request->get('weekend'); - - $actualEnd = clone $end; - switch ($endsAt) { - default: - throw new FireflyException(sprintf('Cannot generate events for type that ends at "%s".', $endsAt)); - case 'forever': - // simply generate up until $end. No change from default behavior. - $occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd); - break; - case 'until_date': - $actualEnd = $endDate ?? clone $end; - $occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd); - break; - case 'times': - $occurrences = $this->recurring->getXOccurrences($repetition, $actualStart, $repetitions); - break; - } - - - /** @var Carbon $current */ - foreach ($occurrences as $current) { - if ($current->gte($start)) { - $event = [ - 'id' => $repetitionType . $firstDate->format('Ymd'), - 'title' => 'X', - 'allDay' => true, - 'start' => $current->format('Y-m-d'), - 'end' => $current->format('Y-m-d'), - 'editable' => false, - 'rendering' => 'background', - ]; - $return[] = $event; - } - } - - return response()->json($return); - } - - - /** * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function index(Request $request) { @@ -163,7 +77,6 @@ class IndexController extends Controller $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $collection = $this->recurring->get(); - // TODO: split collection into pages $transformer = new RecurrenceTransformer(new ParameterBag); $recurring = []; @@ -206,38 +119,4 @@ class IndexController extends Controller return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'transactions')); } - /** - * @param Request $request - * - * @return JsonResponse - */ - public function suggest(Request $request): JsonResponse - { - $today = new Carbon; - $date = Carbon::createFromFormat('Y-m-d', $request->get('date')); - $preSelected = (string)$request->get('pre_select'); - $result = []; - if ($date > $today || 'true' === (string)$request->get('past')) { - $weekly = sprintf('weekly,%s', $date->dayOfWeekIso); - $monthly = sprintf('monthly,%s', $date->day); - $dayOfWeek = trans(sprintf('config.dow_%s', $date->dayOfWeekIso)); - $ndom = sprintf('ndom,%s,%s', $date->weekOfMonth, $date->dayOfWeekIso); - $yearly = sprintf('yearly,%s', $date->format('Y-m-d')); - $yearlyDate = $date->formatLocalized(trans('config.month_and_day_no_year')); - $result = [ - 'daily' => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], - $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), - 'selected' => 0 === strpos($preSelected, 'weekly')], - $monthly => ['label' => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), - 'selected' => 0 === strpos($preSelected, 'monthly')], - $ndom => ['label' => (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), - 'selected' => 0 === strpos($preSelected, 'ndom')], - $yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], - ]; - } - - - return response()->json($result); - } - } \ No newline at end of file diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php index 8e29812af5..80fad5a433 100644 --- a/app/Http/Controllers/Report/AccountController.php +++ b/app/Http/Controllers/Report/AccountController.php @@ -41,7 +41,7 @@ class AccountController extends Controller * * @return mixed|string * - * @throws \Throwable + */ public function general(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 992845aa09..be928919e1 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -40,7 +40,7 @@ class BalanceController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable + */ public function general(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 44ba71d683..cf6e2ac9c6 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -41,7 +41,7 @@ class BudgetController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable + */ public function general(Collection $accounts, Carbon $start, Carbon $end) { @@ -70,7 +70,7 @@ class BudgetController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable + */ public function period(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index a37336b0fc..79bd8a726f 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -28,6 +28,8 @@ use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; +use Log; +use Throwable; /** * Class CategoryController. @@ -41,7 +43,6 @@ class CategoryController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable */ public function expenses(Collection $accounts, Carbon $start, Carbon $end) { @@ -60,7 +61,12 @@ class CategoryController extends Controller $data[0] = $repository->periodExpensesNoCategory($accounts, $start, $end); $report = $this->filterReport($data); $periods = app('navigation')->listOfPeriods($start, $end); - $result = view('reports.partials.category-period', compact('report', 'periods'))->render(); + try { + $result = view('reports.partials.category-period', compact('report', 'periods'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); @@ -75,7 +81,6 @@ class CategoryController extends Controller * @param Carbon $end * * @return string - * @throws \Throwable */ public function income(Collection $accounts, Carbon $start, Carbon $end): string { @@ -94,8 +99,12 @@ class CategoryController extends Controller $data[0] = $repository->periodIncomeNoCategory($accounts, $start, $end); $report = $this->filterReport($data); $periods = app('navigation')->listOfPeriods($start, $end); - $result = view('reports.partials.category-period', compact('report', 'periods'))->render(); - + try { + $result = view('reports.partials.category-period', compact('report', 'periods'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); return $result; @@ -109,8 +118,7 @@ class CategoryController extends Controller * * @return mixed|string * - * @throws \Throwable - * @internal param ReportHelperInterface $helper + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function operations(Collection $accounts, Carbon $start, Carbon $end) { @@ -136,17 +144,18 @@ class CategoryController extends Controller $report[$category->id] = ['name' => $category->name, 'spent' => $spent, 'earned' => $earned, 'id' => $category->id]; } } - // sort the result - // Obtain a list of columns $sum = []; foreach ($report as $categoryId => $row) { $sum[$categoryId] = (float)$row['spent']; } - array_multisort($sum, SORT_ASC, $report); - - $result = view('reports.partials.categories', compact('report'))->render(); - $cache->store($result); + try { + $result = view('reports.partials.categories', compact('report'))->render(); + $cache->store($result); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } return $result; } diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 9d5b7276ae..37adf0f446 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -18,7 +18,6 @@ * You should have received a copy of the GNU General Public License * along with Firefly III. If not, see . */ -/** @noinspection MoreThanThreeArgumentsInspection */ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -33,9 +32,13 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; +use Log; +use Throwable; /** * Class ExpenseController + * + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class ExpenseController extends Controller { @@ -60,6 +63,7 @@ class ExpenseController extends Controller } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * Generates the overview per budget. * @@ -69,7 +73,7 @@ class ExpenseController extends Controller * @param Carbon $end * * @return string - * @throws \Throwable + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function budget(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): string { @@ -85,7 +89,7 @@ class ExpenseController extends Controller } $combined = $this->combineAccounts($expense); $all = new Collection; - foreach ($combined as $name => $combi) { + foreach ($combined as $combi) { $all = $all->merge($combi); } // now find spent / earned: @@ -100,13 +104,19 @@ class ExpenseController extends Controller } $together[$categoryId]['grand_total'] = bcadd($spentInfo['grand_total'], $together[$categoryId]['grand_total']); } - $result = view('reports.partials.exp-budgets', compact('together'))->render(); + try { + $result = view('reports.partials.exp-budgets', compact('together'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); return $result; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * Generates the overview per category (spent and earned). * @@ -116,7 +126,8 @@ class ExpenseController extends Controller * @param Carbon $end * * @return string - * @throws \Throwable + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function category(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): string { @@ -132,7 +143,7 @@ class ExpenseController extends Controller } $combined = $this->combineAccounts($expense); $all = new Collection; - foreach ($combined as $name => $combi) { + foreach ($combined as $combi) { $all = $all->merge($combi); } // now find spent / earned: @@ -156,14 +167,18 @@ class ExpenseController extends Controller } $together[$categoryId]['grand_total'] = bcadd($earnedInfo['grand_total'], $together[$categoryId]['grand_total']); } - - $result = view('reports.partials.exp-categories', compact('together'))->render(); + try { + $result = view('reports.partials.exp-categories', compact('together'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); return $result; } - + /** @noinspection MoreThanThreeArgumentsInspection */ /** * Overview of spending * @@ -173,7 +188,6 @@ class ExpenseController extends Controller * @param Carbon $end * * @return array|mixed|string - * @throws \Throwable */ public function spent(Collection $accounts, Collection $expense, Carbon $start, Carbon $end) { @@ -203,14 +217,19 @@ class ExpenseController extends Controller 'earned' => $earned, ]; } - $result = view('reports.partials.exp-not-grouped', compact('result'))->render(); + try { + $result = view('reports.partials.exp-not-grouped', compact('result'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); return $result; // for period, get spent and earned for each account (by name) } - + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $expense @@ -218,7 +237,6 @@ class ExpenseController extends Controller * @param Carbon $end * * @return string - * @throws \Throwable */ public function topExpense(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): string { @@ -234,7 +252,7 @@ class ExpenseController extends Controller } $combined = $this->combineAccounts($expense); $all = new Collection; - foreach ($combined as $name => $combi) { + foreach ($combined as $combi) { $all = $all->merge($combi); } // get all expenses in period: @@ -248,12 +266,17 @@ class ExpenseController extends Controller return (float)$transaction->transaction_amount; } ); - $result = view('reports.partials.top-transactions', compact('sorted'))->render(); + try { + $result = view('reports.partials.top-transactions', compact('sorted'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); return $result; } - + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $expense @@ -261,7 +284,6 @@ class ExpenseController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable */ public function topIncome(Collection $accounts, Collection $expense, Carbon $start, Carbon $end) { @@ -277,7 +299,7 @@ class ExpenseController extends Controller } $combined = $this->combineAccounts($expense); $all = new Collection; - foreach ($combined as $name => $combi) { + foreach ($combined as $combi) { $all = $all->merge($combi); } // get all expenses in period: @@ -291,7 +313,12 @@ class ExpenseController extends Controller return (float)$transaction->transaction_amount; } ); - $result = view('reports.partials.top-transactions', compact('sorted'))->render(); + try { + $result = view('reports.partials.top-transactions', compact('sorted'))->render(); + } catch (Throwable $e) { + Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + $result = 'An error prevented Firefly III from rendering. Apologies.'; + } $cache->store($result); return $result; @@ -320,6 +347,7 @@ class ExpenseController extends Controller return $combined; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $assets * @param Collection $opposing @@ -327,6 +355,9 @@ class ExpenseController extends Controller * @param Carbon $end * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function earnedByCategory(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array { @@ -381,6 +412,7 @@ class ExpenseController extends Controller return $sum; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $assets * @param Collection $opposing @@ -423,6 +455,7 @@ class ExpenseController extends Controller return $sum; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $assets * @param Collection $opposing @@ -430,6 +463,8 @@ class ExpenseController extends Controller * @param Carbon $end * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function spentByBudget(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array { @@ -484,6 +519,7 @@ class ExpenseController extends Controller return $sum; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $assets * @param Collection $opposing @@ -491,6 +527,9 @@ class ExpenseController extends Controller * @param Carbon $end * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function spentByCategory(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array { @@ -545,6 +584,7 @@ class ExpenseController extends Controller return $sum; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $assets * @param Collection $opposing diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index a13eaa8593..7b7b2719a8 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -61,7 +61,7 @@ class OperationsController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable + */ public function expenses(Collection $accounts, Carbon $start, Carbon $end) { @@ -88,7 +88,7 @@ class OperationsController extends Controller * @param Carbon $end * * @return string - * @throws \Throwable + */ public function income(Collection $accounts, Carbon $start, Carbon $end): string { @@ -116,7 +116,7 @@ class OperationsController extends Controller * @param Carbon $end * * @return mixed|string - * @throws \Throwable + */ public function operations(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 730ec0f0de..416419a6d7 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -19,7 +19,6 @@ * along with Firefly III. If not, see . */ /** @noinspection CallableParameterUseCaseInTypeContextInspection */ -/** @noinspection MoreThanThreeArgumentsInspection */ declare(strict_types=1); namespace FireflyIII\Http\Controllers; @@ -40,6 +39,7 @@ use Log; /** * Class ReportController. + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ReportController extends Controller { @@ -68,7 +68,7 @@ class ReportController extends Controller } ); } - + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $expense @@ -133,6 +133,7 @@ class ReportController extends Controller return $generator->generate(); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $budgets @@ -168,6 +169,7 @@ class ReportController extends Controller return $generator->generate(); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $categories @@ -259,8 +261,7 @@ class ReportController extends Controller * @param string $reportType * * @return mixed - * - * @throws \Throwable + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function options(string $reportType) { @@ -291,6 +292,10 @@ class ReportController extends Controller * @return RedirectResponse|\Illuminate\Routing\Redirector * * @throws \FireflyIII\Exceptions\FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.NPathComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function postIndex(ReportFormRequest $request) { @@ -358,6 +363,7 @@ class ReportController extends Controller return redirect($uri); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $accounts * @param Collection $tags @@ -395,7 +401,6 @@ class ReportController extends Controller /** * @return string - * @throws \Throwable */ private function accountReportOptions(): string { @@ -416,7 +421,6 @@ class ReportController extends Controller /** * @return string - * @throws \Throwable */ private function budgetReportOptions(): string { @@ -429,7 +433,6 @@ class ReportController extends Controller /** * @return string - * @throws \Throwable */ private function categoryReportOptions(): string { @@ -442,7 +445,6 @@ class ReportController extends Controller /** * @return string - * @throws \Throwable */ private function noReportOptions(): string { @@ -451,7 +453,6 @@ class ReportController extends Controller /** * @return string - * @throws \Throwable */ private function tagReportOptions(): string { diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php new file mode 100644 index 0000000000..c5952227f8 --- /dev/null +++ b/app/Http/Controllers/Rule/CreateController.php @@ -0,0 +1,250 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Rule; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\RuleFormRequest; +use FireflyIII\Models\Bill; +use FireflyIII\Models\RuleGroup; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Support\Http\Controllers\RuleManagement; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Log; +use Throwable; + +/** + * Class CreateController + */ +class CreateController extends Controller +{ + use RuleManagement; + /** @var BillRepositoryInterface */ + private $billRepos; + /** @var RuleGroupRepositoryInterface */ + private $ruleRepos; + + /** + * RuleController constructor. + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', (string)trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); + + $this->billRepos = app(BillRepositoryInterface::class); + $this->ruleRepos = app(RuleRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * Create a new rule. It will be stored under the given $ruleGroup. + * + * TODO remove bill from this method, move to separate routine. + * + * @param Request $request + * @param RuleGroup $ruleGroup + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + public function create(Request $request, RuleGroup $ruleGroup) + { + $this->createDefaultRuleGroup(); + $this->createDefaultRule(); + $bill = null; + $billId = (int)$request->get('fromBill'); + $preFilled = [ + 'strict' => true, + ]; + $oldTriggers = []; + $oldActions = []; + $returnToBill = false; + + if ('true' === $request->get('return')) { + $returnToBill = true; + } + + // has bill? + if ($billId > 0) { + $bill = $this->billRepos->find($billId); + } + + // has old input? + if ($request->old()) { + $oldTriggers = $this->getPreviousTriggers($request); + $oldActions = $this->getPreviousActions($request); + } + // has existing bill refered to in URI? + if (null !== $bill && !$request->old()) { + + // create some sensible defaults: + $preFilled['title'] = (string)trans('firefly.new_rule_for_bill_title', ['name' => $bill->name]); + $preFilled['description'] = (string)trans('firefly.new_rule_for_bill_description', ['name' => $bill->name]); + + + // get triggers and actions for bill: + $oldTriggers = $this->getTriggersForBill($bill); + $oldActions = $this->getActionsForBill($bill); + } + + $triggerCount = \count($oldTriggers); + $actionCount = \count($oldActions); + $subTitleIcon = 'fa-clone'; + $subTitle = (string)trans('firefly.make_new_rule', ['title' => $ruleGroup->title]); + + $request->session()->flash('preFilled', $preFilled); + + // put previous url in session if not redirect from store (not "create another"). + if (true !== session('rules.create.fromStore')) { + $this->rememberPreviousUri('rules.create.uri'); + } + session()->forget('rules.create.fromStore'); + + return view( + 'rules.rule.create', + compact( + 'subTitleIcon', 'oldTriggers', 'returnToBill', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', + 'subTitle' + ) + ); + } + + /** + * @param RuleFormRequest $request + * + * @return RedirectResponse|\Illuminate\Routing\Redirector + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + public function store(RuleFormRequest $request) + { + $data = $request->getRuleData(); + $rule = $this->ruleRepos->store($data); + session()->flash('success', (string)trans('firefly.stored_new_rule', ['title' => $rule->title])); + app('preferences')->mark(); + + // redirect to show bill. + if ('true' === $request->get('return_to_bill') && (int)$request->get('bill_id') > 0) { + return redirect(route('bills.show', [(int)$request->get('bill_id')])); // @codeCoverageIgnore + } + + // redirect to new bill creation. + if ((int)$request->get('bill_id') > 0) { + return redirect($this->getPreviousUri('bills.create.uri')); // @codeCoverageIgnore + } + + $redirect = redirect($this->getPreviousUri('rules.create.uri')); + + if (1 === (int)$request->get('create_another')) { + // @codeCoverageIgnoreStart + session()->put('rules.create.fromStore', true); + $redirect = redirect(route('rules.create', [$data['rule_group_id']]))->withInput(); + // @codeCoverageIgnoreEnd + } + + return $redirect; + } + + /** + * @param Bill $bill + * + * @return array + */ + private function getActionsForBill(Bill $bill): array + { + $result = ''; + try { + $result = view( + 'rules.partials.action', + [ + 'oldAction' => 'link_to_bill', + 'oldValue' => $bill->name, + 'oldChecked' => false, + 'count' => 1, + ] + )->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $e) { + Log::error(sprintf('Throwable was thrown in getActionsForBill(): %s', $e->getMessage())); + Log::error($e->getTraceAsString()); + $result = 'Could not render view. See log files.'; + } + + // @codeCoverageIgnoreEnd + + return [$result]; + } + + /** + * Create fake triggers to match the bill's properties + * + * @param Bill $bill + * + * @return array + */ + private function getTriggersForBill(Bill $bill): array + { + $result = []; + $triggers = ['currency_is', 'amount_more', 'amount_less', 'description_contains']; + $values = [ + $bill->transactionCurrency()->first()->name, + round($bill->amount_min, 12), + round($bill->amount_max, 12), + $bill->name, + ]; + foreach ($triggers as $index => $trigger) { + try { + $string = view( + 'rules.partials.trigger', + [ + 'oldTrigger' => $trigger, + 'oldValue' => $values[$index], + 'oldChecked' => false, + 'count' => $index + 1, + ] + )->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Throwable was thrown in getTriggersForBill(): %s', $e->getMessage())); + Log::debug($e->getTraceAsString()); + $string = ''; + } + if ('' !== $string) { + $result[] = $string; + } + } + + return $result; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php new file mode 100644 index 0000000000..6f9763c894 --- /dev/null +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -0,0 +1,94 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Rule; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Rule; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use Illuminate\Http\RedirectResponse; + +/** + * Class DeleteController + */ +class DeleteController extends Controller +{ + /** @var RuleRepositoryInterface */ + private $ruleRepos; + + /** + * RuleController constructor. + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', (string)trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); + + $this->ruleRepos = app(RuleRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * Delete a given rule. + * + * @param Rule $rule + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function delete(Rule $rule) + { + $subTitle = (string)trans('firefly.delete_rule', ['title' => $rule->title]); + + // put previous url in session + $this->rememberPreviousUri('rules.delete.uri'); + + return view('rules.rule.delete', compact('rule', 'subTitle')); + } + + /** + * Actually destroy the given rule. + * + * @param Rule $rule + * + * @return RedirectResponse + */ + public function destroy(Rule $rule): RedirectResponse + { + $title = $rule->title; + $this->ruleRepos->destroy($rule); + + session()->flash('success', (string)trans('firefly.deleted_rule', ['title' => $title])); + app('preferences')->mark(); + + return redirect($this->getPreviousUri('rules.delete.uri')); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php new file mode 100644 index 0000000000..a91121ab5b --- /dev/null +++ b/app/Http/Controllers/Rule/EditController.php @@ -0,0 +1,219 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Rule; + + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\RuleFormRequest; +use FireflyIII\Models\Rule; +use FireflyIII\Models\RuleAction; +use FireflyIII\Models\RuleTrigger; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Support\Http\Controllers\RuleManagement; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Log; +use Throwable; + +/** + * Class EditController + */ +class EditController extends Controller +{ + use RuleManagement; + + /** @var RuleRepositoryInterface */ + private $ruleRepos; + + /** + * RuleController constructor. + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', (string)trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); + + $this->ruleRepos = app(RuleRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Request $request + * @param Rule $rule + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function edit(Request $request, Rule $rule) + { + $triggerCount = 0; + $actionCount = 0; + $oldActions = []; + $oldTriggers = []; + // has old input? + if (\count($request->old()) > 0) { + $oldTriggers = $this->getPreviousTriggers($request); + $triggerCount = \count($oldTriggers); + $oldActions = $this->getPreviousActions($request); + $actionCount = \count($oldActions); + } + + // overrule old input when it has no rule data: + if (0 === $triggerCount && 0 === $actionCount) { + $oldTriggers = $this->getCurrentTriggers($rule); + $triggerCount = \count($oldTriggers); + $oldActions = $this->getCurrentActions($rule); + $actionCount = \count($oldActions); + } + + $hasOldInput = null !== $request->old('_token'); + $preFilled = [ + 'active' => $hasOldInput ? (bool)$request->old('active') : $rule->active, + 'stop_processing' => $hasOldInput ? (bool)$request->old('stop_processing') : $rule->stop_processing, + 'strict' => $hasOldInput ? (bool)$request->old('strict') : $rule->strict, + + ]; + + // get rule trigger for update / store-journal: + $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule); + $subTitle = (string)trans('firefly.edit_rule', ['title' => $rule->title]); + + // put previous url in session if not redirect from store (not "return_to_edit"). + if (true !== session('rules.edit.fromUpdate')) { + $this->rememberPreviousUri('rules.edit.uri'); + } + session()->forget('rules.edit.fromUpdate'); + + $request->session()->flash('preFilled', $preFilled); + + return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount')); + } + + /** + * @param RuleFormRequest $request + * @param Rule $rule + * + * @return RedirectResponse|\Illuminate\Routing\Redirector + */ + public function update(RuleFormRequest $request, Rule $rule) + { + $data = $request->getRuleData(); + $this->ruleRepos->update($rule, $data); + + session()->flash('success', (string)trans('firefly.updated_rule', ['title' => $rule->title])); + app('preferences')->mark(); + $redirect = redirect($this->getPreviousUri('rules.edit.uri')); + if (1 === (int)$request->get('return_to_edit')) { + // @codeCoverageIgnoreStart + session()->put('rules.edit.fromUpdate', true); + + $redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); + // @codeCoverageIgnoreEnd + } + + return $redirect; + } + + /** + * @param Rule $rule + * + * @return array + * + */ + private function getCurrentActions(Rule $rule): array + { + $index = 0; + $actions = []; + + /** @var RuleAction $entry */ + foreach ($rule->ruleActions as $entry) { + $count = ($index + 1); + try { + $actions[] = view( + 'rules.partials.action', + [ + 'oldAction' => $entry->action_type, + 'oldValue' => $entry->action_value, + 'oldChecked' => $entry->stop_processing, + 'count' => $count, + ] + )->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $e) { + Log::debug(sprintf('Throwable was thrown in getCurrentActions(): %s', $e->getMessage())); + Log::error($e->getTraceAsString()); + } + // @codeCoverageIgnoreEnd + ++$index; + } + + return $actions; + } + + /** + * @param Rule $rule + * + * @return array + * + */ + private function getCurrentTriggers(Rule $rule): array + { + $index = 0; + $triggers = []; + + /** @var RuleTrigger $entry */ + foreach ($rule->ruleTriggers as $entry) { + if ('user_action' !== $entry->trigger_type) { + $count = ($index + 1); + try { + $triggers[] = view( + 'rules.partials.trigger', + [ + 'oldTrigger' => $entry->trigger_type, + 'oldValue' => $entry->trigger_value, + 'oldChecked' => $entry->stop_processing, + 'count' => $count, + ] + )->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $e) { + Log::debug(sprintf('Throwable was thrown in getCurrentTriggers(): %s', $e->getMessage())); + Log::error($e->getTraceAsString()); + } + // @codeCoverageIgnoreEnd + ++$index; + } + } + + return $triggers; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php new file mode 100644 index 0000000000..8d39b8530c --- /dev/null +++ b/app/Http/Controllers/Rule/IndexController.php @@ -0,0 +1,136 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Rule; + +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Rule; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Support\Http\Controllers\RuleManagement; +use FireflyIII\User; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; + +/** + * Class IndexController + */ +class IndexController extends Controller +{ + use RuleManagement; + /** @var RuleGroupRepositoryInterface */ + private $ruleGroupRepos; + /** @var RuleRepositoryInterface */ + private $ruleRepos; + + /** + * RuleController constructor. + */ + public function __construct() + { + parent::__construct(); + $this->middleware( + function ($request, $next) { + app('view')->share('title', (string)trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); + $this->ruleGroupRepos = app(RuleGroupRepositoryInterface::class); + $this->ruleRepos = app(RuleRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param Rule $rule + * + * @return RedirectResponse|\Illuminate\Routing\Redirector + */ + public function down(Rule $rule) + { + $this->ruleRepos->moveDown($rule); + + return redirect(route('rules.index')); + } + + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index() + { + /** @var User $user */ + $user = auth()->user(); + $this->createDefaultRuleGroup(); + $this->createDefaultRule(); + $ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules($user); + + return view('rules.index', compact('ruleGroups')); + } + + /** + * @param Request $request + * @param Rule $rule + * + * @return JsonResponse + */ + public function reorderRuleActions(Request $request, Rule $rule): JsonResponse + { + $ids = $request->get('actions'); + if (\is_array($ids)) { + $this->ruleRepos->reorderRuleActions($rule, $ids); + } + + return response()->json('true'); + } + + /** + * @param Request $request + * @param Rule $rule + * + * @return JsonResponse + */ + public function reorderRuleTriggers(Request $request, Rule $rule): JsonResponse + { + $ids = $request->get('triggers'); + if (\is_array($ids)) { + $this->ruleRepos->reorderRuleTriggers($rule, $ids); + } + + return response()->json('true'); + } + + + /** + * @param Rule $rule + * + * @return RedirectResponse|\Illuminate\Routing\Redirector + * @SuppressWarnings(PHPMD.ShortMethodName) + */ + public function up(Rule $rule) + { + $this->ruleRepos->moveUp($rule); + + return redirect(route('rules.index')); + } + +} diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php new file mode 100644 index 0000000000..1c6cb0b04d --- /dev/null +++ b/app/Http/Controllers/Rule/SelectController.php @@ -0,0 +1,283 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Rule; + + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Http\Requests\SelectTransactionsRequest; +use FireflyIII\Http\Requests\TestRuleFormRequest; +use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions; +use FireflyIII\Models\Rule; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Http\Controllers\RuleManagement; +use FireflyIII\TransactionRules\TransactionMatcher; +use FireflyIII\User; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; +use Illuminate\Support\Collection; +use Log; +use Throwable; + +/** + * Class SelectController + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class SelectController extends Controller +{ + use RuleManagement; + /** @var AccountRepositoryInterface */ + private $accountRepos; + + /** + * RuleController constructor. + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('title', (string)trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); + + $this->accountRepos = app(AccountRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * Execute the given rule on a set of existing transactions. + * + * @param SelectTransactionsRequest $request + * @param Rule $rule + * + * @return RedirectResponse + */ + public function execute(SelectTransactionsRequest $request, Rule $rule): RedirectResponse + { + // Get parameters specified by the user + /** @var User $user */ + $user = auth()->user(); + $accounts = $this->accountRepos->getAccountsById($request->get('accounts')); + $startDate = new Carbon($request->get('start_date')); + $endDate = new Carbon($request->get('end_date')); + + // Create a job to do the work asynchronously + $job = new ExecuteRuleOnExistingTransactions($rule); + + // Apply parameters to the job + $job->setUser($user); + $job->setAccounts($accounts); + $job->setStartDate($startDate); + $job->setEndDate($endDate); + + // Dispatch a new job to execute it in a queue + $this->dispatch($job); + + // Tell the user that the job is queued + session()->flash('success', (string)trans('firefly.applied_rule_selection', ['title' => $rule->title])); + + return redirect()->route('rules.index'); + } + + + /** + * @param Rule $rule + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function selectTransactions(Rule $rule) + { + // does the user have shared accounts? + $first = session('first')->format('Y-m-d'); + $today = Carbon::create()->format('Y-m-d'); + $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); + + return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle')); + } + + + /** + * This method allows the user to test a certain set of rule triggers. The rule triggers are passed along + * using the URL parameters (GET), and are usually put there using a Javascript thing. + * + * This method will parse and validate those rules and create a "TransactionMatcher" which will attempt + * to find transaction journals matching the users input. A maximum range of transactions to try (range) and + * a maximum number of transactions to return (limit) are set as well. + * + * @param TestRuleFormRequest $request + * + * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testTriggers(TestRuleFormRequest $request): JsonResponse + { + // build trigger array from response + $triggers = $this->getValidTriggerList($request); + + if (0 === \count($triggers)) { + return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore + } + + $limit = (int)config('firefly.test-triggers.limit'); + $range = (int)config('firefly.test-triggers.range'); + $matchingTransactions = new Collection; + /** @var TransactionMatcher $matcher */ + $matcher = app(TransactionMatcher::class); + $matcher->setLimit($limit); + $matcher->setRange($range); + $matcher->setTriggers($triggers); + try { + $matchingTransactions = $matcher->findTransactionsByTriggers(); + // @codeCoverageIgnoreStart + } catch (FireflyException $exception) { + Log::error(sprintf('Could not grab transactions in testTriggers(): %s', $exception->getMessage())); + Log::error($exception->getTraceAsString()); + } + // @codeCoverageIgnoreStart + + + // Warn the user if only a subset of transactions is returned + $warning = ''; + if ($matchingTransactions->count() === $limit) { + $warning = (string)trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore + } + if (0 === $matchingTransactions->count()) { + $warning = (string)trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore + } + + // Return json response + $view = 'ERROR, see logs.'; + try { + $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $exception) { + Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage())); + Log::error($exception->getTraceAsString()); + } + + // @codeCoverageIgnoreEnd + + return response()->json(['html' => $view, 'warning' => $warning]); + } + + /** + * This method allows the user to test a certain set of rule triggers. The rule triggers are grabbed from + * the rule itself. + * + * This method will parse and validate those rules and create a "TransactionMatcher" which will attempt + * to find transaction journals matching the users input. A maximum range of transactions to try (range) and + * a maximum number of transactions to return (limit) are set as well. + * + * @param Rule $rule + * + * @return JsonResponse + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testTriggersByRule(Rule $rule): JsonResponse + { + $triggers = $rule->ruleTriggers; + + if (0 === \count($triggers)) { + return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore + } + + $limit = (int)config('firefly.test-triggers.limit'); + $range = (int)config('firefly.test-triggers.range'); + $matchingTransactions = new Collection; + + /** @var TransactionMatcher $matcher */ + $matcher = app(TransactionMatcher::class); + $matcher->setLimit($limit); + $matcher->setRange($range); + $matcher->setRule($rule); + try { + $matchingTransactions = $matcher->findTransactionsByRule(); + // @codeCoverageIgnoreStart + } catch (FireflyException $exception) { + Log::error(sprintf('Could not grab transactions in testTriggersByRule(): %s', $exception->getMessage())); + Log::error($exception->getTraceAsString()); + } + // @codeCoverageIgnoreEnd + + // Warn the user if only a subset of transactions is returned + $warning = ''; + if ($matchingTransactions->count() === $limit) { + $warning = (string)trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore + } + if (0 === $matchingTransactions->count()) { + $warning = (string)trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore + } + + // Return json response + $view = 'ERROR, see logs.'; + try { + $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $exception) { + Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage())); + Log::error($exception->getTraceAsString()); + } + + // @codeCoverageIgnoreEnd + + return response()->json(['html' => $view, 'warning' => $warning]); + } + + + /** + * @param TestRuleFormRequest $request + * + * @return array + */ + private function getValidTriggerList(TestRuleFormRequest $request): array + { + $triggers = []; + $data = [ + 'rule-triggers' => $request->get('rule-trigger'), + 'rule-trigger-values' => $request->get('rule-trigger-value'), + 'rule-trigger-stop' => $request->get('rule-trigger-stop'), + ]; + if (\is_array($data['rule-triggers'])) { + foreach ($data['rule-triggers'] as $index => $triggerType) { + $data['rule-trigger-stop'][$index] = (int)($data['rule-trigger-stop'][$index] ?? 0.0); + $triggers[] = [ + 'type' => $triggerType, + 'value' => $data['rule-trigger-values'][$index], + 'stopProcessing' => 1 === (int)$data['rule-trigger-stop'][$index], + ]; + } + } + + return $triggers; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php deleted file mode 100644 index 7083fa714e..0000000000 --- a/app/Http/Controllers/RuleController.php +++ /dev/null @@ -1,875 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers; - -use Carbon\Carbon; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Http\Requests\RuleFormRequest; -use FireflyIII\Http\Requests\SelectTransactionsRequest; -use FireflyIII\Http\Requests\TestRuleFormRequest; -use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions; -use FireflyIII\Models\Bill; -use FireflyIII\Models\Rule; -use FireflyIII\Models\RuleAction; -use FireflyIII\Models\RuleGroup; -use FireflyIII\Models\RuleTrigger; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use FireflyIII\Repositories\Rule\RuleRepositoryInterface; -use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; -use FireflyIII\TransactionRules\TransactionMatcher; -use FireflyIII\User; -use Illuminate\Http\JsonResponse; -use Illuminate\Http\RedirectResponse; -use Illuminate\Http\Request; -use Illuminate\Support\Collection; -use Log; -use Throwable; - -/** - * Class RuleController. - */ -class RuleController extends Controller -{ - /** @var AccountRepositoryInterface */ - private $accountRepos; - /** @var BillRepositoryInterface */ - private $billRepos; - /** @var RuleGroupRepositoryInterface */ - private $ruleGroupRepos; - /** @var RuleRepositoryInterface */ - private $ruleRepos; - - /** - * RuleController constructor. - */ - public function __construct() - { - parent::__construct(); - - $this->middleware( - function ($request, $next) { - app('view')->share('title', (string)trans('firefly.rules')); - app('view')->share('mainTitleIcon', 'fa-random'); - - $this->accountRepos = app(AccountRepositoryInterface::class); - $this->billRepos = app(BillRepositoryInterface::class); - $this->ruleGroupRepos = app(RuleGroupRepositoryInterface::class); - $this->ruleRepos = app(RuleRepositoryInterface::class); - - return $next($request); - } - ); - } - - /** - * Create a new rule. It will be stored under the given $ruleGroup. - * - * @param Request $request - * @param RuleGroup $ruleGroup - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function create(Request $request, RuleGroup $ruleGroup) - { - $this->createDefaultRuleGroup(); - $this->createDefaultRule(); - $bill = null; - $billId = (int)$request->get('fromBill'); - $preFilled = [ - 'strict' => true, - ]; - $oldTriggers = []; - $oldActions = []; - $returnToBill = false; - - if ('true' === $request->get('return')) { - $returnToBill = true; - } - - // has bill? - if ($billId > 0) { - $bill = $this->billRepos->find($billId); - } - - // has old input? - if ($request->old()) { - $oldTriggers = $this->getPreviousTriggers($request); - $oldActions = $this->getPreviousActions($request); - } - // has existing bill refered to in URI? - if (null !== $bill && !$request->old()) { - - // create some sensible defaults: - $preFilled['title'] = (string)trans('firefly.new_rule_for_bill_title', ['name' => $bill->name]); - $preFilled['description'] = (string)trans('firefly.new_rule_for_bill_description', ['name' => $bill->name]); - - - // get triggers and actions for bill: - $oldTriggers = $this->getTriggersForBill($bill); - $oldActions = $this->getActionsForBill($bill); - } - - $triggerCount = \count($oldTriggers); - $actionCount = \count($oldActions); - $subTitleIcon = 'fa-clone'; - $subTitle = (string)trans('firefly.make_new_rule', ['title' => $ruleGroup->title]); - - $request->session()->flash('preFilled', $preFilled); - - // put previous url in session if not redirect from store (not "create another"). - if (true !== session('rules.create.fromStore')) { - $this->rememberPreviousUri('rules.create.uri'); - } - session()->forget('rules.create.fromStore'); - - return view( - 'rules.rule.create', - compact( - 'subTitleIcon', 'oldTriggers', 'returnToBill', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', - 'subTitle' - ) - ); - } - - /** - * Delete a given rule. - * - * @param Rule $rule - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function delete(Rule $rule) - { - $subTitle = (string)trans('firefly.delete_rule', ['title' => $rule->title]); - - // put previous url in session - $this->rememberPreviousUri('rules.delete.uri'); - - return view('rules.rule.delete', compact('rule', 'subTitle')); - } - - /** - * Actually destroy the given rule. - * - * @param Rule $rule - * - * @return RedirectResponse - */ - public function destroy(Rule $rule): RedirectResponse - { - $title = $rule->title; - $this->ruleRepos->destroy($rule); - - session()->flash('success', (string)trans('firefly.deleted_rule', ['title' => $title])); - app('preferences')->mark(); - - return redirect($this->getPreviousUri('rules.delete.uri')); - } - - /** - * @param Rule $rule - * - * @return RedirectResponse|\Illuminate\Routing\Redirector - */ - public function down(Rule $rule) - { - $this->ruleRepos->moveDown($rule); - - return redirect(route('rules.index')); - } - - /** - * @param Request $request - * @param Rule $rule - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function edit(Request $request, Rule $rule) - { - $triggerCount = 0; - $actionCount = 0; - $oldActions = []; - $oldTriggers = []; - // has old input? - if (\count($request->old()) > 0) { - $oldTriggers = $this->getPreviousTriggers($request); - $triggerCount = \count($oldTriggers); - $oldActions = $this->getPreviousActions($request); - $actionCount = \count($oldActions); - } - - // overrule old input when it as no rule data: - if (0 === $triggerCount && 0 === $actionCount) { - $oldTriggers = $this->getCurrentTriggers($rule); - $triggerCount = \count($oldTriggers); - $oldActions = $this->getCurrentActions($rule); - $actionCount = \count($oldActions); - } - - $hasOldInput = null !== $request->old('_token'); - $preFilled = [ - 'active' => $hasOldInput ? (bool)$request->old('active') : $rule->active, - 'stop_processing' => $hasOldInput ? (bool)$request->old('stop_processing') : $rule->stop_processing, - 'strict' => $hasOldInput ? (bool)$request->old('strict') : $rule->strict, - - ]; - - // get rule trigger for update / store-journal: - $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule); - $subTitle = (string)trans('firefly.edit_rule', ['title' => $rule->title]); - - // put previous url in session if not redirect from store (not "return_to_edit"). - if (true !== session('rules.edit.fromUpdate')) { - $this->rememberPreviousUri('rules.edit.uri'); - } - session()->forget('rules.edit.fromUpdate'); - - $request->session()->flash('preFilled', $preFilled); - - return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount')); - } - - /** - * Execute the given rule on a set of existing transactions. - * - * @param SelectTransactionsRequest $request - * @param Rule $rule - * - * @return RedirectResponse - * - * @internal param RuleGroup $ruleGroup - */ - public function execute(SelectTransactionsRequest $request, Rule $rule): RedirectResponse - { - // Get parameters specified by the user - /** @var User $user */ - $user = auth()->user(); - $accounts = $this->accountRepos->getAccountsById($request->get('accounts')); - $startDate = new Carbon($request->get('start_date')); - $endDate = new Carbon($request->get('end_date')); - - // Create a job to do the work asynchronously - $job = new ExecuteRuleOnExistingTransactions($rule); - - // Apply parameters to the job - $job->setUser($user); - $job->setAccounts($accounts); - $job->setStartDate($startDate); - $job->setEndDate($endDate); - - // Dispatch a new job to execute it in a queue - $this->dispatch($job); - - // Tell the user that the job is queued - session()->flash('success', (string)trans('firefly.applied_rule_selection', ['title' => $rule->title])); - - return redirect()->route('rules.index'); - } - - /** - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function index() - { - /** @var User $user */ - $user = auth()->user(); - $this->createDefaultRuleGroup(); - $this->createDefaultRule(); - $ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules($user); - - return view('rules.index', compact('ruleGroups')); - } - - /** - * @param Request $request - * @param Rule $rule - * - * @return JsonResponse - */ - public function reorderRuleActions(Request $request, Rule $rule): JsonResponse - { - $ids = $request->get('actions'); - if (\is_array($ids)) { - $this->ruleRepos->reorderRuleActions($rule, $ids); - } - - return response()->json('true'); - } - - /** - * @param Request $request - * @param Rule $rule - * - * @return JsonResponse - */ - public function reorderRuleTriggers(Request $request, Rule $rule): JsonResponse - { - $ids = $request->get('triggers'); - if (\is_array($ids)) { - $this->ruleRepos->reorderRuleTriggers($rule, $ids); - } - - return response()->json('true'); - } - - /** - * @param Rule $rule - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function selectTransactions(Rule $rule) - { - // does the user have shared accounts? - $first = session('first')->format('Y-m-d'); - $today = Carbon::create()->format('Y-m-d'); - $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); - - return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle')); - } - - /** - * @param RuleFormRequest $request - * - * @return RedirectResponse|\Illuminate\Routing\Redirector - */ - public function store(RuleFormRequest $request) - { - $data = $request->getRuleData(); - $rule = $this->ruleRepos->store($data); - session()->flash('success', (string)trans('firefly.stored_new_rule', ['title' => $rule->title])); - app('preferences')->mark(); - - // redirect to show bill. - if ('true' === $request->get('return_to_bill') && (int)$request->get('bill_id') > 0) { - return redirect(route('bills.show', [(int)$request->get('bill_id')])); // @codeCoverageIgnore - } - - // redirect to new bill creation. - if ((int)$request->get('bill_id') > 0) { - return redirect($this->getPreviousUri('bills.create.uri')); // @codeCoverageIgnore - } - - $redirect = redirect($this->getPreviousUri('rules.create.uri')); - - if (1 === (int)$request->get('create_another')) { - // @codeCoverageIgnoreStart - session()->put('rules.create.fromStore', true); - $redirect = redirect(route('rules.create', [$data['rule_group_id']]))->withInput(); - // @codeCoverageIgnoreEnd - } - - return $redirect; - } - - /** - * This method allows the user to test a certain set of rule triggers. The rule triggers are passed along - * using the URL parameters (GET), and are usually put there using a Javascript thing. - * - * This method will parse and validate those rules and create a "TransactionMatcher" which will attempt - * to find transaction journals matching the users input. A maximum range of transactions to try (range) and - * a maximum number of transactions to return (limit) are set as well. - * - * @param TestRuleFormRequest $request - * - * @return JsonResponse - */ - public function testTriggers(TestRuleFormRequest $request): JsonResponse - { - // build trigger array from response - $triggers = $this->getValidTriggerList($request); - - if (0 === \count($triggers)) { - return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore - } - - $limit = (int)config('firefly.test-triggers.limit'); - $range = (int)config('firefly.test-triggers.range'); - $matchingTransactions = new Collection; - /** @var TransactionMatcher $matcher */ - $matcher = app(TransactionMatcher::class); - $matcher->setLimit($limit); - $matcher->setRange($range); - $matcher->setTriggers($triggers); - try { - $matchingTransactions = $matcher->findTransactionsByTriggers(); - // @codeCoverageIgnoreStart - } catch (FireflyException $exception) { - Log::error(sprintf('Could not grab transactions in testTriggers(): %s', $exception->getMessage())); - Log::error($exception->getTraceAsString()); - } - // @codeCoverageIgnoreStart - - - // Warn the user if only a subset of transactions is returned - $warning = ''; - if ($matchingTransactions->count() === $limit) { - $warning = (string)trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore - } - if (0 === $matchingTransactions->count()) { - $warning = (string)trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore - } - - // Return json response - $view = 'ERROR, see logs.'; - try { - $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $exception) { - Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage())); - Log::error($exception->getTraceAsString()); - } - - // @codeCoverageIgnoreEnd - - return response()->json(['html' => $view, 'warning' => $warning]); - } - - /** - * This method allows the user to test a certain set of rule triggers. The rule triggers are grabbed from - * the rule itself. - * - * This method will parse and validate those rules and create a "TransactionMatcher" which will attempt - * to find transaction journals matching the users input. A maximum range of transactions to try (range) and - * a maximum number of transactions to return (limit) are set as well. - * - * @param Rule $rule - * - * @return JsonResponse - */ - public function testTriggersByRule(Rule $rule): JsonResponse - { - $triggers = $rule->ruleTriggers; - - if (0 === \count($triggers)) { - return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore - } - - $limit = (int)config('firefly.test-triggers.limit'); - $range = (int)config('firefly.test-triggers.range'); - $matchingTransactions = new Collection; - - /** @var TransactionMatcher $matcher */ - $matcher = app(TransactionMatcher::class); - $matcher->setLimit($limit); - $matcher->setRange($range); - $matcher->setRule($rule); - try { - $matchingTransactions = $matcher->findTransactionsByRule(); - // @codeCoverageIgnoreStart - } catch (FireflyException $exception) { - Log::error(sprintf('Could not grab transactions in testTriggersByRule(): %s', $exception->getMessage())); - Log::error($exception->getTraceAsString()); - } - // @codeCoverageIgnoreEnd - - // Warn the user if only a subset of transactions is returned - $warning = ''; - if ($matchingTransactions->count() === $limit) { - $warning = (string)trans('firefly.warning_transaction_subset', ['max_num_transactions' => $limit]); // @codeCoverageIgnore - } - if (0 === $matchingTransactions->count()) { - $warning = (string)trans('firefly.warning_no_matching_transactions', ['num_transactions' => $range]); // @codeCoverageIgnore - } - - // Return json response - $view = 'ERROR, see logs.'; - try { - $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $exception) { - Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage())); - Log::error($exception->getTraceAsString()); - } - - // @codeCoverageIgnoreEnd - - return response()->json(['html' => $view, 'warning' => $warning]); - } - - /** - * @param Rule $rule - * - * @return RedirectResponse|\Illuminate\Routing\Redirector - */ - public function up(Rule $rule) - { - $this->ruleRepos->moveUp($rule); - - return redirect(route('rules.index')); - } - - /** - * @param RuleFormRequest $request - * @param Rule $rule - * - * @return RedirectResponse|\Illuminate\Routing\Redirector - */ - public function update(RuleFormRequest $request, Rule $rule) - { - $data = $request->getRuleData(); - $this->ruleRepos->update($rule, $data); - - session()->flash('success', (string)trans('firefly.updated_rule', ['title' => $rule->title])); - app('preferences')->mark(); - $redirect = redirect($this->getPreviousUri('rules.edit.uri')); - if (1 === (int)$request->get('return_to_edit')) { - // @codeCoverageIgnoreStart - session()->put('rules.edit.fromUpdate', true); - - $redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); - // @codeCoverageIgnoreEnd - } - - return $redirect; - } - - /** - * - */ - private function createDefaultRule(): void - { - if (0 === $this->ruleRepos->count()) { - $data = [ - 'rule_group_id' => $this->ruleRepos->getFirstRuleGroup()->id, - 'stop-processing' => 0, - 'title' => (string)trans('firefly.default_rule_name'), - 'description' => (string)trans('firefly.default_rule_description'), - 'trigger' => 'store-journal', - 'strict' => true, - 'rule-triggers' => [ - [ - 'name' => 'description_is', - 'value' => (string)trans('firefly.default_rule_trigger_description'), - 'stop-processing' => false, - - ], - [ - 'name' => 'from_account_is', - 'value' => (string)trans('firefly.default_rule_trigger_from_account'), - 'stop-processing' => false, - - ], - - ], - 'rule-actions' => [ - [ - 'name' => 'prepend_description', - 'value' => (string)trans('firefly.default_rule_action_prepend'), - 'stop-processing' => false, - ], - [ - 'name' => 'set_category', - 'value' => (string)trans('firefly.default_rule_action_set_category'), - 'stop-processing' => false, - ], - ], - ]; - - $this->ruleRepos->store($data); - } - } - - /** - * - */ - private function createDefaultRuleGroup(): void - { - if (0 === $this->ruleGroupRepos->count()) { - $data = [ - 'title' => (string)trans('firefly.default_rule_group_name'), - 'description' => (string)trans('firefly.default_rule_group_description'), - ]; - - $this->ruleGroupRepos->store($data); - } - } - - /** - * @param Bill $bill - * - * @return array - */ - private function getActionsForBill(Bill $bill): array - { - $actions = []; - try { - $actions[] = view( - 'rules.partials.action', - [ - 'oldAction' => 'link_to_bill', - 'oldValue' => $bill->name, - 'oldChecked' => false, - 'count' => 1, - ] - )->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $e) { - Log::error(sprintf('Throwable was thrown in getActionsForBill(): %s', $e->getMessage())); - Log::error($e->getTraceAsString()); - } - - // @codeCoverageIgnoreEnd - - return $actions; - } - - /** - * @param Rule $rule - * - * @return array - * - - */ - private function getCurrentActions(Rule $rule): array - { - $index = 0; - $actions = []; - - /** @var RuleAction $entry */ - foreach ($rule->ruleActions as $entry) { - $count = ($index + 1); - try { - $actions[] = view( - 'rules.partials.action', - [ - 'oldAction' => $entry->action_type, - 'oldValue' => $entry->action_value, - 'oldChecked' => $entry->stop_processing, - 'count' => $count, - ] - )->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $e) { - Log::debug(sprintf('Throwable was thrown in getCurrentActions(): %s', $e->getMessage())); - Log::error($e->getTraceAsString()); - } - // @codeCoverageIgnoreEnd - ++$index; - } - - return $actions; - } - - /** - * @param Rule $rule - * - * @return array - * - */ - private function getCurrentTriggers(Rule $rule): array - { - $index = 0; - $triggers = []; - - /** @var RuleTrigger $entry */ - foreach ($rule->ruleTriggers as $entry) { - if ('user_action' !== $entry->trigger_type) { - $count = ($index + 1); - try { - $triggers[] = view( - 'rules.partials.trigger', - [ - 'oldTrigger' => $entry->trigger_type, - 'oldValue' => $entry->trigger_value, - 'oldChecked' => $entry->stop_processing, - 'count' => $count, - ] - )->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $e) { - Log::debug(sprintf('Throwable was thrown in getCurrentTriggers(): %s', $e->getMessage())); - Log::error($e->getTraceAsString()); - } - // @codeCoverageIgnoreEnd - ++$index; - } - } - - return $triggers; - } - - /** - * @param Request $request - * - * @return array - * - */ - private function getPreviousActions(Request $request): array - { - $newIndex = 0; - $actions = []; - /** @var array $oldActions */ - $oldActions = \is_array($request->old('rule-action')) ? $request->old('rule-action') : []; - foreach ($oldActions as $index => $entry) { - $count = ($newIndex + 1); - $checked = isset($request->old('rule-action-stop')[$index]) ? true : false; - try { - $actions[] = view( - 'rules.partials.action', - [ - 'oldAction' => $entry, - 'oldValue' => $request->old('rule-action-value')[$index], - 'oldChecked' => $checked, - 'count' => $count, - ] - )->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $e) { - Log::debug(sprintf('Throwable was thrown in getPreviousActions(): %s', $e->getMessage())); - Log::error($e->getTraceAsString()); - } - // @codeCoverageIgnoreEnd - ++$newIndex; - } - - return $actions; - } - - /** - * @param Request $request - * - * @return array - * - - */ - private function getPreviousTriggers(Request $request): array - { - $newIndex = 0; - $triggers = []; - /** @var array $oldTriggers */ - $oldTriggers = \is_array($request->old('rule-trigger')) ? $request->old('rule-trigger') : []; - foreach ($oldTriggers as $index => $entry) { - $count = ($newIndex + 1); - $oldChecked = isset($request->old('rule-trigger-stop')[$index]) ? true : false; - try { - $triggers[] = view( - 'rules.partials.trigger', - [ - 'oldTrigger' => $entry, - 'oldValue' => $request->old('rule-trigger-value')[$index], - 'oldChecked' => $oldChecked, - 'count' => $count, - ] - )->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $e) { - Log::debug(sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage())); - Log::error($e->getTraceAsString()); - } - // @codeCoverageIgnoreEnd - ++$newIndex; - } - - return $triggers; - } - - /** - * Create fake triggers to match the bill's properties - * - * @param Bill $bill - * - * @return array - */ - private function getTriggersForBill(Bill $bill): array - { - $triggers = []; - /** @noinspection BadExceptionsProcessingInspection */ - try { - $triggers[] = view( - 'rules.partials.trigger', - [ - 'oldTrigger' => 'currency_is', - 'oldValue' => $bill->transactionCurrency()->first()->name, - 'oldChecked' => false, - 'count' => 1, - ] - )->render(); - - $triggers[] = view( - 'rules.partials.trigger', - [ - 'oldTrigger' => 'amount_more', - 'oldValue' => round($bill->amount_min, 12), - 'oldChecked' => false, - 'count' => 2, - ] - )->render(); - - $triggers[] = view( - 'rules.partials.trigger', - [ - 'oldTrigger' => 'amount_less', - 'oldValue' => round($bill->amount_max, 12), - 'oldChecked' => false, - 'count' => 3, - ] - )->render(); - - $triggers[] = view( - 'rules.partials.trigger', - [ - 'oldTrigger' => 'description_contains', - 'oldValue' => $bill->name, 12, - 'oldChecked' => false, - 'count' => 4, - ] - )->render(); - // @codeCoverageIgnoreStart - } catch (Throwable $e) { - Log::debug(sprintf('Throwable was thrown in getTriggersForBill(): %s', $e->getMessage())); - Log::debug($e->getTraceAsString()); - } - - // @codeCoverageIgnoreEnd - - return $triggers; - } - - /** - * @param TestRuleFormRequest $request - * - * @return array - */ - private function getValidTriggerList(TestRuleFormRequest $request): array - { - $triggers = []; - $data = [ - 'rule-triggers' => $request->get('rule-trigger'), - 'rule-trigger-values' => $request->get('rule-trigger-value'), - 'rule-trigger-stop' => $request->get('rule-trigger-stop'), - ]; - if (\is_array($data['rule-triggers'])) { - foreach ($data['rule-triggers'] as $index => $triggerType) { - $data['rule-trigger-stop'][$index] = (int)($data['rule-trigger-stop'][$index] ?? 0.0); - $triggers[] = [ - 'type' => $triggerType, - 'value' => $data['rule-trigger-values'][$index], - 'stopProcessing' => 1 === (int)$data['rule-trigger-stop'][$index], - ]; - } - } - - return $triggers; - } -} diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 2516ad77ea..543da778fc 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -35,6 +35,8 @@ use Illuminate\Http\Request; /** * Class RuleGroupController. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class RuleGroupController extends Controller { @@ -231,6 +233,8 @@ class RuleGroupController extends Controller * @param RuleGroup $ruleGroup * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) { diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 21f0115c12..a5584a6962 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -73,7 +73,7 @@ class SearchController extends Controller * @param SearchInterface $searcher * * @return \Illuminate\Http\JsonResponse - * @throws \Throwable + */ public function search(Request $request, SearchInterface $searcher): JsonResponse { diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index cb43bbb42a..d783fa9fca 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -166,7 +166,12 @@ class TagController extends Controller * @param Tag $tag * @param string|null $moment * + * TODO will be cleaned up and separated + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function show(Request $request, Tag $tag, string $moment = null) { @@ -286,6 +291,8 @@ class TagController extends Controller * @param Tag $tag * * @return Collection + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function getPeriodOverview(Tag $tag): Collection { diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index 2a2a603779..a3ea753677 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -87,6 +87,8 @@ class BulkController extends Controller * @param BulkEditJournalRequest $request * * @return mixed + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function update(BulkEditJournalRequest $request) { diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index ca11f83e21..d2c99ae19c 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -82,16 +82,14 @@ class ConvertController extends Controller $subTitle = (string)trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]); $subTitleIcon = 'fa-exchange'; - // cannot convert to its own type. - if ($sourceType->type === $destinationType->type) { + if ($sourceType->type === $destinationType->type) { // cannot convert to its own type. Log::debug('This is already a transaction of the expected type..'); session()->flash('info', (string)trans('firefly.convert_is_already_type_' . $destinationType->type)); return redirect(route('transactions.show', [$journal->id])); } - // cannot convert split. - if ($journal->transactions()->count() > 2) { + if ($journal->transactions()->count() > 2) { // cannot convert split. Log::info('This journal has more than two transactions.'); session()->flash('error', (string)trans('firefly.cannot_convert_split_journal')); @@ -119,7 +117,8 @@ class ConvertController extends Controller * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws FireflyException - * @throws FireflyException + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function postIndex(Request $request, TransactionType $destinationType, TransactionJournal $journal) { @@ -172,6 +171,9 @@ class ConvertController extends Controller * @return Account * * @throws FireflyException + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getDestinationAccount(TransactionJournal $journal, TransactionType $destinationType, array $data): Account { @@ -228,6 +230,9 @@ class ConvertController extends Controller * @return Account * * @throws FireflyException + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getSourceAccount(TransactionJournal $journal, TransactionType $destinationType, array $data): Account { diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index 34cb561004..d4b4944e49 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -101,13 +101,7 @@ class LinkController extends Controller Log::debug('We are here (store)'); $linkInfo = $request->getLinkInfo(); - if (0 === $linkInfo['transaction_journal_id']) { - session()->flash('error', (string)trans('firefly.invalid_link_selection')); - - return redirect(route('transactions.show', [$journal->id])); - } - $other = $this->journalRepository->findNull($linkInfo['transaction_journal_id']); - + $other = $this->journalRepository->findNull($linkInfo['transaction_journal_id']); if (null === $other) { session()->flash('error', (string)trans('firefly.invalid_link_selection')); diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index e8bb3ea05a..7f324c7d39 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -42,6 +42,8 @@ use Symfony\Component\HttpFoundation\ParameterBag; /** * Class MassController. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class MassController extends Controller { @@ -85,29 +87,24 @@ class MassController extends Controller * @param MassDeleteJournalRequest $request * * @return mixed + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function destroy(MassDeleteJournalRequest $request) { - $ids = $request->get('confirm_mass_delete'); - $set = new Collection; + $ids = $request->get('confirm_mass_delete'); + $count = 0; if (\is_array($ids)) { /** @var string $journalId */ foreach ($ids as $journalId) { /** @var TransactionJournal $journal */ $journal = $this->repository->findNull((int)$journalId); if (null !== $journal && (int)$journalId === $journal->id) { - $set->push($journal); + $this->repository->destroy($journal); + ++$count; } } } - unset($journal); - $count = 0; - /** @var TransactionJournal $journal */ - foreach ($set as $journal) { - $this->repository->destroy($journal); - ++$count; - } app('preferences')->mark(); session()->flash('success', (string)trans('firefly.mass_deleted_transactions_success', ['amount' => $count])); @@ -127,20 +124,16 @@ class MassController extends Controller $user = auth()->user(); $subTitle = (string)trans('firefly.mass_edit_journals'); - /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - // get budgets /** @var BudgetRepositoryInterface $budgetRepository */ $budgetRepository = app(BudgetRepositoryInterface::class); $budgets = $budgetRepository->getBudgets(); - // put previous url in session $this->rememberPreviousUri('transactions.mass-edit.uri'); - // use the collector to get them. $transformer = new TransactionTransformer(new ParameterBag); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); @@ -148,12 +141,7 @@ class MassController extends Controller $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setJournals($journals); $collector->addFilter(TransactionViewFilter::class); - $collection = $collector->getJournals(); - - // add some filters: - - - // transform to array + $collection = $collector->getJournals(); $transactions = $collection->map( function (Transaction $transaction) use ($transformer) { $transformed = $transformer->transform($transaction); @@ -173,6 +161,8 @@ class MassController extends Controller * @param JournalRepositoryInterface $repository * * @return mixed + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function update(MassEditJournalRequest $request, JournalRepositoryInterface $repository) { diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 1b7547ba20..c3ed9429d0 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -41,6 +41,8 @@ use View; /** * Class SingleController. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class SingleController extends Controller { @@ -82,6 +84,8 @@ class SingleController extends Controller * @param TransactionJournal $journal * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function cloneTransaction(TransactionJournal $journal) { @@ -137,6 +141,8 @@ class SingleController extends Controller * @param string|null $what * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function create(Request $request, string $what = null) { @@ -203,8 +209,6 @@ class SingleController extends Controller * @param TransactionJournal $transactionJournal * * @return \Illuminate\Http\RedirectResponse - * - * @internal param JournalRepositoryInterface $repository */ public function destroy(TransactionJournal $transactionJournal): RedirectResponse { @@ -229,6 +233,9 @@ class SingleController extends Controller * @param JournalRepositoryInterface $repository * * @return mixed + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function edit(TransactionJournal $journal, JournalRepositoryInterface $repository) { @@ -319,6 +326,10 @@ class SingleController extends Controller * * @return RedirectResponse * @throws \FireflyIII\Exceptions\FireflyException + * + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function store(JournalFormRequest $request, JournalRepositoryInterface $repository): RedirectResponse { @@ -377,6 +388,9 @@ class SingleController extends Controller * @param TransactionJournal $journal * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal) { diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 5b8c69b9c6..7591fcad70 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -42,6 +42,7 @@ use View; /** * Class SplitController. + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class SplitController extends Controller { @@ -122,6 +123,9 @@ class SplitController extends Controller * @param TransactionJournal $journal * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function update(SplitJournalFormRequest $request, TransactionJournal $journal) { @@ -216,6 +220,8 @@ class SplitController extends Controller * * @return array * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getTransactionDataFromJournal(TransactionJournal $journal): array { @@ -253,6 +259,9 @@ class SplitController extends Controller * @param $old * * @return array + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function updateWithPrevious($array, $old): array { diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index df344675b4..7a44a3d271 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -45,6 +45,8 @@ use View; /** * Class TransactionController. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class TransactionController extends Controller { @@ -174,6 +176,7 @@ class TransactionController extends Controller * @param Request $request * * @return \Illuminate\Http\JsonResponse + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function reorder(Request $request): JsonResponse { @@ -241,6 +244,9 @@ class TransactionController extends Controller * @param Carbon $date * * @return Collection + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getPeriodOverview(string $what, Carbon $date): Collection { @@ -277,7 +283,6 @@ class TransactionController extends Controller 'name' => $dateName, 'sums' => $sums, 'sum' => $sum, - 'start' => $currentDate['start']->format('Y-m-d'), 'end' => $currentDate['end']->format('Y-m-d'), ] diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 4197d6d285..63fbb74996 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -41,7 +41,7 @@ class StartFireflySession extends StartSession { $uri = $request->fullUrl(); $strpos = strpos($uri, 'jscript'); - if (false === $strpos && 'GET' === $request->method() && $request->route() && !$request->ajax()) { + if (false === $strpos && 'GET' === $request->method() && !$request->ajax()) { $session->setPreviousUrl($uri); } } diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index f14b84141d..ed9131fb59 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -40,7 +40,7 @@ class TrustProxies extends Middleware * * @var array|string */ - protected $proxies; + protected $proxies = []; /** * TrustProxies constructor. @@ -49,17 +49,8 @@ class TrustProxies extends Middleware */ public function __construct(Repository $config) { - $trustedProxies = env('TRUSTED_PROXIES', null); - if (false !== $trustedProxies && null !== $trustedProxies && \strlen($trustedProxies) > 0) { - if ('*' === $trustedProxies || '**' === $trustedProxies) { - $this->proxies = $trustedProxies; - - } - if ('*' !== $trustedProxies && '**' !== $trustedProxies) { - $this->proxies = explode(',', $trustedProxies); - } - } - + $trustedProxies = (string)env('TRUSTED_PROXIES', null); + $this->proxies = explode(',', $trustedProxies); parent::__construct($config); } } diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 7c14013d74..ec526a21d4 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -45,6 +45,8 @@ class JournalFormRequest extends Request * Returns and validates the data required to store a new journal. Can handle both single transaction journals and split journals. * * @return array + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getJournalData(): array { @@ -240,61 +242,79 @@ class JournalFormRequest extends Request $type = $data['what'] ?? 'invalid'; Log::debug(sprintf('Type is %s', $type)); if ('withdrawal' === $type) { - - $selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0); - $accountCurrency = (int)($data['source_account_currency'] ?? 0); - Log::debug(sprintf('Selected currency is %d, account currency is %d', $selectedCurrency, $accountCurrency)); - $nativeAmount = (string)($data['native_amount'] ?? ''); - if ($selectedCurrency !== $accountCurrency && '' === $nativeAmount - && 0 !== $selectedCurrency - && 0 !== $accountCurrency - ) { - Log::debug('ADD validation error on native_amount'); - $validator->errors()->add('native_amount', (string)trans('validation.numeric_native')); - - return; - } + $this->validateWithdrawal($validator); } // same thing for deposits: if ('deposit' === $type) { - $selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0); - $accountCurrency = (int)($data['destination_account_currency'] ?? 0); - $nativeAmount = (string)($data['native_amount'] ?? ''); - if ($selectedCurrency !== $accountCurrency && '' === $nativeAmount - && 0 !== $selectedCurrency - && 0 !== $accountCurrency - ) { - $validator->errors()->add('native_amount', (string)trans('validation.numeric_native')); - - return; - } + $this->validateDeposit($validator); } // and for transfers if ('transfer' === $type) { + $this->validateTransfer($validator); + } + } - $sourceCurrency = (int)($data['source_account_currency'] ?? 0); - $destinationCurrency = (int)($data['destination_account_currency'] ?? 0); - $sourceAmount = (string)($data['source_amount'] ?? ''); - $destinationAmount = (string)($data['destination_amount'] ?? ''); + /** + * @param Validator $validator + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function validateDeposit(Validator $validator): void + { + $selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0); + $accountCurrency = (int)($data['destination_account_currency'] ?? 0); + $nativeAmount = (string)($data['native_amount'] ?? ''); + if ($selectedCurrency !== $accountCurrency && '' === $nativeAmount && 0 !== $selectedCurrency && 0 !== $accountCurrency) { + $validator->errors()->add('native_amount', (string)trans('validation.numeric_native')); - Log::debug(sprintf('Source currency is %d, destination currency is %d', $sourceCurrency, $destinationCurrency)); + return; + } + } - if ($sourceCurrency !== $destinationCurrency && '' === $sourceAmount - && 0 !== $sourceCurrency - && 0 !== $destinationCurrency - ) { - $validator->errors()->add('source_amount', (string)trans('validation.numeric_source')); - } + /** + * @param Validator $validator + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function validateTransfer(Validator $validator): void + { + $sourceCurrency = (int)($data['source_account_currency'] ?? 0); + $destinationCurrency = (int)($data['destination_account_currency'] ?? 0); + $sourceAmount = (string)($data['source_amount'] ?? ''); + $destinationAmount = (string)($data['destination_amount'] ?? ''); - if ($sourceCurrency !== $destinationCurrency && '' === $destinationAmount - && 0 !== $sourceCurrency - && 0 !== $destinationCurrency - ) { - $validator->errors()->add('destination_amount', (string)trans('validation.numeric_destination')); - $validator->errors()->add('destination_amount', (string)trans('validation.numeric', ['attribute' => 'destination_amount'])); - } + Log::debug(sprintf('Source currency is %d, destination currency is %d', $sourceCurrency, $destinationCurrency)); + + if ($sourceCurrency !== $destinationCurrency && '' === $sourceAmount && 0 !== $sourceCurrency && 0 !== $destinationCurrency) { + $validator->errors()->add('source_amount', (string)trans('validation.numeric_source')); + } + + if ($sourceCurrency !== $destinationCurrency && '' === $destinationAmount && 0 !== $sourceCurrency && 0 !== $destinationCurrency) { + $validator->errors()->add('destination_amount', (string)trans('validation.numeric_destination')); + $validator->errors()->add('destination_amount', (string)trans('validation.numeric', ['attribute' => 'destination_amount'])); + } + + } + + /** + * @param Validator $validator + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function validateWithdrawal(Validator $validator): void + { + $data = $validator->getData(); + $selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0); + $accountCurrency = (int)($data['source_account_currency'] ?? 0); + Log::debug(sprintf('Selected currency is %d, account currency is %d', $selectedCurrency, $accountCurrency)); + $nativeAmount = (string)($data['native_amount'] ?? ''); + if ($selectedCurrency !== $accountCurrency && '' === $nativeAmount + && 0 !== $selectedCurrency + && 0 !== $accountCurrency + ) { + Log::debug('ADD validation error on native_amount'); + $validator->errors()->add('native_amount', (string)trans('validation.numeric_native')); return; } diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index d1ba493c5b..871c96bc8c 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -48,6 +48,9 @@ class RecurrenceFormRequest extends Request /** * @return array * @throws FireflyException + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getAll(): array { @@ -132,6 +135,10 @@ class RecurrenceFormRequest extends Request /** * @return array * @throws FireflyException + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.NPathComplexity) */ public function rules(): array { @@ -222,6 +229,8 @@ class RecurrenceFormRequest extends Request /** * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function parseRepetitionData(): array { diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 50a8b5f8fe..e470d7d4a4 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -27,6 +27,8 @@ use Illuminate\Foundation\Http\FormRequest; /** * Class Request. + * + * @SuppressWarnings(PHPMD.NumberOfChildren) */ class Request extends FormRequest { @@ -71,6 +73,8 @@ class Request extends FormRequest * @param string $field * * @return string + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function string(string $field): string { diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 7e35f4016a..9248d3c3ce 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -40,6 +40,9 @@ class RuleFormRequest extends Request /** * @return array + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getRuleData(): array { diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index fec9c93519..588625e1a4 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -40,6 +40,9 @@ class SplitJournalFormRequest extends Request /** * @return array + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getAll(): array { @@ -147,6 +150,8 @@ class SplitJournalFormRequest extends Request /** * @param Validator $validator + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ protected function sameAccounts(Validator $validator): void { diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index d738d768d6..99bbd834a8 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -36,7 +36,6 @@ use Illuminate\Support\Collection; /** * Interface RecurringRepositoryInterface * - * @package FireflyIII\Repositories\Recurring */ interface RecurringRepositoryInterface { diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index b36d7d4c0d..97b4404b3f 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -41,7 +41,6 @@ use Log; /** * Trait RecurringTransactionTrait * - * @package FireflyIII\Services\Internal\Support */ trait RecurringTransactionTrait { diff --git a/app/Services/Internal/Support/TransactionTypeTrait.php b/app/Services/Internal/Support/TransactionTypeTrait.php index 204110c66b..b209e7cc61 100644 --- a/app/Services/Internal/Support/TransactionTypeTrait.php +++ b/app/Services/Internal/Support/TransactionTypeTrait.php @@ -30,7 +30,6 @@ use Log; /** * Trait TransactionTypeTrait * - * @package FireflyIII\Services\Internal\Support */ trait TransactionTypeTrait { diff --git a/app/Support/Binder/ImportProvider.php b/app/Support/Binder/ImportProvider.php index b06cff4dc1..1d3df1bf8e 100644 --- a/app/Support/Binder/ImportProvider.php +++ b/app/Support/Binder/ImportProvider.php @@ -23,8 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Support\Binder; use Carbon\Carbon; +use FireflyIII\Import\Prerequisites\PrerequisitesInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\User; use Illuminate\Routing\Route; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Log; /** * Class ImportProvider. @@ -40,10 +44,63 @@ class ImportProvider implements BinderInterface */ public static function routeBinder(string $value, Route $route): string { - $providers = array_keys((array)config('import.enabled')); + $providers = array_keys(self::getProviders()); if (\in_array($value, $providers, true)) { return $value; } throw new NotFoundHttpException; } + + /** + * @return array + */ + public static function getProviders(): array + { + $repository = app(UserRepositoryInterface::class); + // get and filter all import routines: + /** @var User $user */ + $user = auth()->user(); + /** @var array $config */ + $providerNames = array_keys(config('import.enabled')); + $providers = []; + $isDemoUser = $repository->hasRole($user, 'demo'); + $isDebug = (bool)config('app.debug'); + foreach ($providerNames as $providerName) { + //Log::debug(sprintf('Now with provider %s', $providerName)); + // only consider enabled providers + $enabled = (bool)config(sprintf('import.enabled.%s', $providerName)); + $allowedForDemo = (bool)config(sprintf('import.allowed_for_demo.%s', $providerName)); + $allowedForUser = (bool)config(sprintf('import.allowed_for_user.%s', $providerName)); + if (false === $enabled) { + //Log::debug('Provider is not enabled. NEXT!'); + continue; + } + + if (true === $isDemoUser && false === $allowedForDemo) { + //Log::debug('User is demo and this provider is not allowed for demo user. NEXT!'); + continue; + } + if (false === $isDemoUser && false === $allowedForUser && false === $isDebug) { + //Log::debug('User is not demo and this provider is not allowed for such users. NEXT!'); + continue; // @codeCoverageIgnore + } + + $providers[$providerName] = [ + 'has_prereq' => (bool)config('import.has_prereq.' . $providerName), + ]; + $class = (string)config(sprintf('import.prerequisites.%s', $providerName)); + $result = false; + if ('' !== $class && class_exists($class)) { + //Log::debug('Will not check prerequisites.'); + /** @var PrerequisitesInterface $object */ + $object = app($class); + $object->setUser($user); + $result = $object->isComplete(); + } + $providers[$providerName]['prereq_complete'] = $result; + } + Log::debug(sprintf('Enabled providers: %s', json_encode(array_keys($providers)))); + + return $providers; + } } diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index bb2bc9c25c..1e1c44cddc 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -52,7 +52,7 @@ class ExpandedForm * @param null $options * * @return string - * @throws \Throwable + */ public function activeAssetAccountList(string $name, $value = null, array $options = []): string { @@ -93,7 +93,7 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + */ public function amount(string $name, $value = null, array $options = []): string { @@ -106,7 +106,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function amountNoCurrency(string $name, $value = null, array $options = []): string { @@ -145,7 +145,7 @@ class ExpandedForm * @param null $options * * @return string - * @throws \Throwable + */ public function assetAccountCheckList(string $name, $options = null): string { @@ -183,7 +183,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function assetAccountList(string $name, $value = null, array $options = []): string { @@ -225,7 +225,7 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + */ public function balance(string $name, $value = null, array $options = []): string { @@ -239,7 +239,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function checkbox(string $name, $value = 1, $checked = null, $options = []): string { @@ -268,7 +268,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function currencyList(string $name, $value = null, array $options = []): string { @@ -293,7 +293,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function currencyListEmpty(string $name, $value = null, array $options = []): string { @@ -320,7 +320,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function date(string $name, $value = null, array $options = []): string { @@ -339,7 +339,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function file(string $name, array $options = []): string { @@ -357,7 +357,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function integer(string $name, $value = null, array $options = []): string { @@ -377,7 +377,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function location(string $name, $value = null, array $options = []): string { @@ -450,7 +450,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function multiRadio(string $name, array $list = [], $selected = null, array $options = []): string { @@ -472,7 +472,7 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + */ public function nonSelectableAmount(string $name, $value = null, array $options = []): string { @@ -501,7 +501,7 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + */ public function nonSelectableBalance(string $name, $value = null, array $options = []): string { @@ -530,7 +530,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function number(string $name, $value = null, array $options = []): string { @@ -551,7 +551,7 @@ class ExpandedForm * @param string $name * * @return string - * @throws \Throwable + */ public function optionsList(string $type, string $name): string { @@ -565,7 +565,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function password(string $name, array $options = null): string { @@ -584,7 +584,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function piggyBankList(string $name, $value = null, array $options = null): string { @@ -610,7 +610,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function ruleGroupList(string $name, $value = null, array $options = []): string { @@ -664,7 +664,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function select(string $name, array $list = [], $selected = null, array $options = []): string { @@ -684,7 +684,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function staticText(string $name, $value, array $options = []): string { @@ -702,7 +702,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function tags(string $name, $value = null, array $options = []): string { @@ -722,7 +722,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function text(string $name, $value = null, array $options = []): string { @@ -741,7 +741,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + */ public function textarea(string $name, $value = null, array $options = []): string { @@ -843,7 +843,7 @@ class ExpandedForm * @return string * * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + */ private function currencyField(string $name, string $view, $value = null, array $options = []): string { diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.php index 13cb1e221a..80e1ebb1e1 100644 --- a/app/Support/Http/Controllers/DateCalculation.php +++ b/app/Support/Http/Controllers/DateCalculation.php @@ -29,7 +29,6 @@ use Log; /** * Trait DateCalculation * - * @package FireflyIII\Support\Http\Controllers */ trait DateCalculation { diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.php new file mode 100644 index 0000000000..6fdfbb3ac9 --- /dev/null +++ b/app/Support/Http/Controllers/RuleManagement.php @@ -0,0 +1,177 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Http\Controllers; + +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use Illuminate\Http\Request; +use Log; +use Throwable; + +/** + * Trait RuleManagement + * + * @package FireflyIII\Support\Http\Controllers + */ +trait RuleManagement +{ + + /** + * + */ + protected function createDefaultRule(): void + { + /** @var RuleRepositoryInterface $ruleRepository */ + $ruleRepository = app(RuleRepositoryInterface::class); + if (0 === $ruleRepository->count()) { + $data = [ + 'rule_group_id' => $ruleRepository->getFirstRuleGroup()->id, + 'stop-processing' => 0, + 'title' => (string)trans('firefly.default_rule_name'), + 'description' => (string)trans('firefly.default_rule_description'), + 'trigger' => 'store-journal', + 'strict' => true, + 'rule-triggers' => [ + [ + 'name' => 'description_is', + 'value' => (string)trans('firefly.default_rule_trigger_description'), + 'stop-processing' => false, + + ], + [ + 'name' => 'from_account_is', + 'value' => (string)trans('firefly.default_rule_trigger_from_account'), + 'stop-processing' => false, + + ], + + ], + 'rule-actions' => [ + [ + 'name' => 'prepend_description', + 'value' => (string)trans('firefly.default_rule_action_prepend'), + 'stop-processing' => false, + ], + [ + 'name' => 'set_category', + 'value' => (string)trans('firefly.default_rule_action_set_category'), + 'stop-processing' => false, + ], + ], + ]; + + $ruleRepository->store($data); + } + } + + /** + * @param Request $request + * + * @return array + * + */ + protected function getPreviousActions(Request $request): array + { + $newIndex = 0; + $actions = []; + /** @var array $oldActions */ + $oldActions = \is_array($request->old('rule-action')) ? $request->old('rule-action') : []; + foreach ($oldActions as $index => $entry) { + $count = ($newIndex + 1); + $checked = isset($request->old('rule-action-stop')[$index]) ? true : false; + try { + $actions[] = view( + 'rules.partials.action', + [ + 'oldAction' => $entry, + 'oldValue' => $request->old('rule-action-value')[$index], + 'oldChecked' => $checked, + 'count' => $count, + ] + )->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $e) { + Log::debug(sprintf('Throwable was thrown in getPreviousActions(): %s', $e->getMessage())); + Log::error($e->getTraceAsString()); + } + // @codeCoverageIgnoreEnd + ++$newIndex; + } + + return $actions; + } + + /** + * @param Request $request + * + * @return array + */ + protected function getPreviousTriggers(Request $request): array + { + $newIndex = 0; + $triggers = []; + /** @var array $oldTriggers */ + $oldTriggers = \is_array($request->old('rule-trigger')) ? $request->old('rule-trigger') : []; + foreach ($oldTriggers as $index => $entry) { + $count = ($newIndex + 1); + $oldChecked = isset($request->old('rule-trigger-stop')[$index]) ? true : false; + try { + $triggers[] = view( + 'rules.partials.trigger', + [ + 'oldTrigger' => $entry, + 'oldValue' => $request->old('rule-trigger-value')[$index], + 'oldChecked' => $oldChecked, + 'count' => $count, + ] + )->render(); + // @codeCoverageIgnoreStart + } catch (Throwable $e) { + Log::debug(sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage())); + Log::error($e->getTraceAsString()); + } + // @codeCoverageIgnoreEnd + ++$newIndex; + } + + return $triggers; + } + + /** + * + */ + private function createDefaultRuleGroup(): void + { + /** @var RuleGroupRepositoryInterface $repository */ + $repository = app(RuleGroupRepositoryInterface::class); + if (0 === $repository->count()) { + $data = [ + 'title' => (string)trans('firefly.default_rule_group_name'), + 'description' => (string)trans('firefly.default_rule_group_description'), + ]; + + $repository->store($data); + } + } +} \ No newline at end of file diff --git a/app/Support/Import/Information/GetSpectreTokenTrait.php b/app/Support/Import/Information/GetSpectreTokenTrait.php index 15c10202e4..02ed4c0bf8 100644 --- a/app/Support/Import/Information/GetSpectreTokenTrait.php +++ b/app/Support/Import/Information/GetSpectreTokenTrait.php @@ -32,7 +32,6 @@ use Log; /** * Trait GetSpectreTokenTrait * - * @package FireflyIII\Support\Import\Information */ trait GetSpectreTokenTrait { diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.php index 71ee97daec..6a1fe9c587 100644 --- a/app/Validation/RecurrenceValidation.php +++ b/app/Validation/RecurrenceValidation.php @@ -33,7 +33,6 @@ use InvalidArgumentException; * * Contains advanced validation rules used in validation of new and existing recurrences. * - * @package FireflyIII\Validation */ trait RecurrenceValidation { diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index 128c740131..ee08ef9ada 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -33,8 +33,6 @@ use Log; /** * Trait TransactionValidation - * - * @package FireflyIII\Validation */ trait TransactionValidation { diff --git a/composer.lock b/composer.lock index e30d20069c..2a96a6e3a3 100644 --- a/composer.lock +++ b/composer.lock @@ -5126,12 +5126,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "731d60f7fc78a8816dae7049df255cd55e30c313" + "reference": "053766d789f6393e5bc0896635d35abf8d2d362e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/731d60f7fc78a8816dae7049df255cd55e30c313", - "reference": "731d60f7fc78a8816dae7049df255cd55e30c313", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/053766d789f6393e5bc0896635d35abf8d2d362e", + "reference": "053766d789f6393e5bc0896635d35abf8d2d362e", "shasum": "" }, "conflict": { @@ -5180,7 +5180,7 @@ "kreait/firebase-php": ">=3.2,<3.8.1", "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", - "magento/magento1ce": ">=1.5.0.1,<1.9.3.2", + "magento/magento1ce": "<1.9.3.9", "magento/magento1ee": ">=1.9,<1.14.3.2", "magento/product-community-edition": ">=2,<2.2.5", "monolog/monolog": ">=1.8,<1.12", @@ -5238,7 +5238,8 @@ "thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3", "titon/framework": ">=0,<9.9.99", "twig/twig": "<1.20", - "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.30|>=8,<8.7.17|>=9,<9.3.2", + "typo3/cms-core": ">=8,<8.7.17|>=9,<9.3.2", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "willdurand/js-translation-bundle": "<2.1.1", @@ -5287,7 +5288,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2018-07-09T14:09:25+00:00" + "time": "2018-07-18T13:51:34+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", From 2d66a9212fdb0a1336d0fd50475710a557962327 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 14:35:09 +0200 Subject: [PATCH 35/86] Various code cleanup --- public/js/ff/recurring/edit.js | 2 +- resources/lang/en_US/config.php | 2 +- resources/views/recurring/edit.twig | 2 +- routes/web.php | 65 +++++++++++++++++------------ 4 files changed, 42 insertions(+), 29 deletions(-) diff --git a/public/js/ff/recurring/edit.js b/public/js/ff/recurring/edit.js index 24ee67c1e8..2d01c524f3 100644 --- a/public/js/ff/recurring/edit.js +++ b/public/js/ff/recurring/edit.js @@ -108,7 +108,7 @@ function respondToFirstDateChange() { select.prop('disabled', true); // preselected value: - var preSelected = currentRepetitionType; + var preSelected = currentRepType; if(preSelected === '') { preSelected = select.val(); } diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php index eb6b1f2322..eef3a750c7 100644 --- a/resources/lang/en_US/config.php +++ b/resources/lang/en_US/config.php @@ -24,7 +24,7 @@ declare(strict_types=1); return [ 'html_language' => 'en', - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'en, English, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'month_and_date_day' => '%A %B %e, %Y', diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twig index 03a5c0b4a3..59fc8e6e16 100644 --- a/resources/views/recurring/edit.twig +++ b/resources/views/recurring/edit.twig @@ -223,7 +223,7 @@ var transactionType = "{{ preFilled.transaction_type }}"; var suggestUri = "{{ route('recurring.suggest') }}"; var eventsUri = "{{ route('recurring.events') }}"; - var currentRepetitionType = "{{ currentRepetitionType }}"; + var currentRepType = "{{ currentRepType }}"; {% endblock %} diff --git a/routes/web.php b/routes/web.php index b401f43fb5..aabc5e1214 100755 --- a/routes/web.php +++ b/routes/web.php @@ -651,19 +651,22 @@ Route::group( * Recurring Transactions Controller */ Route::group( - ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Recurring', 'prefix' => 'recurring', 'as' => 'recurring.'], function () { + ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'recurring', 'as' => 'recurring.'], function () { - Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); - Route::get('suggest', ['uses' => 'IndexController@suggest', 'as' => 'suggest']); - Route::get('events', ['uses' => 'IndexController@events', 'as' => 'events']); - Route::get('show/{recurrence}', ['uses' => 'IndexController@show', 'as' => 'show']); - Route::get('create', ['uses' => 'CreateController@create', 'as' => 'create']); - Route::get('edit/{recurrence}', ['uses' => 'EditController@edit', 'as' => 'edit']); - Route::get('delete/{recurrence}', ['uses' => 'DeleteController@delete', 'as' => 'delete']); + Route::get('', ['uses' => 'Recurring\IndexController@index', 'as' => 'index']); - Route::post('store', ['uses' => 'CreateController@store', 'as' => 'store']); - Route::post('update/{recurrence}', ['uses' => 'EditController@update', 'as' => 'update']); - Route::post('destroy/{recurrence}', ['uses' => 'DeleteController@destroy', 'as' => 'destroy']); + Route::get('show/{recurrence}', ['uses' => 'Recurring\IndexController@show', 'as' => 'show']); + Route::get('create', ['uses' => 'Recurring\CreateController@create', 'as' => 'create']); + Route::get('edit/{recurrence}', ['uses' => 'Recurring\EditController@edit', 'as' => 'edit']); + Route::get('delete/{recurrence}', ['uses' => 'Recurring\DeleteController@delete', 'as' => 'delete']); + + Route::post('store', ['uses' => 'Recurring\CreateController@store', 'as' => 'store']); + Route::post('update/{recurrence}', ['uses' => 'Recurring\EditController@update', 'as' => 'update']); + Route::post('destroy/{recurrence}', ['uses' => 'Recurring\DeleteController@destroy', 'as' => 'destroy']); + + // JSON routes: + Route::get('events', ['uses' => 'Json\RecurrenceController@events', 'as' => 'events']); + Route::get('suggest', ['uses' => 'Json\RecurrenceController@suggest', 'as' => 'suggest']); } ); @@ -773,22 +776,32 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rules', 'as' => 'rules.'], function () { - Route::get('', ['uses' => 'RuleController@index', 'as' => 'index']); - Route::get('create/{ruleGroup?}', ['uses' => 'RuleController@create', 'as' => 'create']); - Route::get('up/{rule}', ['uses' => 'RuleController@up', 'as' => 'up']); - Route::get('down/{rule}', ['uses' => 'RuleController@down', 'as' => 'down']); - Route::get('edit/{rule}', ['uses' => 'RuleController@edit', 'as' => 'edit']); - Route::get('delete/{rule}', ['uses' => 'RuleController@delete', 'as' => 'delete']); - Route::get('test', ['uses' => 'RuleController@testTriggers', 'as' => 'test-triggers']); - Route::get('test-rule/{rule}', ['uses' => 'RuleController@testTriggersByRule', 'as' => 'test-triggers-rule']); - Route::get('select/{rule}', ['uses' => 'RuleController@selectTransactions', 'as' => 'select-transactions']); + // create controller + Route::get('create/{ruleGroup?}', ['uses' => 'Rule\CreateController@create', 'as' => 'create']); + Route::post('store', ['uses' => 'Rule\CreateController@store', 'as' => 'store']); + + // delete controller + Route::get('delete/{rule}', ['uses' => 'Rule\DeleteController@delete', 'as' => 'delete']); + Route::post('destroy/{rule}', ['uses' => 'Rule\DeleteController@destroy', 'as' => 'destroy']); + + // index controller + Route::get('', ['uses' => 'Rule\IndexController@index', 'as' => 'index']); + Route::get('up/{rule}', ['uses' => 'Rule\IndexController@up', 'as' => 'up']); + Route::get('down/{rule}', ['uses' => 'Rule\IndexController@down', 'as' => 'down']); + Route::post('trigger/order/{rule}', ['uses' => 'Rule\IndexController@reorderRuleTriggers', 'as' => 'reorder-triggers']); + Route::post('action/order/{rule}', ['uses' => 'Rule\IndexController@reorderRuleActions', 'as' => 'reorder-actions']); + + // select controller + Route::get('test', ['uses' => 'Rule\SelectController@testTriggers', 'as' => 'test-triggers']); + Route::get('test-rule/{rule}', ['uses' => 'Rule\SelectController@testTriggersByRule', 'as' => 'test-triggers-rule']); + Route::get('select/{rule}', ['uses' => 'Rule\SelectController@selectTransactions', 'as' => 'select-transactions']); + Route::post('execute/{rule}', ['uses' => 'Rule\SelectController@execute', 'as' => 'execute']); + + // edit controller + Route::get('edit/{rule}', ['uses' => 'Rule\EditController@edit', 'as' => 'edit']); + Route::post('update/{rule}', ['uses' => 'Rule\EditController@update', 'as' => 'update']); + - Route::post('trigger/order/{rule}', ['uses' => 'RuleController@reorderRuleTriggers', 'as' => 'reorder-triggers']); - Route::post('action/order/{rule}', ['uses' => 'RuleController@reorderRuleActions', 'as' => 'reorder-actions']); - Route::post('store', ['uses' => 'RuleController@store', 'as' => 'store']); - Route::post('update/{rule}', ['uses' => 'RuleController@update', 'as' => 'update']); - Route::post('destroy/{rule}', ['uses' => 'RuleController@destroy', 'as' => 'destroy']); - Route::post('execute/{rule}', ['uses' => 'RuleController@execute', 'as' => 'execute']); } ); From 49ff6febe586ecc79d8b24c12a237aaffbc4bd3c Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 16:28:54 +0200 Subject: [PATCH 36/86] Fix tests. --- app/Http/Controllers/HomeController.php | 2 +- .../Controllers/Popup/ReportController.php | 2 +- .../Import/IndexControllerTest.php | 43 +- .../Import/PrerequisitesControllerTest.php | 22 +- .../Popup/ReportControllerTest.php | 6 +- .../Controllers/Rule/CreateControllerTest.php | 169 ++++++ .../Controllers/Rule/DeleteControllerTest.php | 78 +++ .../Controllers/Rule/EditControllerTest.php | 138 +++++ .../Controllers/Rule/IndexControllerTest.php | 148 +++++ .../Controllers/Rule/SelectControllerTest.php | 189 ++++++ .../Controllers/RuleControllerTest.php | 542 ------------------ .../Transaction/LinkControllerTest.php | 8 +- .../TransactionRules/Actions/AddTagTest.php | 2 + .../Triggers/FromAccountIsTest.php | 22 +- 14 files changed, 789 insertions(+), 582 deletions(-) create mode 100644 tests/Feature/Controllers/Rule/CreateControllerTest.php create mode 100644 tests/Feature/Controllers/Rule/DeleteControllerTest.php create mode 100644 tests/Feature/Controllers/Rule/EditControllerTest.php create mode 100644 tests/Feature/Controllers/Rule/IndexControllerTest.php create mode 100644 tests/Feature/Controllers/Rule/SelectControllerTest.php delete mode 100644 tests/Feature/Controllers/RuleControllerTest.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 0cb4a1472a..4044864298 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -104,7 +104,7 @@ class HomeController extends Controller } $subTitle = (string)trans('firefly.welcomeBack'); $transactions = []; - $frontPage = app('preferences')->get('frontPageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray()); + $frontPage = app('preferences')->get('frontPageAccounts', $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()); /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 9be8443b0e..6f10fe1224 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -264,7 +264,7 @@ class ReportController extends Controller try { $attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate']); } catch (InvalidArgumentException $e) { - Log::debug('Not important error message: %s', $e->getMessage()); + Log::debug(sprintf('Not important error message: %s', $e->getMessage())); $date = new Carbon; $date->startOfMonth(); $attributes['startDate'] = $date; diff --git a/tests/Feature/Controllers/Import/IndexControllerTest.php b/tests/Feature/Controllers/Import/IndexControllerTest.php index 3d7a7b3d74..647fb9a528 100644 --- a/tests/Feature/Controllers/Import/IndexControllerTest.php +++ b/tests/Feature/Controllers/Import/IndexControllerTest.php @@ -80,10 +80,7 @@ class IndexControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('import.create', ['bad'])); - $response->assertStatus(302); - // expect a redirect to index - $response->assertSessionHas('warning', 'Firefly III cannot create a job for the "bad"-provider.'); - $response->assertRedirect(route('import.index')); + $response->assertStatus(404); } /** @@ -106,10 +103,10 @@ class IndexControllerTest extends TestCase $importJob->user_id = 1; // mock calls - $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true)->once(); + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true)->times(2); $repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob); - $fakePrerequisites->shouldReceive('isComplete')->twice()->andReturn(false); - $fakePrerequisites->shouldReceive('setUser')->twice(); + $fakePrerequisites->shouldReceive('isComplete')->times(3)->andReturn(false); + $fakePrerequisites->shouldReceive('setUser')->times(3); $this->be($this->user()); @@ -139,10 +136,10 @@ class IndexControllerTest extends TestCase $importJob->user_id = 1; // mock call: - $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true)->once(); + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true)->times(2); $repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob); - $fakePrerequisites->shouldReceive('isComplete')->twice()->andReturn(true); - $fakePrerequisites->shouldReceive('setUser')->twice(); + $fakePrerequisites->shouldReceive('isComplete')->times(3)->andReturn(true); + $fakePrerequisites->shouldReceive('setUser')->times(3); $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'has_prereq'])->andReturn($importJob)->once(); @@ -173,17 +170,16 @@ class IndexControllerTest extends TestCase $importJob->user_id =1; // mock calls - $fakePrerequisites->shouldReceive('setUser')->once(); - $bunqPrerequisites->shouldReceive('setUser')->once(); - $spectrePrerequisites->shouldReceive('setUser')->once(); + $fakePrerequisites->shouldReceive('setUser')->times(2); + $bunqPrerequisites->shouldReceive('setUser')->times(2); + $spectrePrerequisites->shouldReceive('setUser')->times(2); - $fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); - $bunqPrerequisites->shouldReceive('isComplete')->once()->andReturn(true); - $spectrePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $fakePrerequisites->shouldReceive('isComplete')->times(2)->andReturn(true); + $bunqPrerequisites->shouldReceive('isComplete')->times(2)->andReturn(true); + $spectrePrerequisites->shouldReceive('isComplete')->times(2)->andReturn(true); - $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false)->once(); + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false)->times(2); $repository->shouldReceive('create')->withArgs(['file'])->andReturn($importJob); - $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'has_prereq'])->andReturn($importJob)->once(); @@ -224,6 +220,17 @@ class IndexControllerTest extends TestCase ]; $repository->shouldReceive('getConfiguration')->andReturn($fakeConfig)->once(); + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->once()->andReturn(false); + + $fakePrerequisites->shouldReceive('setUser')->times(1); + $bunqPrerequisites->shouldReceive('setUser')->times(1); + $spectrePrerequisites->shouldReceive('setUser')->times(1); + //$filePrerequisites->shouldReceive('setUser')->times(1); + + $fakePrerequisites->shouldReceive('isComplete')->times(1)->andReturn(true); + $bunqPrerequisites->shouldReceive('isComplete')->times(1)->andReturn(true); + $spectrePrerequisites->shouldReceive('isComplete')->times(1)->andReturn(true); + //$filePrerequisites->shouldReceive('isComplete')->times(1)->andReturn(true); $this->be($this->user()); $response = $this->get(route('import.job.download', [$job->key])); diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php index 47e3da10d9..0956aea398 100644 --- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php +++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php @@ -42,7 +42,7 @@ class PrerequisitesControllerTest extends TestCase /** * */ - public function setUp() + public function setUp(): void { parent::setUp(); Log::debug(sprintf('Now in %s.', \get_class($this))); @@ -66,8 +66,8 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); - $prereq->shouldReceive('setUser')->once(); - $prereq->shouldReceive('isComplete')->once()->andReturn(false); + $prereq->shouldReceive('setUser')->times(2); + $prereq->shouldReceive('isComplete')->times(2)->andReturn(false); $prereq->shouldReceive('getView')->once()->andReturn('import.fake.prerequisites'); $prereq->shouldReceive('getViewParameters')->once()->andReturn(['api_key' => '']); @@ -117,8 +117,8 @@ class PrerequisitesControllerTest extends TestCase $repository = $this->mock(ImportJobRepositoryInterface::class); $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'has_prereq']); - $prereq->shouldReceive('setUser')->once(); - $prereq->shouldReceive('isComplete')->once()->andReturn(true); + $prereq->shouldReceive('setUser')->times(2); + $prereq->shouldReceive('isComplete')->times(2)->andReturn(true); $this->be($this->user()); $response = $this->get(route('import.prerequisites.index', ['fake', $job->key])); @@ -147,9 +147,10 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); - $prereq->shouldReceive('setUser')->once(); + $prereq->shouldReceive('setUser')->times(2); $prereq->shouldReceive('storePrerequisites')->once()->andReturn(new MessageBag); $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'has_prereq']); + $prereq->shouldReceive('isComplete')->times(1)->andReturn(false); $this->be($this->user()); $response = $this->post(route('import.prerequisites.post', ['fake', $job->key])); @@ -177,6 +178,9 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $prereq->shouldReceive('setUser')->times(1); + $prereq->shouldReceive('isComplete')->times(1)->andReturn(false); + $this->be($this->user()); $response = $this->post(route('import.prerequisites.post', ['fake', $job->key])); $response->assertStatus(302); @@ -198,6 +202,9 @@ class PrerequisitesControllerTest extends TestCase $prereq->shouldReceive('setUser')->once(); $prereq->shouldReceive('storePrerequisites')->once()->andReturn(new MessageBag); + $prereq->shouldReceive('setUser')->times(1); + $prereq->shouldReceive('isComplete')->times(1)->andReturn(false); + $this->be($this->user()); $response = $this->post(route('import.prerequisites.post', ['fake'])); $response->assertStatus(302); @@ -227,6 +234,9 @@ class PrerequisitesControllerTest extends TestCase $prereq = $this->mock(FakePrerequisites::class); $repository = $this->mock(ImportJobRepositoryInterface::class); + $prereq->shouldReceive('setUser')->times(1); + $prereq->shouldReceive('isComplete')->times(1)->andReturn(false); + $prereq->shouldReceive('setUser')->once(); $prereq->shouldReceive('storePrerequisites')->once()->andReturn($messages); diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php index 3915aae03f..d981b23dc8 100644 --- a/tests/Feature/Controllers/Popup/ReportControllerTest.php +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -98,7 +98,7 @@ class ReportControllerTest extends TestCase ]; $uri = route('popup.general') . '?' . http_build_query($arguments); $response = $this->get($uri); - $response->assertStatus(500); + $response->assertStatus(200); } /** @@ -206,7 +206,7 @@ class ReportControllerTest extends TestCase $uri = route('popup.general') . '?' . http_build_query($arguments); $response = $this->get($uri); - $response->assertStatus(500); + $response->assertStatus(200); } /** @@ -364,6 +364,6 @@ class ReportControllerTest extends TestCase ]; $uri = route('popup.general') . '?' . http_build_query($arguments); $response = $this->get($uri); - $response->assertStatus(500); + $response->assertStatus(200); } } diff --git a/tests/Feature/Controllers/Rule/CreateControllerTest.php b/tests/Feature/Controllers/Rule/CreateControllerTest.php new file mode 100644 index 0000000000..b93898f583 --- /dev/null +++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php @@ -0,0 +1,169 @@ +. + */ + +declare(strict_types=1); + +namespace tests\Feature\Controllers\Rule; + + +use FireflyIII\Models\Bill; +use FireflyIII\Models\Rule; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use Log; +use Tests\TestCase; + +/** + * Class CreateControllerTest + */ +class CreateControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\CreateController + */ + public function testCreate(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('rules.create', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                            '); + $response->assertViewHas('returnToBill', false); + $response->assertViewHas('bill', null); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\CreateController + */ + public function testCreateBill(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $billRepos->shouldReceive('find')->withArgs([1])->andReturn(Bill::find(1))->once(); + + $this->be($this->user()); + $response = $this->get(route('rules.create', [1]) . '?return=true&fromBill=1'); + $response->assertStatus(200); + $response->assertSee('
                                                                              '); + $response->assertViewHas('returnToBill', true); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\CreateController + */ + public function testCreatePreviousInput(): void + { + $old = [ + 'rule-trigger' => ['description_is'], + 'rule-trigger-stop' => ['1'], + 'rule-trigger-value' => ['X'], + 'rule-action' => ['set_category'], + 'rule-action-stop' => ['1'], + 'rule-action-value' => ['x'], + ]; + $this->session(['_old_input' => $old]); + + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('rules.create', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\CreateController + */ + public function testCreateReturn(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('rules.create', [1]) . '?return=true'); + $response->assertStatus(200); + $response->assertSee('
                                                                                  '); + $response->assertViewHas('returnToBill', true); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\CreateController + * @covers \FireflyIII\Http\Requests\RuleFormRequest + */ + public function testStore(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('store')->andReturn(new Rule); + $repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once(); + + $this->session(['rules.create.uri' => 'http://localhost']); + $data = [ + 'rule_group_id' => 1, + 'active' => 1, + 'title' => 'A', + 'trigger' => 'store-journal', + 'description' => 'D', + 'rule-trigger' => [ + 1 => 'from_account_starts', + ], + 'rule-trigger-value' => [ + 1 => 'B', + ], + 'rule-action' => [ + 1 => 'set_category', + ], + 'rule-action-value' => [ + 1 => 'C', + ], + ]; + $this->be($this->user()); + $response = $this->post(route('rules.store', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Rule/DeleteControllerTest.php b/tests/Feature/Controllers/Rule/DeleteControllerTest.php new file mode 100644 index 0000000000..7cb9476a77 --- /dev/null +++ b/tests/Feature/Controllers/Rule/DeleteControllerTest.php @@ -0,0 +1,78 @@ +. + */ + +declare(strict_types=1); + +namespace tests\Feature\Controllers\Rule; + + +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use Log; +use Tests\TestCase; + +class DeleteControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\DeleteController + */ + public function testDelete(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('rules.delete', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\DeleteController + */ + public function testDestroy(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('destroy'); + + $this->session(['rules.delete.uri' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('rules.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $response->assertRedirect(route('index')); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Rule/EditControllerTest.php b/tests/Feature/Controllers/Rule/EditControllerTest.php new file mode 100644 index 0000000000..a7b2c90508 --- /dev/null +++ b/tests/Feature/Controllers/Rule/EditControllerTest.php @@ -0,0 +1,138 @@ +. + */ + +declare(strict_types=1); + +namespace tests\Feature\Controllers\Rule; + + +use FireflyIII\Models\Rule; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use Illuminate\Support\Collection; +use Log; +use Tests\TestCase; + +/** + * Class EditControllerTest + */ +class EditControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\EditController + */ + public function testEdit(): void + { + // mock stuff + $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); + $groupRepos->shouldReceive('get')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('rules.edit', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\EditController + */ + public function testEditPreviousInput(): void + { + $old = [ + 'rule-trigger' => ['description_is'], + 'rule-trigger-stop' => ['1'], + 'rule-trigger-value' => ['X'], + 'rule-action' => ['set_category'], + 'rule-action-stop' => ['1'], + 'rule-action-value' => ['x'], + ]; + $this->session(['_old_input' => $old]); + + // mock stuff + $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); + $groupRepos->shouldReceive('get')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('rules.edit', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\EditController + * @covers \FireflyIII\Http\Requests\RuleFormRequest + */ + public function testUpdate(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $rule = Rule::find(1); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('find')->withArgs([1])->andReturn($rule)->once(); + $repository->shouldReceive('update'); + + $data = [ + 'rule_group_id' => 1, + 'id' => 1, + 'title' => 'Your first default rule', + 'trigger' => 'store-journal', + 'active' => 1, + 'description' => 'This rule is an example. You can safely delete it.', + 'rule-trigger' => [ + 1 => 'description_is', + ], + 'rule-trigger-value' => [ + 1 => 'something', + ], + 'rule-action' => [ + 1 => 'prepend_description', + ], + 'rule-action-value' => [ + 1 => 'Bla bla', + ], + ]; + $this->session(['rules.edit.uri' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('rules.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Rule/IndexControllerTest.php b/tests/Feature/Controllers/Rule/IndexControllerTest.php new file mode 100644 index 0000000000..f4fd74fa71 --- /dev/null +++ b/tests/Feature/Controllers/Rule/IndexControllerTest.php @@ -0,0 +1,148 @@ +. + */ +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Rule; + +use FireflyIII\Models\RuleGroup; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use Illuminate\Support\Collection; +use Log; +use Tests\TestCase; + +/** + * Class IndexControllerTest + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class IndexControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\IndexController + */ + public function testDown(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('moveDown'); + + $this->be($this->user()); + $response = $this->get(route('rules.down', [1])); + $response->assertStatus(302); + $response->assertRedirect(route('rules.index')); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\IndexController + */ + public function testIndex(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $ruleGroupRepos->shouldReceive('count')->andReturn(0); + $ruleGroupRepos->shouldReceive('store'); + $repository->shouldReceive('getFirstRuleGroup')->andReturn(new RuleGroup); + $ruleGroupRepos->shouldReceive('getRuleGroupsWithRules')->andReturn(new Collection); + $repository->shouldReceive('count')->andReturn(0); + $repository->shouldReceive('store'); + + $this->be($this->user()); + $response = $this->get(route('rules.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\IndexController + */ + public function testReorderRuleActions(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $data = ['actions' => [1, 2, 3]]; + $repository->shouldReceive('reorderRuleActions')->once(); + + $this->be($this->user()); + $response = $this->post(route('rules.reorder-actions', [1]), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\IndexController + */ + public function testReorderRuleTriggers(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $data = ['triggers' => [1, 2, 3]]; + $repository->shouldReceive('reorderRuleTriggers')->once(); + + $this->be($this->user()); + $response = $this->post(route('rules.reorder-triggers', [1]), $data); + $response->assertStatus(200); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\IndexController + */ + public function testUp(): void + { + // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('moveUp'); + + $this->be($this->user()); + $response = $this->get(route('rules.up', [1])); + $response->assertStatus(302); + $response->assertRedirect(route('rules.index')); + } + +} diff --git a/tests/Feature/Controllers/Rule/SelectControllerTest.php b/tests/Feature/Controllers/Rule/SelectControllerTest.php new file mode 100644 index 0000000000..7e8d5faf01 --- /dev/null +++ b/tests/Feature/Controllers/Rule/SelectControllerTest.php @@ -0,0 +1,189 @@ +. + */ + +declare(strict_types=1); + +namespace tests\Feature\Controllers\Rule; + +use Carbon\Carbon; +use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions; +use FireflyIII\Jobs\Job; +use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\TransactionRules\TransactionMatcher; +use Illuminate\Support\Collection; +use Log; +use Queue; +use Tests\TestCase; + + +/** + * Class SelectControllerTest + */ +class SelectControllerTest extends TestCase +{ + /** + * + */ + public function setUp(): void + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\SelectController + */ + public function testExecute(): void + { + $account = $this->user()->accounts()->find(1); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $this->session(['first' => new Carbon('2010-01-01')]); + $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); + Queue::fake(); + + $data = [ + 'accounts' => [1], + 'start_date' => '2017-01-01', + 'end_date' => '2017-01-02', + ]; + + $this->be($this->user()); + $response = $this->post(route('rules.execute', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + Queue::assertPushed( + ExecuteRuleOnExistingTransactions::class, function (Job $job) { + return $job->getRule()->id === 1; + } + ); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\SelectController + */ + public function testSelectTransactions(): void + { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('rules.select-transactions', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                            '); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Rule\SelectController + */ + public function testTestTriggers(): void + { + $data = [ + 'rule-trigger' => ['description_is'], + 'rule-trigger-value' => ['Bla bla'], + 'rule-trigger-stop' => ['1'], + ]; + + // mock stuff + $matcher = $this->mock(TransactionMatcher::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); + $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); + $matcher->shouldReceive('setTriggers')->andReturnSelf()->once(); + $matcher->shouldReceive('findTransactionsByTriggers')->andReturn(new Collection); + + $this->be($this->user()); + $uri = route('rules.test-triggers') . '?' . http_build_query($data); + $response = $this->get($uri); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\SelectController + */ + public function testTestTriggersByRule(): void + { + + $matcher = $this->mock(TransactionMatcher::class); + + $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); + $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); + $matcher->shouldReceive('setRule')->andReturnSelf()->once(); + $matcher->shouldReceive('findTransactionsByRule')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('rules.test-triggers-rule', [1])); + $response->assertStatus(200); + + } + + /** + * This actually hits an error and not the actually code but OK. + * + * @covers \FireflyIII\Http\Controllers\Rule\SelectController + */ + public function testTestTriggersError(): void + { + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $uri = route('rules.test-triggers'); + $response = $this->get($uri); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Rule\SelectController + */ + public function testTestTriggersMax(): void + { + $data = [ + 'rule-trigger' => ['description_is'], + 'rule-trigger-value' => ['Bla bla'], + 'rule-trigger-stop' => ['1'], + ]; + $set = factory(Transaction::class, 10)->make(); + + // mock stuff + $matcher = $this->mock(TransactionMatcher::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); + $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); + $matcher->shouldReceive('setTriggers')->andReturnSelf()->once(); + $matcher->shouldReceive('findTransactionsByTriggers')->andReturn($set); + + $this->be($this->user()); + $uri = route('rules.test-triggers') . '?' . http_build_query($data); + $response = $this->get($uri); + $response->assertStatus(200); + } +} \ No newline at end of file diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php deleted file mode 100644 index 7446ac9d5a..0000000000 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ /dev/null @@ -1,542 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace Tests\Feature\Controllers; - -use Carbon\Carbon; -use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions; -use FireflyIII\Jobs\Job; -use FireflyIII\Models\Bill; -use FireflyIII\Models\Rule; -use FireflyIII\Models\RuleGroup; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Repositories\Rule\RuleRepositoryInterface; -use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; -use FireflyIII\TransactionRules\TransactionMatcher; -use Illuminate\Support\Collection; -use Log; -use Queue; -use Tests\TestCase; - -/** - * Class RuleControllerTest - * - * @SuppressWarnings(PHPMD.TooManyPublicMethods) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - */ -class RuleControllerTest extends TestCase -{ - /** - * - */ - public function setUp() - { - parent::setUp(); - Log::debug(sprintf('Now in %s.', \get_class($this))); - } - - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testCreate(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('rules.create', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                              '); - $response->assertViewHas('returnToBill', false); - $response->assertViewHas('bill', null); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testCreateBill(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $billRepos->shouldReceive('find')->withArgs([1])->andReturn(Bill::find(1))->once(); - - $this->be($this->user()); - $response = $this->get(route('rules.create', [1]) . '?return=true&fromBill=1'); - $response->assertStatus(200); - $response->assertSee('
                                                                                                '); - $response->assertViewHas('returnToBill', true); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testCreatePreviousInput(): void - { - $old = [ - 'rule-trigger' => ['description_is'], - 'rule-trigger-stop' => ['1'], - 'rule-trigger-value' => ['X'], - 'rule-action' => ['set_category'], - 'rule-action-stop' => ['1'], - 'rule-action-value' => ['x'], - ]; - $this->session(['_old_input' => $old]); - - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('rules.create', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testCreateReturn(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('rules.create', [1]) . '?return=true'); - $response->assertStatus(200); - $response->assertSee('
                                                                                                    '); - $response->assertViewHas('returnToBill', true); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testDelete(): void - { - // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $response = $this->get(route('rules.delete', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testDestroy(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('destroy'); - - $this->session(['rules.delete.uri' => 'http://localhost']); - $this->be($this->user()); - $response = $this->post(route('rules.destroy', [1])); - $response->assertStatus(302); - $response->assertSessionHas('success'); - $response->assertRedirect(route('index')); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testDown(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('moveDown'); - - $this->be($this->user()); - $response = $this->get(route('rules.down', [1])); - $response->assertStatus(302); - $response->assertRedirect(route('rules.index')); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testEdit(): void - { - // mock stuff - $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); - $groupRepos->shouldReceive('get')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('rules.edit', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testEditPreviousInput(): void - { - $old = [ - 'rule-trigger' => ['description_is'], - 'rule-trigger-stop' => ['1'], - 'rule-trigger-value' => ['X'], - 'rule-action' => ['set_category'], - 'rule-action-stop' => ['1'], - 'rule-action-value' => ['x'], - ]; - $this->session(['_old_input' => $old]); - - // mock stuff - $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); - $groupRepos->shouldReceive('get')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('rules.edit', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testExecute(): void - { - $account = $this->user()->accounts()->find(1); - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $repository = $this->mock(RuleRepositoryInterface::class); - $this->session(['first' => new Carbon('2010-01-01')]); - $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection([$account])); - Queue::fake(); - - $data = [ - 'accounts' => [1], - 'start_date' => '2017-01-01', - 'end_date' => '2017-01-02', - ]; - - $this->be($this->user()); - $response = $this->post(route('rules.execute', [1]), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - - Queue::assertPushed( - ExecuteRuleOnExistingTransactions::class, function (Job $job) { - return $job->getRule()->id === 1; - } - ); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testIndex(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $ruleGroupRepos->shouldReceive('count')->andReturn(0); - $ruleGroupRepos->shouldReceive('store'); - $repository->shouldReceive('getFirstRuleGroup')->andReturn(new RuleGroup); - $ruleGroupRepos->shouldReceive('getRuleGroupsWithRules')->andReturn(new Collection); - $repository->shouldReceive('count')->andReturn(0); - $repository->shouldReceive('store'); - - $this->be($this->user()); - $response = $this->get(route('rules.index')); - $response->assertStatus(200); - $response->assertSee('
                                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testReorderRuleActions(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $data = ['actions' => [1, 2, 3]]; - $repository->shouldReceive('reorderRuleActions')->once(); - - $this->be($this->user()); - $response = $this->post(route('rules.reorder-actions', [1]), $data); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testReorderRuleTriggers(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $data = ['triggers' => [1, 2, 3]]; - $repository->shouldReceive('reorderRuleTriggers')->once(); - - $this->be($this->user()); - $response = $this->post(route('rules.reorder-triggers', [1]), $data); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testSelectTransactions(): void - { - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('rules.select-transactions', [1])); - $response->assertStatus(200); - $response->assertSee('
                                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Requests\RuleFormRequest - */ - public function testStore(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('store')->andReturn(new Rule); - $repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once(); - - $this->session(['rules.create.uri' => 'http://localhost']); - $data = [ - 'rule_group_id' => 1, - 'active' => 1, - 'title' => 'A', - 'trigger' => 'store-journal', - 'description' => 'D', - 'rule-trigger' => [ - 1 => 'from_account_starts', - ], - 'rule-trigger-value' => [ - 1 => 'B', - ], - 'rule-action' => [ - 1 => 'set_category', - ], - 'rule-action-value' => [ - 1 => 'C', - ], - ]; - $this->be($this->user()); - $response = $this->post(route('rules.store', [1]), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testTestTriggers(): void - { - $data = [ - 'rule-trigger' => ['description_is'], - 'rule-trigger-value' => ['Bla bla'], - 'rule-trigger-stop' => ['1'], - ]; - - // mock stuff - $matcher = $this->mock(TransactionMatcher::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); - $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); - $matcher->shouldReceive('setTriggers')->andReturnSelf()->once(); - $matcher->shouldReceive('findTransactionsByTriggers')->andReturn(new Collection); - - $this->be($this->user()); - $uri = route('rules.test-triggers') . '?' . http_build_query($data); - $response = $this->get($uri); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testTestTriggersByRule(): void - { - - $matcher = $this->mock(TransactionMatcher::class); - - $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); - $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); - $matcher->shouldReceive('setRule')->andReturnSelf()->once(); - $matcher->shouldReceive('findTransactionsByRule')->andReturn(new Collection); - - $this->be($this->user()); - $response = $this->get(route('rules.test-triggers-rule', [1])); - $response->assertStatus(200); - - } - - /** - * This actually hits an error and not the actually code but OK. - * - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testTestTriggersError(): void - { - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $this->be($this->user()); - $uri = route('rules.test-triggers'); - $response = $this->get($uri); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testTestTriggersMax(): void - { - $data = [ - 'rule-trigger' => ['description_is'], - 'rule-trigger-value' => ['Bla bla'], - 'rule-trigger-stop' => ['1'], - ]; - $set = factory(Transaction::class, 10)->make(); - - // mock stuff - $matcher = $this->mock(TransactionMatcher::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - - $matcher->shouldReceive('setLimit')->withArgs([10])->andReturnSelf()->once(); - $matcher->shouldReceive('setRange')->withArgs([200])->andReturnSelf()->once(); - $matcher->shouldReceive('setTriggers')->andReturnSelf()->once(); - $matcher->shouldReceive('findTransactionsByTriggers')->andReturn($set); - - $this->be($this->user()); - $uri = route('rules.test-triggers') . '?' . http_build_query($data); - $response = $this->get($uri); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - */ - public function testUp(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('moveUp'); - - $this->be($this->user()); - $response = $this->get(route('rules.up', [1])); - $response->assertStatus(302); - $response->assertRedirect(route('rules.index')); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController - * @covers \FireflyIII\Http\Requests\RuleFormRequest - */ - public function testUpdate(): void - { - // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $rule = Rule::find(1); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('find')->withArgs([1])->andReturn($rule)->once(); - $repository->shouldReceive('update'); - - $data = [ - 'rule_group_id' => 1, - 'id' => 1, - 'title' => 'Your first default rule', - 'trigger' => 'store-journal', - 'active' => 1, - 'description' => 'This rule is an example. You can safely delete it.', - 'rule-trigger' => [ - 1 => 'description_is', - ], - 'rule-trigger-value' => [ - 1 => 'something', - ], - 'rule-action' => [ - 1 => 'prepend_description', - ], - 'rule-action-value' => [ - 1 => 'Bla bla', - ], - ]; - $this->session(['rules.edit.uri' => 'http://localhost']); - $this->be($this->user()); - $response = $this->post(route('rules.update', [1]), $data); - $response->assertStatus(302); - $response->assertSessionHas('success'); - } -} diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php index eb43e5e224..b11003c189 100644 --- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php @@ -38,7 +38,7 @@ class LinkControllerTest extends TestCase /** * */ - public function setUp() + public function setUp(): void { parent::setUp(); Log::debug(sprintf('Now in %s.', \get_class($this))); @@ -167,14 +167,14 @@ class LinkControllerTest extends TestCase */ public function testStoreInvalid(): void { - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); $data = [ 'link_other' => 0, 'link_type' => '1_inward', ]; - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->andReturn(null); + $journalRepos->shouldReceive('findNull')->andReturn(null); $this->be($this->user()); $response = $this->post(route('transactions.link.store', [1]), $data); diff --git a/tests/Unit/TransactionRules/Actions/AddTagTest.php b/tests/Unit/TransactionRules/Actions/AddTagTest.php index d208ee8131..a164ba954c 100644 --- a/tests/Unit/TransactionRules/Actions/AddTagTest.php +++ b/tests/Unit/TransactionRules/Actions/AddTagTest.php @@ -40,7 +40,9 @@ class AddTagTest extends TestCase public function testActExistingTag(): void { $tag = $this->user()->tags()->inRandomOrder()->whereNull('deleted_at')->first(); + /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); + $journal->tags()->sync([]); $journal->tags()->sync([$tag->id]); $this->assertDatabaseHas('tag_transaction_journal', ['tag_id' => $tag->id, 'transaction_journal_id' => $journal->id]); $ruleAction = new RuleAction; diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php index 0ac584ec44..7a299d08cf 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php @@ -25,7 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\FromAccountIs; use Tests\TestCase; - +use Log; /** * Class FromAccountIsTest */ @@ -36,13 +36,21 @@ class FromAccountIsTest extends TestCase */ public function testTriggered(): void { - $count = 0; - while ($count === 0) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '<', 0)->count(); + $loops = 0; // FINAL LOOP METHOD. + do { + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - } - $account = $transaction->account; + $account = $transaction->account; + $count = $journal->transactions()->count(); + + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + + $loops++; + + // do this until: account is not null, journal has two transactions, loops is below 30 + } while (!(null !== $account && 2 === $count && $loops < 30)); + $trigger = FromAccountIs::makeFromStrings($account->name, false); $result = $trigger->triggered($journal); From ec7ef3a81341a0ca5396a9e920e76efa2b80e950 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 20:53:48 +0200 Subject: [PATCH 37/86] Various fixes for tests and code quality. --- .../Controllers/Account/CreateController.php | 8 ++++++-- .../Controllers/Account/DeleteController.php | 9 ++++++--- .../Controllers/Account/EditController.php | 10 +++++++--- .../Controllers/Account/IndexController.php | 8 ++++++-- .../Account/ReconcileController.php | 20 +++++++++++++++---- .../Controllers/Account/ShowController.php | 8 +++++--- .../Category/NoCategoryController.php | 2 +- .../Controllers/Category/ShowController.php | 4 ++-- .../Chart/ExpenseReportController.php | 2 +- app/Http/Controllers/CurrencyController.php | 2 +- .../Controllers/Json/ReconcileController.php | 4 ++-- app/Http/Controllers/NewUserController.php | 2 +- app/Http/Controllers/PiggyBankController.php | 4 ++-- .../Controllers/Popup/ReportController.php | 2 +- .../Controllers/Report/ExpenseController.php | 2 +- .../Controllers/Rule/SelectController.php | 2 +- .../Transaction/BulkController.php | 2 +- .../Transaction/ConvertController.php | 2 +- .../Transaction/LinkController.php | 2 +- .../Transaction/MassController.php | 2 +- .../Transaction/SingleController.php | 2 +- .../Transaction/SplitController.php | 4 ++-- .../Controllers/TransactionController.php | 2 +- .../Triggers/FromAccountIsTest.php | 2 +- .../Triggers/FromAccountStartsTest.php | 4 ++-- .../Triggers/ToAccountEndsTest.php | 6 +++--- .../Triggers/ToAccountIsTest.php | 4 ++-- .../Triggers/ToAccountStartsTest.php | 8 ++++---- 28 files changed, 79 insertions(+), 50 deletions(-) diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index df4af66bb9..faad8c0f43 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -36,11 +36,11 @@ use Illuminate\Http\Request; */ class CreateController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * CreateController constructor. */ public function __construct() { @@ -60,6 +60,8 @@ class CreateController extends Controller } /** + * Create a new account. + * * @param Request $request * @param string|null $what * @@ -90,6 +92,8 @@ class CreateController extends Controller /** + * Store the new account. + * * @param AccountFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index e74cd1264b..ed9adf55be 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -30,16 +30,15 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Http\Request; /** - * * Class DeleteController */ class DeleteController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * DeleteController constructor. */ public function __construct() { @@ -59,6 +58,8 @@ class DeleteController extends Controller } /** + * Delete account screen. + * * @param Account $account * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -77,6 +78,8 @@ class DeleteController extends Controller } /** + * Delete the account. + * * @param Request $request * @param Account $account * diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 570113b762..1f8817902f 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -37,13 +37,13 @@ use Illuminate\Http\Request; */ class EditController extends Controller { - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * EditController constructor. */ public function __construct() { @@ -64,6 +64,8 @@ class EditController extends Controller } /** + * Edit account overview. + * * @param Request $request * @param Account $account * @param AccountRepositoryInterface $repository @@ -120,6 +122,8 @@ class EditController extends Controller /** + * Update the account. + * * @param AccountFormRequest $request * @param Account $account * diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 2eaa3f49d6..363a818cdc 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -36,11 +36,11 @@ use Illuminate\Pagination\LengthAwarePaginator; */ class IndexController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * IndexController constructor. */ public function __construct() { @@ -60,6 +60,8 @@ class IndexController extends Controller } /** + * Show list of accounts. + * * @param Request $request * @param string $what * @@ -106,6 +108,8 @@ class IndexController extends Controller /** + * Find the ID in a given array. Return '0' of not there (amount). + * * @param array $array * @param int $entryId * diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index ee8cfce3c6..9e16cb589a 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -45,15 +45,15 @@ use Log; */ class ReconcileController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** - * + * ReconcileController constructor. */ public function __construct() { @@ -74,6 +74,8 @@ class ReconcileController extends Controller } /** + * Edit a reconciliation. + * * @param TransactionJournal $journal * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -110,6 +112,8 @@ class ReconcileController extends Controller } /** + * Reconciliation overview. + * * @param Account $account * @param Carbon|null $start * @param Carbon|null $end @@ -168,6 +172,8 @@ class ReconcileController extends Controller } /** + * Show a single reconciliation. + * * @param TransactionJournal $journal * * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View @@ -193,6 +199,8 @@ class ReconcileController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Submit a new reconciliation. + * * @param ReconciliationStoreRequest $request * @param Account $account * @param Carbon $start @@ -278,6 +286,8 @@ class ReconcileController extends Controller /** + * Update a reconciliation. + * * @param ReconciliationUpdateRequest $request * @param TransactionJournal $journal * @@ -359,6 +369,8 @@ class ReconcileController extends Controller } /** + * Redirect user to the original asset account. + * * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index e174fea0b9..90e7e3802b 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -45,13 +45,13 @@ use View; */ class ShowController extends Controller { - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * ShowController constructor. */ public function __construct() { @@ -241,6 +241,8 @@ class ShowController extends Controller } /** + * Redirect to the original account. + * * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 9e4a098619..49e1b287d1 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -43,7 +43,7 @@ use Log; class NoCategoryController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; /** @var CategoryRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 81132d4b69..c3731c175c 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -47,9 +47,9 @@ use Illuminate\Support\Collection; class ShowController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; /** @var CategoryRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index 40576c6ef6..0621985ff4 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -43,7 +43,7 @@ use Illuminate\Support\Collection; */ class ExpenseReportController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ protected $accountRepository; /** @var GeneratorInterface */ protected $generator; diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 67172255b2..0e88232f03 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -38,7 +38,7 @@ use View; */ class CurrencyController extends Controller { - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ protected $repository; /** @var UserRepositoryInterface */ diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index f1e64fefda..193d9d87c9 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -50,9 +50,9 @@ class ReconcileController extends Controller /** @var CurrencyUpdateService */ private $accountRepos; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $currencyRepos; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 4dee74940d..9d341f8ed2 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -34,7 +34,7 @@ use View; */ class NewUserController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 7a450fb6ba..08d3c5c249 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -47,9 +47,9 @@ use Symfony\Component\HttpFoundation\ParameterBag; class PiggyBankController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; /** @var PiggyBankRepositoryInterface */ private $piggyRepos; diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 6f10fe1224..84bdb38e87 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -44,7 +44,7 @@ use Throwable; */ class ReportController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepository; /** @var BudgetRepositoryInterface */ private $budgetRepository; diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 37adf0f446..916f45c1f3 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -42,7 +42,7 @@ use Throwable; */ class ExpenseController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ protected $accountRepository; /** diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index 1c6cb0b04d..de4bec4f20 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -48,7 +48,7 @@ use Throwable; class SelectController extends Controller { use RuleManagement; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; /** diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index a3ea753677..b8e9f15134 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -37,7 +37,7 @@ use Log; */ class BulkController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index d2c99ae19c..f1b30d8f78 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -38,7 +38,7 @@ use View; */ class ConvertController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index d4b4944e49..9c1a061399 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -36,7 +36,7 @@ use URL; */ class LinkController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepository; /** @var LinkTypeRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 7f324c7d39..0fd5ee9294 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -47,7 +47,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; */ class MassController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index c3ed9429d0..7223bb1004 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -50,7 +50,7 @@ class SingleController extends Controller private $attachments; /** @var BudgetRepositoryInterface */ private $budgets; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 7591fcad70..87faaf510c 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -52,9 +52,9 @@ class SplitController extends Controller /** @var BudgetRepositoryInterface */ private $budgets; - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencies; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 7a44a3d271..36a35cebb8 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -50,7 +50,7 @@ use View; */ class TransactionController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php index 7a299d08cf..d4ef43b734 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php @@ -41,7 +41,7 @@ class FromAccountIsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index 8c765570e7..ecf2f2e8cc 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -52,7 +52,7 @@ class FromAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; @@ -83,7 +83,7 @@ class FromAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php index 32617ec83d..795eb179fa 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php @@ -42,7 +42,7 @@ class ToAccountEndsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; @@ -73,7 +73,7 @@ class ToAccountEndsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; @@ -103,7 +103,7 @@ class ToAccountEndsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php index 5f06021fd1..44ef88bd18 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php @@ -42,7 +42,7 @@ class ToAccountIsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); @@ -69,7 +69,7 @@ class ToAccountIsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php index 78c0ef1efe..8b05f84aac 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php @@ -44,10 +44,10 @@ class ToAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account)); $loops++; @@ -73,10 +73,10 @@ class ToAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account)); $loops++; From 5ca4f1b18144aba0bb83aabce91fff26919f9f87 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 21 Jul 2018 06:41:42 +0200 Subject: [PATCH 38/86] Remove null pointer. --- app/Transformers/RecurrenceTransformer.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php index af2f0863f2..620e42ec07 100644 --- a/app/Transformers/RecurrenceTransformer.php +++ b/app/Transformers/RecurrenceTransformer.php @@ -282,16 +282,19 @@ class RecurrenceTransformer extends TransformerAbstract // get all transactions: /** @var RecurrenceTransaction $transaction */ foreach ($recurrence->recurrenceTransactions as $transaction) { - $transactionArray = [ + + $sourceAccount = $transaction->sourceAccount; + $destinationAccount = $transaction->destinationAccount; + $transactionArray = [ 'currency_id' => $transaction->transaction_currency_id, 'currency_code' => $transaction->transactionCurrency->code, 'currency_symbol' => $transaction->transactionCurrency->symbol, 'currency_dp' => $transaction->transactionCurrency->decimal_places, 'foreign_currency_id' => $transaction->foreign_currency_id, 'source_id' => $transaction->source_id, - 'source_name' => $transaction->sourceAccount->name, + 'source_name' => null === $sourceAccount ? '' : $sourceAccount->name, 'destination_id' => $transaction->destination_id, - 'destination_name' => $transaction->destinationAccount->name, + 'destination_name' => null === $destinationAccount ? '' : $destinationAccount->name, 'amount' => $transaction->amount, 'foreign_amount' => $transaction->foreign_amount, 'description' => $transaction->description, From 02f5eddd14322b720b80f01f06d561f609a275bb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 21 Jul 2018 08:06:24 +0200 Subject: [PATCH 39/86] Update PHP doc everywhere. --- .../V1/Controllers/BudgetLimitController.php | 26 +++---------------- .../Admin/ConfigurationController.php | 4 +++ app/Http/Controllers/Admin/HomeController.php | 4 +++ app/Http/Controllers/Admin/LinkController.php | 17 +++++++++++- .../Controllers/Admin/UpdateController.php | 4 +++ app/Http/Controllers/Admin/UserController.php | 14 +++++++++- .../Auth/ForgotPasswordController.php | 13 ++-------- app/Http/Controllers/Auth/LoginController.php | 2 ++ .../Controllers/Auth/TwoFactorController.php | 6 +++++ .../Controllers/Budget/AmountController.php | 13 +++++++--- .../Controllers/Budget/CreateController.php | 8 ++++-- .../Controllers/Budget/DeleteController.php | 8 ++++-- .../Controllers/Budget/EditController.php | 8 ++++-- .../Controllers/Budget/IndexController.php | 8 ++++-- .../Controllers/Budget/ShowController.php | 16 ++++++++++-- .../Category/NoCategoryController.php | 4 ++- .../Controllers/Category/ShowController.php | 8 +++++- app/Http/Controllers/CategoryController.php | 2 +- .../Controllers/Chart/AccountController.php | 24 ++++++++++++++--- app/Http/Controllers/Chart/BillController.php | 6 +++-- .../Controllers/Chart/BudgetController.php | 25 +++++++++++++++--- .../Chart/BudgetReportController.php | 16 +++++++++--- .../Controllers/Chart/CategoryController.php | 14 ++++++++-- .../Chart/CategoryReportController.php | 20 ++++++++++++-- .../Chart/ExpenseReportController.php | 12 ++++++++- .../Controllers/Chart/PiggyBankController.php | 4 +-- .../Controllers/Chart/ReportController.php | 6 +++-- .../Controllers/Chart/TagReportController.php | 24 +++++++++++++++-- .../Controllers/Import/IndexController.php | 7 ++--- .../Import/JobConfigurationController.php | 6 +++-- .../Import/JobStatusController.php | 12 +++++++-- .../Import/PrerequisitesController.php | 4 +-- .../Json/AutoCompleteController.php | 14 ++++++++++ app/Http/Controllers/Json/BoxController.php | 12 +++++++++ .../Controllers/Json/ExchangeController.php | 2 ++ .../Controllers/Json/FrontpageController.php | 4 ++- app/Http/Controllers/Json/IntroController.php | 12 +++++++++ .../Controllers/Json/ReconcileController.php | 17 +++++++----- .../Controllers/Json/RecurrenceController.php | 8 ++++-- .../Controllers/Popup/ReportController.php | 17 +++++++++--- .../Recurring/CreateController.php | 10 ++++--- .../Recurring/DeleteController.php | 9 ++++--- .../Controllers/Recurring/EditController.php | 10 ++++--- .../Controllers/Recurring/IndexController.php | 8 ++++-- app/Http/Controllers/ReportController.php | 2 +- .../Transaction/SingleController.php | 2 +- .../Transaction/SplitController.php | 2 +- 47 files changed, 363 insertions(+), 111 deletions(-) diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php index 1acbae59d5..2d40ec7dea 100644 --- a/app/Api/V1/Controllers/BudgetLimitController.php +++ b/app/Api/V1/Controllers/BudgetLimitController.php @@ -97,35 +97,15 @@ class BudgetLimitController extends Controller $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; $budgetId = (int)($request->get('budget_id') ?? 0); $budget = $this->repository->findNull($budgetId); - $start = null; - $end = null; - $this->parameters->set('budget_id', $budgetId); - - - try { - $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); - $this->parameters->set('start', $start->format('Y-m-d')); - } catch (InvalidArgumentException $e) { - Log::debug(sprintf('Invalid date: %s', $e->getMessage())); - } - - try { - $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); - $this->parameters->set('end', $end->format('Y-m-d')); - } catch (InvalidArgumentException $e) { - Log::debug(sprintf('Invalid date: %s', $e->getMessage())); - } - $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; + $this->parameters->set('budget_id', $budgetId); $collection = new Collection; if (null === $budget) { - /** @noinspection PhpUndefinedVariableInspection */ - $collection = $this->repository->getAllBudgetLimits($start, $end); + $collection = $this->repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end')); } if (null !== $budget) { - /** @noinspection PhpUndefinedVariableInspection */ - $collection = $this->repository->getBudgetLimits($budget, $start, $end); + $collection = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end')); } $count = $collection->count(); diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 65ae4cbc24..c2668ec2af 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -55,6 +55,8 @@ class ConfigurationController extends Controller } /** + * Show configuration index. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index() @@ -75,6 +77,8 @@ class ConfigurationController extends Controller } /** + * Store new configuration values. + * * @param ConfigurationRequest $request * * @return RedirectResponse diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 668ce53214..2373143b9a 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -46,6 +46,8 @@ class HomeController extends Controller } /** + * Index of the admin. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index() @@ -58,6 +60,8 @@ class HomeController extends Controller } /** + * Send a test message to the admin. + * * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index d0ab421605..fd877c1e5d 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -36,7 +36,7 @@ use View; class LinkController extends Controller { /** - * + * LinkController constructor. */ public function __construct() { @@ -54,6 +54,7 @@ class LinkController extends Controller } /** + * Make a new link form. * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function create() @@ -70,6 +71,8 @@ class LinkController extends Controller } /** + * Delete a link form. + * * @param Request $request * @param LinkTypeRepositoryInterface $repository * @param LinkType $linkType @@ -102,6 +105,8 @@ class LinkController extends Controller } /** + * Actually destroy the link. + * * @param Request $request * @param LinkTypeRepositoryInterface $repository * @param LinkType $linkType @@ -121,6 +126,8 @@ class LinkController extends Controller } /** + * Edit a link form. + * * @param Request $request * @param LinkType $linkType * @@ -146,6 +153,8 @@ class LinkController extends Controller } /** + * Show index of all links. + * * @param LinkTypeRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -165,6 +174,8 @@ class LinkController extends Controller } /** + * Show a single link. + * * @param LinkType $linkType * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -179,6 +190,8 @@ class LinkController extends Controller } /** + * Store the new link. + * * @param LinkTypeFormRequest $request * @param LinkTypeRepositoryInterface $repository * @@ -206,6 +219,8 @@ class LinkController extends Controller } /** + * Update an existing link. + * * @param LinkTypeFormRequest $request * @param LinkTypeRepositoryInterface $repository * @param LinkType $linkType diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 5c8c7f54c9..3c672fd9aa 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -56,6 +56,8 @@ class UpdateController extends Controller } /** + * Show page with update options. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws \Psr\Container\NotFoundExceptionInterface * @throws \Psr\Container\ContainerExceptionInterface @@ -76,6 +78,8 @@ class UpdateController extends Controller } /** + * Post new settings. + * * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index b5772a8def..1a49e5d93d 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -36,7 +36,7 @@ use Log; class UserController extends Controller { /** - * + * UserController constructor. */ public function __construct() { @@ -55,6 +55,8 @@ class UserController extends Controller } /** + * Delete a user. + * * @param User $user * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -67,6 +69,8 @@ class UserController extends Controller } /** + * Destroy a user. + * * @param User $user * @param UserRepositoryInterface $repository * @@ -81,6 +85,8 @@ class UserController extends Controller } /** + * Edit user form. + * * @param User $user * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -106,6 +112,8 @@ class UserController extends Controller } /** + * Show index of user manager. + * * @param UserRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -133,6 +141,8 @@ class UserController extends Controller } /** + * Show single user. + * * @param UserRepositoryInterface $repository * @param User $user * @@ -154,6 +164,8 @@ class UserController extends Controller } /** + * Update single user. + * * @param UserFormRequest $request * @param User $user * @param UserRepositoryInterface $repository diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 26b56d0928..ccdb13e75c 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -36,17 +36,6 @@ use Illuminate\Support\Facades\Password; */ class ForgotPasswordController extends Controller { - /* - |-------------------------------------------------------------------------- - | Password Reset Controller - |-------------------------------------------------------------------------- - | - | This controller is responsible for handling password reset emails and - | includes a trait which assists in sending these notifications from - | your application to your users. Feel free to explore this trait. - | - */ - use SendsPasswordResetEmails; /** @@ -93,6 +82,8 @@ class ForgotPasswordController extends Controller } /** + * Show form for email recovery. + * * @codeCoverageIgnore * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 2fe7a26b1d..cf47892ff3 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -60,6 +60,8 @@ class LoginController extends Controller } /** + * Log in a user. + * * @param Request $request * * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response|void diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index dce3d27a93..79cf7ec63b 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -36,6 +36,8 @@ use Log; class TwoFactorController extends Controller { /** + * Show 2FA screen. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View @@ -67,6 +69,8 @@ class TwoFactorController extends Controller } /** + * What to do if 2FA lost? + * * @return mixed */ public function lostTwoFactor() @@ -86,6 +90,8 @@ class TwoFactorController extends Controller } /** + * Submit 2FA code. + * * @param TokenFormRequest $request * @param CookieJar $cookieJar * diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index 4dc5fad5dd..fb4be807eb 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -38,17 +38,16 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; /** - * * Class AmountController */ class AmountController extends Controller { use DateCalculation; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * AmountController constructor. */ public function __construct() { @@ -69,6 +68,8 @@ class AmountController extends Controller /** + * Set the amount for a single budget in a specific period. Shows a waring when its a lot. + * * @param Request $request * @param BudgetRepositoryInterface $repository * @param Budget $budget @@ -122,6 +123,8 @@ class AmountController extends Controller /** + * Shows some basic info about the income and the suggested budget. + * * @param Carbon $start * @param Carbon $end * @@ -169,6 +172,8 @@ class AmountController extends Controller /** + * Store an available budget for the current period. + * * @param BudgetIncomeRequest $request * * @return RedirectResponse @@ -188,6 +193,8 @@ class AmountController extends Controller } /** + * Shows the form to update available budget. + * * @param Request $request * @param Carbon $start * @param Carbon $end diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 3b671f255e..097833f2d4 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -35,11 +35,11 @@ use Illuminate\Http\Request; */ class CreateController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * CreateController constructor. */ public function __construct() { @@ -60,6 +60,8 @@ class CreateController extends Controller /** + * Form to create a budget. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -78,6 +80,8 @@ class CreateController extends Controller /** + * Stores a budget. + * * @param BudgetFormRequest $request * * @return \Illuminate\Http\RedirectResponse diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index bbe5d688eb..125dc427b2 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -35,11 +35,11 @@ use Illuminate\Http\Request; */ class DeleteController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * DeleteController constructor. */ public function __construct() { @@ -60,6 +60,8 @@ class DeleteController extends Controller /** + * Deletes a budget. + * * @param Budget $budget * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -75,6 +77,8 @@ class DeleteController extends Controller } /** + * Destroys a budget. + * * @param Request $request * @param Budget $budget * diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index c621b47478..2801ac4d73 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -37,11 +37,11 @@ use Illuminate\Http\Request; */ class EditController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * EditController constructor. */ public function __construct() { @@ -61,6 +61,8 @@ class EditController extends Controller } /** + * Budget edit form. + * * @param Request $request * @param Budget $budget * @@ -87,6 +89,8 @@ class EditController extends Controller } /** + * Budget update routine. + * * @param BudgetFormRequest $request * @param Budget $budget * diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 557da042eb..b385b4f005 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -41,11 +41,11 @@ class IndexController extends Controller { use DateCalculation; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * IndexController constructor. */ public function __construct() { @@ -66,6 +66,10 @@ class IndexController extends Controller /** + * Show all budgets. + * + * TODO remove moment routine. + * * @param Request $request * @param string|null $moment * diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 72013035ba..742bff0ace 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -44,11 +44,11 @@ use Illuminate\Support\Collection; class ShowController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * ShowController constructor. */ public function __construct() { @@ -68,6 +68,8 @@ class ShowController extends Controller } /** + * Show transactions without a budget. + * * @param Request $request * @param Carbon|null $start * @param Carbon|null $end @@ -99,6 +101,8 @@ class ShowController extends Controller } /** + * Shows ALL transactions without a budget. + * * @param Request $request * @param JournalRepositoryInterface $repository * @@ -128,6 +132,8 @@ class ShowController extends Controller /** + * Show a single budget. + * * @param Request $request * @param Budget $budget * @@ -156,6 +162,8 @@ class ShowController extends Controller } /** + * Show a single budget by a budget limit. + * * @param Request $request * @param Budget $budget * @param BudgetLimit $budgetLimit @@ -195,6 +203,8 @@ class ShowController extends Controller } /** + * Gets all budget limits for a budget. + * * @param Budget $budget * @param Carbon $start * @param Carbon $end @@ -229,6 +239,8 @@ class ShowController extends Controller /** + * Gets period overview used for budgets. + * * @return Collection * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 49e1b287d1..7d9c0c52b7 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -45,7 +45,7 @@ class NoCategoryController extends Controller /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; - /** @var CategoryRepositoryInterface */ + /** @var CategoryRepositoryInterface The category repository */ private $repository; /** @@ -68,6 +68,8 @@ class NoCategoryController extends Controller } /** + * Show transactions without a category. + * * @param Request $request * @param string|null $moment * diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index c3731c175c..764226e663 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -51,7 +51,7 @@ class ShowController extends Controller private $accountRepos; /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; - /** @var CategoryRepositoryInterface */ + /** @var CategoryRepositoryInterface The category repository */ private $repository; /** @@ -77,6 +77,8 @@ class ShowController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Show a single category. + * * @param Request $request * @param Category $category * @param Carbon|null $start @@ -114,6 +116,8 @@ class ShowController extends Controller } /** + * Show all transactions within a category. + * * @param Request $request * @param Category $category * @@ -150,6 +154,8 @@ class ShowController extends Controller } /** + * Get a period overview for category. + * * @param Category $category * * @param Carbon $date diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index c8924e0c7f..53c18ae4ad 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -34,7 +34,7 @@ use Illuminate\Support\Collection; */ class CategoryController extends Controller { - /** @var CategoryRepositoryInterface */ + /** @var CategoryRepositoryInterface The category repository */ private $repository; /** diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index a89db85f0c..b326c9272e 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -52,11 +52,11 @@ class AccountController extends Controller { use DateCalculation; - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** - * + * AccountController constructor. */ public function __construct() { @@ -109,6 +109,8 @@ class AccountController extends Controller /** + * Expenses per budget, as shown on account overview. + * * @param Account $account * @param Carbon $start * @param Carbon $end @@ -152,6 +154,8 @@ class AccountController extends Controller } /** + * Expenses per budget for all time, as shown on account overview. + * * @param AccountRepositoryInterface $repository * @param Account $account * @@ -167,6 +171,8 @@ class AccountController extends Controller /** + * Expenses per category for one single account. + * * @param Account $account * @param Carbon $start * @param Carbon $end @@ -210,6 +216,8 @@ class AccountController extends Controller } /** + * Expenses grouped by category for account. + * * @param AccountRepositoryInterface $repository * @param Account $account * @@ -253,6 +261,8 @@ class AccountController extends Controller /** + * Shows all income per account for each category. + * * @param Account $account * @param Carbon $start * @param Carbon $end @@ -296,6 +306,8 @@ class AccountController extends Controller } /** + * Shows the income grouped by category for an account, in all time. + * * @param AccountRepositoryInterface $repository * @param Account $account * @@ -311,6 +323,8 @@ class AccountController extends Controller /** + * Shows overview of account during a single period. + * * @param Account $account * @param Carbon $start * @@ -427,6 +441,8 @@ class AccountController extends Controller /** + * Shows an overview of the account balances for a set of accounts. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end @@ -484,6 +500,8 @@ class AccountController extends Controller } /** + * Get the budget names from a set of budget ID's. + * * @param array $budgetIds * * @return array @@ -506,7 +524,7 @@ class AccountController extends Controller } /** - * Small helper function for some of the charts. + * Get the category names from a set of category ID's. Small helper function for some of the charts. * * @param array $categoryIds * diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 2fb9bb408e..756df67daf 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -38,11 +38,11 @@ use Illuminate\Support\Collection; */ class BillController extends Controller { - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** - * checked. + * BillController constructor. */ public function __construct() { @@ -85,6 +85,8 @@ class BillController extends Controller /** + * Shows history for a single bill. + * * @param JournalCollectorInterface $collector * @param Bill $bill * diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 9586e0fe54..90e647a768 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -50,10 +50,10 @@ use Illuminate\Support\Collection; class BudgetController extends Controller { use DateCalculation; - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ protected $repository; /** @@ -75,6 +75,8 @@ class BudgetController extends Controller /** + * Shows overview of a single budget. + * * @param Budget $budget * * @return JsonResponse @@ -123,7 +125,6 @@ class BudgetController extends Controller /** * Shows the amount left in a specific budget limit. * - * * @param Budget $budget * @param BudgetLimit $budgetLimit * @@ -169,6 +170,8 @@ class BudgetController extends Controller /** + * Shows how much is spent per asset account. + * * @param Budget $budget * @param BudgetLimit|null $budgetLimit * @@ -217,6 +220,8 @@ class BudgetController extends Controller /** + * Shows how much is spent per category. + * * @param Budget $budget * @param BudgetLimit|null $budgetLimit * @@ -266,6 +271,8 @@ class BudgetController extends Controller /** + * Shows how much is spent per expense account. + * * @param Budget $budget * @param BudgetLimit|null $budgetLimit * @@ -370,6 +377,7 @@ class BudgetController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Shows a budget overview chart (spent and budgeted). * * @param Budget $budget * @param Carbon $start @@ -415,6 +423,8 @@ class BudgetController extends Controller /** + * Shows a chart for transactions without a budget. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end @@ -451,6 +461,8 @@ class BudgetController extends Controller } /** + * Get the account names belonging to a bunch of account ID's. + * * @param array $accountIds * * @return array @@ -473,6 +485,8 @@ class BudgetController extends Controller } /** + * Get the amount of money budgeted in a period. + * * @param Budget $budget * @param Carbon $start * @param Carbon $end @@ -501,7 +515,9 @@ class BudgetController extends Controller } /** - * Small helper function for some of the charts. + * Small helper function for some of the charts. Extracts category names from a bunch of ID's. + * + * TODO this method is duplicated and should be in a trait. * * @param array $categoryIds * @@ -526,6 +542,7 @@ class BudgetController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Get the expenses for a budget in a date range. * * @param Collection $limits * @param Budget $budget diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index 386c910663..7bfbcaff22 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -48,13 +48,13 @@ use Illuminate\Support\Collection; */ class BudgetReportController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $budgetRepository; - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ private $generator; /** - * + * BudgetReportController constructor. */ public function __construct() { @@ -71,6 +71,8 @@ class BudgetReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Chart that groups expenses by the account. + * * @param Collection $accounts * @param Collection $budgets * @param Carbon $start @@ -98,6 +100,8 @@ class BudgetReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Chart that groups the expenses by budget. + * * @param Collection $accounts * @param Collection $budgets * @param Carbon $start @@ -125,6 +129,8 @@ class BudgetReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Main overview of a budget in the budget report. + * * @param Collection $accounts * @param Collection $budgets * @param Carbon $start @@ -242,6 +248,8 @@ class BudgetReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Helper function that collects expenses for the given budgets. + * * @param Collection $accounts * @param Collection $budgets * @param Carbon $start @@ -264,6 +272,8 @@ class BudgetReportController extends Controller } /** + * Helper function that groups expenses. + * * @param Collection $set * * @return array diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index a942eb8125..eb3f9559e7 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -38,11 +38,11 @@ use Illuminate\Support\Collection; */ class CategoryController extends Controller { - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** - * + * CategoryController constructor. */ public function __construct() { @@ -112,6 +112,8 @@ class CategoryController extends Controller /** + * Shows the category chart on the front page. + * * @param CategoryRepositoryInterface $repository * @param AccountRepositoryInterface $accountRepository * @@ -154,6 +156,8 @@ class CategoryController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Chart report. + * * @param Category $category * @param Collection $accounts * @param Carbon $start @@ -215,6 +219,8 @@ class CategoryController extends Controller /** + * Chart for period for transactions without a category. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end @@ -272,6 +278,8 @@ class CategoryController extends Controller } /** + * Chart for a specific period. + * * @param Category $category * @param $date * @@ -289,6 +297,8 @@ class CategoryController extends Controller /** + * Chart for a specific period (start and end). + * * @param Category $category * @param Carbon $start * @param Carbon $end diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index 1b5d8f6099..a5b362e320 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -45,11 +45,11 @@ use Illuminate\Support\Collection; */ class CategoryReportController extends Controller { - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ private $generator; /** - * + * CategoryReportController constructor. */ public function __construct() { @@ -65,6 +65,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Chart for expenses grouped by expense account. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -89,6 +91,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Chart for income grouped by revenue account. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -116,6 +120,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Chart for expenses grouped by expense account. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -143,6 +149,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Piechart for income grouped by account. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -170,6 +178,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Main report category chart. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -281,6 +291,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Get all expenses in a period for categories. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -306,6 +318,8 @@ class CategoryReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Get all income for a period and a bunch of categories. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -327,6 +341,8 @@ class CategoryReportController extends Controller } /** + * Group transactions by category. + * * @param Collection $set * * @return array diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index 0621985ff4..a34f0253da 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -45,7 +45,7 @@ class ExpenseReportController extends Controller { /** @var AccountRepositoryInterface The account repository */ protected $accountRepository; - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** @@ -66,6 +66,8 @@ class ExpenseReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Main chart that shows income and expense for a combination of expense/revenue accounts. + * * @param Collection $accounts * @param Collection $expense * @param Carbon $start @@ -191,6 +193,8 @@ class ExpenseReportController extends Controller } /** + * Searches for the opposing account. + * * @param Collection $accounts * * @return array @@ -214,6 +218,8 @@ class ExpenseReportController extends Controller } /** + * Get all expenses for a set of accounts. + * * @param Collection $accounts * @param Collection $opposing * @param Carbon $start @@ -231,6 +237,8 @@ class ExpenseReportController extends Controller } /** + * Get the income for a set of accounts. + * * @param Collection $accounts * @param Collection $opposing * @param Carbon $start @@ -249,6 +257,8 @@ class ExpenseReportController extends Controller } /** + * Group set of transactions by name of opposing account. + * * @param Collection $set * * @return array diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index f9b2aba5db..a22122839b 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -39,11 +39,11 @@ use Illuminate\Support\Collection; class PiggyBankController extends Controller { use DateCalculation; - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** - * + * PiggyBankController constructor. */ public function __construct() { diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 492013e393..53b26958c2 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -36,11 +36,11 @@ use Log; */ class ReportController extends Controller { - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** - * + * ReportController constructor. */ public function __construct() { @@ -220,6 +220,8 @@ class ReportController extends Controller } /** + * Sum up an array. + * * @param $array * * @return string diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php index 09b1583aec..c8401452df 100644 --- a/app/Http/Controllers/Chart/TagReportController.php +++ b/app/Http/Controllers/Chart/TagReportController.php @@ -44,11 +44,11 @@ use Illuminate\Support\Collection; */ class TagReportController extends Controller { - /** @var GeneratorInterface */ + /** @var GeneratorInterface Chart generation methods. */ protected $generator; /** - * + * TagReportController constructor. */ public function __construct() { @@ -59,6 +59,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Generate expenses for tags grouped on account. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -86,6 +88,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Generate income for tag grouped by account. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -113,6 +117,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Generate expense for tag grouped on budget. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -139,6 +145,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Generate expense for tag grouped on category. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -165,6 +173,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Generate main tag overview chart. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -276,6 +286,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Show expense grouped by expense account. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -303,6 +315,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Show income grouped by tag. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -330,6 +344,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Get all expenses by tags. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -355,6 +371,8 @@ class TagReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Get all income by tag. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -378,6 +396,8 @@ class TagReportController extends Controller } /** + * Group transactions by tag. + * * @param Collection $set * * @return array diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php index 27c83fa0b6..89a818fa5d 100644 --- a/app/Http/Controllers/Import/IndexController.php +++ b/app/Http/Controllers/Import/IndexController.php @@ -32,19 +32,20 @@ use Illuminate\Http\Response as LaravelResponse; use Log; /** - * Class FileController. + * + * Class IndexController */ class IndexController extends Controller { /** @var array */ public $providers; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface The import job repository */ public $repository; /** @var UserRepositoryInterface */ public $userRepository; /** - * + * IndexController constructor. */ public function __construct() { diff --git a/app/Http/Controllers/Import/JobConfigurationController.php b/app/Http/Controllers/Import/JobConfigurationController.php index ae5daddcf3..caaeee9825 100644 --- a/app/Http/Controllers/Import/JobConfigurationController.php +++ b/app/Http/Controllers/Import/JobConfigurationController.php @@ -37,11 +37,11 @@ use Log; */ class JobConfigurationController extends Controller { - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface The import job repository */ public $repository; /** - * + * JobConfigurationController constructor. */ public function __construct() { @@ -162,6 +162,8 @@ class JobConfigurationController extends Controller } /** + * Make a configurator object. + * * @param ImportJob $importJob * * @return JobConfigurationInterface diff --git a/app/Http/Controllers/Import/JobStatusController.php b/app/Http/Controllers/Import/JobStatusController.php index fea52a3f06..57e96cee6e 100644 --- a/app/Http/Controllers/Import/JobStatusController.php +++ b/app/Http/Controllers/Import/JobStatusController.php @@ -37,11 +37,11 @@ use Log; */ class JobStatusController extends Controller { - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface The import job repository */ private $repository; /** - * + * JobStatusController constructor. */ public function __construct() { @@ -59,6 +59,8 @@ class JobStatusController extends Controller } /** + * Index for job status. + * * @param ImportJob $importJob * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -72,6 +74,8 @@ class JobStatusController extends Controller } /** + * JSON overview of job status. + * * @param ImportJob $importJob * * @return JsonResponse @@ -120,6 +124,8 @@ class JobStatusController extends Controller } /** + * Calls to start the job. + * * @param ImportJob $importJob * * @return JsonResponse @@ -214,6 +220,8 @@ class JobStatusController extends Controller } /** + * Store the transactions. + * * @param ImportJob $importJob * * @throws FireflyException diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php index c705286b95..74835d62f9 100644 --- a/app/Http/Controllers/Import/PrerequisitesController.php +++ b/app/Http/Controllers/Import/PrerequisitesController.php @@ -36,11 +36,11 @@ use Log; class PrerequisitesController extends Controller { - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface The import job repository */ private $repository; /** - * + * PrerequisitesController constructor. */ public function __construct() { diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index 081a76641a..8e89ac4dd7 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -66,6 +66,8 @@ class AutoCompleteController extends Controller } /** + * List of all journals. + * * @param JournalCollectorInterface $collector * * @return JsonResponse @@ -97,6 +99,8 @@ class AutoCompleteController extends Controller } /** + * List of budgets. + * * @param BudgetRepositoryInterface $repository * * @return JsonResponse @@ -125,6 +129,8 @@ class AutoCompleteController extends Controller } /** + * List of currency names. + * * @param CurrencyRepositoryInterface $repository * * @return JsonResponse @@ -165,6 +171,8 @@ class AutoCompleteController extends Controller /** + * List of journals with their ID. + * * @param JournalCollectorInterface $collector * @param TransactionJournal $except * @@ -198,6 +206,8 @@ class AutoCompleteController extends Controller } /** + * List of revenue accounts. + * * @param AccountRepositoryInterface $repository * * @return JsonResponse @@ -236,6 +246,8 @@ class AutoCompleteController extends Controller } /** + * List of journals by type. + * * @param JournalCollectorInterface $collector * @param string $what * @@ -254,6 +266,8 @@ class AutoCompleteController extends Controller } /** + * List if transaction types. + * * @param JournalRepositoryInterface $repository * * @return JsonResponse diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 5b0a1f4275..c8947f213e 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -44,6 +44,8 @@ class BoxController extends Controller { /** + * How much money user has available. + * * @param BudgetRepositoryInterface $repository * * @return JsonResponse @@ -98,6 +100,8 @@ class BoxController extends Controller /** + * Current total balance. + * * @param CurrencyRepositoryInterface $repository * * @return JsonResponse @@ -183,6 +187,8 @@ class BoxController extends Controller /** + * Bills to pay and paid. + * * @param BillRepositoryInterface $repository * * @return JsonResponse @@ -219,6 +225,8 @@ class BoxController extends Controller /** + * Total user net worth. + * * @param AccountRepositoryInterface $repository * * @return JsonResponse @@ -282,6 +290,8 @@ class BoxController extends Controller } /** + * Get a currency or return default currency. + * * @param Account $account * * @return TransactionCurrency @@ -307,6 +317,8 @@ class BoxController extends Controller } /** + * Check if date is outside session range. + * * @param Carbon $date * * @return bool diff --git a/app/Http/Controllers/Json/ExchangeController.php b/app/Http/Controllers/Json/ExchangeController.php index 85e3b510ca..19a65f37d8 100644 --- a/app/Http/Controllers/Json/ExchangeController.php +++ b/app/Http/Controllers/Json/ExchangeController.php @@ -39,6 +39,8 @@ class ExchangeController extends Controller { /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Returns an exchange rate. + * * @param Request $request * @param TransactionCurrency $fromCurrency * @param TransactionCurrency $toCurrency diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php index b6021c3917..b27dec9585 100644 --- a/app/Http/Controllers/Json/FrontpageController.php +++ b/app/Http/Controllers/Json/FrontpageController.php @@ -33,10 +33,12 @@ use Illuminate\Http\JsonResponse; class FrontpageController extends Controller { /** + * Piggy bank pie chart. + * * @param PiggyBankRepositoryInterface $repository * * @return JsonResponse - + * @throws \Throwable */ public function piggyBanks(PiggyBankRepositoryInterface $repository): JsonResponse { diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 354310e15a..f146e06091 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -31,6 +31,8 @@ use Log; class IntroController { /** + * Returns the introduction wizard for a page. + * * @param string $route * @param string|null $specificPage * @@ -66,6 +68,8 @@ class IntroController } /** + * Returns true if there is a general outro step. + * * @param string $route * * @return bool @@ -89,6 +93,8 @@ class IntroController } /** + * Enable the boxes for a specific page again. + * * @param string $route * @param string|null $specialPage * @@ -109,6 +115,8 @@ class IntroController } /** + * Set that you saw them. + * * @param string $route * @param string|null $specialPage * @@ -128,6 +136,8 @@ class IntroController } /** + * Get the basic steps from config. + * * @param string $route * * @return array @@ -154,6 +164,8 @@ class IntroController } /** + * Get specific info for special routes. + * * @param string $route * @param string $specificPage * diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 193d9d87c9..d2ba3939c0 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -34,7 +34,6 @@ use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; @@ -48,15 +47,15 @@ use Illuminate\Support\Collection; class ReconcileController extends Controller { - /** @var CurrencyUpdateService */ - private $accountRepos; /** @var AccountRepositoryInterface The account repository */ + private $accountRepos; + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** - * + * ReconcileController constructor. */ public function __construct() { @@ -78,6 +77,8 @@ class ReconcileController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Overview of reconciliation. + * * @param Request $request * @param Account $account * @param Carbon $start @@ -86,10 +87,10 @@ class ReconcileController extends Controller * @return JsonResponse * * @throws FireflyException - * * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @throws \Throwable */ public function overview(Request $request, Account $account, Carbon $start, Carbon $end): JsonResponse { @@ -138,6 +139,8 @@ class ReconcileController extends Controller /** + * Returns a list of transactions in a modal. + * * @param Account $account * @param Carbon $start * @param Carbon $end @@ -145,7 +148,7 @@ class ReconcileController extends Controller * @return mixed * * @throws FireflyException - + * @throws \Throwable */ public function transactions(Account $account, Carbon $start, Carbon $end) { @@ -185,6 +188,8 @@ class ReconcileController extends Controller } /** + * Redirect to actual account. + * * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index 0192e4f099..a1b4af1b9f 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -37,11 +37,11 @@ use Illuminate\Http\Request; */ class RecurrenceController extends Controller { - /** @var RecurringRepositoryInterface */ + /** @var RecurringRepositoryInterface The recurring repository. */ private $recurring; /** - * + * RecurrenceController constructor. */ public function __construct() { @@ -58,6 +58,8 @@ class RecurrenceController extends Controller } /** + * Shows all events for a repetition. Used in calendar. + * * @param Request $request * * @throws FireflyException @@ -139,6 +141,8 @@ class RecurrenceController extends Controller } /** + * Suggests repetition moments. + * * @param Request $request * * @return JsonResponse diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 84bdb38e87..a9633c1826 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -46,15 +46,15 @@ class ReportController extends Controller { /** @var AccountRepositoryInterface The account repository */ private $accountRepository; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $budgetRepository; - /** @var CategoryRepositoryInterface */ + /** @var CategoryRepositoryInterface The category repository */ private $categoryRepository; - /** @var PopupReportInterface */ + /** @var PopupReportInterface Various helper functions. */ private $popupHelper; /** - * + * ReportController constructor. */ public function __construct() { @@ -79,6 +79,7 @@ class ReportController extends Controller } /** + * Generate popup view. * @param Request $request * * @return JsonResponse @@ -117,6 +118,8 @@ class ReportController extends Controller } /** + * View for balance row. + * * @param array $attributes * * @return string @@ -155,6 +158,8 @@ class ReportController extends Controller } /** + * View for spent in a single budget. + * * @param array $attributes * * @return string @@ -177,6 +182,8 @@ class ReportController extends Controller } /** + * View for transactions in a category. + * * @param array $attributes * * @return string @@ -253,6 +260,8 @@ class ReportController extends Controller } /** + * Parses attributes from URI. + * * @param array $attributes * * @return array diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 6596075f05..08b0d7b195 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -38,13 +38,13 @@ use Illuminate\Http\Request; */ class CreateController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $budgets; - /** @var RecurringRepositoryInterface */ + /** @var RecurringRepositoryInterface Recurring repository */ private $recurring; /** - * + * CreateController constructor. */ public function __construct() { @@ -66,6 +66,8 @@ class CreateController extends Controller } /** + * Create a new recurring transaction. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -113,6 +115,8 @@ class CreateController extends Controller /** + * Store a recurring transaction. + * * @param RecurrenceFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index 2081551457..e097298031 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -34,11 +34,11 @@ use Illuminate\Http\Request; */ class DeleteController extends Controller { - /** @var RecurringRepositoryInterface */ + /** @var RecurringRepositoryInterface Recurring repository */ private $recurring; /** - * + * DeleteController constructor. */ public function __construct() { @@ -58,6 +58,8 @@ class DeleteController extends Controller } /** + * Delete a recurring transaction form. + * * @param Recurrence $recurrence * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -68,13 +70,14 @@ class DeleteController extends Controller // put previous url in session $this->rememberPreviousUri('recurrences.delete.uri'); - // todo actual number. $journalsCreated = $this->recurring->getTransactions($recurrence)->count(); return view('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated')); } /** + * Destroy the recurring transaction. + * * @param RecurringRepositoryInterface $repository * @param Request $request * @param Recurrence $recurrence diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 4eed6f3f09..237ac6ccce 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -40,13 +40,13 @@ use Symfony\Component\HttpFoundation\ParameterBag; */ class EditController extends Controller { - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $budgets; - /** @var RecurringRepositoryInterface */ + /** @var RecurringRepositoryInterface Recurring repository */ private $recurring; /** - * + * EditController constructor. */ public function __construct() { @@ -68,6 +68,8 @@ class EditController extends Controller } /** + * Edit a recurring transaction. + * * todo move to repository * todo handle old repetition type as well. * @@ -133,6 +135,8 @@ class EditController extends Controller } /** + * Update the recurring transaction. + * * @param RecurrenceFormRequest $request * @param Recurrence $recurrence * diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index 51e4a0215f..959deea821 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -39,11 +39,11 @@ use Symfony\Component\HttpFoundation\ParameterBag; */ class IndexController extends Controller { - /** @var RecurringRepositoryInterface */ + /** @var RecurringRepositoryInterface Recurring repository */ private $recurring; /** - * + * IndexController constructor. */ public function __construct() { @@ -63,6 +63,8 @@ class IndexController extends Controller } /** + * Show all recurring transactions. + * * TODO: split collection into pages * * @param Request $request @@ -93,6 +95,8 @@ class IndexController extends Controller } /** + * Show a single recurring transaction. + * * @param Request $request * @param Recurrence $recurrence * diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 416419a6d7..72dd7fd1d0 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -46,7 +46,7 @@ class ReportController extends Controller /** @var ReportHelperInterface */ protected $helper; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 7223bb1004..2ee79eb35f 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -48,7 +48,7 @@ class SingleController extends Controller { /** @var AttachmentHelperInterface */ private $attachments; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $budgets; /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 87faaf510c..528fe9e60d 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -49,7 +49,7 @@ class SplitController extends Controller /** @var AttachmentHelperInterface */ private $attachments; - /** @var BudgetRepositoryInterface */ + /** @var BudgetRepositoryInterface The budget repository */ private $budgets; /** @var CurrencyRepositoryInterface The currency repository */ From 4a90ce35f25954dd462266a928db0e478505913a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 21 Jul 2018 08:55:32 +0200 Subject: [PATCH 40/86] Add php doc [skip ci] --- app/Http/Controllers/BillController.php | 4 ++-- .../Controllers/Report/AccountController.php | 4 +++- .../Controllers/Report/BalanceController.php | 4 +++- .../Controllers/Report/BudgetController.php | 10 ++++++++-- .../Controllers/Report/CategoryController.php | 6 ++++++ .../Controllers/Report/ExpenseController.php | 18 +++++++++++++++++- .../Report/OperationsController.php | 14 ++++++++++---- app/Http/Controllers/Rule/CreateController.php | 8 ++++++-- app/Http/Controllers/Rule/DeleteController.php | 2 +- app/Http/Controllers/Rule/EditController.php | 11 +++++++++-- app/Http/Controllers/Rule/IndexController.php | 14 ++++++++++++-- 11 files changed, 77 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index f190177da3..3e85289189 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -48,9 +48,9 @@ class BillController extends Controller { /** @var AttachmentHelperInterface Helper for attachments. */ private $attachments; - /** @var BillRepositoryInterface */ + /** @var BillRepositoryInterface Bill repository */ private $billRepository; - /** @var RuleGroupRepositoryInterface */ + /** @var RuleGroupRepositoryInterface Rule group repository */ private $ruleGroupRepos; /** diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php index 80fad5a433..68c0b078ef 100644 --- a/app/Http/Controllers/Report/AccountController.php +++ b/app/Http/Controllers/Report/AccountController.php @@ -35,13 +35,15 @@ class AccountController extends Controller { /** + * Show partial overview for account balances. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return mixed|string * - + * @throws \Throwable */ public function general(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index be928919e1..6ac7642c85 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -35,12 +35,14 @@ class BalanceController extends Controller { /** + * Show overview of budget balances. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return mixed|string - + * @throws \Throwable */ public function general(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index cf6e2ac9c6..494759beea 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -36,12 +36,16 @@ class BudgetController extends Controller { /** + * Show partial overview of budgets. + * + * TODO replace all \Throwable by catch/error and return simple string. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return mixed|string - + * @throws \Throwable */ public function general(Collection $accounts, Carbon $start, Carbon $end) { @@ -65,12 +69,14 @@ class BudgetController extends Controller /** + * Show budget overview for a period. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return mixed|string - + * @throws \Throwable */ public function period(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 79bd8a726f..34693bf846 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -38,6 +38,8 @@ class CategoryController extends Controller { /** + * Show overview of expenses in category. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end @@ -75,6 +77,8 @@ class CategoryController extends Controller /** + * Show overview of income in category. + * * @param Collection $accounts * * @param Carbon $start @@ -112,6 +116,8 @@ class CategoryController extends Controller /** + * Show overview of operations. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 916f45c1f3..892575dd3f 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -180,7 +180,7 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** - * Overview of spending + * Overview of spending. * * @param Collection $accounts * @param Collection $expense @@ -231,6 +231,8 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * List of top expenses. + * * @param Collection $accounts * @param Collection $expense * @param Carbon $start @@ -278,6 +280,8 @@ class ExpenseController extends Controller } /** @noinspection MoreThanThreeArgumentsInspection */ /** + * List of top income. + * * @param Collection $accounts * @param Collection $expense * @param Carbon $start @@ -325,6 +329,8 @@ class ExpenseController extends Controller } /** + * Combine accounts into a single list. + * * @param Collection $accounts * * @return array @@ -349,6 +355,8 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Group by category (earnings). + * * @param Collection $assets * @param Collection $opposing * @param Carbon $start @@ -414,6 +422,8 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Earned in period for accounts. + * * @param Collection $assets * @param Collection $opposing * @param Carbon $start @@ -457,6 +467,8 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Spent by budget. + * * @param Collection $assets * @param Collection $opposing * @param Carbon $start @@ -521,6 +533,8 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Spent by category. + * * @param Collection $assets * @param Collection $opposing * @param Carbon $start @@ -586,6 +600,8 @@ class ExpenseController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Spent in a period. + * * @param Collection $assets * @param Collection $opposing * @param Carbon $start diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 7b7b2719a8..04a5307c0b 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -34,7 +34,7 @@ use Illuminate\Support\Collection; class OperationsController extends Controller { - /** @var AccountTaskerInterface */ + /** @var AccountTaskerInterface Some specific account things. */ private $tasker; /** @@ -56,12 +56,14 @@ class OperationsController extends Controller /** + * View of income and expense. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return mixed|string - + * @throws \Throwable */ public function expenses(Collection $accounts, Carbon $start, Carbon $end) { @@ -83,12 +85,14 @@ class OperationsController extends Controller } /** + * View of income. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return string - + * @throws \Throwable */ public function income(Collection $accounts, Carbon $start, Carbon $end): string { @@ -111,12 +115,14 @@ class OperationsController extends Controller } /** + * Overview of income and expense. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end * * @return mixed|string - + * @throws \Throwable */ public function operations(Collection $accounts, Carbon $start, Carbon $end) { diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index c5952227f8..9abbc436b5 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -43,9 +43,9 @@ use Throwable; class CreateController extends Controller { use RuleManagement; - /** @var BillRepositoryInterface */ + /** @var BillRepositoryInterface Bill repository */ private $billRepos; - /** @var RuleGroupRepositoryInterface */ + /** @var RuleRepositoryInterface Rule repository */ private $ruleRepos; /** @@ -143,6 +143,8 @@ class CreateController extends Controller } /** + * Store the new rule. + * * @param RuleFormRequest $request * * @return RedirectResponse|\Illuminate\Routing\Redirector @@ -178,6 +180,8 @@ class CreateController extends Controller } /** + * Get actions based on a bill. + * * @param Bill $bill * * @return array diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index 6f9763c894..dd36d7aaa4 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -34,7 +34,7 @@ use Illuminate\Http\RedirectResponse; */ class DeleteController extends Controller { - /** @var RuleRepositoryInterface */ + /** @var RuleRepositoryInterface Rule repository */ private $ruleRepos; /** diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index a91121ab5b..90ece88b3a 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -43,7 +43,7 @@ class EditController extends Controller { use RuleManagement; - /** @var RuleRepositoryInterface */ + /** @var RuleRepositoryInterface Rule repository */ private $ruleRepos; /** @@ -66,6 +66,8 @@ class EditController extends Controller } /** + * Edit a rule. + * * @param Request $request * @param Rule $rule * @@ -119,6 +121,8 @@ class EditController extends Controller } /** + * Update the rule. + * * @param RuleFormRequest $request * @param Rule $rule * @@ -144,10 +148,11 @@ class EditController extends Controller } /** + * Get current (from system) rule actions. + * * @param Rule $rule * * @return array - * */ private function getCurrentActions(Rule $rule): array { @@ -180,6 +185,8 @@ class EditController extends Controller } /** + * Get current (from DB) rule triggers. + * * @param Rule $rule * * @return array diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php index 8d39b8530c..5de05fc9a8 100644 --- a/app/Http/Controllers/Rule/IndexController.php +++ b/app/Http/Controllers/Rule/IndexController.php @@ -38,9 +38,9 @@ use Illuminate\Http\Request; class IndexController extends Controller { use RuleManagement; - /** @var RuleGroupRepositoryInterface */ + /** @var RuleGroupRepositoryInterface Rule group repository */ private $ruleGroupRepos; - /** @var RuleRepositoryInterface */ + /** @var RuleRepositoryInterface Rule repository. */ private $ruleRepos; /** @@ -62,6 +62,8 @@ class IndexController extends Controller } /** + * Move rule down in list. + * * @param Rule $rule * * @return RedirectResponse|\Illuminate\Routing\Redirector @@ -74,6 +76,8 @@ class IndexController extends Controller } /** + * Index of all rules and groups. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index() @@ -88,6 +92,8 @@ class IndexController extends Controller } /** + * Stop action for reordering of rule actions. + * * @param Request $request * @param Rule $rule * @@ -104,6 +110,8 @@ class IndexController extends Controller } /** + * Stop action for reordering of rule triggers. + * * @param Request $request * @param Rule $rule * @@ -121,6 +129,8 @@ class IndexController extends Controller /** + * Move rule ip. + * * @param Rule $rule * * @return RedirectResponse|\Illuminate\Routing\Redirector From 4d5bdd25a8bf455598da6d8560a46e6e037e683f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 08:10:16 +0200 Subject: [PATCH 41/86] Add phpdocs everywhere. --- .../Controllers/Account/ShowController.php | 1 + app/Http/Controllers/AttachmentController.php | 18 ++++++++-- app/Http/Controllers/Auth/LoginController.php | 3 +- .../Controllers/Auth/RegisterController.php | 3 +- .../Auth/ResetPasswordController.php | 3 +- app/Http/Controllers/BillController.php | 20 ++++++++++- .../Controllers/Budget/ShowController.php | 2 +- .../Category/NoCategoryController.php | 10 +++--- app/Http/Controllers/CategoryController.php | 14 ++++++++ .../Chart/ExpenseReportController.php | 2 +- .../Controllers/Chart/ReportController.php | 2 +- app/Http/Controllers/Controller.php | 30 +++++++++++++--- app/Http/Controllers/CurrencyController.php | 22 ++++++++++-- app/Http/Controllers/DebugController.php | 12 +++++++ app/Http/Controllers/ExportController.php | 10 +++++- app/Http/Controllers/HelpController.php | 8 ++++- app/Http/Controllers/HomeController.php | 4 +++ .../Controllers/Import/IndexController.php | 2 +- app/Http/Controllers/JavascriptController.php | 8 +++++ .../Controllers/Json/RecurrenceController.php | 6 ++-- app/Http/Controllers/JsonController.php | 8 +++-- app/Http/Controllers/NewUserController.php | 10 ++++++ app/Http/Controllers/PiggyBankController.php | 28 +++++++++++++-- .../Controllers/PreferencesController.php | 6 +++- app/Http/Controllers/ProfileController.php | 31 +++++++++++++++- app/Http/Controllers/ReportController.php | 35 +++++++++++++++++-- .../Controllers/Rule/CreateController.php | 3 +- .../Controllers/Rule/SelectController.php | 7 +++- app/Http/Controllers/RuleGroupController.php | 18 ++++++++++ app/Http/Controllers/SearchController.php | 6 +++- .../Controllers/System/InstallController.php | 20 ++++++++--- app/Http/Controllers/TagController.php | 16 +++++++-- .../Transaction/BulkController.php | 4 +++ .../Transaction/ConvertController.php | 8 +++++ .../Transaction/LinkController.php | 11 ++++-- .../Transaction/MassController.php | 10 +++++- .../Transaction/SingleController.php | 18 ++++++++-- .../Transaction/SplitController.php | 15 ++++++-- .../Controllers/TransactionController.php | 12 +++++++ app/Http/Kernel.php | 3 +- app/Http/Middleware/AuthenticateTwoFactor.php | 2 ++ app/Http/Middleware/Binder.php | 6 +++- app/Http/Middleware/EncryptCookies.php | 3 +- app/Http/Middleware/Installer.php | 4 +++ app/Http/Middleware/IsSandStormUser.php | 2 +- app/Http/Middleware/Range.php | 8 +++-- .../Middleware/RedirectIfAuthenticated.php | 3 +- app/Http/Middleware/Sandstorm.php | 4 ++- app/Http/Middleware/StartFireflySession.php | 3 +- app/Http/Middleware/TrimStrings.php | 3 +- app/Http/Middleware/TrustProxies.php | 5 +-- app/Http/Middleware/VerifyCsrfToken.php | 3 +- app/Http/Requests/AccountFormRequest.php | 6 ++++ app/Http/Requests/AttachmentFormRequest.php | 9 ++++- app/Http/Requests/BillFormRequest.php | 6 ++++ app/Http/Requests/BudgetFormRequest.php | 9 ++++- app/Http/Requests/BudgetIncomeRequest.php | 7 +++- app/Http/Requests/BulkEditJournalRequest.php | 4 +++ app/Http/Requests/CategoryFormRequest.php | 6 ++++ app/Http/Requests/ConfigurationRequest.php | 9 ++++- app/Http/Requests/CurrencyFormRequest.php | 6 ++++ .../Requests/DeleteAccountFormRequest.php | 7 +++- app/Http/Requests/EmailFormRequest.php | 7 +++- app/Http/Requests/ExportFormRequest.php | 4 +++ app/Http/Requests/JournalFormRequest.php | 13 ++++++- app/Http/Requests/JournalLinkRequest.php | 6 ++++ app/Http/Requests/LinkTypeFormRequest.php | 4 +++ .../Requests/MassDeleteJournalRequest.php | 7 +++- app/Http/Requests/MassEditJournalRequest.php | 7 +++- app/Http/Requests/NewUserFormRequest.php | 7 +++- app/Http/Requests/PiggyBankFormRequest.php | 6 ++++ app/Http/Requests/ProfileFormRequest.php | 7 +++- .../Requests/ReconciliationStoreRequest.php | 6 ++++ .../Requests/ReconciliationUpdateRequest.php | 4 +++ app/Http/Requests/RecurrenceFormRequest.php | 8 +++++ app/Http/Requests/ReportFormRequest.php | 18 ++++++++++ app/Http/Requests/Request.php | 10 ++++++ app/Http/Requests/RuleFormRequest.php | 6 ++++ app/Http/Requests/RuleGroupFormRequest.php | 6 ++++ .../Requests/SelectTransactionsRequest.php | 7 +++- app/Http/Requests/SplitJournalFormRequest.php | 8 +++++ app/Http/Requests/TagFormRequest.php | 6 ++++ app/Http/Requests/TestRuleFormRequest.php | 7 +++- app/Http/Requests/TokenFormRequest.php | 7 +++- app/Http/Requests/UserFormRequest.php | 9 ++++- app/Http/Requests/UserRegistrationRequest.php | 7 +++- 86 files changed, 661 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 90e7e3802b..0ef0517215 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -71,6 +71,7 @@ class ShowController extends Controller ); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * Show an account. * diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index aa6f1bd32b..272b7a3f3b 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -36,11 +36,11 @@ use Illuminate\Http\Response as LaravelResponse; */ class AttachmentController extends Controller { - /** @var AttachmentRepositoryInterface */ + /** @var AttachmentRepositoryInterface Attachment repository */ private $repository; /** - * + * AttachmentController constructor. */ public function __construct() { @@ -59,6 +59,8 @@ class AttachmentController extends Controller } /** + * Form to delete an attachment. + * * @param Attachment $attachment * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -74,6 +76,8 @@ class AttachmentController extends Controller } /** + * Destroy attachment. + * * @param Request $request * @param Attachment $attachment * @@ -92,6 +96,8 @@ class AttachmentController extends Controller } /** + * Download attachment to PC. + * * @param Attachment $attachment * * @return mixed @@ -123,6 +129,8 @@ class AttachmentController extends Controller } /** + * Edit an attachment. + * * @param Request $request * @param Attachment $attachment * @@ -146,6 +154,8 @@ class AttachmentController extends Controller } /** + * Index of all attachments. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index() @@ -164,6 +174,8 @@ class AttachmentController extends Controller } /** + * Update attachment. + * * @param AttachmentFormRequest $request * @param Attachment $attachment * @@ -191,6 +203,8 @@ class AttachmentController extends Controller } /** + * View attachment in browser. + * * @param Attachment $attachment * * @return LaravelResponse diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index cf47892ff3..0ca4c9f6b7 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -32,12 +32,13 @@ use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; /** - * @codeCoverageIgnore * Class LoginController * * This controller handles authenticating users for the application and * redirecting them to your home screen. The controller uses a trait * to conveniently provide its functionality to your applications. + * + * @codeCoverageIgnore */ class LoginController extends Controller { diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index a49f12116a..ea5d8f025e 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -33,12 +33,13 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Validator; /** - * @codeCoverageIgnore * Class RegisterController * * This controller handles the registration of new users as well as their * validation and creation. By default this controller uses a trait to * provide this functionality without requiring any additional code. + * + * @codeCoverageIgnore */ class RegisterController extends Controller { diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 2f43ad6461..a5401c488d 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -30,12 +30,13 @@ use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Http\Request; /** - * @codeCoverageIgnore * Class ResetPasswordController * * This controller is responsible for handling password reset requests * and uses a simple trait to include this behavior. You're free to * explore this trait and override any methods you wish to tweak. + * + * @codeCoverageIgnore */ class ResetPasswordController extends Controller { diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 3e85289189..9faf24e25f 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -54,7 +54,7 @@ class BillController extends Controller private $ruleGroupRepos; /** - * + * BillController constructor. */ public function __construct() { @@ -79,6 +79,8 @@ class BillController extends Controller } /** + * Create a new bill. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -104,6 +106,8 @@ class BillController extends Controller } /** + * Delete a bill. + * * @param Bill $bill * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -118,6 +122,8 @@ class BillController extends Controller } /** + * Destroy a bill. + * * @param Request $request * @param Bill $bill * @@ -135,6 +141,8 @@ class BillController extends Controller } /** + * Edit a bill. + * * @param Request $request * @param Bill $bill * @@ -178,6 +186,8 @@ class BillController extends Controller } /** + * Show all bills. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index() @@ -218,6 +228,8 @@ class BillController extends Controller } /** + * Rescan bills for transactions. + * * @param Request $request * @param Bill $bill * @@ -253,6 +265,8 @@ class BillController extends Controller } /** + * Show a bill. + * * @param Request $request * @param Bill $bill * @@ -295,6 +309,8 @@ class BillController extends Controller /** + * Store a new bill. + * * @param BillFormRequest $request * * @return RedirectResponse @@ -350,6 +366,8 @@ class BillController extends Controller } /** + * Update a bill. + * * @param BillFormRequest $request * @param Bill $bill * diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 742bff0ace..ce15d9f0c1 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -127,7 +127,7 @@ class ShowController extends Controller $transactions = $collector->getPaginatedJournals(); $transactions->setPath(route('budgets.no-budget')); - return view('budgets.no-budget', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); + return view('budgets.no-budget', compact('transactions', 'subTitle', 'moment', 'start', 'end')); } diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 7d9c0c52b7..a732c66e11 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -45,8 +45,6 @@ class NoCategoryController extends Controller /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; - /** @var CategoryRepositoryInterface The category repository */ - private $repository; /** * CategoryController constructor. @@ -60,7 +58,6 @@ class NoCategoryController extends Controller app('view')->share('title', (string)trans('firefly.categories')); app('view')->share('mainTitleIcon', 'fa-bar-chart'); $this->journalRepos = app(JournalRepositoryInterface::class); - $this->repository = app(CategoryRepositoryInterface::class); return $next($request); } @@ -71,7 +68,8 @@ class NoCategoryController extends Controller * Show transactions without a category. * * @param Request $request - * @param string|null $moment + * @param Carbon|null $start + * @param Carbon|null $end * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ @@ -107,6 +105,8 @@ class NoCategoryController extends Controller /** + * Show all transactions without a category. + * * @param Request $request * @param string|null $moment * @@ -142,6 +142,8 @@ class NoCategoryController extends Controller /** + * Show period overview for no category view. + * * @param Carbon $theDate * * @return Collection diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 53c18ae4ad..c051b36b1c 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -56,6 +56,8 @@ class CategoryController extends Controller } /** + * Create category. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -72,6 +74,8 @@ class CategoryController extends Controller } /** + * Delete a category. + * * @param Category $category * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -87,6 +91,8 @@ class CategoryController extends Controller } /** + * Destroy a category. + * * @param Request $request * @param Category $category * @@ -104,6 +110,8 @@ class CategoryController extends Controller } /** + * Edit a category. + * * @param Request $request * @param Category $category * @@ -123,6 +131,8 @@ class CategoryController extends Controller } /** + * Show all categories. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -150,6 +160,8 @@ class CategoryController extends Controller /** + * Store new category. + * * @param CategoryFormRequest $request * @param CategoryRepositoryInterface $repository * @@ -177,6 +189,8 @@ class CategoryController extends Controller /** + * Update category. + * * @param CategoryFormRequest $request * @param CategoryRepositoryInterface $repository * @param Category $category diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index a34f0253da..31f7d28782 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -49,7 +49,7 @@ class ExpenseReportController extends Controller protected $generator; /** - * + * ExpenseReportController constructor. */ public function __construct() { diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 53b26958c2..bfba313d82 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -147,9 +147,9 @@ class ReportController extends Controller /** * Shows sum income and expense, debit/credit: operations. * + * @param Collection $accounts * @param Carbon $start * @param Carbon $end - * @param Collection $accounts * * @return \Illuminate\Http\JsonResponse * diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 5ca4b3f940..b3730d5de9 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -44,13 +44,13 @@ class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; - /** @var string */ + /** @var string Format for date and time. */ protected $dateTimeFormat; - /** @var string */ + /** @var string Format for "23 Feb, 2016". */ protected $monthAndDayFormat; - /** @var string */ + /** @var string Format for "March 2018" */ protected $monthFormat; - /** @var string */ + /** @var string Redirect user */ protected $redirectUri = '/'; /** @@ -119,6 +119,10 @@ class Controller extends BaseController } /** + * Is transaction opening balance? + * + * TODO move to trait. + * * @param TransactionJournal $journal * * @return bool @@ -130,6 +134,10 @@ class Controller extends BaseController /** + * Redirect to asset account that transaction belongs to. + * + * TODO move to trait. + * * @param TransactionJournal $journal * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -153,6 +161,8 @@ class Controller extends BaseController } /** + * Remember previous URL. + * * @param string $identifier */ protected function rememberPreviousUri(string $identifier): void @@ -161,6 +171,10 @@ class Controller extends BaseController } /** + * Get user's language. + * + * TODO pretty sure nobody uses this. + * * @return string */ private function getLanguage(): string @@ -180,6 +194,10 @@ class Controller extends BaseController } /** + * Get the specific name of a page for intro. + * + * TODO move to trait. + * * @return string */ private function getSpecificPageName(): string @@ -188,6 +206,10 @@ class Controller extends BaseController } /** + * Returns if user has seen demo. + * + * TODO move to trait. + * * @return bool */ private function hasSeenDemo(): bool diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 0e88232f03..b2b7ae7fb2 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -41,11 +41,11 @@ class CurrencyController extends Controller /** @var CurrencyRepositoryInterface The currency repository */ protected $repository; - /** @var UserRepositoryInterface */ + /** @var UserRepositoryInterface The user repository */ protected $userRepository; /** - * + * CurrencyController constructor. */ public function __construct() { @@ -65,6 +65,8 @@ class CurrencyController extends Controller /** + * Create a currency. + * * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View @@ -92,6 +94,8 @@ class CurrencyController extends Controller } /** + * Make currency the default currency. + * * @param Request $request * @param TransactionCurrency $currency * @@ -103,7 +107,7 @@ class CurrencyController extends Controller app('preferences')->mark(); $request->session()->flash('success', (string)trans('firefly.new_default_currency', ['name' => $currency->name])); - Cache::forget('FFCURRENCYSYMBOL'); + Cache::forget('FFCURRENCYSYMBOL'); // todo are these even used? Cache::forget('FFCURRENCYCODE'); return redirect(route('currencies.index')); @@ -111,6 +115,8 @@ class CurrencyController extends Controller /** + * Deletes a currency. + * * @param Request $request * @param TransactionCurrency $currency * @@ -143,6 +149,8 @@ class CurrencyController extends Controller /** + * Destroys a currency. + * * @param Request $request * @param TransactionCurrency $currency * @@ -174,6 +182,8 @@ class CurrencyController extends Controller /** + * Edit a currency. + * * @param Request $request * @param TransactionCurrency $currency * @@ -205,6 +215,8 @@ class CurrencyController extends Controller } /** + * Show overview of currencies. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -238,6 +250,8 @@ class CurrencyController extends Controller /** + * Store new currency. + * * @param CurrencyFormRequest $request * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -279,6 +293,8 @@ class CurrencyController extends Controller /** + * Updates a currency. + * * @param CurrencyFormRequest $request * @param TransactionCurrency $currency * diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 1054918950..af596ecd2e 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -52,6 +52,8 @@ class DebugController extends Controller } /** + * Show all possible errors. + * * @throws FireflyException */ public function displayError(): void @@ -68,6 +70,8 @@ class DebugController extends Controller } /** + * Clear log and session. + * * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -99,6 +103,8 @@ class DebugController extends Controller } /** + * Show debug info. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -176,6 +182,8 @@ class DebugController extends Controller } /** + * Return all possible routes. + * * @return string * * @SuppressWarnings(PHPMD.CyclomaticComplexity) @@ -217,6 +225,8 @@ class DebugController extends Controller } /** + * Flash all types of messages. + * * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -258,6 +268,8 @@ class DebugController extends Controller } /** + * All packages that are installed. + * * @return array */ private function collectPackages(): array diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 1a532a86ee..8426d5b2f7 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -39,7 +39,7 @@ use Illuminate\Http\Response as LaravelResponse; class ExportController extends Controller { /** - * + * ExportController constructor. */ public function __construct() { @@ -57,6 +57,8 @@ class ExportController extends Controller } /** + * Download exported file. + * * @param ExportJobRepositoryInterface $repository * @param ExportJob $job * @@ -94,6 +96,8 @@ class ExportController extends Controller } /** + * Get current export status. + * * @param ExportJob $job * * @return \Illuminate\Http\JsonResponse @@ -104,6 +108,8 @@ class ExportController extends Controller } /** + * Index of export routine. + * * @param ExportJobRepositoryInterface $jobs * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -125,6 +131,8 @@ class ExportController extends Controller } /** + * Submit the job. + * * @param ExportFormRequest $request * @param AccountRepositoryInterface $repository * @param ExportJobRepositoryInterface $jobs diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 93ec561d28..35555c2318 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -31,7 +31,7 @@ use Log; */ class HelpController extends Controller { - /** @var HelpInterface */ + /** @var HelpInterface Help interface. */ private $help; /** @@ -51,6 +51,8 @@ class HelpController extends Controller } /** + * Show help for a route. + * * @param $route * * @return JsonResponse @@ -64,6 +66,10 @@ class HelpController extends Controller } /** + * Gets the help text. + * + * TODO move to repos or trait. + * * @param string $route * @param string $language * diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4044864298..cf2b749385 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -52,6 +52,8 @@ class HomeController extends Controller } /** + * Change index date range. + * * @param Request $request * * @return JsonResponse @@ -90,6 +92,8 @@ class HomeController extends Controller /** + * Show index. + * * @param AccountRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php index 89a818fa5d..799904d0c2 100644 --- a/app/Http/Controllers/Import/IndexController.php +++ b/app/Http/Controllers/Import/IndexController.php @@ -41,7 +41,7 @@ class IndexController extends Controller public $providers; /** @var ImportJobRepositoryInterface The import job repository */ public $repository; - /** @var UserRepositoryInterface */ + /** @var UserRepositoryInterface The user repository */ public $userRepository; /** diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index fe38a461ae..fc054d5590 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -38,6 +38,8 @@ use Log; class JavascriptController extends Controller { /** + * Show info about accounts. + * * @param AccountRepositoryInterface $repository * @param CurrencyRepositoryInterface $currencyRepository * @@ -68,6 +70,8 @@ class JavascriptController extends Controller } /** + * Get info about currencies. + * * @param CurrencyRepositoryInterface $repository * * @return Response @@ -89,6 +93,8 @@ class JavascriptController extends Controller } /** + * Show some common variables to be used in scripts. + * * @param Request $request * @param AccountRepositoryInterface $repository * @param CurrencyRepositoryInterface $currencyRepository @@ -135,6 +141,8 @@ class JavascriptController extends Controller } /** + * Get config for date range. + * * @return array * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index a1b4af1b9f..533ea64e98 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -88,13 +88,13 @@ class RecurrenceController extends Controller // if $firstDate is beyond start, use that one: $actualStart = clone $firstDate; - if ($repetitionType === 'weekly' || $repetitionType === 'monthly') { + if ('weekly' === $repetitionType || 'monthly' === $repetitionType) { $repetitionMoment = explode(',', $request->get('type'))[1] ?? '1'; } - if ($repetitionType === 'ndom') { + if ('ndom' === $repetitionType) { $repetitionMoment = str_ireplace('ndom,', '', $request->get('type')); } - if ($repetitionType === 'yearly') { + if ('yearly' === $repetitionType) { $repetitionMoment = explode(',', $request->get('type'))[1] ?? '2018-01-01'; } $repetition = new RecurrenceRepetition; diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index e48fe6192e..a18561b929 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -31,10 +31,12 @@ use Illuminate\Http\Request; class JsonController extends Controller { /** + * Render HTML form for rule action. + * * @param Request $request * * @return JsonResponse - + * @throws \Throwable */ public function action(Request $request): JsonResponse { @@ -50,10 +52,12 @@ class JsonController extends Controller } /** + * Render HTML for rule trigger. + * * @param Request $request * * @return JsonResponse - + * @throws \Throwable */ public function trigger(Request $request): JsonResponse { diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 9d341f8ed2..0b67b0b609 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -54,6 +54,8 @@ class NewUserController extends Controller } /** + * Form the user gets when he has no data in the system. + * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ public function index() @@ -74,6 +76,8 @@ class NewUserController extends Controller } /** + * Store his new settings. + * * @param NewUserFormRequest $request * @param CurrencyRepositoryInterface $currencyRepository * @@ -117,6 +121,8 @@ class NewUserController extends Controller } /** + * Creates an asset account. + * * @param NewUserFormRequest $request * @param TransactionCurrency $currency * @@ -143,6 +149,8 @@ class NewUserController extends Controller } /** + * Creates a cash wallet. + * * @param TransactionCurrency $currency * @param string $language * @@ -169,6 +177,8 @@ class NewUserController extends Controller } /** + * Create a savings account. + * * @param NewUserFormRequest $request * @param TransactionCurrency $currency * @param string $language diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 08d3c5c249..7eb87a3f17 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -51,11 +51,11 @@ class PiggyBankController extends Controller private $accountRepos; /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var PiggyBankRepositoryInterface */ + /** @var PiggyBankRepositoryInterface Piggy bank repository. */ private $piggyRepos; /** - * + * PiggyBankController constructor. */ public function __construct() { @@ -128,6 +128,8 @@ class PiggyBankController extends Controller } /** + * Create a piggy bank. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function create() @@ -145,6 +147,8 @@ class PiggyBankController extends Controller } /** + * Delete a piggy bank. + * * @param PiggyBank $piggyBank * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -160,6 +164,8 @@ class PiggyBankController extends Controller } /** + * Destroy the piggy bank. + * * @param PiggyBank $piggyBank * * @return RedirectResponse @@ -174,6 +180,8 @@ class PiggyBankController extends Controller } /** + * Edit a piggy bank. + * * @param PiggyBank $piggyBank * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -214,6 +222,8 @@ class PiggyBankController extends Controller } /** + * Show overview of all piggy banks. + * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -270,6 +280,8 @@ class PiggyBankController extends Controller } /** + * Add money to piggy bank. + * * @param Request $request * @param PiggyBank $piggyBank * @@ -310,6 +322,8 @@ class PiggyBankController extends Controller } /** + * Remove money from piggy bank. + * * @param Request $request * @param PiggyBank $piggyBank * @@ -351,6 +365,8 @@ class PiggyBankController extends Controller } /** + * Remove money from piggy bank form. + * * @param PiggyBank $piggyBank * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -390,6 +406,8 @@ class PiggyBankController extends Controller } /** + * Set the order of a piggy bank. + * * @param Request $request * @param PiggyBank $piggyBank * @@ -404,6 +422,8 @@ class PiggyBankController extends Controller } /** + * Show a single piggy bank. + * * @param PiggyBank $piggyBank * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -424,6 +444,8 @@ class PiggyBankController extends Controller } /** + * Store a new piggy bank. + * * @param PiggyBankFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -453,6 +475,8 @@ class PiggyBankController extends Controller } /** + * Update a piggy bank. + * * @param PiggyBankFormRequest $request * @param PiggyBank $piggyBank * diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 0afca32757..b5e3dc07b6 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -32,7 +32,7 @@ use Illuminate\Http\Request; class PreferencesController extends Controller { /** - * + * PreferencesController constructor. */ public function __construct() { @@ -49,6 +49,8 @@ class PreferencesController extends Controller } /** + * Show overview of preferences. + * * @param AccountRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -83,6 +85,8 @@ class PreferencesController extends Controller } /** + * Store new preferences. + * * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 171809ba37..944a221915 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -74,6 +74,8 @@ class ProfileController extends Controller } /** + * Change your email address. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function changeEmail() @@ -87,6 +89,8 @@ class ProfileController extends Controller } /** + * Change your password. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function changePassword() @@ -115,6 +119,8 @@ class ProfileController extends Controller } /** + * Screen to confirm email change. + * * @param UserRepositoryInterface $repository * @param string $token * @@ -151,6 +157,8 @@ class ProfileController extends Controller } /** + * Delete your account view. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function deleteAccount() @@ -163,6 +171,8 @@ class ProfileController extends Controller } /** + * Delete 2FA routine. + * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function deleteCode() @@ -176,6 +186,8 @@ class ProfileController extends Controller } /** + * Enable 2FA screen. + * * @param UserRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -203,6 +215,8 @@ class ProfileController extends Controller } /** + * Index for profile. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index() @@ -236,6 +250,8 @@ class ProfileController extends Controller } /** + * Submit the change email form. + * * @param EmailFormRequest $request * @param UserRepositoryInterface $repository * @@ -279,6 +295,8 @@ class ProfileController extends Controller } /** + * Submit change password form. + * * @param ProfileFormRequest $request * @param UserRepositoryInterface $repository * @@ -307,6 +325,8 @@ class ProfileController extends Controller /** @noinspection PhpUnusedParameterInspection */ /** + * Submit 2FA for the first time. + * * @param TokenFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -324,6 +344,8 @@ class ProfileController extends Controller } /** + * Submit delete account. + * * @param UserRepositoryInterface $repository * @param DeleteAccountFormRequest $request * @@ -348,6 +370,7 @@ class ProfileController extends Controller } /** + * Regenerate access token. * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function regenerate() @@ -362,6 +385,8 @@ class ProfileController extends Controller } /** + * Undo change of user email address. + * * @param UserRepositoryInterface $repository * @param string $token * @param string $hash @@ -413,6 +438,8 @@ class ProfileController extends Controller } /** + * Validate users new password. + * * @param User $user * @param string $current * @param string $new @@ -435,7 +462,7 @@ class ProfileController extends Controller } /** - * + * Create new RSA keys. */ private function createOAuthKeys(): void { @@ -459,6 +486,8 @@ class ProfileController extends Controller // @codeCoverageIgnoreEnd /** + * Get the domain of FF system. + * * @return string */ private function getDomain(): string diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 72dd7fd1d0..ff77965966 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -39,18 +39,19 @@ use Log; /** * Class ReportController. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ReportController extends Controller { - /** @var ReportHelperInterface */ + /** @var ReportHelperInterface Helper interface. */ protected $helper; /** @var BudgetRepositoryInterface The budget repository */ private $repository; /** - * + * ReportController constructor. */ public function __construct() { @@ -70,6 +71,8 @@ class ReportController extends Controller } /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Show account report. + * * @param Collection $accounts * @param Collection $expense * @param Carbon $start @@ -101,6 +104,8 @@ class ReportController extends Controller } /** + * Show audit report. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end @@ -135,6 +140,8 @@ class ReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Show budget report. + * * @param Collection $accounts * @param Collection $budgets * @param Carbon $start @@ -171,6 +178,8 @@ class ReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Show category report. + * * @param Collection $accounts * @param Collection $categories * @param Carbon $start @@ -206,6 +215,8 @@ class ReportController extends Controller } /** + * Show default report. + * * @param Collection $accounts * @param Carbon $start * @param Carbon $end @@ -240,6 +251,8 @@ class ReportController extends Controller } /** + * Show index. + * * @param AccountRepositoryInterface $repository * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -258,10 +271,13 @@ class ReportController extends Controller } /** + * Show options for reports. + * * @param string $reportType * * @return mixed * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @throws \Throwable */ public function options(string $reportType) { @@ -287,6 +303,8 @@ class ReportController extends Controller } /** + * Process the submit of report. + * * @param ReportFormRequest $request * * @return RedirectResponse|\Illuminate\Routing\Redirector @@ -365,6 +383,8 @@ class ReportController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Get a tag report. + * * @param Collection $accounts * @param Collection $tags * @param Carbon $start @@ -400,7 +420,10 @@ class ReportController extends Controller } /** + * Get options for account report. + * * @return string + * @throws \Throwable */ private function accountReportOptions(): string { @@ -420,7 +443,9 @@ class ReportController extends Controller } /** + * Get options for budget report. * @return string + * @throws \Throwable */ private function budgetReportOptions(): string { @@ -432,7 +457,9 @@ class ReportController extends Controller } /** + * Get options for category report. * @return string + * @throws \Throwable */ private function categoryReportOptions(): string { @@ -444,7 +471,9 @@ class ReportController extends Controller } /** + * Get options for default report. * @return string + * @throws \Throwable */ private function noReportOptions(): string { @@ -452,7 +481,9 @@ class ReportController extends Controller } /** + * Get options for tag report. * @return string + * @throws \Throwable */ private function tagReportOptions(): string { diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index 9abbc436b5..146cc3ce07 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -30,7 +30,7 @@ use FireflyIII\Models\Bill; use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; -use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; + use FireflyIII\Support\Http\Controllers\RuleManagement; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; @@ -188,7 +188,6 @@ class CreateController extends Controller */ private function getActionsForBill(Bill $bill): array { - $result = ''; try { $result = view( 'rules.partials.action', diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index de4bec4f20..bc9b9e6545 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -42,7 +42,8 @@ use Log; use Throwable; /** - * Class SelectController + * Class SelectController. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class SelectController extends Controller @@ -107,6 +108,8 @@ class SelectController extends Controller /** + * View to select transactions by a rule. + * * @param Rule $rule * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -255,6 +258,8 @@ class SelectController extends Controller /** + * Get a list of triggers. + * * @param TestRuleFormRequest $request * * @return array diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 543da778fc..c814776eb8 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -58,6 +58,8 @@ class RuleGroupController extends Controller } /** + * Create a new rule group. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function create() @@ -75,6 +77,8 @@ class RuleGroupController extends Controller } /** + * Delege a rule group. + * * @param RuleGroup $ruleGroup * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -90,6 +94,8 @@ class RuleGroupController extends Controller } /** + * Actually destroy the rule group. + * * @param Request $request * @param RuleGroupRepositoryInterface $repository * @param RuleGroup $ruleGroup @@ -114,6 +120,8 @@ class RuleGroupController extends Controller } /** + * Move a rule group down. + * * @param RuleGroupRepositoryInterface $repository * @param RuleGroup $ruleGroup * @@ -127,6 +135,8 @@ class RuleGroupController extends Controller } /** + * Edit a rule group. + * * @param Request $request * @param RuleGroup $ruleGroup * @@ -189,6 +199,8 @@ class RuleGroupController extends Controller } /** + * Select transactions to apply the group on. + * * @param RuleGroup $ruleGroup * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -203,6 +215,8 @@ class RuleGroupController extends Controller } /** + * Store the rule group. + * * @param RuleGroupFormRequest $request * @param RuleGroupRepositoryInterface $repository * @@ -229,6 +243,8 @@ class RuleGroupController extends Controller } /** + * Move the rule group up. + * * @param RuleGroupRepositoryInterface $repository * @param RuleGroup $ruleGroup * @@ -244,6 +260,8 @@ class RuleGroupController extends Controller } /** + * Update the rule group. + * * @param RuleGroupFormRequest $request * @param RuleGroupRepositoryInterface $repository * @param RuleGroup $ruleGroup diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index a5584a6962..6308bd1770 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -51,6 +51,8 @@ class SearchController extends Controller } /** + * Do the search. + * * @param Request $request * @param SearchInterface $searcher * @@ -69,11 +71,13 @@ class SearchController extends Controller } /** + * JSON request that does the work. + * * @param Request $request * @param SearchInterface $searcher * * @return \Illuminate\Http\JsonResponse - + * @throws \Throwable */ public function search(Request $request, SearchInterface $searcher): JsonResponse { diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 8e345e7084..23056a5642 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -33,16 +33,16 @@ use Log; use phpseclib\Crypt\RSA; /** - * @codeCoverageIgnore * Class InstallController + * @codeCoverageIgnore */ class InstallController extends Controller { - /** @var string */ + /** @var string Forbidden error */ public const FORBIDDEN_ERROR = 'Internal PHP function "proc_close" is disabled for your installation. Auto-migration is not possible.'; - /** @var string */ + /** @var string Basedir error */ public const BASEDIR_ERROR = 'Firefly III cannot execute the upgrade commands. It is not allowed to because of an open_basedir restriction.'; - /** @var string */ + /** @var string Other errors */ public const OTHER_ERROR = 'An unknown error prevented Firefly III from executing the upgrade commands. Sorry.'; /** @noinspection MagicMethodsValidityInspection */ /** @noinspection PhpMissingParentConstructorInspection */ @@ -55,6 +55,8 @@ class InstallController extends Controller } /** + * Show index. + * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function index() @@ -63,6 +65,8 @@ class InstallController extends Controller } /** + * Create specific RSA keys. + * * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function keys() @@ -91,6 +95,8 @@ class InstallController extends Controller } /** + * Run migration commands. + * * @return JsonResponse */ public function migrate(): JsonResponse @@ -118,6 +124,8 @@ class InstallController extends Controller } /** + * Do database upgrade. + * * @return \Illuminate\Http\JsonResponse */ public function upgrade(): JsonResponse @@ -143,6 +151,8 @@ class InstallController extends Controller } /** + * Do database verification. + * * @return \Illuminate\Http\JsonResponse */ public function verify(): JsonResponse @@ -168,6 +178,8 @@ class InstallController extends Controller } /** + * Check if forbidden functions are set. + * * @return bool */ private function hasForbiddenFunctions(): bool diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index d783fa9fca..1e19e950f2 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -39,11 +39,11 @@ use Illuminate\Support\Collection; */ class TagController extends Controller { - /** @var TagRepositoryInterface */ + /** @var TagRepositoryInterface The tag repository. */ protected $repository; /** - * + * TagController constructor. */ public function __construct() { @@ -63,6 +63,8 @@ class TagController extends Controller } /** + * Create a new tag. + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function create() @@ -97,6 +99,8 @@ class TagController extends Controller } /** + * Destroy a tag. + * * @param Tag $tag * * @return RedirectResponse @@ -162,6 +166,8 @@ class TagController extends Controller } /** + * Show a single tag. + * * @param Request $request * @param Tag $tag * @param string|null $moment @@ -235,6 +241,8 @@ class TagController extends Controller } /** + * Store a tag. + * * @param TagFormRequest $request * * @return RedirectResponse @@ -261,6 +269,8 @@ class TagController extends Controller } /** + * Update a tag. + * * @param TagFormRequest $request * @param Tag $tag * @@ -288,6 +298,8 @@ class TagController extends Controller } /** + * Get overview of periods for tag. + * * @param Tag $tag * * @return Collection diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index b8e9f15134..c4c28cdc83 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -60,6 +60,8 @@ class BulkController extends Controller } /** + * Edit a set of journals in bulk. + * * @param Collection $journals * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -84,6 +86,8 @@ class BulkController extends Controller /** + * Update all journals. + * * @param BulkEditJournalRequest $request * * @return mixed diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index f1b30d8f78..897af76c00 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -63,6 +63,8 @@ class ConvertController extends Controller /** + * Show overview of a to be converted transaction. + * * @param TransactionType $destinationType * @param TransactionJournal $journal * @@ -110,6 +112,8 @@ class ConvertController extends Controller /** + * Do the conversion. + * * @param Request $request * @param TransactionType $destinationType * @param TransactionJournal $journal @@ -164,6 +168,8 @@ class ConvertController extends Controller /** + * Get the destination account. Is complex. + * * @param TransactionJournal $journal * @param TransactionType $destinationType * @param array $data @@ -223,6 +229,8 @@ class ConvertController extends Controller /** + * Get the source account. + * * @param TransactionJournal $journal * @param TransactionType $destinationType * @param array $data diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index 9c1a061399..ed11993a1e 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -38,11 +38,11 @@ class LinkController extends Controller { /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepository; - /** @var LinkTypeRepositoryInterface */ + /** @var LinkTypeRepositoryInterface Link repository. */ private $repository; /** - * + * LinkController constructor. */ public function __construct() { @@ -62,6 +62,8 @@ class LinkController extends Controller } /** + * Delete a link. + * * @param TransactionJournalLink $link * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -76,6 +78,8 @@ class LinkController extends Controller } /** + * Actually destroy it. + * * @param TransactionJournalLink $link * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -91,6 +95,8 @@ class LinkController extends Controller } /** + * Store a new link. + * * @param JournalLinkRequest $request * @param TransactionJournal $journal * @@ -129,6 +135,7 @@ class LinkController extends Controller } /** + * Switch link from A <> B to B <> A. * @param TransactionJournalLink $link * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 0fd5ee9294..9fdf5b8437 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -51,7 +51,7 @@ class MassController extends Controller private $repository; /** - * + * MassController constructor. */ public function __construct() { @@ -69,6 +69,8 @@ class MassController extends Controller } /** + * Mass delete transactions. + * * @param Collection $journals * * @return IlluminateView @@ -84,6 +86,8 @@ class MassController extends Controller } /** + * Do the mass delete. + * * @param MassDeleteJournalRequest $request * * @return mixed @@ -114,6 +118,8 @@ class MassController extends Controller } /** + * Mass edit of journals. + * * @param Collection $journals * * @return IlluminateView @@ -157,6 +163,8 @@ class MassController extends Controller } /** + * Mass update of journals. + * * @param MassEditJournalRequest $request * @param JournalRepositoryInterface $repository * diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 2ee79eb35f..00c6dd78cf 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -46,7 +46,7 @@ use View; */ class SingleController extends Controller { - /** @var AttachmentHelperInterface */ + /** @var AttachmentHelperInterface The attachment helper. */ private $attachments; /** @var BudgetRepositoryInterface The budget repository */ private $budgets; @@ -54,7 +54,7 @@ class SingleController extends Controller private $repository; /** - * + * SingleController constructor. */ public function __construct() { @@ -81,6 +81,8 @@ class SingleController extends Controller } /** + * CLone a transaction. + * * @param TransactionJournal $journal * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -137,6 +139,8 @@ class SingleController extends Controller } /** + * Create a new journal. + * * @param Request $request * @param string|null $what * @@ -206,6 +210,8 @@ class SingleController extends Controller } /** + * Actually destroys the journal. + * * @param TransactionJournal $transactionJournal * * @return \Illuminate\Http\RedirectResponse @@ -228,6 +234,8 @@ class SingleController extends Controller } /** + * Edit a journal. + * * @param TransactionJournal $journal * * @param JournalRepositoryInterface $repository @@ -321,6 +329,8 @@ class SingleController extends Controller } /** + * Stores a new journal. + * * @param JournalFormRequest $request * @param JournalRepositoryInterface $repository * @@ -383,6 +393,8 @@ class SingleController extends Controller } /** + * Update a journal. + * * @param JournalFormRequest $request * @param JournalRepositoryInterface $repository * @param TransactionJournal $journal @@ -439,6 +451,8 @@ class SingleController extends Controller } /** + * Checks if journal is split. + * * @param TransactionJournal $journal * * @return bool diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 528fe9e60d..d407c4b4c5 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -42,11 +42,12 @@ use View; /** * Class SplitController. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class SplitController extends Controller { - /** @var AttachmentHelperInterface */ + /** @var AttachmentHelperInterface Attachment helper */ private $attachments; /** @var BudgetRepositoryInterface The budget repository */ @@ -58,7 +59,7 @@ class SplitController extends Controller private $repository; /** - * + * SplitController constructor. */ public function __construct() { @@ -80,6 +81,8 @@ class SplitController extends Controller } /** + * Edit a split. + * * @param Request $request * @param TransactionJournal $journal * @@ -119,6 +122,8 @@ class SplitController extends Controller } /** + * Store new split journal. + * * @param SplitJournalFormRequest $request * @param TransactionJournal $journal * @@ -169,6 +174,8 @@ class SplitController extends Controller } /** + * Create data-array from a journal. + * * @param SplitJournalFormRequest|Request $request * @param TransactionJournal $journal * @@ -216,6 +223,8 @@ class SplitController extends Controller } /** + * Get transaction overview from journal. + * * @param TransactionJournal $journal * * @return array @@ -255,6 +264,8 @@ class SplitController extends Controller } /** + * Get info from old input. + * * @param $array * @param $old * diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 36a35cebb8..815114325b 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -121,6 +121,8 @@ class TransactionController extends Controller } /** + * Index for ALL transactions. + * * @param Request $request * @param string $what * @@ -153,6 +155,8 @@ class TransactionController extends Controller } /** + * Do a reconciliation. + * * @param Request $request * * @return JsonResponse @@ -173,6 +177,8 @@ class TransactionController extends Controller } /** + * Reorder transactions. + * * @param Request $request * * @return \Illuminate\Http\JsonResponse @@ -199,6 +205,8 @@ class TransactionController extends Controller } /** + * Show a transaction. + * * @param TransactionJournal $journal * @param LinkTypeRepositoryInterface $linkTypeRepository * @@ -239,6 +247,8 @@ class TransactionController extends Controller } /** + * Get period overview for index. + * * @param string $what * * @param Carbon $date @@ -294,6 +304,8 @@ class TransactionController extends Controller } /** + * Collect the sum per currency. + * * @param Collection $collection * * @return array diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 5fcf14adda..b21c6bf743 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -48,8 +48,9 @@ use Illuminate\View\Middleware\ShareErrorsFromSession; use Laravel\Passport\Http\Middleware\CreateFreshApiToken; /** - * @codeCoverageIgnore * Class Kernel + * + * @codeCoverageIgnore */ class Kernel extends HttpKernel { diff --git a/app/Http/Middleware/AuthenticateTwoFactor.php b/app/Http/Middleware/AuthenticateTwoFactor.php index 078261add4..1b2e62b728 100644 --- a/app/Http/Middleware/AuthenticateTwoFactor.php +++ b/app/Http/Middleware/AuthenticateTwoFactor.php @@ -53,6 +53,8 @@ class AuthenticateTwoFactor /** + * Handle 2FA request. + * * @param $request * @param Closure $next * diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php index 323dcd4a57..aad7287a6a 100644 --- a/app/Http/Middleware/Binder.php +++ b/app/Http/Middleware/Binder.php @@ -28,7 +28,7 @@ use Illuminate\Contracts\Auth\Factory as Auth; use Illuminate\Routing\Route; /** - * Class HttpBinder + * Class Binder */ class Binder { @@ -39,6 +39,8 @@ class Binder */ protected $auth; /** + * The binders. + * * @var array */ protected $binders = []; @@ -77,6 +79,8 @@ class Binder } /** + * Do the binding. + * * @param $key * @param $value * @param $route diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 6ed1ae7c4f..d88e45a25b 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -25,8 +25,9 @@ namespace FireflyIII\Http\Middleware; use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; /** - * @codeCoverageIgnore * Class EncryptCookies + * + * @codeCoverageIgnore */ class EncryptCookies extends Middleware { diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index b78e966a23..ccb574c8df 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -99,6 +99,8 @@ class Installer } /** + * Is access denied error. + * * @param string $message * * @return bool @@ -109,6 +111,8 @@ class Installer } /** + * Is no tables exist error. + * * @param string $message * * @return bool diff --git a/app/Http/Middleware/IsSandStormUser.php b/app/Http/Middleware/IsSandStormUser.php index 03590d4b64..397fe0d7bf 100644 --- a/app/Http/Middleware/IsSandStormUser.php +++ b/app/Http/Middleware/IsSandStormUser.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Middleware; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Session; + /** * Class IsSandStormUser. diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 4f7314fa3f..9ff1f89e1d 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -61,7 +61,7 @@ class Range } /** - * + * Configure the list length. */ private function configureList(): void { @@ -70,7 +70,7 @@ class Range } /** - * + * Configure the user's view. */ private function configureView(): void { @@ -101,6 +101,8 @@ class Range } /** + * Error when sqlite in docker. + * * @param Request $request */ private function loseItAll(Request $request): void @@ -113,6 +115,8 @@ class Range } /** + * Set the range for the current view. + * * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function setRange(): void diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 98d010590c..fbd58bd583 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -26,8 +26,9 @@ use Closure; use Illuminate\Support\Facades\Auth; /** - * @codeCoverageIgnore * Class RedirectIfAuthenticated + * + * @codeCoverageIgnore */ class RedirectIfAuthenticated { diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 017595baa2..479c9ba78d 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -60,7 +60,7 @@ class Sandstorm $repository = app(UserRepositoryInterface::class); $userId = (string)$request->header('X-Sandstorm-User-Id'); // catch anonymous: - $userId = $userId === '' ? 'anonymous' : $userId; + $userId = '' === $userId ? 'anonymous' : $userId; $email = $userId . '@firefly'; $user = $repository->findByEmail($email) ?? $this->createUser($email); Log::debug(sprintf('Sandstorm user email is "%s"', $email)); @@ -75,6 +75,8 @@ class Sandstorm /** + * Create a user. + * * @param string $email * * @return User diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 63fbb74996..fdf71f4d1e 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -26,8 +26,9 @@ use Illuminate\Http\Request; use Illuminate\Session\Middleware\StartSession; /** - * @codeCoverageIgnore * Class StartFireflySession. + * + * @codeCoverageIgnore */ class StartFireflySession extends StartSession { diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php index 178685f2e0..2503635f45 100644 --- a/app/Http/Middleware/TrimStrings.php +++ b/app/Http/Middleware/TrimStrings.php @@ -25,8 +25,9 @@ namespace FireflyIII\Http\Middleware; use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; /** - * @codeCoverageIgnore * Class TrimStrings + * + * @codeCoverageIgnore */ class TrimStrings extends Middleware { diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index ed9131fb59..fe1d249e83 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -27,12 +27,13 @@ use Illuminate\Contracts\Config\Repository; use Illuminate\Http\Request; /** - * @codeCoverageIgnore * Class TrustProxies + * + * @codeCoverageIgnore */ class TrustProxies extends Middleware { - /** @var int */ + /** @var int The headers to check. */ protected $headers = Request::HEADER_X_FORWARDED_ALL; /** diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 16a542dff5..5402419865 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -25,8 +25,9 @@ namespace FireflyIII\Http\Middleware; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; /** + * Class VerifyCsrfToken. + * * @codeCoverageIgnore - * Class VerifyCsrfToken */ class VerifyCsrfToken extends Middleware { diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 85d717990a..f79500515a 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -31,6 +31,8 @@ use FireflyIII\Rules\UniqueIban; class AccountFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -40,6 +42,8 @@ class AccountFormRequest extends Request } /** + * Get all data. + * * @return array */ public function getAccountData(): array @@ -64,6 +68,8 @@ class AccountFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index 96086b0433..0469784687 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class AttachmentFormRequest. + * + * @codeCoverageIgnore */ class AttachmentFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class AttachmentFormRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getAttachmentData(): array @@ -49,6 +54,8 @@ class AttachmentFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php index e053e4c09c..db13b29bb8 100644 --- a/app/Http/Requests/BillFormRequest.php +++ b/app/Http/Requests/BillFormRequest.php @@ -28,6 +28,8 @@ namespace FireflyIII\Http\Requests; class BillFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -37,6 +39,8 @@ class BillFormRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getBillData(): array @@ -55,6 +59,8 @@ class BillFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php index 94e870e9dd..b087071a92 100644 --- a/app/Http/Requests/BudgetFormRequest.php +++ b/app/Http/Requests/BudgetFormRequest.php @@ -25,12 +25,15 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; /** - * @codeCoverageIgnore * Class BudgetFormRequest. + * + * @codeCoverageIgnore */ class BudgetFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +42,8 @@ class BudgetFormRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getBudgetData(): array @@ -50,6 +55,8 @@ class BudgetFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php index 859b758f6d..e7b911e20f 100644 --- a/app/Http/Requests/BudgetIncomeRequest.php +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class BudgetIncomeRequest. + * + * @codeCoverageIgnore */ class BudgetIncomeRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class BudgetIncomeRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/BulkEditJournalRequest.php b/app/Http/Requests/BulkEditJournalRequest.php index 84d037aab5..2005c7f7e0 100644 --- a/app/Http/Requests/BulkEditJournalRequest.php +++ b/app/Http/Requests/BulkEditJournalRequest.php @@ -28,6 +28,8 @@ namespace FireflyIII\Http\Requests; class BulkEditJournalRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -37,6 +39,8 @@ class BulkEditJournalRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index e51aa818db..bb5bb973f6 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -30,6 +30,8 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; class CategoryFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +41,8 @@ class CategoryFormRequest extends Request } /** + * Get information for the controller. + * * @return array */ public function getCategoryData(): array @@ -49,6 +53,8 @@ class CategoryFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index 74ec996eca..4846650bc1 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class ConfigurationRequest. + * + * @codeCoverageIgnore */ class ConfigurationRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class ConfigurationRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getConfigurationData(): array @@ -49,6 +54,8 @@ class ConfigurationRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index 9e0b143e92..49ba96a5c5 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -28,6 +28,8 @@ namespace FireflyIII\Http\Requests; class CurrencyFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -37,6 +39,8 @@ class CurrencyFormRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getCurrencyData(): array @@ -50,6 +54,8 @@ class CurrencyFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php index d4109b0063..d97fba542e 100644 --- a/app/Http/Requests/DeleteAccountFormRequest.php +++ b/app/Http/Requests/DeleteAccountFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class DeleteAccountFormRequest. + * + * @codeCoverageIgnore */ class DeleteAccountFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class DeleteAccountFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/EmailFormRequest.php b/app/Http/Requests/EmailFormRequest.php index a64b72e8e9..2357ecc1ac 100644 --- a/app/Http/Requests/EmailFormRequest.php +++ b/app/Http/Requests/EmailFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class EmailFormRequest. + * + * @codeCoverageIgnore */ class EmailFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class EmailFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php index 4897c6dbaa..2a12faac28 100644 --- a/app/Http/Requests/ExportFormRequest.php +++ b/app/Http/Requests/ExportFormRequest.php @@ -30,6 +30,8 @@ use Carbon\Carbon; class ExportFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +41,8 @@ class ExportFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index ec526a21d4..406e9f5439 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -33,6 +33,8 @@ use Log; class JournalFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -140,8 +142,9 @@ class JournalFormRequest extends Request } /** - * @return array + * Rules for this request. * + * @return array * @throws FireflyException */ public function rules(): array @@ -234,6 +237,8 @@ class JournalFormRequest extends Request } /** + * Check if amounts are valid. + * * @param Validator $validator */ private function validNativeAmount(Validator $validator): void @@ -257,6 +262,8 @@ class JournalFormRequest extends Request } /** + * Check if deposit amount is valid. + * * @param Validator $validator * * @SuppressWarnings(PHPMD.CyclomaticComplexity) @@ -274,6 +281,8 @@ class JournalFormRequest extends Request } /** + * Check if transfer amount is valid. + * * @param Validator $validator * * @SuppressWarnings(PHPMD.CyclomaticComplexity) @@ -299,6 +308,8 @@ class JournalFormRequest extends Request } /** + * Check if withdrawal amount is valid. + * * @param Validator $validator * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php index 6cebe3a4de..a9b3a0d6a5 100644 --- a/app/Http/Requests/JournalLinkRequest.php +++ b/app/Http/Requests/JournalLinkRequest.php @@ -31,6 +31,8 @@ use FireflyIII\Models\LinkType; class JournalLinkRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -40,6 +42,8 @@ class JournalLinkRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getLinkInfo(): array @@ -59,6 +63,8 @@ class JournalLinkRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/LinkTypeFormRequest.php b/app/Http/Requests/LinkTypeFormRequest.php index 77cae53114..7e75f6abcf 100644 --- a/app/Http/Requests/LinkTypeFormRequest.php +++ b/app/Http/Requests/LinkTypeFormRequest.php @@ -28,6 +28,8 @@ namespace FireflyIII\Http\Requests; class LinkTypeFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -37,6 +39,8 @@ class LinkTypeFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php index 5e7a423dec..fa325b204c 100644 --- a/app/Http/Requests/MassDeleteJournalRequest.php +++ b/app/Http/Requests/MassDeleteJournalRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class MassDeleteJournalRequest. + * + * @codeCoverageIgnore */ class MassDeleteJournalRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class MassDeleteJournalRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php index 91bc871e33..b171ecfa20 100644 --- a/app/Http/Requests/MassEditJournalRequest.php +++ b/app/Http/Requests/MassEditJournalRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class MassEditJournalRequest. + * + * @codeCoverageIgnore */ class MassEditJournalRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class MassEditJournalRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index 27c7042a2f..343b36403d 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class NewUserFormRequest. + * + * @codeCoverageIgnore */ class NewUserFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class NewUserFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index fadcaad5c7..6aa7ad5d9f 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -28,6 +28,8 @@ namespace FireflyIII\Http\Requests; class PiggyBankFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -37,6 +39,8 @@ class PiggyBankFormRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getPiggyBankData(): array @@ -52,6 +56,8 @@ class PiggyBankFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php index c03c865ed9..aa060bd794 100644 --- a/app/Http/Requests/ProfileFormRequest.php +++ b/app/Http/Requests/ProfileFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class ProfileFormRequest. + * + * @codeCoverageIgnore */ class ProfileFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class ProfileFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/ReconciliationStoreRequest.php b/app/Http/Requests/ReconciliationStoreRequest.php index 7866ca793b..3e1fc096f9 100644 --- a/app/Http/Requests/ReconciliationStoreRequest.php +++ b/app/Http/Requests/ReconciliationStoreRequest.php @@ -32,6 +32,8 @@ use Log; class ReconciliationStoreRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -41,6 +43,8 @@ class ReconciliationStoreRequest extends Request } /** + * Returns the data required by the controller. + * * @return array */ public function getAll(): array @@ -64,6 +68,8 @@ class ReconciliationStoreRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/ReconciliationUpdateRequest.php b/app/Http/Requests/ReconciliationUpdateRequest.php index e100866214..0f71e7a184 100644 --- a/app/Http/Requests/ReconciliationUpdateRequest.php +++ b/app/Http/Requests/ReconciliationUpdateRequest.php @@ -28,6 +28,8 @@ namespace FireflyIII\Http\Requests; class ReconciliationUpdateRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -53,6 +55,8 @@ class ReconciliationUpdateRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 871c96bc8c..eb7b476d88 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -37,6 +37,8 @@ class RecurrenceFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -46,6 +48,8 @@ class RecurrenceFormRequest extends Request } /** + * Get the data required by the controller. + * * @return array * @throws FireflyException * @@ -133,6 +137,8 @@ class RecurrenceFormRequest extends Request } /** + * The rules for this request. + * * @return array * @throws FireflyException * @@ -228,6 +234,8 @@ class RecurrenceFormRequest extends Request } /** + * Parses repetition data. + * * @return array * * @SuppressWarnings(PHPMD.CyclomaticComplexity) diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index f07049ebc1..a5c8dc87e3 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -38,6 +38,8 @@ use Log; class ReportFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -47,6 +49,8 @@ class ReportFormRequest extends Request } /** + * Validate list of accounts. + * * @return Collection */ public function getAccountList(): Collection @@ -69,6 +73,8 @@ class ReportFormRequest extends Request } /** + * Validate list of budgets. + * * @return Collection */ public function getBudgetList(): Collection @@ -90,6 +96,8 @@ class ReportFormRequest extends Request } /** + * Validate list of categories. + * * @return Collection */ public function getCategoryList(): Collection @@ -111,6 +119,8 @@ class ReportFormRequest extends Request } /** + * Validate end date. + * * @return Carbon * * @throws FireflyException @@ -137,6 +147,8 @@ class ReportFormRequest extends Request } /** + * Validate list of expense accounts. + * * @return Collection */ public function getExpenseList(): Collection @@ -159,6 +171,8 @@ class ReportFormRequest extends Request } /** + * Validate start date. + * * @return Carbon * * @throws FireflyException @@ -184,6 +198,8 @@ class ReportFormRequest extends Request } /** + * Validate list of tags. + * * @return Collection */ public function getTagList(): Collection @@ -205,6 +221,8 @@ class ReportFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index e470d7d4a4..488d1ab2ed 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -33,6 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; class Request extends FormRequest { /** + * Return a boolean value. + * * @param string $field * * @return bool @@ -50,6 +52,8 @@ class Request extends FormRequest } /** + * Return floating value. + * * @param string $field * * @return float @@ -60,6 +64,8 @@ class Request extends FormRequest } /** + * Return integer value. + * * @param string $field * * @return int @@ -70,6 +76,8 @@ class Request extends FormRequest } /** + * Return string value. + * * @param string $field * * @return string @@ -133,6 +141,8 @@ class Request extends FormRequest } /** + * Return date or NULL. + * * @param string $field * * @return Carbon|null diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 9248d3c3ce..24390eb024 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -30,6 +30,8 @@ use FireflyIII\Repositories\Rule\RuleRepositoryInterface; class RuleFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +41,8 @@ class RuleFormRequest extends Request } /** + * Get all data for controller. + * * @return array * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) @@ -89,6 +93,8 @@ class RuleFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index dfe36c4514..8b99c1f957 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -30,6 +30,8 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; class RuleGroupFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +41,8 @@ class RuleGroupFormRequest extends Request } /** + * Get all data for controller. + * * @return array */ public function getRuleGroupData(): array @@ -50,6 +54,8 @@ class RuleGroupFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index 8473d0d465..311efa751b 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -25,12 +25,15 @@ namespace FireflyIII\Http\Requests; use Carbon\Carbon; /** - * @codeCoverageIgnore * Class ExportFormRequest. + * + * @codeCoverageIgnore */ class SelectTransactionsRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -40,6 +43,8 @@ class SelectTransactionsRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index 588625e1a4..65e861c5d9 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -30,6 +30,8 @@ use Illuminate\Validation\Validator; class SplitJournalFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +41,8 @@ class SplitJournalFormRequest extends Request } /** + * Get all info for the controller. + * * @return array * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) @@ -107,6 +111,8 @@ class SplitJournalFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array @@ -149,6 +155,8 @@ class SplitJournalFormRequest extends Request } /** + * Verify that source and destination are not the same. + * * @param Validator $validator * * @SuppressWarnings(PHPMD.CyclomaticComplexity) diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 7254280d65..e2a86b5183 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -30,6 +30,8 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface; class TagFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -39,6 +41,8 @@ class TagFormRequest extends Request } /** + * Get all data for controller. + * * @return array */ public function collectTagData(): array @@ -66,6 +70,8 @@ class TagFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index e8dadd3e00..5cb45c8a30 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class RuleFormRequest. + * + * @codeCoverageIgnore */ class TestRuleFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class TestRuleFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php index 25909b3e7b..c30cf5827e 100644 --- a/app/Http/Requests/TokenFormRequest.php +++ b/app/Http/Requests/TokenFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class TokenFormRequest. + * + * @codeCoverageIgnore */ class TokenFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class TokenFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index c5827f6db3..65b2de6217 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class UserFormRequest. + * + * @codeCoverageIgnore */ class UserFormRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class UserFormRequest extends Request } /** + * Get data for controller. + * * @return array */ public function getUserData(): array @@ -51,6 +56,8 @@ class UserFormRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array diff --git a/app/Http/Requests/UserRegistrationRequest.php b/app/Http/Requests/UserRegistrationRequest.php index 1095c434b2..d69b8322ae 100644 --- a/app/Http/Requests/UserRegistrationRequest.php +++ b/app/Http/Requests/UserRegistrationRequest.php @@ -23,12 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; /** - * @codeCoverageIgnore * Class UserRegistrationRequest. + * + * @codeCoverageIgnore */ class UserRegistrationRequest extends Request { /** + * Verify the request. + * * @return bool */ public function authorize(): bool @@ -38,6 +41,8 @@ class UserRegistrationRequest extends Request } /** + * Rules for this request. + * * @return array */ public function rules(): array From f7a1201d02c95d6e34e606e818ee67b477a8ba0a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 08:14:42 +0200 Subject: [PATCH 42/86] Expand route link for transactions without a budget. --- resources/views/budgets/index.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index c5d57c0cb4..97cba2e2e3 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -65,7 +65,7 @@

                                                                          - + {{ trans('firefly.transactions_no_budget', {start: periodStart, end: periodEnd }) }}

                                                                          From aed7e6d28917cfe96ef094f9dee9868b954509a7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 08:27:18 +0200 Subject: [PATCH 43/86] Fix #1549 --- app/Repositories/Budget/BudgetRepository.php | 42 +++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 8d1277f6f6..d9464e73a2 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -30,6 +30,8 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\RuleAction; +use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; @@ -815,11 +817,49 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function update(Budget $budget, array $data): Budget { - // update the account: + $oldName = $budget->name; + // update the budget: $budget->name = $data['name']; $budget->active = $data['active']; $budget->save(); + // find any rule triggers related to budgets, with this budget name, and update them accordingly. + $types = [ + 'budget_is', + ]; + $triggers = RuleTrigger::leftJoin('rules', 'rules.id', '=', 'rule_triggers.rule_id') + ->where('rules.user_id', $this->user->id) + ->whereIn('rule_triggers.trigger_type', $types) + ->where('rule_triggers.trigger_value', $oldName) + ->get(['rule_triggers.*']); + Log::debug(sprintf('Found %d triggers to update.', $triggers->count())); + /** @var RuleTrigger $trigger */ + foreach ($triggers as $trigger) { + $trigger->trigger_value = $data['name']; + $trigger->save(); + Log::debug(sprintf('Updated trigger %d: %s', $trigger->id, $trigger->trigger_value)); + } + + + // find any rule actions related to budgets, with this budget name, and update them accordingly. + $types = [ + 'set_budget', + ]; + $actions = RuleAction::leftJoin('rules', 'rules.id', '=', 'rule_actions.rule_id') + ->where('rules.user_id', $this->user->id) + ->whereIn('rule_actions.action_type', $types) + ->where('rule_actions.action_value', $oldName) + ->get(['rule_actions.*']); + Log::debug(sprintf('Found %d actions to update.', $actions->count())); + /** @var RuleAction $action */ + foreach($actions as $action) { + $action->action_value = $data['name']; + $action->save(); + Log::debug(sprintf('Updated action %d: %s', $action->id, $action->action_value)); + } + + app('preferences')->mark(); + return $budget; } From 662b832274ba8f915398391729c37ebc13c40ed5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 08:36:30 +0200 Subject: [PATCH 44/86] Fix max amount. --- app/Http/Requests/JournalFormRequest.php | 6 +++--- app/Repositories/Budget/BudgetRepository.php | 2 +- app/Validation/FireflyValidator.php | 17 +++++++++++++++++ resources/lang/en_US/validation.php | 3 ++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 406e9f5439..c8b549e9be 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -161,11 +161,11 @@ class JournalFormRequest extends Request 'due_date' => 'date|nullable', 'payment_date' => 'date|nullable', 'invoice_date' => 'date|nullable', - 'internal_reference' => 'min:1,max:255|nullable', - 'notes' => 'min:1,max:50000|nullable', + 'internal_reference' => 'min:1|max:255|nullable', + 'notes' => 'min:1|max:50000|nullable', // and then transaction rules: 'description' => 'required|between:1,255', - 'amount' => 'numeric|required|more:0', + 'amount' => 'numeric|required|more:0|less:10000000',// 'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable', 'category' => 'between:1,255|nullable', 'source_id' => 'numeric|belongsToUser:accounts,id|nullable', diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index d9464e73a2..9f6a4676e7 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -840,7 +840,7 @@ class BudgetRepository implements BudgetRepositoryInterface Log::debug(sprintf('Updated trigger %d: %s', $trigger->id, $trigger->trigger_value)); } - + // find any rule actions related to budgets, with this budget name, and update them accordingly. $types = [ 'set_budget', diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index ff0669a98c..db51337bd4 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -203,6 +203,23 @@ class FireflyValidator extends Validator return bccomp((string)$value, (string)$compare) > 0; } + /** + * @param $attribute + * @param $value + * @param $parameters + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * + * @return bool + */ + public function validateLess($attribute, $value, $parameters): bool + { + /** @var mixed $compare */ + $compare = $parameters[0] ?? '0'; + + return bccomp((string)$value, (string)$compare) < 0; + } + + /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) * diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php index b573da5844..58266f14c9 100644 --- a/resources/lang/en_US/validation.php +++ b/resources/lang/en_US/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'This is not valid base64 encoded data.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute must be larger than zero.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => 'The :attribute is not a valid URL.', 'after' => 'The :attribute must be a date after :date.', 'alpha' => 'The :attribute may only contain letters.', From b705240faab66c79c421129ad818ad40baa7fd46 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 08:58:58 +0200 Subject: [PATCH 45/86] Fix #1530 --- app/Http/Controllers/Chart/BillController.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 756df67daf..ab4fb05f79 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -85,7 +85,7 @@ class BillController extends Controller /** - * Shows history for a single bill. + * Shows overview for a single bill. * * @param JournalCollectorInterface $collector * @param Bill $bill @@ -101,8 +101,8 @@ class BillController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - $results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals(); - $results = $results->sortBy( + $results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals(); + $results = $results->sortBy( function (Transaction $transaction) { return $transaction->date->format('U'); } @@ -118,7 +118,13 @@ class BillController extends Controller $date = $entry->date->formatLocalized((string)trans('config.month_and_day')); $chartData[0]['entries'][$date] = $bill->amount_min; // minimum amount of bill $chartData[1]['entries'][$date] = $bill->amount_max; // maximum amount of bill - $chartData[2]['entries'][$date] = bcmul($entry->transaction_amount, '-1'); // amount of journal + + // append amount because there are more than one per moment: + if (!isset($chartData[2]['entries'][$date])) { + $chartData[2]['entries'][$date] = '0'; + } + $amount = bcmul($entry->transaction_amount, '-1'); + $chartData[2]['entries'][$date] = bcadd($chartData[2]['entries'][$date], $amount); // amount of journal } $data = $this->generator->multiSet($chartData); From 1f0fdf3da73b61703dd87f0fee8eced9358304cf Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 09:03:53 +0200 Subject: [PATCH 46/86] Fix #1563 --- app/Repositories/PiggyBank/PiggyBankRepository.php | 2 +- resources/views/list/piggy-banks.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index cacf70be61..2c5581b762 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -501,7 +501,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $piggyBank->name = $data['name']; $piggyBank->account_id = (int)$data['account_id']; $piggyBank->targetamount = $data['targetamount']; - $piggyBank->targetdate = $data['targetdate'] ?? $piggyBank->targetdate; + $piggyBank->targetdate = $data['targetdate']; $piggyBank->startdate = $data['startdate'] ?? $piggyBank->startdate; $piggyBank->save(); diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig index 19a57d9ea7..5aa821077d 100644 --- a/resources/views/list/piggy-banks.twig +++ b/resources/views/list/piggy-banks.twig @@ -81,7 +81,7 @@ {% endif %} - {% if piggy.targetdate %} + {% if piggy.target_date %} {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_dp) }} {% endif %} From d193a6aec41877fc180ae8a5128a75d58528192c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 10:05:06 +0200 Subject: [PATCH 47/86] Give commands proper exit codes. --- app/Console/Commands/Import.php | 8 +++++--- app/Console/Commands/ScanAttachments.php | 3 ++- app/Console/Commands/UpgradeDatabase.php | 4 +++- app/Console/Commands/UpgradeFireflyInstructions.php | 3 ++- app/Console/Commands/UseEncryption.php | 3 ++- app/Console/Commands/VerifyDatabase.php | 6 ++++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 0446f6ccc5..5d6d853f59 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -59,7 +59,7 @@ class Import extends Command * * @throws FireflyException */ - public function handle(): void + public function handle(): int { Log::debug('Start start-import command'); $jobKey = $this->argument('key'); @@ -67,12 +67,12 @@ class Import extends Command if (null === $job) { $this->errorLine(sprintf('No job found with key "%s"', $jobKey)); - return; + return 1; } if (!$this->isValid($job)) { $this->errorLine('Job is not valid for some reason. Exit.'); - return; + return 1; } $this->infoLine(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type)); @@ -106,6 +106,8 @@ class Import extends Command } $this->infoLine(sprintf('The import has finished. %d transactions have been imported.', $count)); + + return 0; } /** diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php index ac10dec27f..0a77363a0a 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -54,7 +54,7 @@ class ScanAttachments extends Command /** * Execute the console command. */ - public function handle(): void + public function handle(): int { $attachments = Attachment::get(); $disk = Storage::disk('upload'); @@ -82,5 +82,6 @@ class ScanAttachments extends Command $attachment->save(); $this->line(sprintf('Fixed attachment #%d', $attachment->id)); } + return 0; } } diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index 5c328ac60f..927630bc50 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -82,7 +82,7 @@ class UpgradeDatabase extends Command /** * Execute the console command. */ - public function handle(): void + public function handle(): int { $this->setTransactionIdentifier(); $this->updateAccountCurrencies(); @@ -96,6 +96,8 @@ class UpgradeDatabase extends Command $this->migrateBillsToRules(); $this->info('Firefly III database is up to date.'); + + return 0; } /** diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index eae3998a22..54695221c4 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -46,7 +46,7 @@ class UpgradeFireflyInstructions extends Command /** * Execute the console command. */ - public function handle(): void + public function handle(): int { if ('update' === $this->argument('task')) { $this->updateInstructions(); @@ -54,6 +54,7 @@ class UpgradeFireflyInstructions extends Command if ('install' === $this->argument('task')) { $this->installInstructions(); } + return 0; } /** diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php index df38fff556..bfc04db91c 100644 --- a/app/Console/Commands/UseEncryption.php +++ b/app/Console/Commands/UseEncryption.php @@ -47,7 +47,7 @@ class UseEncryption extends Command /** * Execute the console command. */ - public function handle(): void + public function handle(): int { if (true === config('firefly.encryption')) { $this->info('Firefly III configuration calls for encrypted data.'); @@ -62,6 +62,7 @@ class UseEncryption extends Command $this->handleObjects('Category', 'name', 'encrypted'); $this->handleObjects('PiggyBank', 'name', 'encrypted'); $this->handleObjects('TransactionJournal', 'description', 'encrypted'); + return 0; } /** diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index dc43c373bb..88635664ae 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -69,11 +69,11 @@ class VerifyDatabase extends Command /** * Execute the console command. */ - public function handle(): void + public function handle(): int { // if table does not exist, return false if (!Schema::hasTable('users')) { - return; + return 1; } $this->reportEmptyBudgets(); @@ -94,6 +94,8 @@ class VerifyDatabase extends Command $this->fixDoubleAmounts(); $this->fixBadMeta(); $this->removeBills(); + + return 0; } /** From d4ba014a8ade132f5e0e5de628d3637d7764a546 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 12:52:07 +0200 Subject: [PATCH 48/86] Clean up various code. --- app/Factory/TransactionFactory.php | 2 +- app/Import/Converter/Amount.php | 161 +++++++++++++----- app/Import/Converter/INGDebitCredit.php | 2 +- .../JobConfiguration/FakeJobConfiguration.php | 31 ++-- .../JobConfiguration/FileJobConfiguration.php | 2 +- app/Import/Mapper/AssetAccountIbans.php | 2 +- app/Import/Mapper/OpposingAccountIbans.php | 3 +- .../Prerequisites/FakePrerequisites.php | 4 +- app/Import/Routine/FakeRoutine.php | 3 +- app/Import/Routine/SpectreRoutine.php | 2 +- app/Import/Specifics/AbnAmroDescription.php | 6 +- app/Import/Specifics/PresidentsChoice.php | 2 +- app/Import/Specifics/RabobankDescription.php | 4 +- app/Import/Storage/ImportArrayStorage.php | 42 +++-- 14 files changed, 171 insertions(+), 95 deletions(-) diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 35a435faa7..7f328ac270 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -113,7 +113,7 @@ class TransactionFactory $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']); if (null === $sourceAccount || null === $destinationAccount) { - throw new FireflyException('Could not determine source or destination account.'); + throw new FireflyException('Could not determine source or destination account.', $data); } Log::debug(sprintf('Source type is "%s", destination type is "%s"', $sourceAccount->accountType->type, $destinationAccount->accountType->type)); diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php index 070842a050..1b828c6663 100644 --- a/app/Import/Converter/Amount.php +++ b/app/Import/Converter/Amount.php @@ -33,12 +33,12 @@ class Amount implements ConverterInterface * Some people, when confronted with a problem, think "I know, I'll use regular expressions." Now they have two problems. * - Jamie Zawinski. * - * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.NPathComplexity) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @param $value * * @return string - * - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function convert($value): string { @@ -46,59 +46,43 @@ class Amount implements ConverterInterface return '0'; } Log::debug(sprintf('Start with amount "%s"', $value)); - $original = $value; - $value = (string)$value; - $value = $this->stripAmount($value); - $len = \strlen($value); - $decimalPosition = $len - 3; - $altPosition = $len - 2; - $decimal = null; + $original = $value; + $value = $this->stripAmount((string)$value); + $decimal = null; - if (($len > 2 && '.' === $value[$decimalPosition]) || ($len > 2 && strpos($value, '.') > $decimalPosition)) { + if ($this->decimalIsDot($value)) { $decimal = '.'; Log::debug(sprintf('Decimal character in "%s" seems to be a dot.', $value)); } - if ($len > 2 && ',' === $value[$decimalPosition]) { + + if ($this->decimalIsComma($value)) { $decimal = ','; Log::debug(sprintf('Decimal character in "%s" seems to be a comma.', $value)); } + // decimal character is null? find out if "0.1" or ".1" or "0,1" or ",1" - if ($len > 1 && ('.' === $value[$altPosition] || ',' === $value[$altPosition])) { - $decimal = $value[$altPosition]; - Log::debug(sprintf('Alternate search resulted in "%s" for decimal sign.', $decimal)); + if ($this->alternativeDecimalSign($value)) { + $decimal = $this->getAlternativeDecimalSign($value); } // decimal character still null? Search from the left for '.',',' or ' '. if (null === $decimal) { - Log::debug('Decimal is still NULL, probably number with >2 decimals. Search for a dot.'); - $res = strrpos($value, '.'); - if (!(false === $res)) { - // blandly assume this is the one. - Log::debug(sprintf('Searched from the left for "." in amount "%s", assume this is the decimal sign.', $value)); - $decimal = '.'; - } - unset($res); + $decimal = $this->findFromLeft($value); } - // if decimal is dot, replace all comma's and spaces with nothing. then parse as float (round to 4 pos) - if ('.' === $decimal) { - $search = [',', ' ']; - $value = str_replace($search, '', $value); - Log::debug(sprintf('Converted amount from "%s" to "%s".', $original, $value)); - } - if (',' === $decimal) { - $search = ['.', ' ']; - $value = str_replace($search, '', $value); - $value = str_replace(',', '.', $value); + // if decimal is dot, replace all comma's and spaces with nothing + if (null !== $decimal) { + $value = $this->replaceDecimal($decimal, $value); Log::debug(sprintf('Converted amount from "%s" to "%s".', $original, $value)); } + if (null === $decimal) { // replace all: $search = ['.', ' ', ',']; $value = str_replace($search, '', $value); Log::debug(sprintf('No decimal character found. Converted amount from "%s" to "%s".', $original, $value)); } - if ($value{0} === '.') { + if ('.' === $value{0}) { $value = '0' . $value; } @@ -114,18 +98,113 @@ class Amount implements ConverterInterface return $formatted; } - private function bcround($number, $scale = 0) + /** + * Check if the value has a dot or comma on an alternative place, + * catching strings like ",1" or ".5". + * + * @param string $value + * + * @return bool + */ + private function alternativeDecimalSign(string $value): bool { - $fix = "5"; - for ($i = 0; $i < $scale; $i++) { - $fix = "0$fix"; - } - $number = bcadd($number, "0.$fix", $scale + 1); + $length = \strlen($value); + $altPosition = $length - 2; - return bcdiv($number, "1.0", $scale); + return $length > 1 && ('.' === $value[$altPosition] || ',' === $value[$altPosition]); } /** + * Helper function to see if the decimal separator is a comma. + * + * @param string $value + * + * @return bool + */ + private function decimalIsComma(string $value): bool + { + $length = \strlen($value); + $decimalPosition = $length - 3; + + return $length > 2 && ',' === $value[$decimalPosition]; + } + + /** + * Helper function to see if the decimal separator is a dot. + * + * @param string $value + * + * @return bool + */ + private function decimalIsDot(string $value): bool + { + $length = \strlen($value); + $decimalPosition = $length - 3; + + return ($length > 2 && '.' === $value[$decimalPosition]) || ($length > 2 && strpos($value, '.') > $decimalPosition); + } + + /** + * Search from the left for decimal sign. + * + * @param string $value + * + * @return string + */ + private function findFromLeft(string $value): ?string + { + $decimal = null; + Log::debug('Decimal is still NULL, probably number with >2 decimals. Search for a dot.'); + $res = strrpos($value, '.'); + if (!(false === $res)) { + // blandly assume this is the one. + Log::debug(sprintf('Searched from the left for "." in amount "%s", assume this is the decimal sign.', $value)); + $decimal = '.'; + } + + return $decimal; + } + + /** + * Returns the alternative decimal point used, such as a dot or a comma, + * from strings like ",1" or "0.5". + * + * @param string $value + * + * @return string + */ + private function getAlternativeDecimalSign(string $value): string + { + $length = \strlen($value); + $altPosition = $length - 2; + + return $value[$altPosition]; + + } + + /** + * @param string $decimal + * @param string $value + * + * @return string + */ + private function replaceDecimal(string $decimal, string $value): string + { + $search = [',', ' ']; // default when decimal sign is a dot. + if (',' === $decimal) { + $search = ['.', ' ']; + } + $value = str_replace($search, '', $value); + + /** @noinspection CascadeStringReplacementInspection */ + $value = str_replace(',', '.', $value); + + return $value; + } + + /** + * Strip amount from weird characters. + * * @param string $value * * @return string diff --git a/app/Import/Converter/INGDebitCredit.php b/app/Import/Converter/INGDebitCredit.php index 4779cecca6..4148c7d2ea 100644 --- a/app/Import/Converter/INGDebitCredit.php +++ b/app/Import/Converter/INGDebitCredit.php @@ -34,7 +34,7 @@ class INGDebitCredit implements ConverterInterface * * @return int */ - public function convert($value) + public function convert($value): int { Log::debug('Going to convert ing debit credit', ['value' => $value]); diff --git a/app/Import/JobConfiguration/FakeJobConfiguration.php b/app/Import/JobConfiguration/FakeJobConfiguration.php index 2003a2b230..751cacf721 100644 --- a/app/Import/JobConfiguration/FakeJobConfiguration.php +++ b/app/Import/JobConfiguration/FakeJobConfiguration.php @@ -40,20 +40,22 @@ class FakeJobConfiguration implements JobConfigurationInterface /** * Returns true when the initial configuration for this job is complete. + * configuration array of job must have two values: + * 'artist' must be 'david bowie', case insensitive + * 'song' must be 'golden years', case insensitive. + * if stage is not "new", then album must be 'station to station' * * @return bool + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function configurationComplete(): bool { - // configuration array of job must have two values: - // 'artist' must be 'david bowie', case insensitive - // 'song' must be 'golden years', case insensitive. - // if stage is not "new", then album must be 'station to station' $config = $this->importJob->configuration; - if ($this->importJob->stage === 'new') { - return (isset($config['artist']) && 'david bowie' === strtolower($config['artist'])) - && (isset($config['song']) && 'golden years' === strtolower($config['song'])) - && isset($config['apply-rules']); + if ('new' === $this->importJob->stage) { + return + isset($config['artist'], $config['song'], $config['apply-rules']) + && 'david bowie' === strtolower($config['artist']) + && 'golden years' === strtolower($config['song']); } return isset($config['album']) && 'station to station' === strtolower($config['album']); @@ -80,12 +82,12 @@ class FakeJobConfiguration implements JobConfigurationInterface $configuration['artist'] = $artist; } - if ($song === 'golden years') { + if ('golden years' === $song) { // store song $configuration['song'] = $song; } - if ($album === 'station to station') { + if ('station to station' === $album) { // store album $configuration['album'] = $album; } @@ -96,8 +98,7 @@ class FakeJobConfiguration implements JobConfigurationInterface $this->repository->setConfiguration($this->importJob, $configuration); $messages = new MessageBag(); - if (\count($configuration) !== 3) { - + if (3 !== \count($configuration)) { $messages->add('some_key', 'Ignore this error: ' . \count($configuration)); } @@ -136,13 +137,13 @@ class FakeJobConfiguration implements JobConfigurationInterface if (null === $applyRules) { return 'import.fake.apply-rules'; } - if (strtolower($artist) !== 'david bowie') { + if ('david bowie' !== strtolower($artist)) { return 'import.fake.enter-artist'; } - if (strtolower($song) !== 'golden years') { + if ('golden years' !== strtolower($song)) { return 'import.fake.enter-song'; } - if (strtolower($album) !== 'station to station' && $this->importJob->stage !== 'new') { + if ('new' !== $this->importJob->stage && 'station to station' !== strtolower($album)) { return 'import.fake.enter-album'; } diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php index 5820b38951..a40bc47bf7 100644 --- a/app/Import/JobConfiguration/FileJobConfiguration.php +++ b/app/Import/JobConfiguration/FileJobConfiguration.php @@ -52,7 +52,7 @@ class FileJobConfiguration implements JobConfigurationInterface */ public function configurationComplete(): bool { - return $this->importJob->stage === 'ready_to_run'; + return 'ready_to_run' === $this->importJob->stage; } /** diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php index 3d166184b7..ce9585fc44 100644 --- a/app/Import/Mapper/AssetAccountIbans.php +++ b/app/Import/Mapper/AssetAccountIbans.php @@ -49,7 +49,7 @@ class AssetAccountIbans implements MapperInterface if (\strlen($iban) > 0) { $topList[$accountId] = $account->iban . ' (' . $account->name . ')'; } - if (0 === \strlen($iban)) { + if ('' === $iban) { $list[$accountId] = $account->name; } } diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php index a8b3d4eb99..3eae583064 100644 --- a/app/Import/Mapper/OpposingAccountIbans.php +++ b/app/Import/Mapper/OpposingAccountIbans.php @@ -55,10 +55,11 @@ class OpposingAccountIbans implements MapperInterface if (\strlen($iban) > 0) { $topList[$accountId] = $account->iban . ' (' . $account->name . ')'; } - if (0 === \strlen($iban)) { + if ('' === $iban) { $list[$accountId] = $account->name; } } + /** @noinspection AdditionOperationOnArraysInspection */ $list = $topList + $list; asort($list); $list = [0 => (string)trans('import.map_do_not_map')] + $list; diff --git a/app/Import/Prerequisites/FakePrerequisites.php b/app/Import/Prerequisites/FakePrerequisites.php index 86642e8066..a5565d9c5d 100644 --- a/app/Import/Prerequisites/FakePrerequisites.php +++ b/app/Import/Prerequisites/FakePrerequisites.php @@ -58,7 +58,7 @@ class FakePrerequisites implements PrerequisitesInterface $apiKey = app('preferences')->getForUser($this->user, 'fake_api_key', null)->data; } $oldKey = (string)\request()->old('api_key'); - if ($oldKey !== '') { + if ('' !== $oldKey) { $apiKey = \request()->old('api_key'); // @codeCoverageIgnore } @@ -118,7 +118,7 @@ class FakePrerequisites implements PrerequisitesInterface if (null === $apiKey->data) { return false; } - if (\strlen((string)$apiKey->data) === 32) { + if (32 === \strlen((string)$apiKey->data)) { return true; } diff --git a/app/Import/Routine/FakeRoutine.php b/app/Import/Routine/FakeRoutine.php index bd609706c5..497fcb93dd 100644 --- a/app/Import/Routine/FakeRoutine.php +++ b/app/Import/Routine/FakeRoutine.php @@ -55,7 +55,7 @@ class FakeRoutine implements RoutineInterface public function run(): void { Log::debug(sprintf('Now in run() for fake routine with status: %s', $this->importJob->status)); - if ($this->importJob->status !== 'ready_to_run') { + if ('ready_to_run' !== $this->importJob->status) { throw new FireflyException(sprintf('Fake job should have status "ready_to_run", not "%s"', $this->importJob->status)); // @codeCoverageIgnore } @@ -95,7 +95,6 @@ class FakeRoutine implements RoutineInterface /** * @param ImportJob $importJob * - * @return */ public function setImportJob(ImportJob $importJob): void { diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php index 83aea2664a..a35f65b9f4 100644 --- a/app/Import/Routine/SpectreRoutine.php +++ b/app/Import/Routine/SpectreRoutine.php @@ -66,7 +66,7 @@ class SpectreRoutine implements RoutineInterface $handler->run(); // if count logins is zero, go to authenticate stage - if ($handler->getCountLogins() === 0) { + if (0 === $handler->getCountLogins()) { $this->repository->setStage($this->importJob, 'do-authenticate'); $this->repository->setStatus($this->importJob, 'ready_to_run'); diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index dcdb8600c3..8eab9c29f3 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -122,8 +122,6 @@ class AbnAmroDescription implements SpecificInterface /** * Parses the current description in SEPA format. * - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * * @return bool true if the description is SEPA format, false otherwise */ protected function parseSepaDescription(): bool @@ -165,7 +163,7 @@ class AbnAmroDescription implements SpecificInterface // Set a new description for the current transaction. If none was given // set the description to type, name and reference $this->row[7] = $newDescription; - if (0 === \strlen($newDescription)) { + if ('' === $newDescription) { $this->row[7] = sprintf('%s - %s (%s)', $type, $name, $reference); } @@ -220,7 +218,7 @@ class AbnAmroDescription implements SpecificInterface // Set a new description for the current transaction. If none was given // set the description to type, name and reference $this->row[7] = $newDescription; - if (0 === \strlen($newDescription)) { + if ('' === $newDescription) { $this->row[7] = sprintf('%s - %s (%s)', $type, $name, $reference); } } diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php index b01fdb28a5..2b067305d1 100644 --- a/app/Import/Specifics/PresidentsChoice.php +++ b/app/Import/Specifics/PresidentsChoice.php @@ -55,7 +55,7 @@ class PresidentsChoice implements SpecificInterface $row = array_values($row); // first, if column 2 is empty and 3 is not, do nothing. // if column 3 is empty and column 2 is not, move amount to column 3, *-1 - if (isset($row[3]) && 0 === \strlen($row[3])) { + if (isset($row[3]) && '' === $row[3]) { $row[3] = bcmul($row[2], '-1'); } if (isset($row[1])) { diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index 3927fedf27..38b9e33dd3 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -60,7 +60,7 @@ class RabobankDescription implements SpecificInterface $oppositeName = isset($row[6]) ? trim($row[6]) : ''; $alternateName = isset($row[10]) ? trim($row[10]) : ''; - if (\strlen($oppositeAccount) < 1 && \strlen($oppositeName) < 1) { + if ('' === $oppositeAccount && '' === $oppositeName) { Log::debug( sprintf( 'Rabobank specific: Opposite account and opposite name are' . @@ -71,7 +71,7 @@ class RabobankDescription implements SpecificInterface $row[6] = $alternateName; $row[10] = ''; } - if (!(\strlen($oppositeAccount) < 1 && \strlen($oppositeName) < 1)) { + if (!('' === $oppositeAccount && '' === $oppositeName)) { Log::debug('Rabobank specific: either opposite account or name are filled.'); } diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 551bec3d14..e71e4986b1 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -102,7 +102,7 @@ class ImportArrayStorage // run rules, if configured to. $config = $this->importJob->configuration; - if (isset($config['apply-rules']) && $config['apply-rules'] === true) { + if (isset($config['apply-rules']) && true === $config['apply-rules']) { $this->setStatus('applying_rules'); $this->applyRules($collection); $this->setStatus('rules_applied'); @@ -118,7 +118,6 @@ class ImportArrayStorage * * @param Collection $collection * - * @throws FireflyException */ private function applyRules(Collection $collection): void { @@ -153,7 +152,7 @@ class ImportArrayStorage foreach ($array as $index => $transaction) { if (strtolower(TransactionType::TRANSFER) === $transaction['type']) { $count++; - Log::debug(sprintf('Row #%d is a transfer, increase count to %d', ($index + 1), $count)); + Log::debug(sprintf('Row #%d is a transfer, increase count to %d', $index + 1, $count)); } } if (0 === $count) { @@ -179,7 +178,7 @@ class ImportArrayStorage { unset($transaction['importHashV2']); $json = json_encode($transaction); - if ($json === false) { + if (false === $json) { throw new FireflyException('Could not encode import array. Please see the logs.', $transaction); // @codeCoverageIgnore } $hash = hash('sha256', $json, false); @@ -231,7 +230,6 @@ class ImportArrayStorage * @param string $hash * * @return int|null - * @throws FireflyException */ private function hashExists(string $hash): ?int { @@ -253,7 +251,7 @@ class ImportArrayStorage */ private function linkToTag(Collection $collection): void { - if ($collection->count() === 0) { + if (0 === $collection->count()) { return; } /** @var TagRepositoryInterface $repository */ @@ -321,7 +319,7 @@ class ImportArrayStorage [ 'description' => $transaction['description'] ?? '', 'amount' => $transaction['transactions'][0]['amount'] ?? 0, - 'date' => isset($transaction['date']) ? $transaction['date'] : '', + 'date' => $transaction['date'] ?? '', ] ); } @@ -365,24 +363,22 @@ class ImportArrayStorage ); continue; } - if ($this->checkForTransfers) { - if ($this->transferExists($transaction)) { - $this->logDuplicateTransfer($transaction); - $this->repository->addErrorMessage( - $this->importJob, sprintf( - 'Row #%d ("%s") could not be imported. Such a transfer already exists.', - $index, - $transaction['description'] - ) - ); - continue; - } + if ($this->checkForTransfers && $this->transferExists($transaction)) { + $this->logDuplicateTransfer($transaction); + $this->repository->addErrorMessage( + $this->importJob, sprintf( + 'Row #%d ("%s") could not be imported. Such a transfer already exists.', + $index, + $transaction['description'] + ) + ); + continue; } $transaction['importHashV2'] = $hash; $toStore[] = $transaction; } $count = \count($toStore); - if ($count === 0) { + if (0 === $count) { Log::info('No transactions to store left!'); return new Collection; @@ -411,7 +407,7 @@ class ImportArrayStorage Log::debug(sprintf('Going to store entry %d of %d', $index + 1, $count)); // convert the date to an object: $store['date'] = Carbon::createFromFormat('Y-m-d', $store['date']); - $store['description'] = $store['description'] === '' ? '(empty description)' : $store['description']; + $store['description'] = '' === $store['description'] ? '(empty description)' : $store['description']; // store the journal. try { $journal = $this->journalRepos->store($store); @@ -445,7 +441,7 @@ class ImportArrayStorage return false; } // how many hits do we need? - $requiredHits = count($transaction['transactions']) * 4; + $requiredHits = \count($transaction['transactions']) * 4; $totalHits = 0; Log::debug(sprintf('Required hits for transfer comparison is %d', $requiredHits)); Log::debug(sprintf('Array has %d transactions.', \count($transaction['transactions']))); @@ -504,6 +500,7 @@ class ImportArrayStorage // compare source and destination id's $transferSourceIDs = [(int)$transfer->account_id, (int)$transfer->opposing_account_id]; sort($transferSourceIDs); + /** @noinspection DisconnectedForeachInstructionInspection */ Log::debug('Comparing current transaction source+dest IDs', $currentSourceIDs); Log::debug('.. with current transfer source+dest IDs', $transferSourceIDs); if ($currentSourceIDs === $transferSourceIDs) { @@ -515,6 +512,7 @@ class ImportArrayStorage // compare source and destination names $transferSource = [(string)$transfer->account_name, (int)$transfer->opposing_account_name]; sort($transferSource); + /** @noinspection DisconnectedForeachInstructionInspection */ Log::debug('Comparing current transaction source+dest names', $currentSourceNames); Log::debug('.. with current transfer source+dest names', $transferSource); if ($currentSourceNames === $transferSource) { From a941519db5ebfc29aac96c242c73eae72fe71115 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 15:08:56 +0200 Subject: [PATCH 49/86] Improve code quality. --- app/Import/Converter/Amount.php | 3 +++ app/Import/Converter/AmountCredit.php | 2 ++ app/Import/Converter/AmountDebit.php | 2 ++ app/Import/Converter/ConverterInterface.php | 4 +++ app/Import/Converter/INGDebitCredit.php | 2 ++ app/Import/Converter/RabobankDebitCredit.php | 2 ++ .../JobConfiguration/BunqJobConfiguration.php | 10 +++++--- .../JobConfiguration/FakeJobConfiguration.php | 10 ++++++-- .../JobConfiguration/FileJobConfiguration.php | 10 ++++++-- .../JobConfigurationInterface.php | 2 ++ .../SpectreJobConfiguration.php | 16 ++++++------ app/Import/Mapper/AssetAccountIbans.php | 2 ++ app/Import/Mapper/AssetAccounts.php | 2 ++ app/Import/Mapper/Bills.php | 2 ++ app/Import/Mapper/Budgets.php | 2 ++ app/Import/Mapper/Categories.php | 2 ++ app/Import/Mapper/MapperInterface.php | 2 ++ app/Import/Mapper/OpposingAccountIbans.php | 1 + app/Import/Mapper/OpposingAccounts.php | 2 ++ app/Import/Mapper/Tags.php | 2 ++ app/Import/Mapper/TransactionCurrencies.php | 2 ++ .../PreProcessorInterface.php | 2 ++ app/Import/MapperPreProcess/TagsComma.php | 2 ++ app/Import/MapperPreProcess/TagsSpace.php | 2 ++ .../Prerequisites/BunqPrerequisites.php | 20 +++++++++++---- .../Prerequisites/FakePrerequisites.php | 6 ++++- .../Prerequisites/FilePrerequisites.php | 3 ++- .../Prerequisites/SpectrePrerequisites.php | 6 ++++- app/Import/Routine/BunqRoutine.php | 7 +++--- app/Import/Routine/FakeRoutine.php | 9 +++++-- app/Import/Routine/FileRoutine.php | 6 +++-- app/Import/Routine/RoutineInterface.php | 2 ++ app/Import/Routine/SpectreRoutine.php | 9 +++++-- app/Import/Specifics/AbnAmroDescription.php | 20 ++++++++++++--- app/Import/Specifics/IngDescription.php | 16 +++++++++--- app/Import/Specifics/PresidentsChoice.php | 10 ++++++-- app/Import/Specifics/RabobankDescription.php | 15 +++++++++-- app/Import/Specifics/SnsDescription.php | 10 ++++++-- app/Import/Specifics/SpecificInterface.php | 6 +++++ app/Import/Storage/ImportArrayStorage.php | 25 ++++++++++++++----- .../Journal/JournalRepository.php | 4 +-- 41 files changed, 210 insertions(+), 52 deletions(-) diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php index 1b828c6663..417e1ac71f 100644 --- a/app/Import/Converter/Amount.php +++ b/app/Import/Converter/Amount.php @@ -183,6 +183,9 @@ class Amount implements ConverterInterface } /** + * Replaces other characters like thousand separators with nothing to make the decimal separator the only special + * character in the string. + * * @param string $decimal * @param string $value * diff --git a/app/Import/Converter/AmountCredit.php b/app/Import/Converter/AmountCredit.php index f57220860f..877a68a0a8 100644 --- a/app/Import/Converter/AmountCredit.php +++ b/app/Import/Converter/AmountCredit.php @@ -28,6 +28,8 @@ namespace FireflyIII\Import\Converter; class AmountCredit implements ConverterInterface { /** + * Convert an amount, always return positive. + * * @param $value * * @return string diff --git a/app/Import/Converter/AmountDebit.php b/app/Import/Converter/AmountDebit.php index 46162ec484..f071569920 100644 --- a/app/Import/Converter/AmountDebit.php +++ b/app/Import/Converter/AmountDebit.php @@ -28,6 +28,8 @@ namespace FireflyIII\Import\Converter; class AmountDebit implements ConverterInterface { /** + * Convert amount, always return positive. + * * @param $value * * @return string diff --git a/app/Import/Converter/ConverterInterface.php b/app/Import/Converter/ConverterInterface.php index 40c51884cf..903929ba1d 100644 --- a/app/Import/Converter/ConverterInterface.php +++ b/app/Import/Converter/ConverterInterface.php @@ -28,6 +28,10 @@ namespace FireflyIII\Import\Converter; interface ConverterInterface { /** + * Convert a value. + * + * @return mixed + * * @param $value */ public function convert($value); diff --git a/app/Import/Converter/INGDebitCredit.php b/app/Import/Converter/INGDebitCredit.php index 4148c7d2ea..6b741f23e3 100644 --- a/app/Import/Converter/INGDebitCredit.php +++ b/app/Import/Converter/INGDebitCredit.php @@ -30,6 +30,8 @@ use Log; class INGDebitCredit implements ConverterInterface { /** + * Convert Af or Bij to correct integer values. + * * @param $value * * @return int diff --git a/app/Import/Converter/RabobankDebitCredit.php b/app/Import/Converter/RabobankDebitCredit.php index 764a7f907e..921056eaf3 100644 --- a/app/Import/Converter/RabobankDebitCredit.php +++ b/app/Import/Converter/RabobankDebitCredit.php @@ -30,6 +30,8 @@ use Log; class RabobankDebitCredit implements ConverterInterface { /** + * Convert D or A to integer values. + * * @param $value * * @return int diff --git a/app/Import/JobConfiguration/BunqJobConfiguration.php b/app/Import/JobConfiguration/BunqJobConfiguration.php index 9ea6382b4d..8a91eb8105 100644 --- a/app/Import/JobConfiguration/BunqJobConfiguration.php +++ b/app/Import/JobConfiguration/BunqJobConfiguration.php @@ -37,11 +37,11 @@ use Log; */ class BunqJobConfiguration implements JobConfigurationInterface { - /** @var BunqJobConfigurationInterface */ + /** @var BunqJobConfigurationInterface Bunq job interface */ private $handler; - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -88,6 +88,8 @@ class BunqJobConfiguration implements JobConfigurationInterface } /** + * Set import job. + * * @param ImportJob $importJob * * @throws FireflyException @@ -101,6 +103,8 @@ class BunqJobConfiguration implements JobConfigurationInterface } /** + * Get correct handler. + * * @return BunqJobConfigurationInterface * @throws FireflyException */ diff --git a/app/Import/JobConfiguration/FakeJobConfiguration.php b/app/Import/JobConfiguration/FakeJobConfiguration.php index 751cacf721..6936768b78 100644 --- a/app/Import/JobConfiguration/FakeJobConfiguration.php +++ b/app/Import/JobConfiguration/FakeJobConfiguration.php @@ -32,10 +32,10 @@ use Illuminate\Support\MessageBag; */ class FakeJobConfiguration implements JobConfigurationInterface { - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -69,6 +69,8 @@ class FakeJobConfiguration implements JobConfigurationInterface * @param array $data * * @return MessageBag + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function configureJob(array $data): MessageBag { @@ -125,6 +127,8 @@ class FakeJobConfiguration implements JobConfigurationInterface * Returns the view of the next step in the job configuration. * * @return string + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getNextView(): string { @@ -151,6 +155,8 @@ class FakeJobConfiguration implements JobConfigurationInterface } /** + * Set import job. + * * @param ImportJob $importJob */ public function setImportJob(ImportJob $importJob): void diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php index a40bc47bf7..e240dd974e 100644 --- a/app/Import/JobConfiguration/FileJobConfiguration.php +++ b/app/Import/JobConfiguration/FileJobConfiguration.php @@ -40,9 +40,9 @@ use Illuminate\Support\MessageBag; */ class FileJobConfiguration implements JobConfigurationInterface { - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -91,6 +91,8 @@ class FileJobConfiguration implements JobConfigurationInterface * * @throws FireflyException * @return string + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getNextView(): string { @@ -116,6 +118,8 @@ class FileJobConfiguration implements JobConfigurationInterface } /** + * Set import job. + * * @param ImportJob $importJob */ public function setImportJob(ImportJob $importJob): void @@ -130,6 +134,8 @@ class FileJobConfiguration implements JobConfigurationInterface * * @return FileConfigurationInterface * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getConfigurationObject(): FileConfigurationInterface { diff --git a/app/Import/JobConfiguration/JobConfigurationInterface.php b/app/Import/JobConfiguration/JobConfigurationInterface.php index 0560240b17..4ff58ae133 100644 --- a/app/Import/JobConfiguration/JobConfigurationInterface.php +++ b/app/Import/JobConfiguration/JobConfigurationInterface.php @@ -62,6 +62,8 @@ interface JobConfigurationInterface public function getNextView(): string; /** + * Set import job. + * * @param ImportJob $importJob */ public function setImportJob(ImportJob $importJob): void; diff --git a/app/Import/JobConfiguration/SpectreJobConfiguration.php b/app/Import/JobConfiguration/SpectreJobConfiguration.php index 1251ebf6f4..2569159a7f 100644 --- a/app/Import/JobConfiguration/SpectreJobConfiguration.php +++ b/app/Import/JobConfiguration/SpectreJobConfiguration.php @@ -26,14 +26,10 @@ namespace FireflyIII\Import\JobConfiguration; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedConfigHandler; use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedHandler; -use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticateHandler; -use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccount; use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler; use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler; use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler; -use FireflyIII\Support\Import\JobConfiguration\Spectre\NewConfig; use FireflyIII\Support\Import\JobConfiguration\Spectre\NewSpectreJobHandler; use FireflyIII\Support\Import\JobConfiguration\Spectre\SpectreJobConfigurationInterface; use Illuminate\Support\MessageBag; @@ -44,11 +40,11 @@ use Log; */ class SpectreJobConfiguration implements JobConfigurationInterface { - /** @var SpectreJobConfigurationInterface */ + /** @var SpectreJobConfigurationInterface The job handler. */ private $handler; - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -95,6 +91,8 @@ class SpectreJobConfiguration implements JobConfigurationInterface } /** + * Set the import job. + * * @param ImportJob $importJob * * @throws FireflyException @@ -108,8 +106,12 @@ class SpectreJobConfiguration implements JobConfigurationInterface } /** + * Get correct handler. + * * @return SpectreJobConfigurationInterface * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getHandler(): SpectreJobConfigurationInterface { diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php index ce9585fc44..f79415e63b 100644 --- a/app/Import/Mapper/AssetAccountIbans.php +++ b/app/Import/Mapper/AssetAccountIbans.php @@ -32,6 +32,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; class AssetAccountIbans implements MapperInterface { /** + * Get map of asset accounts. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/AssetAccounts.php b/app/Import/Mapper/AssetAccounts.php index c5754a3717..e1062074a0 100644 --- a/app/Import/Mapper/AssetAccounts.php +++ b/app/Import/Mapper/AssetAccounts.php @@ -32,6 +32,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; class AssetAccounts implements MapperInterface { /** + * Get map of asset accounts. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php index 8e8c8efa2e..dc0f6a3598 100644 --- a/app/Import/Mapper/Bills.php +++ b/app/Import/Mapper/Bills.php @@ -31,6 +31,8 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; class Bills implements MapperInterface { /** + * Get map of bills. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/Budgets.php b/app/Import/Mapper/Budgets.php index d8399dce85..f69e7ec23e 100644 --- a/app/Import/Mapper/Budgets.php +++ b/app/Import/Mapper/Budgets.php @@ -31,6 +31,8 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; class Budgets implements MapperInterface { /** + * Get map of budgets. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/Categories.php b/app/Import/Mapper/Categories.php index bb840743e5..6c55aa53e8 100644 --- a/app/Import/Mapper/Categories.php +++ b/app/Import/Mapper/Categories.php @@ -31,6 +31,8 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; class Categories implements MapperInterface { /** + * Get map of categories. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/MapperInterface.php b/app/Import/Mapper/MapperInterface.php index 9446babdd2..5ac042611e 100644 --- a/app/Import/Mapper/MapperInterface.php +++ b/app/Import/Mapper/MapperInterface.php @@ -28,6 +28,8 @@ namespace FireflyIII\Import\Mapper; interface MapperInterface { /** + * Get map of objects. + * * @return array */ public function getMap(): array; diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php index 3eae583064..ad15bf94e6 100644 --- a/app/Import/Mapper/OpposingAccountIbans.php +++ b/app/Import/Mapper/OpposingAccountIbans.php @@ -32,6 +32,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; class OpposingAccountIbans implements MapperInterface { /** + * Get map of opposing accounts. * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/OpposingAccounts.php b/app/Import/Mapper/OpposingAccounts.php index e887078758..424cdafb37 100644 --- a/app/Import/Mapper/OpposingAccounts.php +++ b/app/Import/Mapper/OpposingAccounts.php @@ -32,6 +32,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; class OpposingAccounts implements MapperInterface { /** + * Get map of opposing accounts. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/Tags.php b/app/Import/Mapper/Tags.php index e81fb2a2be..90ce4b8a41 100644 --- a/app/Import/Mapper/Tags.php +++ b/app/Import/Mapper/Tags.php @@ -31,6 +31,8 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface; class Tags implements MapperInterface { /** + * Get map of tags. + * * @return array */ public function getMap(): array diff --git a/app/Import/Mapper/TransactionCurrencies.php b/app/Import/Mapper/TransactionCurrencies.php index b0eaf956bd..44c7ba5be8 100644 --- a/app/Import/Mapper/TransactionCurrencies.php +++ b/app/Import/Mapper/TransactionCurrencies.php @@ -30,6 +30,8 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; class TransactionCurrencies implements MapperInterface { /** + * Get map of currencies. + * * @return array */ public function getMap(): array diff --git a/app/Import/MapperPreProcess/PreProcessorInterface.php b/app/Import/MapperPreProcess/PreProcessorInterface.php index 5346d5dddc..b577f605a6 100644 --- a/app/Import/MapperPreProcess/PreProcessorInterface.php +++ b/app/Import/MapperPreProcess/PreProcessorInterface.php @@ -28,6 +28,8 @@ namespace FireflyIII\Import\MapperPreProcess; interface PreProcessorInterface { /** + * Run preprocessor. + * * @param string $value * * @return array diff --git a/app/Import/MapperPreProcess/TagsComma.php b/app/Import/MapperPreProcess/TagsComma.php index 294026c090..1c54595a7a 100644 --- a/app/Import/MapperPreProcess/TagsComma.php +++ b/app/Import/MapperPreProcess/TagsComma.php @@ -28,6 +28,8 @@ namespace FireflyIII\Import\MapperPreProcess; class TagsComma implements PreProcessorInterface { /** + * Explode and filter list of comma separated tags. + * * @param string $value * * @return array diff --git a/app/Import/MapperPreProcess/TagsSpace.php b/app/Import/MapperPreProcess/TagsSpace.php index 63e949e5d7..92530ee887 100644 --- a/app/Import/MapperPreProcess/TagsSpace.php +++ b/app/Import/MapperPreProcess/TagsSpace.php @@ -28,6 +28,8 @@ namespace FireflyIII\Import\MapperPreProcess; class TagsSpace implements PreProcessorInterface { /** + * Explode and filter list of space separated tags. + * * @param string $value * * @return array diff --git a/app/Import/Prerequisites/BunqPrerequisites.php b/app/Import/Prerequisites/BunqPrerequisites.php index 21334ced35..1aeecf1499 100644 --- a/app/Import/Prerequisites/BunqPrerequisites.php +++ b/app/Import/Prerequisites/BunqPrerequisites.php @@ -36,13 +36,14 @@ use Log; */ class BunqPrerequisites implements PrerequisitesInterface { - /** @var User */ + /** @var User The current user */ private $user; /** - * @codeCoverageIgnore * Returns view name that allows user to fill in prerequisites. * + * @codeCoverageIgnore + * * @return string */ public function getView(): string @@ -86,10 +87,11 @@ class BunqPrerequisites implements PrerequisitesInterface } /** - * @codeCoverageIgnore * Set the user for this Prerequisites-routine. Class is expected to implement and save this. * * @param User $user + * + * @codeCoverageIgnore */ public function setUser(User $user): void { @@ -104,6 +106,7 @@ class BunqPrerequisites implements PrerequisitesInterface * @param array $data * * @return MessageBag + * */ public function storePrerequisites(array $data): MessageBag { @@ -112,7 +115,6 @@ class BunqPrerequisites implements PrerequisitesInterface Log::debug('Storing bunq API key'); app('preferences')->setForUser($this->user, 'bunq_api_key', $apiKey); app('preferences')->setForUser($this->user, 'bunq_external_ip', $externalIP); - $environment = $this->getBunqEnvironment(); $deviceDescription = 'Firefly III v' . config('firefly.version'); $permittedIps = [$externalIP]; @@ -147,8 +149,10 @@ class BunqPrerequisites implements PrerequisitesInterface } /** - * @codeCoverageIgnore + * Get correct bunq environment. + * * @return BunqEnumApiEnvironmentType + * @codeCoverageIgnore */ private function getBunqEnvironment(): BunqEnumApiEnvironmentType { @@ -164,6 +168,8 @@ class BunqPrerequisites implements PrerequisitesInterface } /** + * Check if we have API context. + * * @return bool */ private function hasApiContext(): bool @@ -180,6 +186,8 @@ class BunqPrerequisites implements PrerequisitesInterface } /** + * Check if we have the API key. + * * @return bool */ private function hasApiKey(): bool @@ -196,6 +204,8 @@ class BunqPrerequisites implements PrerequisitesInterface } /** + * Checks if we have an external IP. + * * @return bool */ private function hasExternalIP(): bool diff --git a/app/Import/Prerequisites/FakePrerequisites.php b/app/Import/Prerequisites/FakePrerequisites.php index a5565d9c5d..39dbec4762 100644 --- a/app/Import/Prerequisites/FakePrerequisites.php +++ b/app/Import/Prerequisites/FakePrerequisites.php @@ -32,7 +32,7 @@ use Illuminate\Support\MessageBag; */ class FakePrerequisites implements PrerequisitesInterface { - /** @var User */ + /** @var User The current user */ private $user; /** @@ -87,6 +87,8 @@ class FakePrerequisites implements PrerequisitesInterface } /** + * Store fake prerequisites. + * * @param array $data * * @return MessageBag @@ -107,6 +109,8 @@ class FakePrerequisites implements PrerequisitesInterface } /** + * Check if we have an API key. + * * @return bool */ private function hasApiKey(): bool diff --git a/app/Import/Prerequisites/FilePrerequisites.php b/app/Import/Prerequisites/FilePrerequisites.php index c9200489e3..14109b0fb3 100644 --- a/app/Import/Prerequisites/FilePrerequisites.php +++ b/app/Import/Prerequisites/FilePrerequisites.php @@ -26,9 +26,10 @@ use FireflyIII\User; use Illuminate\Support\MessageBag; /** - * @codeCoverageIgnore * * This class contains all the routines necessary to import from a file. Hint: there are none. + * + * @codeCoverageIgnore */ class FilePrerequisites implements PrerequisitesInterface { diff --git a/app/Import/Prerequisites/SpectrePrerequisites.php b/app/Import/Prerequisites/SpectrePrerequisites.php index 239e3f274b..8cd4616ae9 100644 --- a/app/Import/Prerequisites/SpectrePrerequisites.php +++ b/app/Import/Prerequisites/SpectrePrerequisites.php @@ -32,7 +32,7 @@ use Log; */ class SpectrePrerequisites implements PrerequisitesInterface { - /** @var User */ + /** @var User The current user */ private $user; /** @@ -156,6 +156,8 @@ class SpectrePrerequisites implements PrerequisitesInterface } /** + * Check if we have the App ID. + * * @return bool */ private function hasAppId(): bool @@ -172,6 +174,8 @@ class SpectrePrerequisites implements PrerequisitesInterface } /** + * Check if we have the secret. + * * @return bool */ private function hasSecret(): bool diff --git a/app/Import/Routine/BunqRoutine.php b/app/Import/Routine/BunqRoutine.php index 0f29d089f8..d450655345 100644 --- a/app/Import/Routine/BunqRoutine.php +++ b/app/Import/Routine/BunqRoutine.php @@ -35,10 +35,10 @@ use Log; */ class BunqRoutine implements RoutineInterface { - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -63,7 +63,6 @@ class BunqRoutine implements RoutineInterface $handler = app(StageNewHandler::class); $handler->setImportJob($this->importJob); $handler->run(); - // make user choose accounts to import from. $this->repository->setStage($this->importJob, 'choose-accounts'); $this->repository->setStatus($this->importJob, 'need_job_config'); @@ -91,6 +90,8 @@ class BunqRoutine implements RoutineInterface /** + * Set the import job. + * * @param ImportJob $importJob * * @return void diff --git a/app/Import/Routine/FakeRoutine.php b/app/Import/Routine/FakeRoutine.php index 497fcb93dd..14ed949977 100644 --- a/app/Import/Routine/FakeRoutine.php +++ b/app/Import/Routine/FakeRoutine.php @@ -36,9 +36,9 @@ use Log; */ class FakeRoutine implements RoutineInterface { - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -51,6 +51,9 @@ class FakeRoutine implements RoutineInterface * * @return void * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function run(): void { @@ -93,6 +96,8 @@ class FakeRoutine implements RoutineInterface } /** + * Set the import job. + * * @param ImportJob $importJob * */ diff --git a/app/Import/Routine/FileRoutine.php b/app/Import/Routine/FileRoutine.php index e88fe64456..c61f7afdac 100644 --- a/app/Import/Routine/FileRoutine.php +++ b/app/Import/Routine/FileRoutine.php @@ -33,9 +33,9 @@ use Log; */ class FileRoutine implements RoutineInterface { - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -66,6 +66,8 @@ class FileRoutine implements RoutineInterface } /** + * Set the import job. + * * @param ImportJob $importJob * * @return void diff --git a/app/Import/Routine/RoutineInterface.php b/app/Import/Routine/RoutineInterface.php index aad9c4854a..bb7c4537fb 100644 --- a/app/Import/Routine/RoutineInterface.php +++ b/app/Import/Routine/RoutineInterface.php @@ -40,6 +40,8 @@ interface RoutineInterface public function run(): void; /** + * Set the import job. + * * @param ImportJob $importJob * * @return void diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php index a35f65b9f4..5bb5a07b53 100644 --- a/app/Import/Routine/SpectreRoutine.php +++ b/app/Import/Routine/SpectreRoutine.php @@ -36,10 +36,10 @@ use Log; class SpectreRoutine implements RoutineInterface { - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; /** @@ -48,6 +48,9 @@ class SpectreRoutine implements RoutineInterface * The final status of the routine must be "provider_finished". * * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function run(): void { @@ -108,6 +111,8 @@ class SpectreRoutine implements RoutineInterface } /** + * Set the import job. + * * @param ImportJob $importJob * * @return void diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index 8eab9c29f3..2c4296a119 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -32,12 +32,14 @@ namespace FireflyIII\Import\Specifics; */ class AbnAmroDescription implements SpecificInterface { - /** @var array */ + /** @var array The current row. */ public $row; /** - * @codeCoverageIgnore + * Description of this specific fix. + * * @return string + * @codeCoverageIgnore */ public static function getDescription(): string { @@ -45,8 +47,10 @@ class AbnAmroDescription implements SpecificInterface } /** - * @codeCoverageIgnore + * Name of specific fix. + * * @return string + * @codeCoverageIgnore */ public static function getName(): string { @@ -54,9 +58,13 @@ class AbnAmroDescription implements SpecificInterface } /** + * Run the fix. + * * @param array $row * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function run(array $row): array { @@ -123,6 +131,9 @@ class AbnAmroDescription implements SpecificInterface * Parses the current description in SEPA format. * * @return bool true if the description is SEPA format, false otherwise + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function parseSepaDescription(): bool { @@ -177,6 +188,9 @@ class AbnAmroDescription implements SpecificInterface * Parses the current description in TRTP format. * * @return bool true if the description is TRTP format, false otherwise + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function parseTRTPDescription(): bool { diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php index 599f22d669..6980105893 100644 --- a/app/Import/Specifics/IngDescription.php +++ b/app/Import/Specifics/IngDescription.php @@ -34,12 +34,14 @@ namespace FireflyIII\Import\Specifics; */ class IngDescription implements SpecificInterface { - /** @var array */ + /** @var array The current row. */ public $row; /** - * @codeCoverageIgnore + * Description of the current specific. + * * @return string + * @codeCoverageIgnore */ public static function getDescription(): string { @@ -47,8 +49,10 @@ class IngDescription implements SpecificInterface } /** - * @codeCoverageIgnore + * Name of the current specific. + * * @return string + * @codeCoverageIgnore */ public static function getName(): string { @@ -56,9 +60,13 @@ class IngDescription implements SpecificInterface } /** + * Run the specific code. + * * @param array $row * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function run(array $row): array { @@ -112,7 +120,7 @@ class IngDescription implements SpecificInterface } /** - * + * Copy description to name of opposite account. */ private function copyDescriptionToOpposite(): void { diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php index 2b067305d1..1fa71e1cf2 100644 --- a/app/Import/Specifics/PresidentsChoice.php +++ b/app/Import/Specifics/PresidentsChoice.php @@ -28,8 +28,10 @@ namespace FireflyIII\Import\Specifics; class PresidentsChoice implements SpecificInterface { /** - * @codeCoverageIgnore + * Description of specific. + * * @return string + * @codeCoverageIgnore */ public static function getDescription(): string { @@ -37,8 +39,10 @@ class PresidentsChoice implements SpecificInterface } /** - * @codeCoverageIgnore + * Name of specific. + * * @return string + * @codeCoverageIgnore */ public static function getName(): string { @@ -46,6 +50,8 @@ class PresidentsChoice implements SpecificInterface } /** + * Run this specific. + * * @param array $row * * @return array diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index 38b9e33dd3..65ceaf0024 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -26,12 +26,17 @@ use Log; /** * Class RabobankDescription. + * + * @codeCoverageIgnore + * @deprecated */ class RabobankDescription implements SpecificInterface { /** - * @codeCoverageIgnore + * Description of this specific. + * * @return string + * @codeCoverageIgnore */ public static function getDescription(): string { @@ -39,8 +44,10 @@ class RabobankDescription implements SpecificInterface } /** - * @codeCoverageIgnore + * Name of this specific. + * * @return string + * @codeCoverageIgnore */ public static function getName(): string { @@ -48,9 +55,13 @@ class RabobankDescription implements SpecificInterface } /** + * Run the specific. + * * @param array $row * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function run(array $row): array { diff --git a/app/Import/Specifics/SnsDescription.php b/app/Import/Specifics/SnsDescription.php index 3ce3f1499e..3106075555 100644 --- a/app/Import/Specifics/SnsDescription.php +++ b/app/Import/Specifics/SnsDescription.php @@ -28,8 +28,10 @@ namespace FireflyIII\Import\Specifics; class SnsDescription implements SpecificInterface { /** - * @codeCoverageIgnore + * Get description of specific. + * * @return string + * @codeCoverageIgnore */ public static function getDescription(): string { @@ -37,8 +39,10 @@ class SnsDescription implements SpecificInterface } /** - * @codeCoverageIgnore + * Get name of specific. + * * @return string + * @codeCoverageIgnore */ public static function getName(): string { @@ -46,6 +50,8 @@ class SnsDescription implements SpecificInterface } /** + * Run specific. + * * @param array $row * * @return array diff --git a/app/Import/Specifics/SpecificInterface.php b/app/Import/Specifics/SpecificInterface.php index d721f18557..70e028e0b1 100644 --- a/app/Import/Specifics/SpecificInterface.php +++ b/app/Import/Specifics/SpecificInterface.php @@ -28,16 +28,22 @@ namespace FireflyIII\Import\Specifics; interface SpecificInterface { /** + * Get description. + * * @return string */ public static function getDescription(): string; /** + * Get name. + * * @return string */ public static function getName(): string; /** + * Run specific. + * * @param array $row * * @return array diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index e71e4986b1..666593e238 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -46,18 +46,20 @@ use Log; * Creates new transactions based upon arrays. Will first check the array for duplicates. * * Class ImportArrayStorage + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ImportArrayStorage { - /** @var bool */ + /** @var bool Check for transfers during import. */ private $checkForTransfers = false; - /** @var ImportJob */ + /** @var ImportJob The import job */ private $importJob; /** @var JournalRepositoryInterface */ private $journalRepos; - /** @var ImportJobRepositoryInterface */ + /** @var ImportJobRepositoryInterface Import job repository */ private $repository; - /** @var Collection */ + /** @var Collection The transfers. */ private $transfers; /** @@ -142,6 +144,8 @@ class ImportArrayStorage /** * Count the number of transfers in the array. If this is zero, don't bother checking for double transfers. + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function countTransfers(): void { @@ -156,10 +160,10 @@ class ImportArrayStorage } } if (0 === $count) { - Log::debug('Count is zero.'); + Log::debug('Count is zero, will not check for duplicate transfers.'); } if ($count > 0) { - Log::debug(sprintf('Count is %d', $count)); + Log::debug(sprintf('Count is %d, will check for duplicate transfers.', $count)); $this->checkForTransfers = true; // get users transfers. Needed for comparison. @@ -169,6 +173,8 @@ class ImportArrayStorage } /** + * Get hash of transaction. + * * @param array $transaction * * @throws FireflyException @@ -339,6 +345,9 @@ class ImportArrayStorage * * @return Collection * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ private function storeArray(): Collection { @@ -431,6 +440,10 @@ class ImportArrayStorage * @param $transaction * * @return bool + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.NPathComplexity) */ private function transferExists(array $transaction): bool { diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index d5e58f96f6..c3ad238bb9 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -167,8 +167,8 @@ class JournalRepository implements JournalRepositoryInterface Log::debug(sprintf('JSON encoded hash is: %s', $jsonEncode)); Log::debug(sprintf('Hash of hash is: %s', $hashOfHash)); - $result = TransactionJournalMeta - ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') + $result = TransactionJournalMeta::withTrashed() + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') ->where('hash', $hashOfHash) ->where('name', 'importHashV2') ->first(['journal_meta.*']); From dbbf0ff5e4068bb033178551bf42512a9dce735e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 15:20:45 +0200 Subject: [PATCH 50/86] Improve code in Jobs. --- app/Jobs/CreateRecurringTransactions.php | 44 ++++++++++++++----- ...ExecuteRuleGroupOnExistingTransactions.php | 30 ++++++++++--- .../ExecuteRuleOnExistingTransactions.php | 32 +++++++++++--- app/Jobs/MailError.php | 20 ++++----- 4 files changed, 91 insertions(+), 35 deletions(-) diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index 2240394ec2..cffa7154eb 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -23,19 +23,21 @@ use Illuminate\Support\Collection; use Log; /** - * Class CreateRecurringTransactions + * Class CreateRecurringTransactions. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class CreateRecurringTransactions implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** @var Carbon */ + /** @var Carbon The current date */ private $date; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journal repository */ private $journalRepository; - /** @var RecurringRepositoryInterface */ + /** @var RecurringRepositoryInterface Recurring transactions repository. */ private $repository; - /** @var array */ + /** @var array The users rules. */ private $rules = []; /** @@ -61,10 +63,9 @@ class CreateRecurringTransactions implements ShouldQueue { Log::debug(sprintf('Now at start of CreateRecurringTransactions() job for %s.', $this->date->format('D d M Y'))); $recurrences = $this->repository->getAll(); + $result = []; Log::debug(sprintf('Count of collection is %d', $recurrences->count())); - $result = []; - /** @var Collection $filtered */ $filtered = $recurrences->filter( function (Recurrence $recurrence) { @@ -78,7 +79,6 @@ class CreateRecurringTransactions implements ShouldQueue if (!isset($result[$recurrence->user_id])) { $result[$recurrence->user_id] = new Collection; } - $this->repository->setUser($recurrence->user); $this->journalRepository->setUser($recurrence->user); Log::debug(sprintf('Now at recurrence #%d', $recurrence->id)); @@ -112,8 +112,12 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Apply the users rules to newly created journals. + * * @param User $user * @param Collection $journals + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function applyRules(User $user, Collection $journals): void { @@ -140,6 +144,8 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Helper function for debug information. + * * @param array $occurrences * * @return array @@ -155,6 +161,8 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Get the users rules. + * * @param User $user * * @return Collection @@ -172,6 +180,8 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Get the start date of a recurrence. + * * @param Recurrence $recurrence * * @return Carbon @@ -187,6 +197,8 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Get transaction information from a recurring transaction. + * * @param Recurrence $recurrence * * @return array @@ -223,11 +235,15 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Check if the occurences should be executed. + * * @param Recurrence $recurrence * @param array $occurrences * * @return Collection * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function handleOccurrences(Recurrence $recurrence, array $occurrences): Collection { @@ -256,7 +272,6 @@ class CreateRecurringTransactions implements ShouldQueue 'tags' => $this->repository->getTags($recurrence), 'user' => $recurrence->user_id, 'notes' => (string)trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]), - // journal data: 'description' => $recurrence->recurrenceTransactions()->first()->description, 'piggy_bank_id' => null, @@ -264,7 +279,6 @@ class CreateRecurringTransactions implements ShouldQueue 'bill_id' => null, 'bill_name' => null, 'recurrence_id' => (int)$recurrence->id, - // transaction data: 'transactions' => $this->getTransactionData($recurrence), ]; @@ -325,6 +339,8 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Has the recurrence fired today. + * * @param Recurrence $recurrence * * @return bool @@ -335,6 +351,8 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Has the reuccrence started yet. + * * @param $recurrence * * @return bool @@ -360,9 +378,13 @@ class CreateRecurringTransactions implements ShouldQueue } /** + * Is the info in the recurrence valid? + * * @param Recurrence $recurrence * * @return bool + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function validRecurrence(Recurrence $recurrence): bool { @@ -375,7 +397,7 @@ class CreateRecurringTransactions implements ShouldQueue // has repeated X times. $journals = $this->repository->getJournals($recurrence, null, null); - if ($recurrence->repetitions !== 0 && $journals->count() >= $recurrence->repetitions) { + if (0 !== $recurrence->repetitions && $journals->count() >= $recurrence->repetitions) { Log::info(sprintf('Recurrence #%d has run %d times, so will run no longer.', $recurrence->id, $recurrence->repetitions)); return false; diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php index 670deb6550..f2676061f6 100644 --- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php @@ -39,15 +39,15 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue { use InteractsWithQueue, SerializesModels; - /** @var Collection */ + /** @var Collection Set of accounts */ private $accounts; - /** @var Carbon */ + /** @var Carbon The end date */ private $endDate; - /** @var RuleGroup */ + /** @var RuleGroup The rule group */ private $ruleGroup; - /** @var Carbon */ + /** @var Carbon The start date */ private $startDate; - /** @var User */ + /** @var User The user */ private $user; /** @@ -61,6 +61,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Get accounts. + * * @return Collection */ public function getAccounts(): Collection @@ -69,6 +71,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Set accounts. + * * @param Collection $accounts */ public function setAccounts(Collection $accounts) @@ -77,6 +81,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Get end date. + * * @return \Carbon\Carbon */ public function getEndDate(): Carbon @@ -85,6 +91,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Set end date. + * * @param Carbon $date */ public function setEndDate(Carbon $date) @@ -93,6 +101,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Get start date. + * * @return \Carbon\Carbon */ public function getStartDate(): Carbon @@ -101,6 +111,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Set start date. + * * @param Carbon $date */ public function setStartDate(Carbon $date) @@ -109,6 +121,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Get user. + * * @return User */ public function getUser(): User @@ -117,6 +131,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue } /** + * Set user. + * * @param User $user */ public function setUser(User $user) @@ -156,7 +172,7 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue * * @return Collection */ - protected function collectJournals() + protected function collectJournals(): Collection { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); @@ -171,7 +187,7 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue * * @return array */ - protected function collectProcessors() + protected function collectProcessors(): array { // Find all rules belonging to this rulegroup $rules = $this->ruleGroup->rules() diff --git a/app/Jobs/ExecuteRuleOnExistingTransactions.php b/app/Jobs/ExecuteRuleOnExistingTransactions.php index be5778934b..7cfea5706e 100644 --- a/app/Jobs/ExecuteRuleOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleOnExistingTransactions.php @@ -40,15 +40,15 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue { use InteractsWithQueue, SerializesModels; - /** @var Collection */ + /** @var Collection The accounts */ private $accounts; - /** @var Carbon */ + /** @var Carbon The end date */ private $endDate; - /** @var Rule */ + /** @var Rule The current rule */ private $rule; - /** @var Carbon */ + /** @var Carbon The start date */ private $startDate; - /** @var User */ + /** @var User The user */ private $user; /** @@ -62,6 +62,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Get accounts. + * * @return Collection */ public function getAccounts(): Collection @@ -70,6 +72,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Set accounts. + * * @param Collection $accounts */ public function setAccounts(Collection $accounts) @@ -78,6 +82,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Get end date. + * * @return \Carbon\Carbon */ public function getEndDate(): Carbon @@ -86,6 +92,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Set end date. + * * @param Carbon $date */ public function setEndDate(Carbon $date) @@ -94,6 +102,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Get rule. + * * @return Rule */ public function getRule(): Rule @@ -102,6 +112,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Get start date. + * * @return \Carbon\Carbon */ public function getStartDate(): Carbon @@ -110,6 +122,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Set start date. + * * @param Carbon $date */ public function setStartDate(Carbon $date) @@ -118,6 +132,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Get user. + * * @return User */ public function getUser(): User @@ -126,6 +142,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue } /** + * Set user. + * * @param User $user */ public function setUser(User $user) @@ -137,6 +155,8 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue * Execute the job. * * @throws \FireflyIII\Exceptions\FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function handle() { @@ -170,7 +190,7 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue * * @return Collection */ - protected function collectJournals() + protected function collectJournals(): Collection { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 7afc2840b3..09b43883c5 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -37,13 +37,13 @@ class MailError extends Job implements ShouldQueue { use InteractsWithQueue, SerializesModels; - /** @var string */ + /** @var string Destination */ protected $destination; - /** @var array */ + /** @var array Exception information */ protected $exception; - /** @var string */ + /** @var string IP address */ protected $ipAddress; - /** @var array */ + /** @var array User information */ protected $userData; /** @@ -70,15 +70,13 @@ class MailError extends Job implements ShouldQueue */ public function handle() { + $email = env('SITE_OWNER'); + $args = $this->exception; + $args['loggedIn'] = $this->userData['id'] > 0; + $args['user'] = $this->userData; + $args['ip'] = $this->ipAddress; if ($this->attempts() < 3) { - // mail? try { - $email = env('SITE_OWNER'); - $args = $this->exception; - $args['loggedIn'] = $this->userData['id'] > 0; - $args['user'] = $this->userData; - $args['ip'] = $this->ipAddress; - Mail::send( ['emails.error-html', 'emails.error-text'], $args, From a722dc4235e4fd2e507a27eb46c7d9f48c555f79 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 16:35:46 +0200 Subject: [PATCH 51/86] Clean up code, remove unused methods. --- app/Mail/AccessTokenCreatedMail.php | 4 +- app/Mail/AdminTestMail.php | 2 +- app/Mail/ConfirmEmailChangeMail.php | 2 +- app/Mail/RegisteredUser.php | 2 +- app/Mail/ReportNewJournalsMail.php | 2 +- app/Mail/RequestedNewPassword.php | 2 +- app/Mail/UndoEmailChangeMail.php | 2 +- app/Models/Account.php | 114 +++----------- app/Models/AccountMeta.php | 2 +- app/Models/Attachment.php | 5 +- app/Models/AvailableBudget.php | 5 +- app/Models/Bill.php | 23 ++- app/Models/Budget.php | 44 ++---- app/Models/Category.php | 42 ++--- app/Models/Configuration.php | 2 +- app/Models/ExportJob.php | 9 +- app/Models/ImportJob.php | 11 +- app/Models/LinkType.php | 2 +- app/Models/Note.php | 2 +- app/Models/PiggyBank.php | 52 +----- app/Models/PiggyBankEvent.php | 6 +- app/Models/PiggyBankRepetition.php | 6 +- app/Models/Preference.php | 17 +- app/Models/Recurrence.php | 5 +- app/Models/Rule.php | 5 +- app/Models/RuleAction.php | 2 +- app/Models/RuleGroup.php | 9 +- app/Models/RuleTrigger.php | 2 +- app/Models/Tag.php | 51 ++---- app/Models/Transaction.php | 36 ++--- app/Models/TransactionCurrency.php | 11 +- app/Models/TransactionJournal.php | 149 +++--------------- app/Models/TransactionJournalLink.php | 4 +- app/Models/TransactionJournalMeta.php | 2 +- app/Models/TransactionType.php | 2 +- app/Providers/FireflyServiceProvider.php | 2 - .../Journal/JournalRepository.php | 16 +- .../PiggyBank/PiggyBankRepository.php | 6 +- app/Support/ExpandedForm.php | 35 +--- app/Support/Steam.php | 11 +- app/Support/Twig/PiggyBank.php | 51 ------ app/TransactionRules/Actions/SetCategory.php | 10 +- .../PiggyBankEventTransformer.php | 9 +- 43 files changed, 210 insertions(+), 566 deletions(-) delete mode 100644 app/Support/Twig/PiggyBank.php diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php index 6e0e43e8a4..496b8586a1 100644 --- a/app/Mail/AccessTokenCreatedMail.php +++ b/app/Mail/AccessTokenCreatedMail.php @@ -27,7 +27,6 @@ namespace FireflyIII\Mail; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Laravel\Passport\Token; /** * Class AccessTokenCreatedMail @@ -47,7 +46,6 @@ class AccessTokenCreatedMail extends Mailable * * @param string $email * @param string $ipAddress - * @param Token $token */ public function __construct(string $email, string $ipAddress) { @@ -60,7 +58,7 @@ class AccessTokenCreatedMail extends Mailable * * @return $this */ - public function build() + public function build(): self { return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text') ->subject('A new access token was created'); diff --git a/app/Mail/AdminTestMail.php b/app/Mail/AdminTestMail.php index dc2ea460e8..a87537597a 100644 --- a/app/Mail/AdminTestMail.php +++ b/app/Mail/AdminTestMail.php @@ -57,7 +57,7 @@ class AdminTestMail extends Mailable * * @return $this */ - public function build() + public function build(): self { return $this->view('emails.admin-test-html')->text('emails.admin-test-text') ->subject('A test message from your Firefly III installation'); diff --git a/app/Mail/ConfirmEmailChangeMail.php b/app/Mail/ConfirmEmailChangeMail.php index 9289671ea9..780f840975 100644 --- a/app/Mail/ConfirmEmailChangeMail.php +++ b/app/Mail/ConfirmEmailChangeMail.php @@ -65,7 +65,7 @@ class ConfirmEmailChangeMail extends Mailable * * @return $this */ - public function build() + public function build(): self { return $this->view('emails.confirm-email-change-html')->text('emails.confirm-email-change-text') ->subject('Your Firefly III email address has changed'); diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php index 462509408f..fd6d589b8c 100644 --- a/app/Mail/RegisteredUser.php +++ b/app/Mail/RegisteredUser.php @@ -57,7 +57,7 @@ class RegisteredUser extends Mailable * * @return $this */ - public function build() + public function build(): self { return $this->view('emails.registered-html')->text('emails.registered-text')->subject('Welcome to Firefly III!'); } diff --git a/app/Mail/ReportNewJournalsMail.php b/app/Mail/ReportNewJournalsMail.php index a483625c1a..2d4120144b 100644 --- a/app/Mail/ReportNewJournalsMail.php +++ b/app/Mail/ReportNewJournalsMail.php @@ -65,7 +65,7 @@ class ReportNewJournalsMail extends Mailable */ public function build(): self { - $subject = $this->journals->count() === 1 + $subject = 1 === $this->journals->count() ? 'Firefly III has created a new transaction' : sprintf( 'Firefly III has created new %d transactions', $this->journals->count() diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php index 6ff7c81f03..5811a36a1f 100644 --- a/app/Mail/RequestedNewPassword.php +++ b/app/Mail/RequestedNewPassword.php @@ -56,7 +56,7 @@ class RequestedNewPassword extends Mailable * * @return $this */ - public function build() + public function build(): self { return $this->view('emails.password-html')->text('emails.password-text')->subject('Your password reset request'); } diff --git a/app/Mail/UndoEmailChangeMail.php b/app/Mail/UndoEmailChangeMail.php index a47d6ee9f4..20e5b6ec4f 100644 --- a/app/Mail/UndoEmailChangeMail.php +++ b/app/Mail/UndoEmailChangeMail.php @@ -63,7 +63,7 @@ class UndoEmailChangeMail extends Mailable * * @return $this */ - public function build() + public function build(): self { return $this->view('emails.undo-email-change-html')->text('emails.undo-email-change-text') ->subject('Your Firefly III email address has changed'); diff --git a/app/Models/Account.php b/app/Models/Account.php index 81093d68c5..c0dd8988fc 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Models; +use Carbon\Carbon; use Crypt; use FireflyIII\Exceptions\FireflyException; use FireflyIII\User; @@ -31,7 +32,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Collection; use Log; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -45,12 +46,14 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property bool $active * @property string $virtual_balance * @property User $user - * @property mixed|null startBalance - * @property mixed|null endBalance + * @property string startBalance + * @property string endBalance * @property string difference - * @property mixed|null endBalance - * @property mixed|null startBalance - * @property mixed|null lastActivityDate + * @property Carbon lastActivityDate + * @property Collection accountMeta + * @property bool encrypted + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Account extends Model { @@ -76,48 +79,6 @@ class Account extends Model /** @var bool */ private $joinedAccountTypes; - /** - * @param array $fields - * - * @return Account - * - * @deprecated - * - * @throws FireflyException - */ - public static function firstOrCreateEncrypted(array $fields) - { - if (!isset($fields['user_id'])) { - throw new FireflyException('Missing required field "user_id".'); - } - // everything but the name: - $query = self::orderBy('id'); - $search = $fields; - unset($search['name'], $search['iban']); - - foreach ($search as $name => $value) { - $query->where($name, $value); - } - $set = $query->get(['accounts.*']); - - // account must have a name. If not set, use IBAN. - if (!isset($fields['name'])) { - $fields['name'] = $fields['iban']; - } - - /** @var Account $account */ - foreach ($set as $account) { - if ($account->name === $fields['name']) { - return $account; - } - } - - // create it! - $account = self::create($fields); - - return $account; - } - /** * @param string $value * @@ -128,7 +89,10 @@ class Account extends Model { if (auth()->check()) { $accountId = (int)$value; - $account = auth()->user()->accounts()->find($accountId); + /** @var User $user */ + $user = auth()->user(); + /** @var Account $account */ + $account = $user->accounts()->find($accountId); if (null !== $account) { return $account; } @@ -178,7 +142,7 @@ class Account extends Model */ public function getIbanAttribute($value): string { - if (null === $value || '' === (string)$value) { + if ('' === (string)$value) { return ''; } try { @@ -195,25 +159,6 @@ class Account extends Model return $result; } - /** - * @codeCoverageIgnore - * - * @param string $fieldName - * - * @deprecated - * @return string - */ - public function getMeta(string $fieldName): string - { - foreach ($this->accountMeta as $meta) { - if ($meta->name === $fieldName) { - return (string)$meta->data; - } - } - - return ''; - } - /** * @codeCoverageIgnore * @@ -273,7 +218,7 @@ class Account extends Model * @param EloquentBuilder $query * @param array $types */ - public function scopeAccountTypeIn(EloquentBuilder $query, array $types) + public function scopeAccountTypeIn(EloquentBuilder $query, array $types): void { if (null === $this->joinedAccountTypes) { $query->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id'); @@ -283,35 +228,12 @@ class Account extends Model } /** - * @codeCoverageIgnore - * @deprecated - * - * @param EloquentBuilder $query - * @param string $name - * @param string $value - * - */ - public function scopeHasMetaValue(EloquentBuilder $query, $name, $value) - { - $joinName = str_replace('.', '_', $name); - $query->leftJoin( - 'account_meta as ' . $joinName, - function (JoinClause $join) use ($joinName, $name) { - $join->on($joinName . '.account_id', '=', 'accounts.id')->where($joinName . '.name', '=', $name); - } - ); - $query->where($joinName . '.data', json_encode($value)); - } - - /** - * @codeCoverageIgnore - * * @param $value * * @codeCoverageIgnore * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setIbanAttribute($value) + public function setIbanAttribute($value): void { $this->attributes['iban'] = Crypt::encrypt($value); } @@ -323,7 +245,7 @@ class Account extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setNameAttribute($value) + public function setNameAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['name'] = $encrypt ? Crypt::encrypt($value) : $value; @@ -337,7 +259,7 @@ class Account extends Model * * @codeCoverageIgnore */ - public function setVirtualBalanceAttribute($value) + public function setVirtualBalanceAttribute($value): void { $this->attributes['virtual_balance'] = (string)$value; } diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 2dde72aa88..4f6e68e52c 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -76,7 +76,7 @@ class AccountMeta extends Model * * @codeCoverageIgnore */ - public function setDataAttribute($value) + public function setDataAttribute($value): void { $this->attributes['data'] = json_encode($value); } diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 913585ab8a..43d12b7f15 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -78,7 +78,10 @@ class Attachment extends Model { if (auth()->check()) { $attachmentId = (int)$value; - $attachment = auth()->user()->attachments()->find($attachmentId); + /** @var User $user */ + $user = auth()->user(); + /** @var Attachment $attachment */ + $attachment = $user->attachments()->find($attachmentId); if (null !== $attachment) { return $attachment; } diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 6cfbc53862..4950cb7661 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -71,7 +71,10 @@ class AvailableBudget extends Model { if (auth()->check()) { $availableBudgetId = (int)$value; - $availableBudget = auth()->user()->availableBudgets()->find($availableBudgetId); + /** @var User $user */ + $user = auth()->user(); + /** @var AvailableBudget $availableBudget */ + $availableBudget = $user->availableBudgets()->find($availableBudgetId); if (null !== $availableBudget) { return $availableBudget; } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 73b5ad5426..3560800ec6 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -51,6 +51,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property bool $automatch * @property User $user * @property string $match + * @property bool match_encrypted + * @property bool name_encrypted + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Bill extends Model { @@ -93,7 +97,10 @@ class Bill extends Model { if (auth()->check()) { $billId = (int)$value; - $bill = auth()->user()->bills()->find($billId); + /** @var User $user */ + $user = auth()->user(); + /** @var Bill $bill */ + $bill = $user->bills()->find($billId); if (null !== $bill) { return $bill; } @@ -105,7 +112,7 @@ class Bill extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\MorphMany */ - public function attachments() + public function attachments(): \Illuminate\Database\Eloquent\Relations\MorphMany { return $this->morphMany(Attachment::class, 'attachable'); } @@ -118,7 +125,7 @@ class Bill extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getMatchAttribute($value) + public function getMatchAttribute($value): string { if (1 === (int)$this->match_encrypted) { return Crypt::decrypt($value); @@ -135,7 +142,7 @@ class Bill extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value) + public function getNameAttribute($value): string { if (1 === (int)$this->name_encrypted) { return Crypt::decrypt($value); @@ -158,7 +165,7 @@ class Bill extends Model * * @param $value */ - public function setAmountMaxAttribute($value) + public function setAmountMaxAttribute($value): void { $this->attributes['amount_max'] = (string)$value; } @@ -168,7 +175,7 @@ class Bill extends Model * * @codeCoverageIgnore */ - public function setAmountMinAttribute($value) + public function setAmountMinAttribute($value): void { $this->attributes['amount_min'] = (string)$value; } @@ -179,7 +186,7 @@ class Bill extends Model * @codeCoverageIgnore * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setMatchAttribute($value) + public function setMatchAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['match'] = $encrypt ? Crypt::encrypt($value) : $value; @@ -192,7 +199,7 @@ class Bill extends Model * @codeCoverageIgnore * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setNameAttribute($value) + public function setNameAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['name'] = $encrypt ? Crypt::encrypt($value) : $value; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 1ee29963e0..b6c29ae3ed 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -37,6 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property bool $active * @property int $user_id * @property-read string $email + * @property bool encrypted */ class Budget extends Model { @@ -60,34 +61,6 @@ class Budget extends Model /** @var array */ protected $hidden = ['encrypted']; - /** - * @param array $fields - * - * @deprecated - * @return Budget - */ - public static function firstOrCreateEncrypted(array $fields) - { - // everything but the name: - $query = self::orderBy('id'); - $search = $fields; - unset($search['name']); - foreach ($search as $name => $value) { - $query->where($name, $value); - } - $set = $query->get(['budgets.*']); - /** @var Budget $budget */ - foreach ($set as $budget) { - if ($budget->name === $fields['name']) { - return $budget; - } - } - // create it! - $budget = self::create($fields); - - return $budget; - } - /** * @param string $value * @@ -98,7 +71,10 @@ class Budget extends Model { if (auth()->check()) { $budgetId = (int)$value; - $budget = auth()->user()->budgets()->find($budgetId); + /** @var User $user */ + $user = auth()->user(); + /** @var Budget $budget */ + $budget = $user->budgets()->find($budgetId); if (null !== $budget) { return $budget; } @@ -110,7 +86,7 @@ class Budget extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function budgetlimits() + public function budgetlimits(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(BudgetLimit::class); } @@ -123,7 +99,7 @@ class Budget extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value) + public function getNameAttribute($value): string { if ($this->encrypted) { return Crypt::decrypt($value); @@ -139,7 +115,7 @@ class Budget extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setNameAttribute($value) + public function setNameAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['name'] = $encrypt ? Crypt::encrypt($value) : $value; @@ -150,7 +126,7 @@ class Budget extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function transactionJournals() + public function transactionJournals(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(TransactionJournal::class, 'budget_transaction_journal', 'budget_id'); } @@ -159,7 +135,7 @@ class Budget extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function transactions() + public function transactions(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(Transaction::class, 'budget_transaction', 'budget_id'); } diff --git a/app/Models/Category.php b/app/Models/Category.php index dd3a3fb818..a9cdb27bce 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -36,6 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $id * @property float $spent // used in category reports * @property Carbon|null lastActivity + * @property bool encrypted */ class Category extends Model { @@ -58,34 +59,6 @@ class Category extends Model /** @var array */ protected $hidden = ['encrypted']; - /** - * @param array $fields - * - * @deprecated - * @return Category - */ - public static function firstOrCreateEncrypted(array $fields) - { - // everything but the name: - $query = self::orderBy('id'); - $search = $fields; - unset($search['name']); - foreach ($search as $name => $value) { - $query->where($name, $value); - } - $set = $query->get(['categories.*']); - /** @var Category $category */ - foreach ($set as $category) { - if ($category->name === $fields['name']) { - return $category; - } - } - // create it! - $category = self::create($fields); - - return $category; - } - /** * @param string $value * @@ -96,7 +69,10 @@ class Category extends Model { if (auth()->check()) { $categoryId = (int)$value; - $category = auth()->user()->categories()->find($categoryId); + /** @var User $user */ + $user = auth()->user(); + /** @var Category $category */ + $category = $user->categories()->find($categoryId); if (null !== $category) { return $category; } @@ -112,7 +88,7 @@ class Category extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value) + public function getNameAttribute($value): string { if ($this->encrypted) { return Crypt::decrypt($value); @@ -128,7 +104,7 @@ class Category extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setNameAttribute($value) + public function setNameAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['name'] = $encrypt ? Crypt::encrypt($value) : $value; @@ -139,7 +115,7 @@ class Category extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function transactionJournals() + public function transactionJournals(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(TransactionJournal::class, 'category_transaction_journal', 'category_id'); } @@ -148,7 +124,7 @@ class Category extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function transactions() + public function transactions(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(Transaction::class, 'category_transaction', 'category_id'); } diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 8f29c16dc0..76eae0f9ed 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -67,7 +67,7 @@ class Configuration extends Model * * @param $value */ - public function setDataAttribute($value) + public function setDataAttribute($value): void { $this->attributes['data'] = json_encode($value); } diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index 8b16e88730..b55b6f792f 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -54,7 +54,10 @@ class ExportJob extends Model { if (auth()->check()) { $key = trim($value); - $exportJob = auth()->user()->exportJobs()->where('key', $key)->first(); + /** @var User $user */ + $user = auth()->user(); + /** @var ExportJob $exportJob */ + $exportJob = $user->exportJobs()->where('key', $key)->first(); if (null !== $exportJob) { return $exportJob; } @@ -67,7 +70,7 @@ class ExportJob extends Model * * @param $status */ - public function change($status) + public function change($status): void { $this->status = $status; $this->save(); @@ -77,7 +80,7 @@ class ExportJob extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class); } diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index 29715e55ba..1a9851b233 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -73,7 +73,10 @@ class ImportJob extends Model { if (auth()->check()) { $key = trim($value); - $importJob = auth()->user()->importJobs()->where('key', $key)->first(); + /** @var User $user */ + $user = auth()->user(); + /** @var ImportJob $importJob */ + $importJob = $user->importJobs()->where('key', $key)->first(); if (null !== $importJob) { return $importJob; } @@ -85,7 +88,7 @@ class ImportJob extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\MorphMany */ - public function attachments() + public function attachments(): \Illuminate\Database\Eloquent\Relations\MorphMany { return $this->morphMany(Attachment::class, 'attachable'); } @@ -94,7 +97,7 @@ class ImportJob extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function tag() + public function tag(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Tag::class); } @@ -103,7 +106,7 @@ class ImportJob extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class); } diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index b9caaf05b7..f5f1bd9e86 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -81,7 +81,7 @@ class LinkType extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function transactionJournalLinks() + public function transactionJournalLinks(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(TransactionJournalLink::class); } diff --git a/app/Models/Note.php b/app/Models/Note.php index 487dca8146..1e37ef8cc0 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -66,7 +66,7 @@ class Note extends Model /** * @param $value */ - public function setTextAttribute($value) + public function setTextAttribute($value): void { $this->attributes['text'] = e($value); } diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 3b4422cdd4..9a07f79175 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -43,6 +43,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $order * @property bool $active * @property int $account_id + * @property bool encrypted * */ class PiggyBank extends Model @@ -101,28 +102,6 @@ class PiggyBank extends Model return $this->belongsTo(Account::class); } - /** - * Grabs the PiggyBankRepetition that's currently relevant / active. - * - * @deprecated - * @returns PiggyBankRepetition - */ - public function currentRelevantRep(): PiggyBankRepetition - { - if (null !== $this->currentRep) { - return $this->currentRep; - } - // repeating piggy banks are no longer supported. - /** @var PiggyBankRepetition $rep */ - $rep = $this->piggyBankRepetitions()->first(['piggy_bank_repetitions.*']); - if (null === $rep) { - return new PiggyBankRepetition(); - } - $this->currentRep = $rep; - - return $rep; - } - /** * @codeCoverageIgnore * @@ -131,7 +110,7 @@ class PiggyBank extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value) + public function getNameAttribute($value): string { if ($this->encrypted) { return Crypt::decrypt($value); @@ -140,25 +119,6 @@ class PiggyBank extends Model return $value; } - /** - * @param Carbon $date - * - * @deprecated - * @return string - */ - public function leftOnAccount(Carbon $date): string - { - $balance = app('steam')->balanceIgnoreVirtual($this->account, $date); - /** @var PiggyBank $piggyBank */ - foreach ($this->account->piggyBanks as $piggyBank) { - $currentAmount = $piggyBank->currentRelevantRep()->currentamount ?? '0'; - - $balance = bcsub($balance, $currentAmount); - } - - return $balance; - } - /** * @codeCoverageIgnore * Get all of the piggy bank's notes. @@ -172,7 +132,7 @@ class PiggyBank extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function piggyBankEvents() + public function piggyBankEvents(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(PiggyBankEvent::class); } @@ -181,7 +141,7 @@ class PiggyBank extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function piggyBankRepetitions() + public function piggyBankRepetitions(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(PiggyBankRepetition::class); } @@ -193,7 +153,7 @@ class PiggyBank extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setNameAttribute($value) + public function setNameAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['name'] = $encrypt ? Crypt::encrypt($value) : $value; @@ -205,7 +165,7 @@ class PiggyBank extends Model * * @param $value */ - public function setTargetamountAttribute($value) + public function setTargetamountAttribute($value): void { $this->attributes['targetamount'] = (string)$value; } diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 4410010937..48668c220e 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -61,7 +61,7 @@ class PiggyBankEvent extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function piggyBank() + public function piggyBank(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(PiggyBank::class); } @@ -71,7 +71,7 @@ class PiggyBankEvent extends Model * * @param $value */ - public function setAmountAttribute($value) + public function setAmountAttribute($value): void { $this->attributes['amount'] = (string)$value; } @@ -80,7 +80,7 @@ class PiggyBankEvent extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function transactionJournal() + public function transactionJournal(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(TransactionJournal::class); } diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 470d9b7a11..a021ce61b6 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -57,7 +57,7 @@ class PiggyBankRepetition extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function piggyBank() + public function piggyBank(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(PiggyBank::class); } @@ -71,7 +71,7 @@ class PiggyBankRepetition extends Model * * @return EloquentBuilder */ - public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $target) + public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $target): EloquentBuilder { return $query->where('startdate', $start->format('Y-m-d'))->where('targetdate', $target->format('Y-m-d')); } @@ -105,7 +105,7 @@ class PiggyBankRepetition extends Model * * @param $value */ - public function setCurrentamountAttribute($value) + public function setCurrentamountAttribute($value): void { $this->attributes['currentamount'] = (string)$value; } diff --git a/app/Models/Preference.php b/app/Models/Preference.php index fab0037bfc..cc9ccc0b15 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -40,8 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property Carbon $updated_at * @property Carbon $created_at * @property int $id - * @property mixed user - * @property mixed user + * @property User user */ class Preference extends Model { @@ -62,14 +61,17 @@ class Preference extends Model /** * @param string $value * - * @return Account + * @return Preference * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException */ public static function routeBinder(string $value): Preference { if (auth()->check()) { $preferenceId = (int)$value; - $preference = auth()->user()->preferences()->find($preferenceId); + /** @var User $user */ + $user = auth()->user(); + /** @var Preference $preference */ + $preference = $user->preferences()->find($preferenceId); if (null !== $preference) { return $preference; } @@ -84,6 +86,7 @@ class Preference extends Model * @return mixed * * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getDataAttribute($value) { @@ -91,7 +94,7 @@ class Preference extends Model try { $data = Crypt::decrypt($value); } catch (DecryptException $e) { - Log::error('Could not decrypt preference.', ['id' => $this->id, 'name' => $this->name, 'data' => $value]); + Log::error(sprintf('Could not decrypt preference: %s', $e->getMessage()), ['id' => $this->id, 'name' => $this->name, 'data' => $value]); throw new FireflyException( sprintf('Could not decrypt preference #%d. If this error persists, please run "php artisan cache:clear" on the command line.', $this->id) ); @@ -119,7 +122,7 @@ class Preference extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setDataAttribute($value) + public function setDataAttribute($value): void { $this->attributes['data'] = Crypt::encrypt(json_encode($value)); } @@ -128,7 +131,7 @@ class Preference extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class); } diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index bc60c3bad2..242e64e040 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -97,7 +97,10 @@ class Recurrence extends Model { if (auth()->check()) { $recurrenceId = (int)$value; - $recurrence = auth()->user()->recurrences()->find($recurrenceId); + /** @var User $user */ + $user = auth()->user(); + /** @var Recurrence $recurrence */ + $recurrence = $user->recurrences()->find($recurrenceId); if (null !== $recurrence) { return $recurrence; } diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 36982b40c3..d7fbc0ba00 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -83,7 +83,10 @@ class Rule extends Model { if (auth()->check()) { $ruleId = (int)$value; - $rule = auth()->user()->rules()->find($ruleId); + /** @var User $user */ + $user = auth()->user(); + /** @var Rule $rule */ + $rule = $user->rules()->find($ruleId); if (null !== $rule) { return $rule; } diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 6bad677108..b0b7e9dcd3 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -61,7 +61,7 @@ class RuleAction extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function rule() + public function rule(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Rule::class); } diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index bc3ba014fe..2f9a7a8968 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -74,7 +74,10 @@ class RuleGroup extends Model { if (auth()->check()) { $ruleGroupId = (int)$value; - $ruleGroup = auth()->user()->ruleGroups()->find($ruleGroupId); + /** @var User $user */ + $user = auth()->user(); + /** @var RuleGroup $ruleGroup */ + $ruleGroup = $user->ruleGroups()->find($ruleGroupId); if (null !== $ruleGroup) { return $ruleGroup; } @@ -86,7 +89,7 @@ class RuleGroup extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function rules() + public function rules(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(Rule::class); } @@ -95,7 +98,7 @@ class RuleGroup extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class); } diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index b030f9d836..7c8da2f6e2 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -60,7 +60,7 @@ class RuleTrigger extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function rule() + public function rule(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Rule::class); } diff --git a/app/Models/Tag.php b/app/Models/Tag.php index a60b07449b..ef97718a6e 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -59,38 +59,6 @@ class Tag extends Model /** @var array */ protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode']; - /** - * @param array $fields - * - * @deprecated - * @return Tag|null - */ - public static function firstOrCreateEncrypted(array $fields) - { - // everything but the tag: - unset($fields['tagMode']); - $search = $fields; - unset($search['tag']); - - $query = self::orderBy('id'); - foreach ($search as $name => $value) { - $query->where($name, $value); - } - $set = $query->get(['tags.*']); - /** @var Tag $tag */ - foreach ($set as $tag) { - if ($tag->tag === $fields['tag']) { - return $tag; - } - } - // create it! - $fields['tagMode'] = 'nothing'; - $fields['description'] = $fields['description'] ?? ''; - $tag = self::create($fields); - - return $tag; - } - /** * @param string $value * @@ -101,7 +69,10 @@ class Tag extends Model { if (auth()->check()) { $tagId = (int)$value; - $tag = auth()->user()->tags()->find($tagId); + /** @var User $user */ + $user = auth()->user(); + /** @var Tag $tag */ + $tag = $user->tags()->find($tagId); if (null !== $tag) { return $tag; } @@ -117,7 +88,7 @@ class Tag extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getDescriptionAttribute($value) + public function getDescriptionAttribute($value): string { if (null === $value) { return $value; @@ -131,10 +102,10 @@ class Tag extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getTagAttribute($value) + public function getTagAttribute($value): ?string { if (null === $value) { return null; @@ -150,7 +121,7 @@ class Tag extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setDescriptionAttribute($value) + public function setDescriptionAttribute($value): void { $this->attributes['description'] = Crypt::encrypt($value); } @@ -162,7 +133,7 @@ class Tag extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setTagAttribute($value) + public function setTagAttribute($value): void { $this->attributes['tag'] = Crypt::encrypt($value); } @@ -171,7 +142,7 @@ class Tag extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function transactionJournals() + public function transactionJournals(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(TransactionJournal::class); } @@ -180,7 +151,7 @@ class Tag extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class); } diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 7e5d34ac17..467b34e44f 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; +use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -88,6 +89,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $after // used in audit reports. * @property int $opposing_id // ID of the opposing transaction, used in collector * @property bool $encrypted // is the journal encrypted + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class Transaction extends Model { @@ -150,8 +152,10 @@ class Transaction extends Model { if (auth()->check()) { $transactionId = (int)$value; - $transaction = auth()->user()->transactions()->where('transactions.id', $transactionId) - ->first(['transactions.*']); + /** @var User $user */ + $user = auth()->user(); + /** @var Transaction $transaction */ + $transaction = $user->transactions()->where('transactions.id', $transactionId)->first(['transactions.*']); if (null !== $transaction) { return $transaction; } @@ -166,7 +170,7 @@ class Transaction extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function account() + public function account(): BelongsTo { return $this->belongsTo(Account::class); } @@ -175,7 +179,7 @@ class Transaction extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function budgets() + public function budgets(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(Budget::class); } @@ -184,7 +188,7 @@ class Transaction extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function categories() + public function categories(): \Illuminate\Database\Eloquent\Relations\BelongsToMany { return $this->belongsToMany(Category::class); } @@ -193,30 +197,18 @@ class Transaction extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function foreignCurrency() + public function foreignCurrency(): BelongsTo { return $this->belongsTo(TransactionCurrency::class, 'foreign_currency_id'); } - /** - * @codeCoverageIgnore - * - * @param $value - * - * @return float|int - */ - public function getAmountAttribute($value) - { - return $value; - } - /** * @codeCoverageIgnore * * @param Builder $query * @param Carbon $date */ - public function scopeAfter(Builder $query, Carbon $date) + public function scopeAfter(Builder $query, Carbon $date): void { if (!self::isJoined($query, 'transaction_journals')) { $query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'); @@ -230,7 +222,7 @@ class Transaction extends Model * @param Builder $query * @param Carbon $date */ - public function scopeBefore(Builder $query, Carbon $date) + public function scopeBefore(Builder $query, Carbon $date): void { if (!self::isJoined($query, 'transaction_journals')) { $query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'); @@ -244,7 +236,7 @@ class Transaction extends Model * @param Builder $query * @param array $types */ - public function scopeTransactionTypes(Builder $query, array $types) + public function scopeTransactionTypes(Builder $query, array $types): void { if (!self::isJoined($query, 'transaction_journals')) { $query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'); @@ -261,7 +253,7 @@ class Transaction extends Model * * @param $value */ - public function setAmountAttribute($value) + public function setAmountAttribute($value): void { $this->attributes['amount'] = (string)$value; } diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index ef577f839e..c44d6d350b 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -33,14 +33,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $symbol * @property int $decimal_places * @property int $id - * @property mixed name - * @property mixed name - * @property mixed name - * @property mixed name - * @property mixed name - * @property mixed name - * @property mixed name - * @property mixed name + * @property string name * */ class TransactionCurrency extends Model @@ -86,7 +79,7 @@ class TransactionCurrency extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function transactionJournals() + public function transactionJournals(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(TransactionJournal::class); } diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index dc00497da4..2501343b4d 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -24,7 +24,6 @@ namespace FireflyIII\Models; use Carbon\Carbon; use Crypt; -use FireflyIII\Support\CacheProperties; use FireflyIII\Support\Models\TransactionJournalTrait; use FireflyIII\User; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; @@ -33,7 +32,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; -use Log; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -54,6 +52,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property Carbon interest_date * @property Carbon book_date * @property Carbon process_date + * @property bool encrypted + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class TransactionJournal extends Model { @@ -97,8 +99,11 @@ class TransactionJournal extends Model { if (auth()->check()) { $journalId = (int)$value; - $journal = auth()->user()->transactionJournals()->where('transaction_journals.id', $journalId) - ->first(['transaction_journals.*']); + /** @var User $user */ + $user = auth()->user(); + /** @var TransactionJournal $journal */ + $journal = $user->transactionJournals()->where('transaction_journals.id', $journalId) + ->first(['transaction_journals.*']); if (null !== $journal) { return $journal; } @@ -111,7 +116,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\MorphMany */ - public function attachments() + public function attachments(): \Illuminate\Database\Eloquent\Relations\MorphMany { return $this->morphMany(Attachment::class, 'attachable'); } @@ -120,7 +125,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function bill() + public function bill(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Bill::class); } @@ -143,31 +148,6 @@ class TransactionJournal extends Model return $this->belongsToMany(Category::class); } - /** - * @codeCoverageIgnore - * @deprecated - * - * @param string $name - * - * @return bool - */ - public function deleteMeta(string $name): bool - { - $this->transactionJournalMeta()->where('name', $name)->delete(); - - return true; - } - - /** - * @codeCoverageIgnore - * - * @return HasMany - */ - public function destinationJournalLinks(): HasMany - { - return $this->hasMany(TransactionJournalLink::class, 'destination_id'); - } - /** * @codeCoverageIgnore * @@ -176,7 +156,7 @@ class TransactionJournal extends Model * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getDescriptionAttribute($value) + public function getDescriptionAttribute($value): string { if ($this->encrypted) { return Crypt::decrypt($value); @@ -185,56 +165,6 @@ class TransactionJournal extends Model return $value; } - /** - * - * @param string $name - * - * @deprecated - * @return string - */ - public function getMeta(string $name) - { - $value = null; - $cache = new CacheProperties; - $cache->addProperty('journal-meta'); - $cache->addProperty($this->id); - $cache->addProperty($name); - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - - Log::debug(sprintf('Looking for journal #%d meta field "%s".', $this->id, $name)); - $entry = $this->transactionJournalMeta()->where('name', $name)->first(); - if (null !== $entry) { - $value = $entry->data; - // cache: - $cache->store($value); - } - - // convert to Carbon if name is _date - if (null !== $value && '_date' === substr($name, -5)) { - $value = new Carbon($value); - // cache: - $cache->store($value); - } - - return $value; - } - - /** - * @codeCoverageIgnore - * - * @param string $name - * - * @deprecated - * @return bool - */ - public function hasMeta(string $name): bool - { - return null !== $this->getMeta($name); - } - /** * @codeCoverageIgnore * @return bool @@ -313,7 +243,7 @@ class TransactionJournal extends Model * * @return EloquentBuilder */ - public function scopeAfter(EloquentBuilder $query, Carbon $date) + public function scopeAfter(EloquentBuilder $query, Carbon $date): EloquentBuilder { return $query->where('transaction_journals.date', '>=', $date->format('Y-m-d 00:00:00')); } @@ -326,7 +256,7 @@ class TransactionJournal extends Model * * @return EloquentBuilder */ - public function scopeBefore(EloquentBuilder $query, Carbon $date) + public function scopeBefore(EloquentBuilder $query, Carbon $date): EloquentBuilder { return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d 00:00:00')); } @@ -337,7 +267,7 @@ class TransactionJournal extends Model * @param EloquentBuilder $query * @param array $types */ - public function scopeTransactionTypes(EloquentBuilder $query, array $types) + public function scopeTransactionTypes(EloquentBuilder $query, array $types): void { if (!self::isJoined($query, 'transaction_types')) { $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); @@ -354,52 +284,13 @@ class TransactionJournal extends Model * * @throws \Illuminate\Contracts\Encryption\EncryptException */ - public function setDescriptionAttribute($value) + public function setDescriptionAttribute($value): void { $encrypt = config('firefly.encryption'); $this->attributes['description'] = $encrypt ? Crypt::encrypt($value) : $value; $this->attributes['encrypted'] = $encrypt; } - /** - * @deprecated - * - * @param string $name - * @param $value - * - * @return TransactionJournalMeta - */ - public function setMeta(string $name, $value): TransactionJournalMeta - { - if (null === $value) { - $this->deleteMeta($name); - - return new TransactionJournalMeta(); - } - if (\is_string($value) && 0 === \strlen($value)) { - $this->deleteMeta($name); - - return new TransactionJournalMeta(); - } - - if ($value instanceof Carbon) { - $value = $value->toW3cString(); - } - - Log::debug(sprintf('Going to set "%s" with value "%s"', $name, json_encode($value))); - $entry = $this->transactionJournalMeta()->where('name', $name)->first(); - if (null === $entry) { - $entry = new TransactionJournalMeta(); - $entry->transactionJournal()->associate($this); - $entry->name = $name; - } - $entry->data = $value; - $entry->save(); - app('preferences')->mark(); - - return $entry; - } - /** * @codeCoverageIgnore * @return HasMany @@ -413,7 +304,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function tags() + public function tags(): BelongsToMany { return $this->belongsToMany(Tag::class); } @@ -422,7 +313,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function transactionCurrency() + public function transactionCurrency(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(TransactionCurrency::class); } @@ -440,7 +331,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function transactionType() + public function transactionType(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(TransactionType::class); } @@ -458,7 +349,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class); } diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index aa5146b3e7..dad69ba82f 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -77,7 +77,7 @@ class TransactionJournalLink extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function destination() + public function destination(): BelongsTo { return $this->belongsTo(TransactionJournal::class, 'destination_id'); } @@ -137,7 +137,7 @@ class TransactionJournalLink extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function source() + public function source(): BelongsTo { return $this->belongsTo(TransactionJournal::class, 'source_id'); } diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 0842e5d2d1..d27a7a5996 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -71,7 +71,7 @@ class TransactionJournalMeta extends Model * * @param $value */ - public function setDataAttribute($value) + public function setDataAttribute($value): void { $data = json_encode($value); $this->attributes['data'] = $data; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 4c9bc1f04a..f82f24769a 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -128,7 +128,7 @@ class TransactionType extends Model * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function transactionJournals() + public function transactionJournals(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(TransactionJournal::class); } diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 842103b20e..89ff1178a2 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -64,7 +64,6 @@ use FireflyIII\Support\Twig\Journal; use FireflyIII\Support\Twig\Loader\AccountLoader; use FireflyIII\Support\Twig\Loader\TransactionJournalLoader; use FireflyIII\Support\Twig\Loader\TransactionLoader; -use FireflyIII\Support\Twig\PiggyBank; use FireflyIII\Support\Twig\Rule; use FireflyIII\Support\Twig\Transaction; use FireflyIII\Support\Twig\Translation; @@ -96,7 +95,6 @@ class FireflyServiceProvider extends ServiceProvider Twig::addRuntimeLoader(new TransactionLoader); Twig::addRuntimeLoader(new AccountLoader); Twig::addRuntimeLoader(new TransactionJournalLoader); - Twig::addExtension(new PiggyBank); Twig::addExtension(new General); Twig::addExtension(new Journal); Twig::addExtension(new Translation); diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index c3ad238bb9..2fbad62f30 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -168,10 +168,10 @@ class JournalRepository implements JournalRepositoryInterface Log::debug(sprintf('Hash of hash is: %s', $hashOfHash)); $result = TransactionJournalMeta::withTrashed() - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') - ->where('hash', $hashOfHash) - ->where('name', 'importHashV2') - ->first(['journal_meta.*']); + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') + ->where('hash', $hashOfHash) + ->where('name', 'importHashV2') + ->first(['journal_meta.*']); if (null === $result) { Log::debug('Result is null'); } @@ -350,16 +350,14 @@ class JournalRepository implements JournalRepositoryInterface $journal->save(); // create meta entry - $journal->setMeta($field, $carbon); + $this->setMetaDate($journal, $field, $carbon); // return that one instead. return $carbon->format('Y-m-d'); } - $metaField = $journal->getMeta($field); + $metaField = $this->getMetaDate($journal, $field); if (null !== $metaField) { - $carbon = new Carbon($metaField); - - return $carbon->format('Y-m-d'); + return $metaField->format('Y-m-d'); } return ''; diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 2c5581b762..a76c2bec54 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -86,8 +86,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function canAddAmount(PiggyBank $piggyBank, string $amount): bool { - $leftOnAccount = $piggyBank->leftOnAccount(new Carbon); - $savedSoFar = (string)$piggyBank->currentRelevantRep()->currentamount; + $leftOnAccount = $this->leftOnAccount($piggyBank, new Carbon); + $savedSoFar = (string)$this->getRepetition($piggyBank)->currentamount; $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); $maxAmount = (string)min(round($leftOnAccount, 12), round($leftToSave, 12)); @@ -415,7 +415,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function removeAmount(PiggyBank $piggyBank, string $amount): bool { - $repetition = $piggyBank->currentRelevantRep(); + $repetition = $this->getRepetition($piggyBank); $repetition->currentamount = bcsub($repetition->currentamount, $amount); $repetition->save(); diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 1e1c44cddc..de66d82467 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -52,7 +52,6 @@ class ExpandedForm * @param null $options * * @return string - */ public function activeAssetAccountList(string $name, $value = null, array $options = []): string { @@ -69,9 +68,9 @@ class ExpandedForm /** @var Account $account */ foreach ($assetAccounts as $account) { $balance = app('steam')->balance($account, new Carbon); - $currencyId = (int)$account->getMeta('currency_id'); + $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); $currency = $currencyRepos->findNull($currencyId); - $role = $account->getMeta('accountRole'); + $role = $repository->getMetaValue($account, 'accountRole'); if ('' === $role) { $role = 'no_account_type'; // @codeCoverageIgnore } @@ -93,7 +92,6 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - */ public function amount(string $name, $value = null, array $options = []): string { @@ -106,7 +104,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function amountNoCurrency(string $name, $value = null, array $options = []): string { @@ -145,7 +142,6 @@ class ExpandedForm * @param null $options * * @return string - */ public function assetAccountCheckList(string $name, $options = null): string { @@ -183,7 +179,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function assetAccountList(string $name, $value = null, array $options = []): string { @@ -200,9 +195,9 @@ class ExpandedForm /** @var Account $account */ foreach ($assetAccounts as $account) { $balance = app('steam')->balance($account, new Carbon); - $currencyId = (int)$account->getMeta('currency_id'); + $currencyId = (int)$repository->getMetaValue($account,'currency_id'); $currency = $currencyRepos->findNull($currencyId); - $role = $account->getMeta('accountRole'); + $role = $repository->getMetaValue($account,'accountRole'); if (0 === \strlen($role)) { $role = 'no_account_type'; // @codeCoverageIgnore } @@ -225,7 +220,6 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - */ public function balance(string $name, $value = null, array $options = []): string { @@ -239,7 +233,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function checkbox(string $name, $value = 1, $checked = null, $options = []): string { @@ -268,7 +261,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function currencyList(string $name, $value = null, array $options = []): string { @@ -293,7 +285,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function currencyListEmpty(string $name, $value = null, array $options = []): string { @@ -320,7 +311,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function date(string $name, $value = null, array $options = []): string { @@ -339,7 +329,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function file(string $name, array $options = []): string { @@ -357,7 +346,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function integer(string $name, $value = null, array $options = []): string { @@ -377,7 +365,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function location(string $name, $value = null, array $options = []): string { @@ -450,7 +437,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function multiRadio(string $name, array $list = [], $selected = null, array $options = []): string { @@ -472,7 +458,6 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - */ public function nonSelectableAmount(string $name, $value = null, array $options = []): string { @@ -501,7 +486,6 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - */ public function nonSelectableBalance(string $name, $value = null, array $options = []): string { @@ -530,7 +514,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function number(string $name, $value = null, array $options = []): string { @@ -551,7 +534,6 @@ class ExpandedForm * @param string $name * * @return string - */ public function optionsList(string $type, string $name): string { @@ -565,7 +547,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function password(string $name, array $options = null): string { @@ -584,7 +565,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function piggyBankList(string $name, $value = null, array $options = null): string { @@ -610,7 +590,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function ruleGroupList(string $name, $value = null, array $options = []): string { @@ -664,7 +643,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function select(string $name, array $list = [], $selected = null, array $options = []): string { @@ -684,7 +662,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function staticText(string $name, $value, array $options = []): string { @@ -702,7 +679,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function tags(string $name, $value = null, array $options = []): string { @@ -722,7 +698,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function text(string $name, $value = null, array $options = []): string { @@ -741,7 +716,6 @@ class ExpandedForm * @param array $options * * @return string - */ public function textarea(string $name, $value = null, array $options = []): string { @@ -843,7 +817,6 @@ class ExpandedForm * @return string * * @throws \FireflyIII\Exceptions\FireflyException - */ private function currencyField(string $name, string $view, $value = null, array $options = []): string { diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 6dd329cf86..42df4918af 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -101,8 +101,11 @@ class Steam if ($cache->has()) { return $cache->get(); // @codeCoverageIgnore } - $currencyId = (int)$account->getMeta('currency_id'); + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($account->user); + $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); $nativeBalance = (string)$account->transactions() ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) @@ -152,8 +155,12 @@ class Steam $formatted = $start->format('Y-m-d'); $startBalance = $this->balance($account, $start); + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($account->user); + $balances[$formatted] = $startBalance; - $currencyId = (int)$account->getMeta('currency_id'); + $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); $start->addDay(); // query! diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php deleted file mode 100644 index 6096acf3de..0000000000 --- a/app/Support/Twig/PiggyBank.php +++ /dev/null @@ -1,51 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Twig; - -use FireflyIII\Models\PiggyBank as PB; -use Twig_Extension; -use Twig_SimpleFunction; - -/** - * Class PiggyBank. - */ -class PiggyBank extends Twig_Extension -{ - /** - * - */ - public function getFunctions(): array - { - $functions = []; - - $functions[] = new Twig_SimpleFunction( - 'currentRelevantRepAmount', - function (PB $piggyBank) { - return $piggyBank->currentRelevantRep()->currentamount; - } - ); - - return $functions; - } - -} diff --git a/app/TransactionRules/Actions/SetCategory.php b/app/TransactionRules/Actions/SetCategory.php index 567cde9f47..94a776d67a 100644 --- a/app/TransactionRules/Actions/SetCategory.php +++ b/app/TransactionRules/Actions/SetCategory.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace FireflyIII\TransactionRules\Actions; -use FireflyIII\Models\Category; +use FireflyIII\Factory\CategoryFactory; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; @@ -55,8 +55,12 @@ class SetCategory implements ActionInterface */ public function act(TransactionJournal $journal): bool { - $name = $this->action->action_value; - $category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => $journal->user->id]); + $name = $this->action->action_value; + + /** @var CategoryFactory $factory */ + $factory = app(CategoryFactory::class); + $factory->setUser($journal->user); + $category = $factory->findOrCreate(null, $name); $journal->categories()->detach(); // set category on transactions: diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index a9b53ab085..44b60aad55 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -26,6 +26,7 @@ namespace FireflyIII\Transformers; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\PiggyBankEvent; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; use League\Fractal\Resource\Item; @@ -117,8 +118,12 @@ class PiggyBankEventTransformer extends TransformerAbstract */ public function transform(PiggyBankEvent $event): array { - $account = $event->piggyBank->account; - $currencyId = (int)$account->getMeta('currency_id'); + $account = $event->piggyBank->account; + /** @var AccountRepositoryInterface $accountRepos */ + $accountRepos = app(AccountRepositoryInterface::class); + $accountRepos->setUser($account->user); + + $currencyId = (int)$accountRepos->getMetaValue($account, 'currency_id'); $decimalPlaces = 2; if ($currencyId > 0) { /** @var CurrencyRepositoryInterface $repository */ From ea2c48bca52d6f4b0c6aa9e3ba72a4806bceb4b9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 17:06:10 +0200 Subject: [PATCH 52/86] Fix tests. --- app/Http/Controllers/Chart/AccountController.php | 10 +++++++--- app/Models/Bill.php | 4 ++-- app/Models/Budget.php | 4 ++-- app/Models/Category.php | 4 ++-- app/Models/PiggyBank.php | 4 ++-- app/Models/Tag.php | 4 ++-- app/Models/TransactionJournal.php | 4 ++-- app/Rules/IsAssetAccountId.php | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index b326c9272e..10923b03a5 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -467,10 +467,14 @@ class AccountController extends Controller /** @var CurrencyRepositoryInterface $repository */ $repository = app(CurrencyRepositoryInterface::class); - $default = app('amount')->getDefaultCurrency(); - $chartData = []; + /** @var AccountRepositoryInterface $accountRepos */ + $accountRepos = app(AccountRepositoryInterface::class); + + $default = app('amount')->getDefaultCurrency(); + $chartData = []; + /** @var Account $account */ foreach ($accounts as $account) { - $currency = $repository->findNull((int)$account->getMeta('currency_id')); + $currency = $repository->findNull((int)$accountRepos->getMetaValue($account, 'currency_id')); if (null === $currency) { $currency = $default; } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 3560800ec6..99a30828e5 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -139,10 +139,10 @@ class Bill extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value): string + public function getNameAttribute($value): ?string { if (1 === (int)$this->name_encrypted) { return Crypt::decrypt($value); diff --git a/app/Models/Budget.php b/app/Models/Budget.php index b6c29ae3ed..6838945741 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -96,10 +96,10 @@ class Budget extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value): string + public function getNameAttribute($value): ?string { if ($this->encrypted) { return Crypt::decrypt($value); diff --git a/app/Models/Category.php b/app/Models/Category.php index a9cdb27bce..b8ea97894d 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -85,10 +85,10 @@ class Category extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value): string + public function getNameAttribute($value): ?string { if ($this->encrypted) { return Crypt::decrypt($value); diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 9a07f79175..d6779aef84 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -107,10 +107,10 @@ class PiggyBank extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getNameAttribute($value): string + public function getNameAttribute($value): ?string { if ($this->encrypted) { return Crypt::decrypt($value); diff --git a/app/Models/Tag.php b/app/Models/Tag.php index ef97718a6e..2d2ddc7758 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -85,10 +85,10 @@ class Tag extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getDescriptionAttribute($value): string + public function getDescriptionAttribute($value): ?string { if (null === $value) { return $value; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 2501343b4d..7a6a1e1ada 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -153,10 +153,10 @@ class TransactionJournal extends Model * * @param $value * - * @return string + * @return string|null * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function getDescriptionAttribute($value): string + public function getDescriptionAttribute($value): ?string { if ($this->encrypted) { return Crypt::decrypt($value); diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index 7ffa717037..b072784b0b 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -1,6 +1,6 @@ Date: Sun, 22 Jul 2018 18:50:27 +0200 Subject: [PATCH 53/86] Code optimisations. --- app/Models/Account.php | 2 + app/Models/Budget.php | 4 +- app/Models/ExportJob.php | 5 +- app/Models/ImportJob.php | 2 + app/Models/RuleGroup.php | 1 + app/Models/Tag.php | 6 ++ app/Models/Transaction.php | 1 + app/Models/TransactionJournal.php | 3 + app/Providers/AccountServiceProvider.php | 8 +-- app/Providers/AdminServiceProvider.php | 6 +- app/Providers/AppServiceProvider.php | 4 +- app/Providers/AttachmentServiceProvider.php | 4 +- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/BillServiceProvider.php | 4 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/BudgetServiceProvider.php | 4 +- app/Providers/CategoryServiceProvider.php | 4 +- app/Providers/CurrencyServiceProvider.php | 4 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/ExportJobServiceProvider.php | 8 +-- app/Providers/FireflyServiceProvider.php | 12 +++- app/Providers/FireflySessionProvider.php | 6 +- app/Providers/JournalServiceProvider.php | 8 +-- app/Providers/LogServiceProvider.php | 60 ----------------- app/Providers/PiggyBankServiceProvider.php | 4 +- app/Providers/RouteServiceProvider.php | 6 +- app/Providers/RuleGroupServiceProvider.php | 4 +- app/Providers/RuleServiceProvider.php | 4 +- app/Providers/SearchServiceProvider.php | 4 +- app/Providers/TagServiceProvider.php | 4 +- .../Account/AccountRepository.php | 64 +------------------ .../Account/AccountRepositoryInterface.php | 50 +-------------- app/Repositories/Account/AccountTasker.php | 4 +- .../Account/FindAccountsTrait.php | 51 ++------------- .../Attachment/AttachmentRepository.php | 19 +----- .../AttachmentRepositoryInterface.php | 7 -- app/Repositories/Bill/BillRepository.php | 2 +- app/Repositories/Budget/BudgetRepository.php | 35 ++++++---- .../Budget/BudgetRepositoryInterface.php | 5 +- .../Category/CategoryRepository.php | 7 +- .../Category/CategoryRepositoryInterface.php | 4 ++ .../Currency/CurrencyRepository.php | 9 ++- .../ExportJob/ExportJobRepository.php | 8 +-- .../ExportJobRepositoryInterface.php | 2 +- .../ImportJob/ImportJobRepository.php | 23 ++++--- .../ImportJobRepositoryInterface.php | 6 +- .../Journal/JournalRepository.php | 7 +- .../Journal/JournalRepositoryInterface.php | 1 + .../LinkType/LinkTypeRepository.php | 1 + .../PiggyBank/PiggyBankRepository.php | 2 +- .../Recurring/RecurringRepository.php | 31 +++++---- app/Repositories/Rule/RuleRepository.php | 2 +- .../RuleGroup/RuleGroupRepository.php | 2 +- app/Repositories/Tag/TagRepository.php | 46 ++----------- app/Repositories/User/UserRepository.php | 30 +++++++-- app/User.php | 42 +++--------- 56 files changed, 221 insertions(+), 427 deletions(-) delete mode 100644 app/Providers/LogServiceProvider.php diff --git a/app/Models/Account.php b/app/Models/Account.php index c0dd8988fc..00be2897de 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -52,6 +52,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property Carbon lastActivityDate * @property Collection accountMeta * @property bool encrypted + * @property int account_type_id + * @property Collection piggyBanks * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 6838945741..ab87f02080 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -27,6 +27,7 @@ use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -37,7 +38,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property bool $active * @property int $user_id * @property-read string $email - * @property bool encrypted + * @property bool encrypted + * @property Collection budgetlimits */ class Budget extends Model { diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index b55b6f792f..593b3ebc64 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -32,7 +32,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property User $user * @property string $key * @property int $user_id - * @property mixed status + * @property string status + * @property int id */ class ExportJob extends Model { @@ -53,7 +54,7 @@ class ExportJob extends Model public static function routeBinder(string $value): ExportJob { if (auth()->check()) { - $key = trim($value); + $key = trim($value); /** @var User $user */ $user = auth()->user(); /** @var ExportJob $exportJob */ diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index 1a9851b233..6957faaf2e 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -41,6 +41,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $tag_id * @property Tag $tag * @property array $errors + * @property array extended_status + * @property int id */ class ImportJob extends Model { diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 2f9a7a8968..bc2840175b 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -41,6 +41,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $id * @property int $order * @property Collection $rules + * @property string description */ class RuleGroup extends Model { diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 2d2ddc7758..f0e5c900dc 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -36,6 +36,12 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $tag * @property int $id * @property \Carbon\Carbon $date + * @property int zoomLevel + * @property float longitude + * @property float latitude + * @property string description + * @property string amount_sum + * @property string tagMode */ class Tag extends Model { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 467b34e44f..b3c1c33320 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -89,6 +89,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $after // used in audit reports. * @property int $opposing_id // ID of the opposing transaction, used in collector * @property bool $encrypted // is the journal encrypted + * @property bool reconciled * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class Transaction extends Model diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 7a6a1e1ada..8f2ba2c186 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -53,6 +53,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property Carbon book_date * @property Carbon process_date * @property bool encrypted + * @property int order + * @property int budget_id + * @property string period_marker * * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php index 0582c7377a..3ead64229a 100644 --- a/app/Providers/AccountServiceProvider.php +++ b/app/Providers/AccountServiceProvider.php @@ -38,14 +38,14 @@ class AccountServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->registerRepository(); $this->registerTasker(); @@ -54,7 +54,7 @@ class AccountServiceProvider extends ServiceProvider /** * Register account repository */ - private function registerRepository() + private function registerRepository(): void { $this->app->bind( AccountRepositoryInterface::class, @@ -74,7 +74,7 @@ class AccountServiceProvider extends ServiceProvider /** * Register the tasker. */ - private function registerTasker() + private function registerTasker(): void { $this->app->bind( AccountTaskerInterface::class, diff --git a/app/Providers/AdminServiceProvider.php b/app/Providers/AdminServiceProvider.php index a0d236a579..6886cd67e4 100644 --- a/app/Providers/AdminServiceProvider.php +++ b/app/Providers/AdminServiceProvider.php @@ -36,14 +36,14 @@ class AdminServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->linkType(); } @@ -51,7 +51,7 @@ class AdminServiceProvider extends ServiceProvider /** * Register link type repository */ - private function linkType() + private function linkType(): void { $this->app->bind( LinkTypeRepositoryInterface::class, diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 2e44ca0924..30247d8ee0 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -35,7 +35,7 @@ class AppServiceProvider extends ServiceProvider /** * Bootstrap any application services. */ - public function boot() + public function boot(): void { Schema::defaultStringLength(191); } @@ -43,7 +43,7 @@ class AppServiceProvider extends ServiceProvider /** * Register any application services. */ - public function register() + public function register(): void { Passport::ignoreMigrations(); } diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php index c40862918f..62c998b74d 100644 --- a/app/Providers/AttachmentServiceProvider.php +++ b/app/Providers/AttachmentServiceProvider.php @@ -36,14 +36,14 @@ class AttachmentServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( AttachmentRepositoryInterface::class, diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index ed1d76630b..ede7bf8398 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -44,7 +44,7 @@ class AuthServiceProvider extends ServiceProvider /** * Register any authentication / authorization services. */ - public function boot() + public function boot(): void { $this->registerPolicies(); Passport::routes(); diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php index 0bd528df31..3cd590e359 100644 --- a/app/Providers/BillServiceProvider.php +++ b/app/Providers/BillServiceProvider.php @@ -36,14 +36,14 @@ class BillServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( BillRepositoryInterface::class, diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 1c37b18c83..2b64d5d036 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -34,7 +34,7 @@ class BroadcastServiceProvider extends ServiceProvider /** * Bootstrap any application services. */ - public function boot() + public function boot(): void { Broadcast::routes(); diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php index e728fa728e..0046e2745b 100644 --- a/app/Providers/BudgetServiceProvider.php +++ b/app/Providers/BudgetServiceProvider.php @@ -36,14 +36,14 @@ class BudgetServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( BudgetRepositoryInterface::class, diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php index 4fa1846e45..7a3ab1ffff 100644 --- a/app/Providers/CategoryServiceProvider.php +++ b/app/Providers/CategoryServiceProvider.php @@ -36,14 +36,14 @@ class CategoryServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( CategoryRepositoryInterface::class, diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php index 622c66767c..70044405b5 100644 --- a/app/Providers/CurrencyServiceProvider.php +++ b/app/Providers/CurrencyServiceProvider.php @@ -36,14 +36,14 @@ class CurrencyServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( CurrencyRepositoryInterface::class, diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index ed5c39efca..06207a3106 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -113,7 +113,7 @@ class EventServiceProvider extends ServiceProvider } /** - * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function registerCreateEvents(): void { diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php index 56aa74ba1e..262c561f54 100644 --- a/app/Providers/ExportJobServiceProvider.php +++ b/app/Providers/ExportJobServiceProvider.php @@ -38,14 +38,14 @@ class ExportJobServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->exportJob(); $this->importJob(); @@ -54,7 +54,7 @@ class ExportJobServiceProvider extends ServiceProvider /** * Register export job. */ - private function exportJob() + private function exportJob(): void { $this->app->bind( ExportJobRepositoryInterface::class, @@ -73,7 +73,7 @@ class ExportJobServiceProvider extends ServiceProvider /** * Register import job. */ - private function importJob() + private function importJob(): void { $this->app->bind( ImportJobRepositoryInterface::class, diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 89ff1178a2..554badb4f4 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -75,17 +75,21 @@ use TwigBridge\Extension\Loader\Functions; use Validator; /** - * @codeCoverageIgnore + * * Class FireflyServiceProvider. + * + * @codeCoverageIgnore + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class FireflyServiceProvider extends ServiceProvider { /** * Start provider. */ - public function boot() + public function boot(): void { Validator::resolver( + /** @noinspection MoreThanThreeArgumentsInspection */ function ($translator, $data, $rules, $messages) { return new FireflyValidator($translator, $data, $rules, $messages); } @@ -105,8 +109,10 @@ class FireflyServiceProvider extends ServiceProvider /** * Register stuff. + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function register() + public function register(): void { $this->app->bind( 'preferences', diff --git a/app/Providers/FireflySessionProvider.php b/app/Providers/FireflySessionProvider.php index 5a860196ae..b89cc40ba0 100644 --- a/app/Providers/FireflySessionProvider.php +++ b/app/Providers/FireflySessionProvider.php @@ -35,7 +35,7 @@ class FireflySessionProvider extends ServiceProvider /** * Register the service provider. */ - public function register() + public function register(): void { $this->registerSessionManager(); @@ -47,7 +47,7 @@ class FireflySessionProvider extends ServiceProvider /** * Register the session driver instance. */ - protected function registerSessionDriver() + protected function registerSessionDriver(): void { $this->app->singleton( 'session.store', @@ -63,7 +63,7 @@ class FireflySessionProvider extends ServiceProvider /** * Register the session manager instance. */ - protected function registerSessionManager() + protected function registerSessionManager(): void { $this->app->singleton( 'session', diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index 6d3e1e8ad0..e9f47fb414 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -38,14 +38,14 @@ class JournalServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->registerRepository(); $this->registerCollector(); @@ -54,7 +54,7 @@ class JournalServiceProvider extends ServiceProvider /** * Register the collector. */ - private function registerCollector() + private function registerCollector(): void { $this->app->bind( JournalCollectorInterface::class, @@ -73,7 +73,7 @@ class JournalServiceProvider extends ServiceProvider /** * Register repository. */ - private function registerRepository() + private function registerRepository(): void { $this->app->bind( JournalRepositoryInterface::class, diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php deleted file mode 100644 index 753b3c45d0..0000000000 --- a/app/Providers/LogServiceProvider.php +++ /dev/null @@ -1,60 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Providers; - -use Illuminate\Log\LogServiceProvider as LaravelLogServiceProvider; -use Illuminate\Log\Writer; - -/** - * @codeCoverageIgnore - * Class LogServiceProvider. - */ -class LogServiceProvider extends LaravelLogServiceProvider -{ - /** - * Configure the Monolog handlers for the application. - * - * @param \Illuminate\Log\Writer $log - */ - protected function configureDailyHandler(Writer $log) - { - $log->useDailyFiles( - $this->app->storagePath() . '/logs/firefly-iii.log', - $this->maxFiles(), - $this->logLevel() - ); - } - - /** - * Configure the Monolog handlers for the application. - * - * @param \Illuminate\Log\Writer $log - */ - protected function configureSingleHandler(Writer $log) - { - $log->useFiles( - $this->app->storagePath() . '/logs/firefly-iii.log', - $this->logLevel() - ); - } -} diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index 11f767e797..cdae76e58e 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -36,14 +36,14 @@ class PiggyBankServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( PiggyBankRepositoryInterface::class, diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3a633a4789..3a9524ec65 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -43,7 +43,7 @@ class RouteServiceProvider extends ServiceProvider /** * Define the routes for the application. */ - public function map() + public function map(): void { $this->mapApiRoutes(); @@ -55,7 +55,7 @@ class RouteServiceProvider extends ServiceProvider * * These routes are typically stateless. */ - protected function mapApiRoutes() + protected function mapApiRoutes(): void { Route::prefix('api/v1') ->middleware('auth:api') @@ -68,7 +68,7 @@ class RouteServiceProvider extends ServiceProvider * * These routes all receive session state, CSRF protection, etc. */ - protected function mapWebRoutes() + protected function mapWebRoutes(): void { Route::middleware('web') ->namespace($this->namespace) diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php index 6ad98a1758..7eff95c5b4 100644 --- a/app/Providers/RuleGroupServiceProvider.php +++ b/app/Providers/RuleGroupServiceProvider.php @@ -36,14 +36,14 @@ class RuleGroupServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( RuleGroupRepositoryInterface::class, diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php index 2f0cac6e17..007a66a5ee 100644 --- a/app/Providers/RuleServiceProvider.php +++ b/app/Providers/RuleServiceProvider.php @@ -36,14 +36,14 @@ class RuleServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( RuleRepositoryInterface::class, diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index 8af050c72d..872b4190f2 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -36,14 +36,14 @@ class SearchServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( SearchInterface::class, diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php index 1e71905e22..3b70f8b1b7 100644 --- a/app/Providers/TagServiceProvider.php +++ b/app/Providers/TagServiceProvider.php @@ -36,14 +36,14 @@ class TagServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot() + public function boot(): void { } /** * Register the application services. */ - public function register() + public function register(): void { $this->app->bind( TagRepositoryInterface::class, diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 6c424d6c81..f1074de2bf 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -82,18 +82,6 @@ class AccountRepository implements AccountRepositoryInterface return $this->user->accounts()->find($accountId); } - /** - * Return account type by string. - * - * @param string $type - * - * @return AccountType|null - */ - public function getAccountType(string $type): ?AccountType - { - return AccountType::whereType($type)->first(); - } - /** * Return meta value for account. Null if not found. * @@ -113,16 +101,6 @@ class AccountRepository implements AccountRepositoryInterface return null; } - /** - * @param Account $account - * - * @return Note|null - */ - public function getNote(Account $account): ?Note - { - return $account->notes()->first(); - } - /** * Get note text or null. * @@ -185,29 +163,6 @@ class AccountRepository implements AccountRepositoryInterface return $journal->date->format('Y-m-d'); } - /** - * Returns the date of the very last transaction in this account. - * - * @param Account $account - * - * @return Carbon - */ - public function newestJournalDate(Account $account): Carbon - { - $last = new Carbon; - $date = $account->transactions() - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->first(['transaction_journals.date']); - if (null !== $date) { - $last = new Carbon($date->date); - } - - return $last; - } - /** * Returns the date of the very first transaction in this account. * @@ -253,7 +208,7 @@ class AccountRepository implements AccountRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } @@ -262,6 +217,7 @@ class AccountRepository implements AccountRepositoryInterface * @param array $data * * @return Account + * @throws \FireflyIII\Exceptions\FireflyException */ public function store(array $data): Account { @@ -286,20 +242,4 @@ class AccountRepository implements AccountRepositoryInterface return $account; } - - /** - * @param TransactionJournal $journal - * @param array $data - * - * @return TransactionJournal - */ - public function updateReconciliation(TransactionJournal $journal, array $data): TransactionJournal - { - /** @var JournalUpdateService $service */ - $service = app(JournalUpdateService::class); - $journal = $service->update($journal, $data); - - return $journal; - } - } diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 7820888a99..e7399060a6 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -55,14 +55,8 @@ interface AccountRepositoryInterface public function destroy(Account $account, ?Account $moveTo): bool; /** - * @param int $accountId + * Find by account number. Is used. * - * @deprecated - * @return Account - */ - public function find(int $accountId): Account; - - /** * @param string $number * @param array $types * @@ -70,15 +64,6 @@ interface AccountRepositoryInterface */ public function findByAccountNumber(string $number, array $types): ?Account; - /** - * @param string $iban - * @param array $types - * - * @deprecated - * @return Account - */ - public function findByIban(string $iban, array $types): Account; - /** * @param string $iban * @param array $types @@ -102,15 +87,6 @@ interface AccountRepositoryInterface */ public function findNull(int $accountId): ?Account; - /** - * Return account type by string. - * - * @param string $type - * - * @return AccountType|null - */ - public function getAccountType(string $type): ?AccountType; - /** * @param array $accountIds * @@ -147,13 +123,6 @@ interface AccountRepositoryInterface */ public function getMetaValue(Account $account, string $field): ?string; - /** - * @param Account $account - * - * @return Note|null - */ - public function getNote(Account $account): ?Note; - /** * Get note text or null. * @@ -191,15 +160,6 @@ interface AccountRepositoryInterface */ public function getReconciliation(Account $account): ?Account; - /** - * Returns the date of the very last transaction in this account. - * - * @param Account $account - * - * @return Carbon - */ - public function newestJournalDate(Account $account): Carbon; - /** * Returns the date of the very first transaction in this account. * @@ -237,12 +197,4 @@ interface AccountRepositoryInterface * @return Account */ public function update(Account $account, array $data): Account; - - /** - * @param TransactionJournal $journal - * @param array $data - * - * @return TransactionJournal - */ - public function updateReconciliation(TransactionJournal $journal, array $data): TransactionJournal; } diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 944d846847..e9e44b71c8 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -44,6 +44,7 @@ class AccountTasker implements AccountTaskerInterface * @param Carbon $end * * @return array + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array { @@ -182,7 +183,7 @@ class AccountTasker implements AccountTaskerInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } @@ -191,6 +192,7 @@ class AccountTasker implements AccountTaskerInterface * @param Collection $transactions * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function groupByOpposing(Collection $transactions): array { diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php index 8cfadbe8dc..fa4254039b 100644 --- a/app/Repositories/Account/FindAccountsTrait.php +++ b/app/Repositories/Account/FindAccountsTrait.php @@ -38,22 +38,6 @@ use Log; */ trait FindAccountsTrait { - /** - * @param $accountId - * - * @deprecated - * @return Account - */ - public function find(int $accountId): Account - { - /** @var Account $account */ - $account = $this->user->accounts()->find($accountId); - if (null === $account) { - return new Account; - } - - return $account; - } /** * @param string $number @@ -82,33 +66,6 @@ trait FindAccountsTrait return null; } - /** - * @param string $iban - * @param array $types - * - * @deprecated - * @return Account - */ - public function findByIban(string $iban, array $types): Account - { - $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban'); - - if (\count($types) > 0) { - $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); - $query->whereIn('account_types.type', $types); - } - - $accounts = $query->get(['accounts.*']); - /** @var Account $account */ - foreach ($accounts as $account) { - if ($account->iban === $iban) { - return $account; - } - } - - return new Account; - } - /** * @param string $iban * @param array $types @@ -158,7 +115,8 @@ trait FindAccountsTrait Log::debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id)); return $account; - } else { + } + if ($account->name !== $name) { Log::debug(sprintf('"%s" does not equal "%s"', $account->name, $name)); } } @@ -244,9 +202,11 @@ trait FindAccountsTrait /** * @return Account * + * @throws FireflyException */ public function getCashAccount(): Account { + /** @var AccountType $type */ $type = AccountType::where('type', AccountType::CASH)->first(); /** @var AccountFactory $factory */ $factory = app(AccountFactory::class); @@ -267,7 +227,8 @@ trait FindAccountsTrait if (AccountType::ASSET !== $account->accountType->type) { throw new FireflyException(sprintf('%s is not an asset account.', $account->name)); } - $name = $account->name . ' reconciliation'; + $name = $account->name . ' reconciliation'; + /** @var AccountType $type */ $type = AccountType::where('type', AccountType::RECONCILIATION)->first(); $accounts = $this->user->accounts()->where('account_type_id', $type->id)->get(); /** @var Account $current */ diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index d5eac20346..6d23f64480 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -37,6 +37,7 @@ use Storage; /** * Class AttachmentRepository. + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class AttachmentRepository implements AttachmentRepositoryInterface { @@ -58,7 +59,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface try { unlink($file); } catch (Exception $e) { - Log::error(sprintf('Could not delete file for attachment %d.', $attachment->id)); + Log::error(sprintf('Could not delete file for attachment %d: %s', $attachment->id, $e->getMessage())); } $attachment->delete(); @@ -78,21 +79,6 @@ class AttachmentRepository implements AttachmentRepositoryInterface return $disk->exists($attachment->fileName()); } - /** - * @param int $id - * - * @return Attachment - */ - public function find(int $id): Attachment - { - $attachment = $this->user->attachments()->find($id); - if (null === $attachment) { - return new Attachment; - } - - return $attachment; - } - /** * @param int $id * @@ -100,6 +86,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface */ public function findWithoutUser(int $id): Attachment { + $attachment = Attachment::find($id); if (null === $attachment) { return new Attachment; diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 30caf2c253..a0a0d44a72 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -48,13 +48,6 @@ interface AttachmentRepositoryInterface */ public function exists(Attachment $attachment): bool; - /** - * @param int $id - * - * @return Attachment - */ - public function find(int $id): Attachment; - /** * @param int $id * diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index e7aabdee2a..d8861266a4 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -553,7 +553,7 @@ class BillRepository implements BillRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 9f6a4676e7..0f6f8b83e8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -89,7 +89,11 @@ class BudgetRepository implements BudgetRepositoryInterface public function cleanupBudgets(): bool { // delete limits with amount 0: - BudgetLimit::where('amount', 0)->delete(); + try { + BudgetLimit::where('amount', 0)->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete budget limit: %s', $e->getMessage())); + } // do the clean up by hand because Sqlite can be tricky with this. $budgetLimits = BudgetLimit::orderBy('created_at', 'DESC')->get(['id', 'budget_id', 'start_date', 'end_date']); @@ -99,7 +103,11 @@ class BudgetRepository implements BudgetRepositoryInterface $key = $budgetLimit->budget_id . '-' . $budgetLimit->start_date->format('Y-m-d') . $budgetLimit->end_date->format('Y-m-d'); if (isset($count[$key])) { // delete it! - BudgetLimit::find($budgetLimit->id)->delete(); + try { + BudgetLimit::find($budgetLimit->id)->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete budget limit: %s', $e->getMessage())); + } } $count[$key] = true; } @@ -115,7 +123,6 @@ class BudgetRepository implements BudgetRepositoryInterface * @param Carbon $end * * @return array - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array { @@ -249,6 +256,7 @@ class BudgetRepository implements BudgetRepositoryInterface * @param int $budgetId * * @return Budget + * @deprecated */ public function find(int $budgetId): Budget { @@ -467,9 +475,8 @@ class BudgetRepository implements BudgetRepositoryInterface $total = bcadd($availableBudget->amount, $total); $days += $availableBudget->start_date->diffInDays($availableBudget->end_date); } - $avg = bcdiv($total, (string)$days); - return $avg; + return bcdiv($total, (string)$days); } /** @@ -535,6 +542,7 @@ class BudgetRepository implements BudgetRepositoryInterface return $set; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * This method is being used to generate the budget overview in the year/multi-year report. Its used * in both the year/multi-year budget overview AND in the accompanying chart. @@ -658,6 +666,7 @@ class BudgetRepository implements BudgetRepositoryInterface return $result; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param TransactionCurrency $currency * @param Carbon $start @@ -688,11 +697,12 @@ class BudgetRepository implements BudgetRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $budgets * @param Collection $accounts @@ -842,17 +852,17 @@ class BudgetRepository implements BudgetRepositoryInterface // find any rule actions related to budgets, with this budget name, and update them accordingly. - $types = [ + $types = [ 'set_budget', ]; $actions = RuleAction::leftJoin('rules', 'rules.id', '=', 'rule_actions.rule_id') - ->where('rules.user_id', $this->user->id) - ->whereIn('rule_actions.action_type', $types) - ->where('rule_actions.action_value', $oldName) - ->get(['rule_actions.*']); + ->where('rules.user_id', $this->user->id) + ->whereIn('rule_actions.action_type', $types) + ->where('rule_actions.action_value', $oldName) + ->get(['rule_actions.*']); Log::debug(sprintf('Found %d actions to update.', $actions->count())); /** @var RuleAction $action */ - foreach($actions as $action) { + foreach ($actions as $action) { $action->action_value = $data['name']; $action->save(); Log::debug(sprintf('Updated action %d: %s', $action->id, $action->action_value)); @@ -915,6 +925,7 @@ class BudgetRepository implements BudgetRepositoryInterface return $budgetLimit; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Budget $budget * @param Carbon $start diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 5cc69db173..0ed8ee63c8 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -59,7 +59,6 @@ interface BudgetRepositoryInterface * @param Carbon $end * * @return array - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array; @@ -186,6 +185,7 @@ interface BudgetRepositoryInterface */ public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $budgets * @param Collection $accounts @@ -224,6 +224,7 @@ interface BudgetRepositoryInterface */ public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param TransactionCurrency $currency * @param Carbon $start @@ -239,6 +240,7 @@ interface BudgetRepositoryInterface */ public function setUser(User $user); + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $budgets * @param Collection $accounts @@ -296,6 +298,7 @@ interface BudgetRepositoryInterface */ public function updateBudgetLimit(BudgetLimit $budgetLimit, array $data): BudgetLimit; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Budget $budget * @param Carbon $start diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 23dd873db0..bde679c87c 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -59,6 +59,7 @@ class CategoryRepository implements CategoryRepositoryInterface return true; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts @@ -84,6 +85,7 @@ class CategoryRepository implements CategoryRepositoryInterface * @param int $categoryId * * @return Category + * @deprecated */ public function find(int $categoryId): Category { @@ -211,6 +213,7 @@ class CategoryRepository implements CategoryRepositoryInterface return $lastJournalDate; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts @@ -294,6 +297,7 @@ class CategoryRepository implements CategoryRepositoryInterface return $result; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts @@ -383,11 +387,12 @@ class CategoryRepository implements CategoryRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 8c16732bcb..321186a2a3 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -40,6 +40,7 @@ interface CategoryRepositoryInterface */ public function destroy(Category $category): bool; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts @@ -111,6 +112,7 @@ interface CategoryRepositoryInterface */ public function lastUseDate(Category $category, Collection $accounts): ?Carbon; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts @@ -130,6 +132,7 @@ interface CategoryRepositoryInterface */ public function periodExpensesNoCategory(Collection $accounts, Carbon $start, Carbon $end): array; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts @@ -154,6 +157,7 @@ interface CategoryRepositoryInterface */ public function setUser(User $user); + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param Collection $categories * @param Collection $accounts diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index f3a0ea12d1..d97daf9c45 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -27,6 +27,7 @@ use FireflyIII\Factory\TransactionCurrencyFactory; use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Services\Internal\Destroy\CurrencyDestroyService; use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use FireflyIII\User; @@ -93,7 +94,11 @@ class CurrencyRepository implements CurrencyRepositoryInterface */ public function destroy(TransactionCurrency $currency): bool { - if ($this->user->hasRole('owner')) { + /** @var UserRepositoryInterface $repository */ + $repository = app(UserRepositoryInterface::class); + + + if ($repository->hasRole($this->user, 'owner')) { /** @var CurrencyDestroyService $service */ $service = app(CurrencyDestroyService::class); $service->destroy($currency); @@ -298,7 +303,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index f124b8291d..1745d1a14f 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -66,11 +66,10 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** @var ExportJob $entry */ foreach ($set as $entry) { $key = $entry->key; - $len = \strlen($key); $files = scandir(storage_path('export'), SCANDIR_SORT_NONE); /** @var string $file */ foreach ($files as $file) { - if (substr($file, 0, $len) === $key) { + if (0 === strpos($file, $key)) { unlink(storage_path('export') . DIRECTORY_SEPARATOR . $file); } } @@ -121,11 +120,12 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * @param string $key - * + * @deprecated * @return ExportJob */ public function findByKey(string $key): ExportJob { + /** @var ExportJob $result */ $result = $this->user->exportJobs()->where('key', $key)->first(['export_jobs.*']); if (null === $result) { return new ExportJob; @@ -152,7 +152,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 2fdcd1362f..21ea419de4 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -57,7 +57,7 @@ interface ExportJobRepositoryInterface /** * @param string $key - * + * @deprecated * @return ExportJob */ public function findByKey(string $key): ExportJob; diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 7bf69d8a18..0ffe312230 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -95,8 +95,9 @@ class ImportJobRepository implements ImportJobRepositoryInterface * * @return ImportJob */ - public function addStepsDone(ImportJob $job, int $steps = 1): ImportJob + public function addStepsDone(ImportJob $job, int $steps = null): ImportJob { + $steps = $steps ?? 1; $status = $this->getExtendedStatus($job); $status['done'] += $steps; Log::debug(sprintf('Add %d to steps done for job "%s" making steps done %d', $steps, $job->key, $status['done'])); @@ -110,8 +111,9 @@ class ImportJobRepository implements ImportJobRepositoryInterface * * @return ImportJob */ - public function addTotalSteps(ImportJob $job, int $steps = 1): ImportJob + public function addTotalSteps(ImportJob $job, int $steps = null): ImportJob { + $steps = $steps ?? 1; $extended = $this->getExtendedStatus($job); $total = (int)($extended['steps'] ?? 0); $total += $steps; @@ -136,7 +138,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface ->where('name', 'importHash') ->count(); - return (int)$count; + return $count; } /** @@ -309,12 +311,12 @@ class ImportJobRepository implements ImportJobRepositoryInterface // verify content: $result = mb_detect_encoding($content, 'UTF-8', true); - if ($result === false) { + if (false === $result) { Log::error(sprintf('Cannot detect encoding for uploaded import file "%s".', $file->getClientOriginalName())); return false; } - if ($result !== 'ASCII' && $result !== 'UTF-8') { + if ('ASCII' !== $result && 'UTF-8' !== $result) { Log::error(sprintf('Uploaded import file is %s instead of UTF8!', var_export($result, true))); return false; @@ -472,7 +474,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } @@ -480,12 +482,11 @@ class ImportJobRepository implements ImportJobRepositoryInterface /** * Handle upload for job. * - * @param ImportJob $job - * @param string $name - * @param UploadedFile $file + * @param ImportJob $job + * @param string $name + * @param string $fileName * * @return MessageBag - * @throws FireflyException */ public function storeCLIUpload(ImportJob $job, string $name, string $fileName): MessageBag { @@ -538,7 +539,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface * @param UploadedFile $file * * @return MessageBag - * @throws FireflyException */ public function storeFileUpload(ImportJob $job, string $name, UploadedFile $file): MessageBag { @@ -607,7 +607,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface * @param ImportJob $job * * @return string - * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException */ public function uploadFileContents(ImportJob $job): string { diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index fd5ccd1d5e..e10d79be85 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -60,7 +60,7 @@ interface ImportJobRepositoryInterface * * @return ImportJob */ - public function addStepsDone(ImportJob $job, int $steps = 1): ImportJob; + public function addStepsDone(ImportJob $job, int $steps = null): ImportJob; /** * @param ImportJob $job @@ -68,7 +68,7 @@ interface ImportJobRepositoryInterface * * @return ImportJob */ - public function addTotalSteps(ImportJob $job, int $steps = 1): ImportJob; + public function addTotalSteps(ImportJob $job, int $steps = null): ImportJob; /** * Return number of imported rows with this hash value. @@ -125,7 +125,7 @@ interface ImportJobRepositoryInterface * * @return string */ - public function getStatus(ImportJob $job); + public function getStatus(ImportJob $job): string; /** * @param ImportJob $job diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 2fbad62f30..5c6a104a56 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -51,6 +51,7 @@ class JournalRepository implements JournalRepositoryInterface /** @var User */ private $user; + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param TransactionJournal $journal * @param TransactionType $type @@ -141,6 +142,7 @@ class JournalRepository implements JournalRepositoryInterface * @param int $journalId * * @return TransactionJournal + * @deprecated */ public function find(int $journalId): TransactionJournal { @@ -300,6 +302,7 @@ class JournalRepository implements JournalRepositoryInterface if (null !== $budget) { return $budget->id; } + /** @noinspection NullPointerExceptionInspection */ $budget = $journal->transactions()->first()->budgets()->first(); if (null !== $budget) { return $budget->id; @@ -321,6 +324,7 @@ class JournalRepository implements JournalRepositoryInterface if (null !== $category) { return $category->name; } + /** @noinspection NullPointerExceptionInspection */ $category = $journal->transactions()->first()->categories()->first(); if (null !== $category) { return $category->name; @@ -343,6 +347,7 @@ class JournalRepository implements JournalRepositoryInterface if (null === $field) { return $journal->date->format('Y-m-d'); } + /** @noinspection NotOptimalIfConditionsInspection */ if (null !== $journal->$field && $journal->$field instanceof Carbon) { // make field NULL $carbon = clone $journal->$field; @@ -731,7 +736,7 @@ class JournalRepository implements JournalRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index e0884a3858..603685307b 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -39,6 +39,7 @@ use Illuminate\Support\MessageBag; */ interface JournalRepositoryInterface { + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param TransactionJournal $journal * @param TransactionType $type diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index 117bcaa6e9..0fa01718de 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -84,6 +84,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface * @param int $id * * @return LinkType + * @deprecated */ public function find(int $id): LinkType { diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index a76c2bec54..4ca0715831 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -530,7 +530,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ private function updateNote(PiggyBank $piggyBank, string $note): bool { - if (0 === \strlen($note)) { + if ('' === $note) { $dbNote = $piggyBank->notes()->first(); if (null !== $dbNote) { $dbNote->delete(); diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 31b6a3b8d9..e910cad992 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -107,12 +107,12 @@ class RecurringRepository implements RecurringRepositoryInterface $return = 0; /** @var RecurrenceTransactionMeta $meta */ foreach ($recurrenceTransaction->recurrenceTransactionMeta as $meta) { - if ($meta->name === 'budget_id') { + if ('budget_id' === $meta->name) { $return = (int)$meta->value; } } - return $return === 0 ? null : $return; + return 0 === $return ? null : $return; } /** @@ -127,12 +127,12 @@ class RecurringRepository implements RecurringRepositoryInterface $return = ''; /** @var RecurrenceTransactionMeta $meta */ foreach ($recurrenceTransaction->recurrenceTransactionMeta as $meta) { - if ($meta->name === 'category_name') { + if ('category_name' === $meta->name) { $return = (string)$meta->value; } } - return $return === '' ? null : $return; + return '' === $return ? null : $return; } /** @@ -158,9 +158,8 @@ class RecurringRepository implements RecurringRepositoryInterface if (null !== $end) { $query->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')); } - $result = $query->get(['transaction_journals.*']); - return $result; + return $query->get(['transaction_journals.*']); } /** @@ -210,7 +209,7 @@ class RecurringRepository implements RecurringRepositoryInterface Log::debug('Rep is daily. Start of loop.'); while ($mutator <= $end) { Log::debug(sprintf('Mutator is now: %s', $mutator->format('Y-m-d'))); - if ($attempts % $skipMod === 0) { + if (0 === $attempts % $skipMod) { Log::debug(sprintf('Attempts modulo skipmod is zero, include %s', $mutator->format('Y-m-d'))); $return[] = clone $mutator; } @@ -236,7 +235,7 @@ class RecurringRepository implements RecurringRepositoryInterface $mutator->addDays($dayDifference); Log::debug(sprintf('Mutator is now: %s', $mutator->format('Y-m-d'))); while ($mutator <= $end) { - if ($attempts % $skipMod === 0 && $start->lte($mutator) && $end->gte($mutator)) { + if (0 === $attempts % $skipMod && $start->lte($mutator) && $end->gte($mutator)) { Log::debug('Date is in range of start+end, add to set.'); $return[] = clone $mutator; } @@ -263,10 +262,10 @@ class RecurringRepository implements RecurringRepositoryInterface Log::debug(sprintf('DoM corrected is %d', $domCorrected)); $mutator->day = $domCorrected; Log::debug(sprintf('Mutator is now %s.', $mutator->format('Y-m-d'))); - Log::debug(sprintf('$attempts %% $skipMod === 0 is %s', var_export($attempts % $skipMod === 0, true))); + Log::debug(sprintf('$attempts %% $skipMod === 0 is %s', var_export(0 === $attempts % $skipMod, true))); Log::debug(sprintf('$start->lte($mutator) is %s', var_export($start->lte($mutator), true))); Log::debug(sprintf('$end->gte($mutator) is %s', var_export($end->gte($mutator), true))); - if ($attempts % $skipMod === 0 && $start->lte($mutator) && $end->gte($mutator)) { + if (0 === $attempts % $skipMod && $start->lte($mutator) && $end->gte($mutator)) { Log::debug(sprintf('ADD %s to return!', $mutator->format('Y-m-d'))); $return[] = clone $mutator; } @@ -324,7 +323,7 @@ class RecurringRepository implements RecurringRepositoryInterface $tags = []; /** @var RecurrenceMeta $meta */ foreach ($recurrence->recurrenceMeta as $meta) { - if ($meta->name === 'tags' && '' !== $meta->value) { + if ('tags' === $meta->name && '' !== $meta->value) { $tags = explode(',', $meta->value); } } @@ -417,7 +416,7 @@ class RecurringRepository implements RecurringRepositoryInterface case 'daily': while ($total < $count) { $mutator->addDay(); - if ($attempts % $skipMod === 0) { + if (0 === $attempts % $skipMod) { $return[] = clone $mutator; $total++; } @@ -439,7 +438,7 @@ class RecurringRepository implements RecurringRepositoryInterface $mutator->addDays($dayDifference); while ($total < $count) { - if ($attempts % $skipMod === 0) { + if (0 === $attempts % $skipMod) { $return[] = clone $mutator; $total++; } @@ -458,7 +457,7 @@ class RecurringRepository implements RecurringRepositoryInterface while ($total < $count) { $domCorrected = min($dayOfMonth, $mutator->daysInMonth); $mutator->day = $domCorrected; - if ($attempts % $skipMod === 0) { + if (0 === $attempts % $skipMod) { $return[] = clone $mutator; $total++; } @@ -477,7 +476,7 @@ class RecurringRepository implements RecurringRepositoryInterface while ($total < $count) { $string = sprintf('%s %s of %s %s', $counters[$parts[0]], $daysOfWeek[$parts[1]], $mutator->format('F'), $mutator->format('Y')); $newCarbon = new Carbon($string); - if ($attempts % $skipMod === 0) { + if (0 === $attempts % $skipMod) { $return[] = clone $newCarbon; $total++; } @@ -493,7 +492,7 @@ class RecurringRepository implements RecurringRepositoryInterface } $obj = clone $date; while ($total < $count) { - if ($attempts % $skipMod === 0) { + if (0 === $attempts % $skipMod) { $return[] = clone $obj; $total++; } diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index cb33208d77..fad8c7d9ea 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -264,7 +264,7 @@ class RuleRepository implements RuleRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index a63c5d8d93..aeedeab01c 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -265,7 +265,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 2cefe02b68..b494755695 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -223,7 +223,7 @@ class TagRepository implements TagRepositoryInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } @@ -290,7 +290,7 @@ class TagRepository implements TagRepositoryInterface $sum = bcadd($sum, app('steam')->positive((string)$journal->transaction_amount)); } - return (string)$sum; + return $sum; } /** @@ -373,7 +373,7 @@ class TagRepository implements TagRepositoryInterface /** @var Tag $tag */ foreach ($result as $tag) { $tagsWithAmounts[$tag->id] = (string)$tag->amount_sum; - $amount = \strlen($tagsWithAmounts[$tag->id]) ? $tagsWithAmounts[$tag->id] : '0'; + $amount = '' !== $tagsWithAmounts[$tag->id] ? $tagsWithAmounts[$tag->id] : '0'; if (null === $min) { $min = $amount; } @@ -396,17 +396,16 @@ class TagRepository implements TagRepositoryInterface Log::debug(sprintf('The range is: %s', $range)); // each euro difference is this step in the scale: - $step = (float)$range !== 0.0 ? 8 / (float)$range : 0; + $step = 0.0 !== (float)$range ? 8 / (float)$range : 0; Log::debug(sprintf('The step is: %f', $step)); - $return = []; - + $size = 12; foreach ($result as $tag) { - if ($step === 0) { + if (0 === $step) { // easy: size is 12: $size = 12; } - if ($step !== 0) { + if (0 !== $step) { $amount = bcsub((string)$tag->amount_sum, $min); Log::debug(sprintf('Work with amount %s for tag %s', $amount, $tag->tag)); $size = ((int)(float)$amount * $step) + 12; @@ -442,35 +441,4 @@ class TagRepository implements TagRepositoryInterface return $tag; } - - /** - * @param array $range - * @param float $amount - * @param float $min - * @param float $max - * - * @return int - */ - private function cloudScale(array $range, float $amount, float $min, float $max): int - { - $amountDiff = $max - $min; - - // no difference? Every tag same range: - if (0.0 === $amountDiff) { - return $range[0]; - } - - $diff = $range[1] - $range[0]; - $step = 1; - if (0.0 !== $diff) { - $step = $amountDiff / $diff; - } - if (0.0 === $step) { - $step = 1; - } - - $extra = $step / $amount; - - return (int)($range[0] + $extra); - } } diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 95df481da5..174de7b430 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\User; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\Role; use FireflyIII\User; +use Illuminate\Database\QueryException; use Illuminate\Support\Collection; use Log; @@ -49,9 +50,17 @@ class UserRepository implements UserRepositoryInterface */ public function attachRole(User $user, string $role): bool { - $admin = Role::where('name', 'owner')->first(); - $user->attachRole($admin); - $user->save(); + $roleObject = Role::where('name', $role)->first(); + if (null === $roleObject) { + return false; + } + + try { + $user->roles()->attach($role); + } catch (QueryException $e) { + // don't care + Log::info(sprintf('Query exception when giving user a role: %s', $e->getMessage())); + } return true; } @@ -76,8 +85,8 @@ class UserRepository implements UserRepositoryInterface app('preferences')->setForUser($user, 'previous_email_' . date('Y-m-d-H-i-s'), $oldEmail); // set undo and confirm token: - app('preferences')->setForUser($user, 'email_change_undo_token', (string)bin2hex(random_bytes(16))); - app('preferences')->setForUser($user, 'email_change_confirm_token', (string)bin2hex(random_bytes(16))); + app('preferences')->setForUser($user, 'email_change_undo_token', bin2hex(random_bytes(16))); + app('preferences')->setForUser($user, 'email_change_confirm_token', bin2hex(random_bytes(16))); // update user $user->email = $newEmail; @@ -228,7 +237,7 @@ class UserRepository implements UserRepositoryInterface $return['has_2fa'] = true; } - $return['is_admin'] = $user->hasRole('owner'); + $return['is_admin'] = $this->hasRole($user, 'owner'); $return['blocked'] = 1 === (int)$user->blocked; $return['blocked_code'] = $user->blocked_code; $return['accounts'] = $user->accounts()->count(); @@ -263,7 +272,14 @@ class UserRepository implements UserRepositoryInterface */ public function hasRole(User $user, string $role): bool { - return $user->hasRole($role); + /** @var Role $userRole */ + foreach ($user->roles as $userRole) { + if ($userRole->name === $role) { + return true; + } + } + + return false; } /** diff --git a/app/User.php b/app/User.php index 9e0963ad36..e0f7c618bf 100644 --- a/app/User.php +++ b/app/User.php @@ -46,23 +46,25 @@ use FireflyIII\Models\TransactionJournal; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasManyThrough; -use Illuminate\Database\QueryException; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +use Illuminate\Support\Collection; use Laravel\Passport\HasApiTokens; -use Log; use Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class User. * - * @property int $id - * @property string $email - * @property bool $isAdmin used in admin user controller. - * @property bool $has2FA used in admin user controller. - * @property array $prefs used in admin user controller. - * @property mixed password + * @property int $id + * @property string $email + * @property bool $isAdmin used in admin user controller. + * @property bool $has2FA used in admin user controller. + * @property array $prefs used in admin user controller. + * @property mixed password + * @property Collection roles + * @property string blocked_code + * @property bool blocked */ class User extends Authenticatable { @@ -127,30 +129,6 @@ class User extends Authenticatable return $this->hasMany(Account::class); } - /** - * Alias to eloquent many-to-many relation's attach() method. - * - * Full credit goes to: https://github.com/Zizaco/entrust - * - * @param mixed $role - */ - public function attachRole($role) - { - if (\is_object($role)) { - $role = $role->getKey(); - } - - if (\is_array($role)) { - $role = $role['id']; - } - try { - $this->roles()->attach($role); - } catch (QueryException $e) { - // don't care - Log::info(sprintf('Query exception when giving user a role: %s', $e->getMessage())); - } - } - /** * @codeCoverageIgnore * Link to attachments From b7752928a4197c78fbae23e373b2a40989190a2d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 20:32:02 +0200 Subject: [PATCH 54/86] Give all of these files a newline at the end. --- .../V1/Controllers/AttachmentController.php | 2 +- .../Controllers/AvailableBudgetController.php | 2 +- app/Api/V1/Controllers/BudgetController.php | 2 +- .../V1/Controllers/BudgetLimitController.php | 2 +- app/Api/V1/Controllers/CategoryController.php | 2 +- .../Controllers/ConfigurationController.php | 2 +- .../CurrencyExchangeRateController.php | 2 +- .../V1/Controllers/JournalLinkController.php | 2 +- app/Api/V1/Controllers/LinkTypeController.php | 2 +- .../V1/Controllers/PiggyBankController.php | 2 +- .../V1/Controllers/PreferenceController.php | 2 +- .../V1/Controllers/RecurrenceController.php | 2 +- app/Api/V1/Controllers/RuleController.php | 2 +- .../V1/Controllers/RuleGroupController.php | 2 +- app/Api/V1/Requests/AttachmentRequest.php | 2 +- .../V1/Requests/AvailableBudgetRequest.php | 2 +- app/Api/V1/Requests/BudgetLimitRequest.php | 2 +- app/Api/V1/Requests/BudgetRequest.php | 2 +- app/Api/V1/Requests/CategoryRequest.php | 2 +- app/Api/V1/Requests/JournalLinkRequest.php | 2 +- app/Api/V1/Requests/LinkTypeRequest.php | 2 +- app/Api/V1/Requests/PiggyBankRequest.php | 2 +- app/Api/V1/Requests/PreferenceRequest.php | 2 +- app/Api/V1/Requests/RecurrenceRequest.php | 2 +- app/Api/V1/Requests/RuleGroupRequest.php | 2 +- app/Api/V1/Requests/RuleRequest.php | 2 +- app/Events/RequestedReportOnJournals.php | 1 + app/Factory/AttachmentFactory.php | 2 +- app/Factory/RecurrenceFactory.php | 2 +- app/Handlers/Events/APIEventHandler.php | 2 +- app/Handlers/Events/AutomationHandler.php | 2 +- app/Helpers/Update/UpdateTrait.php | 2 +- .../Controllers/Account/CreateController.php | 2 +- .../Controllers/Account/DeleteController.php | 2 +- .../Controllers/Account/EditController.php | 2 +- .../Controllers/Account/ShowController.php | 2 +- .../Controllers/Budget/AmountController.php | 2 +- .../Controllers/Budget/CreateController.php | 2 +- .../Controllers/Budget/DeleteController.php | 2 +- .../Controllers/Budget/EditController.php | 2 +- .../Controllers/Budget/IndexController.php | 2 +- .../Controllers/Budget/ShowController.php | 2 +- .../Category/NoCategoryController.php | 2 +- .../Controllers/Category/ShowController.php | 2 +- .../Controllers/Json/ReconcileController.php | 2 +- .../Controllers/Json/RecurrenceController.php | 2 +- .../Recurring/CreateController.php | 2 +- .../Recurring/DeleteController.php | 2 +- .../Controllers/Recurring/EditController.php | 2 +- .../Controllers/Recurring/IndexController.php | 2 +- .../Controllers/Rule/CreateController.php | 2 +- .../Controllers/Rule/DeleteController.php | 2 +- app/Http/Controllers/Rule/EditController.php | 2 +- .../Controllers/Rule/SelectController.php | 2 +- app/Http/Requests/RecurrenceFormRequest.php | 2 +- .../JobConfiguration/BunqJobConfiguration.php | 2 +- .../SpectreJobConfiguration.php | 2 +- app/Jobs/CreateRecurringTransactions.php | 22 +++++++++++++++++++ app/Mail/AccessTokenCreatedMail.php | 2 +- app/Mail/OAuthTokenCreatedMail.php | 2 +- app/Models/Recurrence.php | 2 +- app/Models/RecurrenceMeta.php | 2 +- app/Models/RecurrenceRepetition.php | 2 +- app/Models/RecurrenceTransaction.php | 2 +- app/Models/RecurrenceTransactionMeta.php | 2 +- .../Recurring/RecurringRepository.php | 2 +- .../RecurringRepositoryInterface.php | 2 +- app/Rules/IsAssetAccountId.php | 22 ++++++++++++++++++- app/Rules/IsValidAttachmentModel.php | 2 +- app/Rules/ValidRecurrenceRepetitionType.php | 2 +- app/Rules/ValidRecurrenceRepetitionValue.php | 2 +- app/Services/Bunq/ApiContext.php | 2 +- app/Services/Bunq/MonetaryAccount.php | 2 +- app/Services/Bunq/Payment.php | 2 +- .../Support/RecurringTransactionTrait.php | 2 +- .../Internal/Support/TransactionTypeTrait.php | 2 +- .../Update/RecurrenceUpdateService.php | 2 +- .../Http/Controllers/DateCalculation.php | 2 +- .../Http/Controllers/RuleManagement.php | 2 +- .../Information/GetSpectreCustomerTrait.php | 2 +- .../Information/GetSpectreTokenTrait.php | 2 +- .../Bunq/BunqJobConfigurationInterface.php | 2 +- .../Bunq/ChooseAccountsHandler.php | 2 +- .../Bunq/NewBunqJobHandler.php | 2 +- .../Spectre/AuthenticatedHandler.php | 2 +- .../Spectre/ChooseAccountsHandler.php | 2 +- .../Spectre/ChooseLoginHandler.php | 2 +- .../Spectre/DoAuthenticateHandler.php | 2 +- .../Spectre/NewSpectreJobHandler.php | 2 +- .../SpectreJobConfigurationInterface.php | 2 +- .../Routine/Bunq/StageImportDataHandler.php | 2 +- .../Import/Routine/Bunq/StageNewHandler.php | 2 +- .../Routine/File/AssetAccountMapper.php | 2 +- .../Import/Routine/File/CurrencyMapper.php | 2 +- .../Routine/File/ImportableConverter.php | 2 +- .../Import/Routine/File/ImportableCreator.php | 2 +- .../Import/Routine/File/LineReader.php | 2 +- .../Routine/File/MappedValuesValidator.php | 2 +- .../Import/Routine/File/MappingConverger.php | 2 +- .../Routine/File/OpposingAccountMapper.php | 2 +- .../Spectre/StageAuthenticatedHandler.php | 2 +- .../Spectre/StageImportDataHandler.php | 2 +- .../Routine/Spectre/StageNewHandler.php | 2 +- .../AvailableBudgetTransformer.php | 2 +- app/Transformers/BudgetLimitTransformer.php | 2 +- .../CurrencyExchangeRateTransformer.php | 2 +- app/Transformers/JournalLinkTransformer.php | 2 +- app/Transformers/LinkTypeTransformer.php | 2 +- app/Transformers/NoteTransformer.php | 2 +- app/Transformers/PreferenceTransformer.php | 2 +- app/Transformers/RecurrenceTransformer.php | 2 +- app/Transformers/RuleActionTransformer.php | 2 +- app/Transformers/RuleTransformer.php | 2 +- app/Transformers/RuleTriggerTransformer.php | 2 +- app/Validation/RecurrenceValidation.php | 2 +- app/Validation/TransactionValidation.php | 2 +- .../2018_06_08_200526_changes_for_v475.php | 1 + 117 files changed, 158 insertions(+), 114 deletions(-) diff --git a/app/Api/V1/Controllers/AttachmentController.php b/app/Api/V1/Controllers/AttachmentController.php index c416e57a7f..947691f2c0 100644 --- a/app/Api/V1/Controllers/AttachmentController.php +++ b/app/Api/V1/Controllers/AttachmentController.php @@ -232,4 +232,4 @@ class AttachmentController extends Controller return response()->json([], 204); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/AvailableBudgetController.php b/app/Api/V1/Controllers/AvailableBudgetController.php index 92fbfae79f..fa2697dbeb 100644 --- a/app/Api/V1/Controllers/AvailableBudgetController.php +++ b/app/Api/V1/Controllers/AvailableBudgetController.php @@ -187,4 +187,4 @@ class AvailableBudgetController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/BudgetController.php b/app/Api/V1/Controllers/BudgetController.php index 38ad437017..68409008c2 100644 --- a/app/Api/V1/Controllers/BudgetController.php +++ b/app/Api/V1/Controllers/BudgetController.php @@ -185,4 +185,4 @@ class BudgetController extends Controller } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php index 2d40ec7dea..e875a475f5 100644 --- a/app/Api/V1/Controllers/BudgetLimitController.php +++ b/app/Api/V1/Controllers/BudgetLimitController.php @@ -195,4 +195,4 @@ class BudgetLimitController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/CategoryController.php b/app/Api/V1/Controllers/CategoryController.php index cbc69366ba..42e11acd79 100644 --- a/app/Api/V1/Controllers/CategoryController.php +++ b/app/Api/V1/Controllers/CategoryController.php @@ -185,4 +185,4 @@ class CategoryController extends Controller } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/ConfigurationController.php b/app/Api/V1/Controllers/ConfigurationController.php index 46cadefeaa..aee513f7cb 100644 --- a/app/Api/V1/Controllers/ConfigurationController.php +++ b/app/Api/V1/Controllers/ConfigurationController.php @@ -132,4 +132,4 @@ class ConfigurationController extends Controller return $data; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/CurrencyExchangeRateController.php b/app/Api/V1/Controllers/CurrencyExchangeRateController.php index f66c3ac89f..a1d11d7853 100644 --- a/app/Api/V1/Controllers/CurrencyExchangeRateController.php +++ b/app/Api/V1/Controllers/CurrencyExchangeRateController.php @@ -108,4 +108,4 @@ class CurrencyExchangeRateController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/JournalLinkController.php b/app/Api/V1/Controllers/JournalLinkController.php index ce6ae8a200..7ae6b12792 100644 --- a/app/Api/V1/Controllers/JournalLinkController.php +++ b/app/Api/V1/Controllers/JournalLinkController.php @@ -214,4 +214,4 @@ class JournalLinkController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/LinkTypeController.php b/app/Api/V1/Controllers/LinkTypeController.php index d1dd2e850c..6d3afaad13 100644 --- a/app/Api/V1/Controllers/LinkTypeController.php +++ b/app/Api/V1/Controllers/LinkTypeController.php @@ -207,4 +207,4 @@ class LinkTypeController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/PiggyBankController.php b/app/Api/V1/Controllers/PiggyBankController.php index 0aa3295131..4b1da3528f 100644 --- a/app/Api/V1/Controllers/PiggyBankController.php +++ b/app/Api/V1/Controllers/PiggyBankController.php @@ -185,4 +185,4 @@ class PiggyBankController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/PreferenceController.php b/app/Api/V1/Controllers/PreferenceController.php index a954ef90ec..23d9de3028 100644 --- a/app/Api/V1/Controllers/PreferenceController.php +++ b/app/Api/V1/Controllers/PreferenceController.php @@ -142,4 +142,4 @@ class PreferenceController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/RecurrenceController.php b/app/Api/V1/Controllers/RecurrenceController.php index 10c07b1d02..38003cf0e1 100644 --- a/app/Api/V1/Controllers/RecurrenceController.php +++ b/app/Api/V1/Controllers/RecurrenceController.php @@ -177,4 +177,4 @@ class RecurrenceController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/RuleController.php b/app/Api/V1/Controllers/RuleController.php index d3977bfb2e..42e016332a 100644 --- a/app/Api/V1/Controllers/RuleController.php +++ b/app/Api/V1/Controllers/RuleController.php @@ -175,4 +175,4 @@ class RuleController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Controllers/RuleGroupController.php b/app/Api/V1/Controllers/RuleGroupController.php index c97fecb22e..83185cec11 100644 --- a/app/Api/V1/Controllers/RuleGroupController.php +++ b/app/Api/V1/Controllers/RuleGroupController.php @@ -176,4 +176,4 @@ class RuleGroupController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/AttachmentRequest.php b/app/Api/V1/Requests/AttachmentRequest.php index c0cb193e70..e78c5555bf 100644 --- a/app/Api/V1/Requests/AttachmentRequest.php +++ b/app/Api/V1/Requests/AttachmentRequest.php @@ -94,4 +94,4 @@ class AttachmentRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/AvailableBudgetRequest.php b/app/Api/V1/Requests/AvailableBudgetRequest.php index 31c673e10d..9ded5fdefa 100644 --- a/app/Api/V1/Requests/AvailableBudgetRequest.php +++ b/app/Api/V1/Requests/AvailableBudgetRequest.php @@ -73,4 +73,4 @@ class AvailableBudgetRequest extends Request } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/BudgetLimitRequest.php b/app/Api/V1/Requests/BudgetLimitRequest.php index a12ac2ffdc..1080df0d5c 100644 --- a/app/Api/V1/Requests/BudgetLimitRequest.php +++ b/app/Api/V1/Requests/BudgetLimitRequest.php @@ -80,4 +80,4 @@ class BudgetLimitRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/BudgetRequest.php b/app/Api/V1/Requests/BudgetRequest.php index 707c7b11c2..f2b926931d 100644 --- a/app/Api/V1/Requests/BudgetRequest.php +++ b/app/Api/V1/Requests/BudgetRequest.php @@ -79,4 +79,4 @@ class BudgetRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/CategoryRequest.php b/app/Api/V1/Requests/CategoryRequest.php index 922892103a..7cd5a2bd1e 100644 --- a/app/Api/V1/Requests/CategoryRequest.php +++ b/app/Api/V1/Requests/CategoryRequest.php @@ -78,4 +78,4 @@ class CategoryRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/JournalLinkRequest.php b/app/Api/V1/Requests/JournalLinkRequest.php index fd06410b08..b6a9d9b9af 100644 --- a/app/Api/V1/Requests/JournalLinkRequest.php +++ b/app/Api/V1/Requests/JournalLinkRequest.php @@ -74,4 +74,4 @@ class JournalLinkRequest extends Request ]; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/LinkTypeRequest.php b/app/Api/V1/Requests/LinkTypeRequest.php index 34cb49dd57..cacc793b42 100644 --- a/app/Api/V1/Requests/LinkTypeRequest.php +++ b/app/Api/V1/Requests/LinkTypeRequest.php @@ -88,4 +88,4 @@ class LinkTypeRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/PiggyBankRequest.php b/app/Api/V1/Requests/PiggyBankRequest.php index 5106a93f45..b113fa8fe2 100644 --- a/app/Api/V1/Requests/PiggyBankRequest.php +++ b/app/Api/V1/Requests/PiggyBankRequest.php @@ -93,4 +93,4 @@ class PiggyBankRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/PreferenceRequest.php b/app/Api/V1/Requests/PreferenceRequest.php index f3439ccfef..4c103370a2 100644 --- a/app/Api/V1/Requests/PreferenceRequest.php +++ b/app/Api/V1/Requests/PreferenceRequest.php @@ -66,4 +66,4 @@ class PreferenceRequest extends Request ]; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/RecurrenceRequest.php b/app/Api/V1/Requests/RecurrenceRequest.php index 34494a0cce..5e4d646aa9 100644 --- a/app/Api/V1/Requests/RecurrenceRequest.php +++ b/app/Api/V1/Requests/RecurrenceRequest.php @@ -201,4 +201,4 @@ class RecurrenceRequest extends Request return $return; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/RuleGroupRequest.php b/app/Api/V1/Requests/RuleGroupRequest.php index 5c56cda869..313cdd73f3 100644 --- a/app/Api/V1/Requests/RuleGroupRequest.php +++ b/app/Api/V1/Requests/RuleGroupRequest.php @@ -82,4 +82,4 @@ class RuleGroupRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/RuleRequest.php b/app/Api/V1/Requests/RuleRequest.php index fb32c34c97..d44833852e 100644 --- a/app/Api/V1/Requests/RuleRequest.php +++ b/app/Api/V1/Requests/RuleRequest.php @@ -159,4 +159,4 @@ class RuleRequest extends Request $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger')); } } -} \ No newline at end of file +} diff --git a/app/Events/RequestedReportOnJournals.php b/app/Events/RequestedReportOnJournals.php index 632ebe6570..9d9c0444a6 100644 --- a/app/Events/RequestedReportOnJournals.php +++ b/app/Events/RequestedReportOnJournals.php @@ -1,4 +1,5 @@ user = $user; } -} \ No newline at end of file +} diff --git a/app/Factory/RecurrenceFactory.php b/app/Factory/RecurrenceFactory.php index f21c760df1..7ae0bf9787 100644 --- a/app/Factory/RecurrenceFactory.php +++ b/app/Factory/RecurrenceFactory.php @@ -93,4 +93,4 @@ class RecurrenceFactory $this->user = $user; } -} \ No newline at end of file +} diff --git a/app/Handlers/Events/APIEventHandler.php b/app/Handlers/Events/APIEventHandler.php index 5be569d2a2..b35130f0d0 100644 --- a/app/Handlers/Events/APIEventHandler.php +++ b/app/Handlers/Events/APIEventHandler.php @@ -74,4 +74,4 @@ class APIEventHandler } -} \ No newline at end of file +} diff --git a/app/Handlers/Events/AutomationHandler.php b/app/Handlers/Events/AutomationHandler.php index bc694b4108..f7549ae84b 100644 --- a/app/Handlers/Events/AutomationHandler.php +++ b/app/Handlers/Events/AutomationHandler.php @@ -63,4 +63,4 @@ class AutomationHandler // @codeCoverageIgnoreEnd return true; } -} \ No newline at end of file +} diff --git a/app/Helpers/Update/UpdateTrait.php b/app/Helpers/Update/UpdateTrait.php index 3d755163b7..e7fe2d936e 100644 --- a/app/Helpers/Update/UpdateTrait.php +++ b/app/Helpers/Update/UpdateTrait.php @@ -127,4 +127,4 @@ trait UpdateTrait return $check; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index faad8c0f43..10da6e9c81 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -125,4 +125,4 @@ class CreateController extends Controller return $redirect; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index ed9adf55be..700a0660c7 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -100,4 +100,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUri('accounts.delete.uri')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 1f8817902f..3bab623ed8 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -148,4 +148,4 @@ class EditController extends Controller return $redirect; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 0ef0517215..13eedc3304 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -268,4 +268,4 @@ class ShowController extends Controller return redirect(route('accounts.show', [$opposingTransaction->account_id])); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index fb4be807eb..3753265b1d 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -210,4 +210,4 @@ class AmountController extends Controller return view('budgets.income', compact('available', 'start', 'end', 'page')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 097833f2d4..daa47876d9 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -106,4 +106,4 @@ class CreateController extends Controller return $redirect; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index 125dc427b2..36d3798390 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -94,4 +94,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUri('budgets.delete.uri')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index 2801ac4d73..f2d9398399 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -117,4 +117,4 @@ class EditController extends Controller return $redirect; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index b385b4f005..15b9f9bba2 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -144,4 +144,4 @@ class IndexController extends Controller } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index ce15d9f0c1..bf19fbac6d 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -289,4 +289,4 @@ class ShowController extends Controller return $entries; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index a732c66e11..d50c88190b 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -227,4 +227,4 @@ class NoCategoryController extends Controller return $entries; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 764226e663..4dc431ccfb 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -220,4 +220,4 @@ class ShowController extends Controller return $entries; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index d2ba3939c0..dc5878c97a 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -214,4 +214,4 @@ class ReconcileController extends Controller return redirect(route('accounts.show', [$opposingTransaction->account_id])); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index 533ea64e98..e5cd05697e 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -176,4 +176,4 @@ class RecurrenceController extends Controller return response()->json($result); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 08b0d7b195..38bde82fe2 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -142,4 +142,4 @@ class CreateController extends Controller } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index e097298031..8b7b548541 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -93,4 +93,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUri('recurrences.delete.uri')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 237ac6ccce..b5f88eb645 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -163,4 +163,4 @@ class EditController extends Controller } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index 959deea821..0321dd34e3 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -123,4 +123,4 @@ class IndexController extends Controller return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'transactions')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index 146cc3ce07..68ae618735 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -250,4 +250,4 @@ class CreateController extends Controller return $result; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index dd36d7aaa4..a568f2dd91 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -91,4 +91,4 @@ class DeleteController extends Controller return redirect($this->getPreviousUri('rules.delete.uri')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index 90ece88b3a..edd265844a 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -223,4 +223,4 @@ class EditController extends Controller return $triggers; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index bc9b9e6545..6381fbf21c 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -285,4 +285,4 @@ class SelectController extends Controller return $triggers; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index eb7b476d88..59b62874bf 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -270,4 +270,4 @@ class RecurrenceFormRequest extends Request } -} \ No newline at end of file +} diff --git a/app/Import/JobConfiguration/BunqJobConfiguration.php b/app/Import/JobConfiguration/BunqJobConfiguration.php index 8a91eb8105..31ec787ba5 100644 --- a/app/Import/JobConfiguration/BunqJobConfiguration.php +++ b/app/Import/JobConfiguration/BunqJobConfiguration.php @@ -130,4 +130,4 @@ class BunqJobConfiguration implements JobConfigurationInterface return $handler; } -} \ No newline at end of file +} diff --git a/app/Import/JobConfiguration/SpectreJobConfiguration.php b/app/Import/JobConfiguration/SpectreJobConfiguration.php index 2569159a7f..fde970cd58 100644 --- a/app/Import/JobConfiguration/SpectreJobConfiguration.php +++ b/app/Import/JobConfiguration/SpectreJobConfiguration.php @@ -151,4 +151,4 @@ class SpectreJobConfiguration implements JobConfigurationInterface return $handler; } -} \ No newline at end of file +} diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index cffa7154eb..16c0bcd15d 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -1,4 +1,26 @@ . + */ namespace FireflyIII\Jobs; diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php index 496b8586a1..67690ef21b 100644 --- a/app/Mail/AccessTokenCreatedMail.php +++ b/app/Mail/AccessTokenCreatedMail.php @@ -63,4 +63,4 @@ class AccessTokenCreatedMail extends Mailable return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text') ->subject('A new access token was created'); } -} \ No newline at end of file +} diff --git a/app/Mail/OAuthTokenCreatedMail.php b/app/Mail/OAuthTokenCreatedMail.php index 5036c1225d..7b9553a543 100644 --- a/app/Mail/OAuthTokenCreatedMail.php +++ b/app/Mail/OAuthTokenCreatedMail.php @@ -67,4 +67,4 @@ class OAuthTokenCreatedMail extends Mailable return $this->view('emails.oauth-client-created-html')->text('emails.oauth-client-created-text') ->subject('A new OAuth client has been created'); } -} \ No newline at end of file +} diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 242e64e040..7b6743019e 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -171,4 +171,4 @@ class Recurrence extends Model return $this->belongsTo(User::class); } -} \ No newline at end of file +} diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index 97dc354c87..dbd7424917 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -60,4 +60,4 @@ class RecurrenceMeta extends Model return $this->belongsTo(Recurrence::class); } -} \ No newline at end of file +} diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 015a777a0e..89c54def54 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -74,4 +74,4 @@ class RecurrenceRepetition extends Model { return $this->belongsTo(Recurrence::class); } -} \ No newline at end of file +} diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 9ca7aa9ec5..62ffd49d10 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -121,4 +121,4 @@ class RecurrenceTransaction extends Model { return $this->belongsTo(TransactionCurrency::class); } -} \ No newline at end of file +} diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index aa246529cf..e39aff977e 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -59,4 +59,4 @@ class RecurrenceTransactionMeta extends Model return $this->belongsTo(RecurrenceTransaction::class, 'rt_id'); } -} \ No newline at end of file +} diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index e910cad992..3dd4db2028 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -658,4 +658,4 @@ class RecurringRepository implements RecurringRepositoryInterface return $return; } -} \ No newline at end of file +} diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index 99bbd834a8..d34d8ed8ab 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -186,4 +186,4 @@ interface RecurringRepositoryInterface */ public function update(Recurrence $recurrence, array $data): Recurrence; -} \ No newline at end of file +} diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index b072784b0b..14f2defc0b 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -1,6 +1,26 @@ . + */ +declare(strict_types=1); -namespace FireflyIII\TransactionRules\Triggers; +namespace FireflyIII\Rules; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.php index 9e817f22d1..99ceb61f78 100644 --- a/app/Rules/IsValidAttachmentModel.php +++ b/app/Rules/IsValidAttachmentModel.php @@ -85,4 +85,4 @@ class IsValidAttachmentModel implements Rule break; } } -} \ No newline at end of file +} diff --git a/app/Rules/ValidRecurrenceRepetitionType.php b/app/Rules/ValidRecurrenceRepetitionType.php index 06b3d07cad..10affa68c6 100644 --- a/app/Rules/ValidRecurrenceRepetitionType.php +++ b/app/Rules/ValidRecurrenceRepetitionType.php @@ -69,4 +69,4 @@ class ValidRecurrenceRepetitionType implements Rule return false; } -} \ No newline at end of file +} diff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.php index 8c838a8991..b2177c9606 100644 --- a/app/Rules/ValidRecurrenceRepetitionValue.php +++ b/app/Rules/ValidRecurrenceRepetitionValue.php @@ -104,4 +104,4 @@ class ValidRecurrenceRepetitionValue implements Rule return false; } -} \ No newline at end of file +} diff --git a/app/Services/Bunq/ApiContext.php b/app/Services/Bunq/ApiContext.php index b657fcf18f..5b0670e72a 100644 --- a/app/Services/Bunq/ApiContext.php +++ b/app/Services/Bunq/ApiContext.php @@ -89,4 +89,4 @@ class ApiContext throw new FireflyException($message); } } -} \ No newline at end of file +} diff --git a/app/Services/Bunq/MonetaryAccount.php b/app/Services/Bunq/MonetaryAccount.php index bb77c54a80..803a125cae 100644 --- a/app/Services/Bunq/MonetaryAccount.php +++ b/app/Services/Bunq/MonetaryAccount.php @@ -54,4 +54,4 @@ class MonetaryAccount return $result; } -} \ No newline at end of file +} diff --git a/app/Services/Bunq/Payment.php b/app/Services/Bunq/Payment.php index e8c91dfd53..cf7f996c76 100644 --- a/app/Services/Bunq/Payment.php +++ b/app/Services/Bunq/Payment.php @@ -58,4 +58,4 @@ class Payment } -} \ No newline at end of file +} diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 97b4404b3f..fa51f957e5 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -210,4 +210,4 @@ trait RecurringTransactionTrait $recurrence->recurrenceMeta()->where('name', 'tags')->delete(); } } -} \ No newline at end of file +} diff --git a/app/Services/Internal/Support/TransactionTypeTrait.php b/app/Services/Internal/Support/TransactionTypeTrait.php index b209e7cc61..4372c736d8 100644 --- a/app/Services/Internal/Support/TransactionTypeTrait.php +++ b/app/Services/Internal/Support/TransactionTypeTrait.php @@ -53,4 +53,4 @@ trait TransactionTypeTrait return $transactionType; } -} \ No newline at end of file +} diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index 241a36cf50..0bce14ab27 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -88,4 +88,4 @@ class RecurrenceUpdateService return $recurrence; } -} \ No newline at end of file +} diff --git a/app/Support/Http/Controllers/DateCalculation.php b/app/Support/Http/Controllers/DateCalculation.php index 80e1ebb1e1..03c9df546a 100644 --- a/app/Support/Http/Controllers/DateCalculation.php +++ b/app/Support/Http/Controllers/DateCalculation.php @@ -169,4 +169,4 @@ trait DateCalculation return $loop; } -} \ No newline at end of file +} diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.php index 6fdfbb3ac9..7033ae5e25 100644 --- a/app/Support/Http/Controllers/RuleManagement.php +++ b/app/Support/Http/Controllers/RuleManagement.php @@ -174,4 +174,4 @@ trait RuleManagement $repository->store($data); } } -} \ No newline at end of file +} diff --git a/app/Support/Import/Information/GetSpectreCustomerTrait.php b/app/Support/Import/Information/GetSpectreCustomerTrait.php index bb3010d3f3..cc0664a7d9 100644 --- a/app/Support/Import/Information/GetSpectreCustomerTrait.php +++ b/app/Support/Import/Information/GetSpectreCustomerTrait.php @@ -106,4 +106,4 @@ trait GetSpectreCustomerTrait return $customer; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Information/GetSpectreTokenTrait.php b/app/Support/Import/Information/GetSpectreTokenTrait.php index 02ed4c0bf8..dd866cc814 100644 --- a/app/Support/Import/Information/GetSpectreTokenTrait.php +++ b/app/Support/Import/Information/GetSpectreTokenTrait.php @@ -55,4 +55,4 @@ trait GetSpectreTokenTrait return $request->getToken(); } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php index dc85d3b541..dcf86bffec 100644 --- a/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php +++ b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php @@ -69,4 +69,4 @@ interface BunqJobConfigurationInterface */ public function setImportJob(ImportJob $importJob): void; -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php index c73f214b66..22d1cd7983 100644 --- a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php @@ -218,4 +218,4 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface return $accountId; } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php b/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php index e83d4247b5..a0e9116bde 100644 --- a/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php +++ b/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php @@ -100,4 +100,4 @@ class NewBunqJobHandler implements BunqJobConfigurationInterface $this->repository = app(ImportJobRepositoryInterface::class); $this->repository->setUser($importJob->user); } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php b/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php index 1c9fff6b4f..7dba930c40 100644 --- a/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php @@ -92,4 +92,4 @@ class AuthenticatedHandler implements SpectreJobConfigurationInterface public function setImportJob(ImportJob $importJob): void { } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php index 186993d99f..478041a396 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php @@ -250,4 +250,4 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface return 0; } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php index d4f1a60e73..d2d2027538 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php @@ -142,4 +142,4 @@ class ChooseLoginHandler implements SpectreJobConfigurationInterface $this->repository = app(ImportJobRepositoryInterface::class); $this->repository->setUser($importJob->user); } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php b/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php index 0699e9dd72..f92510c875 100644 --- a/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php @@ -126,4 +126,4 @@ class DoAuthenticateHandler implements SpectreJobConfigurationInterface $this->repository = app(ImportJobRepositoryInterface::class); $this->repository->setUser($importJob->user); } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php b/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php index 8381de8639..efe55c1fd2 100644 --- a/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php @@ -95,4 +95,4 @@ class NewSpectreJobHandler implements SpectreJobConfigurationInterface public function setImportJob(ImportJob $importJob): void { } -} \ No newline at end of file +} diff --git a/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php index 6dbf38b1b4..1abc2cc9c9 100644 --- a/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php +++ b/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php @@ -71,4 +71,4 @@ interface SpectreJobConfigurationInterface */ public function setImportJob(ImportJob $importJob): void; -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php index 24ec36257a..102135f87f 100644 --- a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php +++ b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php @@ -293,4 +293,4 @@ class StageImportDataHandler return $return; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/Bunq/StageNewHandler.php b/app/Support/Import/Routine/Bunq/StageNewHandler.php index 05f057337c..b4e9a30743 100644 --- a/app/Support/Import/Routine/Bunq/StageNewHandler.php +++ b/app/Support/Import/Routine/Bunq/StageNewHandler.php @@ -269,4 +269,4 @@ class StageNewHandler return $return; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/AssetAccountMapper.php b/app/Support/Import/Routine/File/AssetAccountMapper.php index 23851d531d..10535e1ad4 100644 --- a/app/Support/Import/Routine/File/AssetAccountMapper.php +++ b/app/Support/Import/Routine/File/AssetAccountMapper.php @@ -118,4 +118,4 @@ class AssetAccountMapper $this->repository->setUser($user); } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/CurrencyMapper.php b/app/Support/Import/Routine/File/CurrencyMapper.php index bf7c5ec4b5..21362912b5 100644 --- a/app/Support/Import/Routine/File/CurrencyMapper.php +++ b/app/Support/Import/Routine/File/CurrencyMapper.php @@ -97,4 +97,4 @@ class CurrencyMapper $this->repository->setUser($user); } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php index 2654a619c1..e0ec2ba022 100644 --- a/app/Support/Import/Routine/File/ImportableConverter.php +++ b/app/Support/Import/Routine/File/ImportableConverter.php @@ -325,4 +325,4 @@ class ImportableConverter return $type; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/ImportableCreator.php b/app/Support/Import/Routine/File/ImportableCreator.php index 9a4310a6f0..e400e4282d 100644 --- a/app/Support/Import/Routine/File/ImportableCreator.php +++ b/app/Support/Import/Routine/File/ImportableCreator.php @@ -69,4 +69,4 @@ class ImportableCreator return $transaction; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/LineReader.php b/app/Support/Import/Routine/File/LineReader.php index 927847313b..2391ff8af0 100644 --- a/app/Support/Import/Routine/File/LineReader.php +++ b/app/Support/Import/Routine/File/LineReader.php @@ -171,4 +171,4 @@ class LineReader } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/MappedValuesValidator.php b/app/Support/Import/Routine/File/MappedValuesValidator.php index e9229a275a..ddd2434871 100644 --- a/app/Support/Import/Routine/File/MappedValuesValidator.php +++ b/app/Support/Import/Routine/File/MappedValuesValidator.php @@ -128,4 +128,4 @@ class MappedValuesValidator return $return; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/MappingConverger.php b/app/Support/Import/Routine/File/MappingConverger.php index a6d161041a..e2768ae8f2 100644 --- a/app/Support/Import/Routine/File/MappingConverger.php +++ b/app/Support/Import/Routine/File/MappingConverger.php @@ -217,4 +217,4 @@ class MappingConverger return $return; } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/File/OpposingAccountMapper.php b/app/Support/Import/Routine/File/OpposingAccountMapper.php index 2ba07bf2ef..da1b6b9fa0 100644 --- a/app/Support/Import/Routine/File/OpposingAccountMapper.php +++ b/app/Support/Import/Routine/File/OpposingAccountMapper.php @@ -134,4 +134,4 @@ class OpposingAccountMapper $this->repository->setUser($user); } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php index 49bd98579e..b247a230e0 100644 --- a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php +++ b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php @@ -148,4 +148,4 @@ class StageAuthenticatedHandler } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php index d8fe9ad981..4f2eff2872 100644 --- a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php +++ b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php @@ -280,4 +280,4 @@ class StageImportDataHandler } -} \ No newline at end of file +} diff --git a/app/Support/Import/Routine/Spectre/StageNewHandler.php b/app/Support/Import/Routine/Spectre/StageNewHandler.php index e381730b64..74a789dc0f 100644 --- a/app/Support/Import/Routine/Spectre/StageNewHandler.php +++ b/app/Support/Import/Routine/Spectre/StageNewHandler.php @@ -104,4 +104,4 @@ class StageNewHandler $this->repository = app(ImportJobRepositoryInterface::class); $this->repository->setUser($importJob->user); } -} \ No newline at end of file +} diff --git a/app/Transformers/AvailableBudgetTransformer.php b/app/Transformers/AvailableBudgetTransformer.php index e50d0a162f..2dc8e65acb 100644 --- a/app/Transformers/AvailableBudgetTransformer.php +++ b/app/Transformers/AvailableBudgetTransformer.php @@ -117,4 +117,4 @@ class AvailableBudgetTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/BudgetLimitTransformer.php b/app/Transformers/BudgetLimitTransformer.php index 90e858bcdc..7fe980b5c8 100644 --- a/app/Transformers/BudgetLimitTransformer.php +++ b/app/Transformers/BudgetLimitTransformer.php @@ -101,4 +101,4 @@ class BudgetLimitTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/CurrencyExchangeRateTransformer.php b/app/Transformers/CurrencyExchangeRateTransformer.php index 228ef4dbbb..e1c8ebc0e6 100644 --- a/app/Transformers/CurrencyExchangeRateTransformer.php +++ b/app/Transformers/CurrencyExchangeRateTransformer.php @@ -96,4 +96,4 @@ class CurrencyExchangeRateTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/JournalLinkTransformer.php b/app/Transformers/JournalLinkTransformer.php index 944c9f9b20..f05d6807b8 100644 --- a/app/Transformers/JournalLinkTransformer.php +++ b/app/Transformers/JournalLinkTransformer.php @@ -143,4 +143,4 @@ class JournalLinkTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/LinkTypeTransformer.php b/app/Transformers/LinkTypeTransformer.php index 080fb2a52e..19b4600b4d 100644 --- a/app/Transformers/LinkTypeTransformer.php +++ b/app/Transformers/LinkTypeTransformer.php @@ -90,4 +90,4 @@ class LinkTypeTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/NoteTransformer.php b/app/Transformers/NoteTransformer.php index 9cf804c45a..2bd8458240 100644 --- a/app/Transformers/NoteTransformer.php +++ b/app/Transformers/NoteTransformer.php @@ -89,4 +89,4 @@ class NoteTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/PreferenceTransformer.php b/app/Transformers/PreferenceTransformer.php index 76a9d253cb..033b682050 100644 --- a/app/Transformers/PreferenceTransformer.php +++ b/app/Transformers/PreferenceTransformer.php @@ -69,4 +69,4 @@ class PreferenceTransformer extends TransformerAbstract } -} \ No newline at end of file +} diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php index 620e42ec07..f3eccd0c1d 100644 --- a/app/Transformers/RecurrenceTransformer.php +++ b/app/Transformers/RecurrenceTransformer.php @@ -313,4 +313,4 @@ class RecurrenceTransformer extends TransformerAbstract return $return; } -} \ No newline at end of file +} diff --git a/app/Transformers/RuleActionTransformer.php b/app/Transformers/RuleActionTransformer.php index b8b664dd49..731a062946 100644 --- a/app/Transformers/RuleActionTransformer.php +++ b/app/Transformers/RuleActionTransformer.php @@ -89,4 +89,4 @@ class RuleActionTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/RuleTransformer.php b/app/Transformers/RuleTransformer.php index 89f8353aa0..6e6b6cdb70 100644 --- a/app/Transformers/RuleTransformer.php +++ b/app/Transformers/RuleTransformer.php @@ -138,4 +138,4 @@ class RuleTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Transformers/RuleTriggerTransformer.php b/app/Transformers/RuleTriggerTransformer.php index 6c51c84bb3..ad25279614 100644 --- a/app/Transformers/RuleTriggerTransformer.php +++ b/app/Transformers/RuleTriggerTransformer.php @@ -89,4 +89,4 @@ class RuleTriggerTransformer extends TransformerAbstract return $data; } -} \ No newline at end of file +} diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.php index 6a1fe9c587..98ad0d0342 100644 --- a/app/Validation/RecurrenceValidation.php +++ b/app/Validation/RecurrenceValidation.php @@ -190,4 +190,4 @@ trait RecurrenceValidation $validator->errors()->add(sprintf('repetitions.%d.moment', $index), (string)trans('validation.valid_recurrence_rep_moment')); } } -} \ No newline at end of file +} diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index ee08ef9ada..0c874afd03 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -361,4 +361,4 @@ trait TransactionValidation // not having an opposing account by this name is NOT a problem. return null; } -} \ No newline at end of file +} diff --git a/database/migrations/2018_06_08_200526_changes_for_v475.php b/database/migrations/2018_06_08_200526_changes_for_v475.php index fa85ed5456..b0c105e2ee 100644 --- a/database/migrations/2018_06_08_200526_changes_for_v475.php +++ b/database/migrations/2018_06_08_200526_changes_for_v475.php @@ -1,4 +1,5 @@ Date: Sun, 22 Jul 2018 20:33:17 +0200 Subject: [PATCH 55/86] Add newlines to tests. [skip ci] --- tests/Api/V1/Controllers/AttachmentControllerTest.php | 2 +- tests/Api/V1/Controllers/AvailableBudgetControllerTest.php | 2 +- tests/Api/V1/Controllers/BudgetControllerTest.php | 2 +- tests/Api/V1/Controllers/BudgetLimitControllerTest.php | 2 +- tests/Api/V1/Controllers/CategoryControllerTest.php | 2 +- tests/Api/V1/Controllers/ConfigurationControllerTest.php | 2 +- tests/Api/V1/Controllers/CurrencyExchangeRateControllerTest.php | 2 +- tests/Api/V1/Controllers/JournalLinkControllerTest.php | 2 +- tests/Api/V1/Controllers/LinkTypeControllerTest.php | 2 +- tests/Api/V1/Controllers/RecurrenceControllerTest.php | 2 +- tests/Feature/Controllers/Account/CreateControllerTest.php | 2 +- tests/Feature/Controllers/Account/DeleteControllerTest.php | 2 +- tests/Feature/Controllers/Account/EditControllerTest.php | 2 +- tests/Feature/Controllers/Account/ShowControllerTest.php | 2 +- tests/Feature/Controllers/Budget/AmountControllerTest.php | 2 +- tests/Feature/Controllers/Budget/CreateControllerTest.php | 2 +- tests/Feature/Controllers/Budget/DeleteControllerTest.php | 2 +- tests/Feature/Controllers/Budget/EditControllerTest.php | 2 +- tests/Feature/Controllers/Budget/IndexControllerTest.php | 2 +- tests/Feature/Controllers/Budget/ShowControllerTest.php | 2 +- tests/Feature/Controllers/Category/NoCategoryControllerTest.php | 2 +- tests/Feature/Controllers/Category/ShowControllerTest.php | 2 +- tests/Feature/Controllers/Json/ReconcileControllerTest.php | 2 +- tests/Feature/Controllers/Rule/CreateControllerTest.php | 2 +- tests/Feature/Controllers/Rule/DeleteControllerTest.php | 2 +- tests/Feature/Controllers/Rule/EditControllerTest.php | 2 +- tests/Feature/Controllers/Rule/SelectControllerTest.php | 2 +- tests/Object/FakeApiContext.php | 2 +- .../Import/JobConfiguration/SpectreJobConfigurationTest.php | 2 +- tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php | 2 +- tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php | 2 +- tests/Unit/Import/Routine/BunqRoutineTest.php | 2 +- tests/Unit/Import/Routine/SpectreRoutineTest.php | 2 +- .../Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php | 2 +- .../Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php | 2 +- .../Import/JobConfiguration/File/ConfigureUploadHandlerTest.php | 2 +- .../Import/JobConfiguration/File/NewFileJobHandlerTest.php | 2 +- .../JobConfiguration/Spectre/ChooseAccountsHandlerTest.php | 2 +- .../Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php | 2 +- .../JobConfiguration/Spectre/DoAuthenticateHandlerTest.php | 2 +- tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php | 2 +- .../Support/Import/Routine/Bunq/StageImportDataHandlerTest.php | 2 +- tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php | 2 +- .../Unit/Support/Import/Routine/File/AssetAccountMapperTest.php | 2 +- tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php | 2 +- tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php | 2 +- .../Support/Import/Routine/File/ImportableConverterTest.php | 2 +- .../Unit/Support/Import/Routine/File/ImportableCreatorTest.php | 2 +- tests/Unit/Support/Import/Routine/File/LineReaderTest.php | 2 +- .../Support/Import/Routine/File/MappedValuesValidatorTest.php | 2 +- tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php | 2 +- .../Support/Import/Routine/File/OpposingAccountMapperTest.php | 2 +- .../Import/Routine/Spectre/StageAuthenticatedHandlerTest.php | 2 +- .../Import/Routine/Spectre/StageImportDataHandlerTest.php | 2 +- .../Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tests/Api/V1/Controllers/AttachmentControllerTest.php b/tests/Api/V1/Controllers/AttachmentControllerTest.php index e39620347f..ed68ea80ca 100644 --- a/tests/Api/V1/Controllers/AttachmentControllerTest.php +++ b/tests/Api/V1/Controllers/AttachmentControllerTest.php @@ -298,4 +298,4 @@ class AttachmentControllerTest extends TestCase //$response = $this->post('/api/v1/attachments/' . $attachment->id . '/upload',$content, ['Accept' => 'application/json']); $response->assertStatus(204); } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php b/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php index 4f44c300a4..ccd8c56aa6 100644 --- a/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php +++ b/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php @@ -186,4 +186,4 @@ class AvailableBudgetControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/BudgetControllerTest.php b/tests/Api/V1/Controllers/BudgetControllerTest.php index dc5bb91cf9..ad5751b1cc 100644 --- a/tests/Api/V1/Controllers/BudgetControllerTest.php +++ b/tests/Api/V1/Controllers/BudgetControllerTest.php @@ -172,4 +172,4 @@ class BudgetControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/BudgetLimitControllerTest.php b/tests/Api/V1/Controllers/BudgetLimitControllerTest.php index a7c283ef4e..5935f47301 100644 --- a/tests/Api/V1/Controllers/BudgetLimitControllerTest.php +++ b/tests/Api/V1/Controllers/BudgetLimitControllerTest.php @@ -329,4 +329,4 @@ class BudgetLimitControllerTest extends TestCase $response->assertSee('Unknown budget.'); } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/CategoryControllerTest.php b/tests/Api/V1/Controllers/CategoryControllerTest.php index 672a1a366d..0bfb3dfe16 100644 --- a/tests/Api/V1/Controllers/CategoryControllerTest.php +++ b/tests/Api/V1/Controllers/CategoryControllerTest.php @@ -174,4 +174,4 @@ class CategoryControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/ConfigurationControllerTest.php b/tests/Api/V1/Controllers/ConfigurationControllerTest.php index ab958a1f2f..f003a993ac 100644 --- a/tests/Api/V1/Controllers/ConfigurationControllerTest.php +++ b/tests/Api/V1/Controllers/ConfigurationControllerTest.php @@ -182,4 +182,4 @@ class ConfigurationControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/CurrencyExchangeRateControllerTest.php b/tests/Api/V1/Controllers/CurrencyExchangeRateControllerTest.php index c6c718b230..1ba9df9e72 100644 --- a/tests/Api/V1/Controllers/CurrencyExchangeRateControllerTest.php +++ b/tests/Api/V1/Controllers/CurrencyExchangeRateControllerTest.php @@ -102,4 +102,4 @@ class CurrencyExchangeRateControllerTest extends TestCase ); $response->assertHeader('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/JournalLinkControllerTest.php b/tests/Api/V1/Controllers/JournalLinkControllerTest.php index 59720eb5fd..5819cfadaa 100644 --- a/tests/Api/V1/Controllers/JournalLinkControllerTest.php +++ b/tests/Api/V1/Controllers/JournalLinkControllerTest.php @@ -236,4 +236,4 @@ class JournalLinkControllerTest extends TestCase $response->assertSee($journalLink->created_at->toAtomString()); // the creation moment. $response->assertHeader('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/LinkTypeControllerTest.php b/tests/Api/V1/Controllers/LinkTypeControllerTest.php index c23a9c06a5..d296d3d7ba 100644 --- a/tests/Api/V1/Controllers/LinkTypeControllerTest.php +++ b/tests/Api/V1/Controllers/LinkTypeControllerTest.php @@ -197,4 +197,4 @@ class LinkTypeControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/RecurrenceControllerTest.php b/tests/Api/V1/Controllers/RecurrenceControllerTest.php index 56f469e4a7..83ab310195 100644 --- a/tests/Api/V1/Controllers/RecurrenceControllerTest.php +++ b/tests/Api/V1/Controllers/RecurrenceControllerTest.php @@ -1628,4 +1628,4 @@ class RecurrenceControllerTest extends TestCase $response->assertHeader('Content-Type', 'application/vnd.api+json'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Account/CreateControllerTest.php b/tests/Feature/Controllers/Account/CreateControllerTest.php index 1df0d40739..3cc594e6b7 100644 --- a/tests/Feature/Controllers/Account/CreateControllerTest.php +++ b/tests/Feature/Controllers/Account/CreateControllerTest.php @@ -125,4 +125,4 @@ class CreateControllerTest extends TestCase $response->assertStatus(302); $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Account/DeleteControllerTest.php b/tests/Feature/Controllers/Account/DeleteControllerTest.php index 7133f2f7dc..572b4872f1 100644 --- a/tests/Feature/Controllers/Account/DeleteControllerTest.php +++ b/tests/Feature/Controllers/Account/DeleteControllerTest.php @@ -91,4 +91,4 @@ class DeleteControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Account/EditControllerTest.php b/tests/Feature/Controllers/Account/EditControllerTest.php index d9b45c48e7..8e567f0527 100644 --- a/tests/Feature/Controllers/Account/EditControllerTest.php +++ b/tests/Feature/Controllers/Account/EditControllerTest.php @@ -169,4 +169,4 @@ class EditControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Account/ShowControllerTest.php b/tests/Feature/Controllers/Account/ShowControllerTest.php index 323bafe631..3268405a40 100644 --- a/tests/Feature/Controllers/Account/ShowControllerTest.php +++ b/tests/Feature/Controllers/Account/ShowControllerTest.php @@ -239,4 +239,4 @@ class ShowControllerTest extends TestCase $response->assertStatus(302); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Budget/AmountControllerTest.php b/tests/Feature/Controllers/Budget/AmountControllerTest.php index 5e1ea56dd3..a4f4caba3e 100644 --- a/tests/Feature/Controllers/Budget/AmountControllerTest.php +++ b/tests/Feature/Controllers/Budget/AmountControllerTest.php @@ -219,4 +219,4 @@ class AmountControllerTest extends TestCase $response = $this->get(route('budgets.income', ['2017-01-01', '2017-01-31'])); $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Budget/CreateControllerTest.php b/tests/Feature/Controllers/Budget/CreateControllerTest.php index 3f6c64cd70..0b392a45b1 100644 --- a/tests/Feature/Controllers/Budget/CreateControllerTest.php +++ b/tests/Feature/Controllers/Budget/CreateControllerTest.php @@ -92,4 +92,4 @@ class CreateControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Budget/DeleteControllerTest.php b/tests/Feature/Controllers/Budget/DeleteControllerTest.php index 0e763580f0..6cc8436f0f 100644 --- a/tests/Feature/Controllers/Budget/DeleteControllerTest.php +++ b/tests/Feature/Controllers/Budget/DeleteControllerTest.php @@ -82,4 +82,4 @@ class DeleteControllerTest extends TestCase $response->assertStatus(302); $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Budget/EditControllerTest.php b/tests/Feature/Controllers/Budget/EditControllerTest.php index dd1d7d7e74..55ac0e8cb6 100644 --- a/tests/Feature/Controllers/Budget/EditControllerTest.php +++ b/tests/Feature/Controllers/Budget/EditControllerTest.php @@ -91,4 +91,4 @@ class EditControllerTest extends TestCase $response->assertStatus(302); $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Budget/IndexControllerTest.php b/tests/Feature/Controllers/Budget/IndexControllerTest.php index 59bf0e6de9..3ab7a3f11f 100644 --- a/tests/Feature/Controllers/Budget/IndexControllerTest.php +++ b/tests/Feature/Controllers/Budget/IndexControllerTest.php @@ -234,4 +234,4 @@ class IndexControllerTest extends TestCase // has bread crumb $response->assertSee('
                                                                            '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Budget/ShowControllerTest.php b/tests/Feature/Controllers/Budget/ShowControllerTest.php index b0fcfa635e..dc0b485eed 100644 --- a/tests/Feature/Controllers/Budget/ShowControllerTest.php +++ b/tests/Feature/Controllers/Budget/ShowControllerTest.php @@ -262,4 +262,4 @@ class ShowControllerTest extends TestCase // has bread crumb $response->assertSee('
                                                                              '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php index 970bebd2c7..02f6aafb5f 100644 --- a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php +++ b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php @@ -172,4 +172,4 @@ class NoCategoryControllerTest extends TestCase // has bread crumb $response->assertSee('
                                                                                '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php index d40057c0ff..b678a30176 100644 --- a/tests/Feature/Controllers/Category/ShowControllerTest.php +++ b/tests/Feature/Controllers/Category/ShowControllerTest.php @@ -233,4 +233,4 @@ class ShowControllerTest extends TestCase $response->assertSee('
                                                                                  '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Json/ReconcileControllerTest.php b/tests/Feature/Controllers/Json/ReconcileControllerTest.php index 25dd06716b..2e0a2601b3 100644 --- a/tests/Feature/Controllers/Json/ReconcileControllerTest.php +++ b/tests/Feature/Controllers/Json/ReconcileControllerTest.php @@ -119,4 +119,4 @@ class ReconcileControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Rule/CreateControllerTest.php b/tests/Feature/Controllers/Rule/CreateControllerTest.php index b93898f583..f41453df93 100644 --- a/tests/Feature/Controllers/Rule/CreateControllerTest.php +++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php @@ -166,4 +166,4 @@ class CreateControllerTest extends TestCase $response->assertStatus(302); $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Rule/DeleteControllerTest.php b/tests/Feature/Controllers/Rule/DeleteControllerTest.php index 7cb9476a77..6b411384b2 100644 --- a/tests/Feature/Controllers/Rule/DeleteControllerTest.php +++ b/tests/Feature/Controllers/Rule/DeleteControllerTest.php @@ -75,4 +75,4 @@ class DeleteControllerTest extends TestCase $response->assertSessionHas('success'); $response->assertRedirect(route('index')); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Rule/EditControllerTest.php b/tests/Feature/Controllers/Rule/EditControllerTest.php index a7b2c90508..39ef002eff 100644 --- a/tests/Feature/Controllers/Rule/EditControllerTest.php +++ b/tests/Feature/Controllers/Rule/EditControllerTest.php @@ -135,4 +135,4 @@ class EditControllerTest extends TestCase $response->assertStatus(302); $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Rule/SelectControllerTest.php b/tests/Feature/Controllers/Rule/SelectControllerTest.php index 7e8d5faf01..87cca71aee 100644 --- a/tests/Feature/Controllers/Rule/SelectControllerTest.php +++ b/tests/Feature/Controllers/Rule/SelectControllerTest.php @@ -186,4 +186,4 @@ class SelectControllerTest extends TestCase $response = $this->get($uri); $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Object/FakeApiContext.php b/tests/Object/FakeApiContext.php index cf5c585e85..7157692db4 100644 --- a/tests/Object/FakeApiContext.php +++ b/tests/Object/FakeApiContext.php @@ -35,4 +35,4 @@ class FakeApiContext return json_encode(['a' => 'b']); } -} \ No newline at end of file +} diff --git a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php index dc114e789a..3a1a08b4d4 100644 --- a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php +++ b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php @@ -189,4 +189,4 @@ class SpectreJobConfigurationTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php b/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php index 49fa193fce..b1d8e7344c 100644 --- a/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php +++ b/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php @@ -215,4 +215,4 @@ class BunqPrerequisitesTest extends TestCase $this->assertEquals('Some exception', $messages->first()); $this->assertCount(1, $messages); } -} \ No newline at end of file +} diff --git a/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php b/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php index 18dc8e2609..e9ea09cc72 100644 --- a/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php +++ b/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php @@ -242,4 +242,4 @@ class SpectrePrerequisitesTest extends TestCase $this->assertEquals(0, $object->storePrerequisites($data)->count()); } -} \ No newline at end of file +} diff --git a/tests/Unit/Import/Routine/BunqRoutineTest.php b/tests/Unit/Import/Routine/BunqRoutineTest.php index a2a3b6f28a..32530df53e 100644 --- a/tests/Unit/Import/Routine/BunqRoutineTest.php +++ b/tests/Unit/Import/Routine/BunqRoutineTest.php @@ -114,4 +114,4 @@ class BunqRoutineTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Unit/Import/Routine/SpectreRoutineTest.php b/tests/Unit/Import/Routine/SpectreRoutineTest.php index 557df164ae..7883f257ba 100644 --- a/tests/Unit/Import/Routine/SpectreRoutineTest.php +++ b/tests/Unit/Import/Routine/SpectreRoutineTest.php @@ -226,4 +226,4 @@ class SpectreRoutineTest extends TestCase $this->assertTrue(false, $e->getMessage()); } } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php index 427a848272..2af6e0ac06 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php @@ -444,4 +444,4 @@ class ChooseAccountsHandlerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php index 089a87e92b..2865cd0382 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php @@ -62,4 +62,4 @@ class NewBunqJobHandlerTest extends TestCase $this->assertTrue($handler->configurationComplete()); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php index caec067b68..442a0524b2 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php @@ -182,4 +182,4 @@ class ConfigureUploadHandlerTest extends TestCase $this->assertEquals($expected, $result); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php index 947c80a591..877e24e03e 100644 --- a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php @@ -302,4 +302,4 @@ class NewFileJobHandlerTest extends TestCase ); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php index 7e6089d9a9..e76be37a67 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php @@ -656,4 +656,4 @@ class ChooseAccountsHandlerTest extends TestCase $this->assertEquals($expected, $result); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php index a565e7e6ca..92c8c9951c 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php @@ -271,4 +271,4 @@ class ChooseLoginHandlerTest extends TestCase $this->assertEquals(['logins' => [$login]], $handler->getNextData()); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php index 66d9073ae4..a92319f105 100644 --- a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php @@ -103,4 +103,4 @@ class DoAuthenticateHandlerTest extends TestCase $this->assertEquals(['token-url' => $token->getConnectUrl()], $result); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php index 05affa9016..df6f72cb34 100644 --- a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php +++ b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php @@ -745,4 +745,4 @@ class ImportTransactionTest extends TestCase $this->assertEquals('a', $importTransaction->tags[0]); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php index 5537abf7bb..a153c93d81 100644 --- a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php @@ -502,4 +502,4 @@ class StageImportDataHandlerTest extends TestCase //$this->assertEquals($expectedTransactions, $transactions); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php index ccb76ea512..6ba32b9bfb 100644 --- a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php @@ -314,4 +314,4 @@ class StageNewHandlerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php index 40458c12b2..46d6f38cca 100644 --- a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php +++ b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php @@ -182,4 +182,4 @@ class AssetAccountMapperTest extends TestCase $this->assertEquals($expected->id, $result->id); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php index 9c274d5b8f..a76ef73a5a 100644 --- a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php +++ b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php @@ -82,4 +82,4 @@ class CSVProcessorTest extends TestCase } $this->assertEquals([], $result); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php index 7ee4ef9711..c067873630 100644 --- a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php +++ b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php @@ -168,4 +168,4 @@ class CurrencyMapperTest extends TestCase $this->assertNull($result); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php index aba92aea0a..482589d2e0 100644 --- a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php +++ b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php @@ -536,4 +536,4 @@ class ImportableConverterTest extends TestCase $this->assertEquals([], $result); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php index 3db3f1ccc6..7e71bb71e1 100644 --- a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php +++ b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php @@ -61,4 +61,4 @@ class ImportableCreatorTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php index ae0eb7b245..4c85b2ce22 100644 --- a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php +++ b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php @@ -99,4 +99,4 @@ class LineReaderTest extends TestCase $this->assertEquals($specifics, $lines); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php index 9e8ff0da22..cb85933a87 100644 --- a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php +++ b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php @@ -124,4 +124,4 @@ class MappedValuesValidatorTest extends TestCase return $obj; } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php index 22fd281170..cea0ebf80c 100644 --- a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php +++ b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php @@ -151,4 +151,4 @@ class MappingConvergerTest extends TestCase $this->assertEquals(0, $result[1][0]->getMappedValue()); // value of mapping is 0. } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php index f41f09289c..86e3fab70a 100644 --- a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php +++ b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php @@ -216,4 +216,4 @@ class OpposingAccountMapperTest extends TestCase $mapper->map(null, $amount, []); } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php index 63576001d7..0226738703 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php @@ -447,4 +447,4 @@ class StageAuthenticatedHandlerTest extends TestCase } } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php index e620538173..5d87619c1b 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php @@ -634,4 +634,4 @@ class StageImportDataHandlerTest extends TestCase } } -} \ No newline at end of file +} diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php index e254ee89bd..9b32655e60 100644 --- a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php +++ b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php @@ -367,4 +367,4 @@ class StageNewHandlerTest extends TestCase $this->assertTrue(false, $e->getMessage()); } } -} \ No newline at end of file +} From 67ea825d4a8edf1a3ff465b47923ac6b84f5219b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 21:09:57 +0200 Subject: [PATCH 56/86] Remove unused methods. --- .../Transaction/SingleController.php | 9 +- app/Http/Requests/RuleFormRequest.php | 2 +- app/Http/Requests/RuleGroupFormRequest.php | 2 +- app/Providers/FireflyServiceProvider.php | 3 - app/Repositories/Budget/BudgetRepository.php | 65 ----- .../Budget/BudgetRepositoryInterface.php | 29 --- .../Category/CategoryRepository.php | 18 -- .../Category/CategoryRepositoryInterface.php | 10 - .../Currency/CurrencyRepository.php | 76 ------ .../Currency/CurrencyRepositoryInterface.php | 43 ---- .../ImportJob/ImportJobRepository.php | 232 ------------------ .../ImportJobRepositoryInterface.php | 89 ------- .../Journal/JournalRepository.php | 66 ----- .../Journal/JournalRepositoryInterface.php | 35 --- .../LinkType/LinkTypeRepository.php | 16 -- .../LinkType/LinkTypeRepositoryInterface.php | 8 - .../PiggyBank/PiggyBankRepository.php | 34 --- .../PiggyBankRepositoryInterface.php | 15 -- app/Repositories/Rule/RuleRepository.php | 6 +- .../Rule/RuleRepositoryInterface.php | 4 +- .../RuleGroup/RuleGroupRepository.php | 6 +- .../RuleGroupRepositoryInterface.php | 4 +- app/Repositories/Tag/TagRepository.php | 57 ----- .../Tag/TagRepositoryInterface.php | 26 -- .../TransactionTypeRepository.php | 44 ---- .../TransactionTypeRepositoryInterface.php | 43 ---- 26 files changed, 13 insertions(+), 929 deletions(-) delete mode 100644 app/Repositories/TransactionType/TransactionTypeRepository.php delete mode 100644 app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 00c6dd78cf..67ca017160 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -28,7 +28,6 @@ use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\JournalFormRequest; -use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; @@ -124,15 +123,9 @@ class SingleController extends Controller 'payment_date' => $this->repository->getMetaField($journal, 'payment_date'), 'invoice_date' => $this->repository->getMetaField($journal, 'invoice_date'), 'internal_reference' => $this->repository->getMetaField($journal, 'internal_reference'), - 'notes' => '', + 'notes' => $this->repository->getNoteText($journal), ]; - /** @var Note $note */ - $note = $this->repository->getNote($journal); - if (null !== $note) { - $preFilled['notes'] = $note->text; - } - session()->flash('preFilled', $preFilled); return redirect(route('transactions.create', [strtolower($journal->transactionType->type)])); diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 24390eb024..84a6e3fe30 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -108,7 +108,7 @@ class RuleFormRequest extends Request $contextActions = implode(',', config('firefly.rule-actions-text')); $titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title'; - if (null !== $repository->find((int)$this->get('id'))->id) { + if (null !== $repository->find((int)$this->get('id'))) { $titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title,' . (int)$this->get('id'); } $rules = [ diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 8b99c1f957..e1c29c6ba4 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -64,7 +64,7 @@ class RuleGroupFormRequest extends Request /** @var RuleGroupRepositoryInterface $repository */ $repository = app(RuleGroupRepositoryInterface::class); $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; - if (null !== $repository->find((int)$this->get('id'))->id) { + if (null !== $repository->find((int)$this->get('id'))) { $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . (int)$this->get('id'); } diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 554badb4f4..4cef20c2bf 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -42,8 +42,6 @@ use FireflyIII\Helpers\Report\PopupReport; use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Helpers\Report\ReportHelper; use FireflyIII\Helpers\Report\ReportHelperInterface; -use FireflyIII\Repositories\TransactionType\TransactionTypeRepository; -use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface; use FireflyIII\Repositories\User\UserRepository; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Services\Currency\ExchangeRateInterface; @@ -174,7 +172,6 @@ class FireflyServiceProvider extends ServiceProvider // export: $this->app->bind(ProcessorInterface::class, ExpandedProcessor::class); $this->app->bind(UserRepositoryInterface::class, UserRepository::class); - $this->app->bind(TransactionTypeRepositoryInterface::class, TransactionTypeRepository::class); $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class); // more generators: diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 0f6f8b83e8..b48bb98157 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -161,20 +161,6 @@ class BudgetRepository implements BudgetRepositoryInterface return $return; } - /** - * Deletes a budget limit. - * - * @param BudgetLimit $budgetLimit - */ - public function deleteBudgetLimit(BudgetLimit $budgetLimit): void - { - try { - $budgetLimit->delete(); - } catch (Exception $e) { - Log::error(sprintf('Could not delete budget limit: %s', $e->getMessage())); - } - } - /** * @param Budget $budget * @@ -217,57 +203,6 @@ class BudgetRepository implements BudgetRepositoryInterface } } - /** - * Filters entries from the result set generated by getBudgetPeriodReport. - * - * @param Collection $set - * @param int $budgetId - * @param array $periods - * - * @return array - */ - public function filterAmounts(Collection $set, int $budgetId, array $periods): array - { - $arr = []; - $keys = array_keys($periods); - foreach ($keys as $period) { - /** @var stdClass $object */ - $result = $set->filter( - function (TransactionJournal $object) use ($budgetId, $period) { - $result = (string)$object->period_marker === (string)$period && $budgetId === (int)$object->budget_id; - - return $result; - } - ); - $amount = '0'; - if (null !== $result->first()) { - $amount = $result->first()->sum_of_period; - } - - $arr[$period] = $amount; - } - - return $arr; - } - - /** - * Find a budget. - * - * @param int $budgetId - * - * @return Budget - * @deprecated - */ - public function find(int $budgetId): Budget - { - $budget = $this->user->budgets()->find($budgetId); - if (null === $budget) { - $budget = new Budget; - } - - return $budget; - } - /** * Find a budget. * diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 0ed8ee63c8..56a3ca82a6 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -62,13 +62,6 @@ interface BudgetRepositoryInterface */ public function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array; - /** - * Deletes a budget limit. - * - * @param BudgetLimit $budgetLimit - */ - public function deleteBudgetLimit(BudgetLimit $budgetLimit): void; - /** * @param Budget $budget * @@ -88,28 +81,6 @@ interface BudgetRepositoryInterface */ public function destroyBudgetLimit(BudgetLimit $budgetLimit): void; - /** - * Filters entries from the result set generated by getBudgetPeriodReport. - * - * @param Collection $set - * @param int $budgetId - * @param array $periods - * - * @return array - */ - public function filterAmounts(Collection $set, int $budgetId, array $periods): array; - - /** - * Find a budget. - * - * @param int $budgetId - * - * @deprecated - * - * @return Budget - */ - public function find(int $budgetId): Budget; - /** * Find a budget. * diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index bde679c87c..b134f74fef 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -79,24 +79,6 @@ class CategoryRepository implements CategoryRepositoryInterface return (string)$set->sum('transaction_amount'); } - /** - * Find a category. - * - * @param int $categoryId - * - * @return Category - * @deprecated - */ - public function find(int $categoryId): Category - { - $category = $this->user->categories()->find($categoryId); - if (null === $category) { - $category = new Category; - } - - return $category; - } - /** * Find a category. * diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 321186a2a3..0ec74ea07a 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -51,16 +51,6 @@ interface CategoryRepositoryInterface */ public function earnedInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string; - /** - * Find a category. - * - * @param int $categoryId - * - * @deprecated - * @return Category - */ - public function find(int $categoryId): Category; - /** * Find a category. * diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index d97daf9c45..8698ae74a8 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -107,44 +107,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface return true; } - /** - * Find by ID. - * - * @param int $currencyId - * - * @deprecated - * - * @return TransactionCurrency - */ - public function find(int $currencyId): TransactionCurrency - { - $currency = TransactionCurrency::find($currencyId); - if (null === $currency) { - $currency = new TransactionCurrency; - } - - return $currency; - } - - /** - * Find by currency code. - * - * @deprecated - * - * @param string $currencyCode - * - * @return TransactionCurrency - */ - public function findByCode(string $currencyCode): TransactionCurrency - { - $currency = TransactionCurrency::where('code', $currencyCode)->first(); - if (null === $currency) { - $currency = new TransactionCurrency; - } - - return $currency; - } - /** * Find by currency code, return NULL if unfound. * Used in Import Currency! @@ -158,25 +120,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface return TransactionCurrency::where('code', $currencyCode)->first(); } - /** - * Find by currency name. - * - * @param string $currencyName - * - * @deprecated - * - * @return TransactionCurrency - */ - public function findByName(string $currencyName): TransactionCurrency - { - $preferred = TransactionCurrency::whereName($currencyName)->first(); - if (null === $preferred) { - $preferred = new TransactionCurrency; - } - - return $preferred; - } - /** * Find by currency name or return null. * Used in Import Currency! @@ -190,25 +133,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface return TransactionCurrency::whereName($currencyName)->first(); } - /** - * Find by currency symbol. - * - * @deprecated - * - * @param string $currencySymbol - * - * @return TransactionCurrency - */ - public function findBySymbol(string $currencySymbol): TransactionCurrency - { - $currency = TransactionCurrency::whereSymbol($currencySymbol)->first(); - if (null === $currency) { - $currency = new TransactionCurrency; - } - - return $currency; - } - /** * Find by currency symbol or return NULL * Used in Import Currency! diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 72f12a0188..72c4d9de29 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -55,27 +55,6 @@ interface CurrencyRepositoryInterface */ public function destroy(TransactionCurrency $currency): bool; - /** - * Find by ID. - * - * @param int $currencyId - * - * @deprecated - * @return TransactionCurrency - */ - public function find(int $currencyId): TransactionCurrency; - - /** - * Find by currency code. - * - * @deprecated - * - * @param string $currencyCode - * - * @return TransactionCurrency - */ - public function findByCode(string $currencyCode): TransactionCurrency; - /** * Find by currency code, return NULL if unfound. * @@ -85,17 +64,6 @@ interface CurrencyRepositoryInterface */ public function findByCodeNull(string $currencyCode): ?TransactionCurrency; - /** - * Find by currency name. - * - * @deprecated - * - * @param string $currencyName - * - * @return TransactionCurrency - */ - public function findByName(string $currencyName): TransactionCurrency; - /** * Find by currency name. * @@ -105,17 +73,6 @@ interface CurrencyRepositoryInterface */ public function findByNameNull(string $currencyName): ?TransactionCurrency; - /** - * Find by currency symbol. - * - * @deprecated - * - * @param string $currencySymbol - * - * @return TransactionCurrency - */ - public function findBySymbol(string $currencySymbol): TransactionCurrency; - /** * Find by currency symbol. * diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 0ffe312230..ca5f59ff8b 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -56,21 +56,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface $this->uploadDisk = Storage::disk('upload'); } - /** - * @param ImportJob $job - * @param int $index - * @param string $error - * - * @return ImportJob - */ - public function addError(ImportJob $job, int $index, string $error): ImportJob - { - $extended = $this->getExtendedStatus($job); - $extended['errors'][$index][] = $error; - - return $this->setExtendedStatus($job, $extended); - } - /** * Add message to job. * @@ -89,58 +74,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $job; } - /** - * @param ImportJob $job - * @param int $steps - * - * @return ImportJob - */ - public function addStepsDone(ImportJob $job, int $steps = null): ImportJob - { - $steps = $steps ?? 1; - $status = $this->getExtendedStatus($job); - $status['done'] += $steps; - Log::debug(sprintf('Add %d to steps done for job "%s" making steps done %d', $steps, $job->key, $status['done'])); - - return $this->setExtendedStatus($job, $status); - } - - /** - * @param ImportJob $job - * @param int $steps - * - * @return ImportJob - */ - public function addTotalSteps(ImportJob $job, int $steps = null): ImportJob - { - $steps = $steps ?? 1; - $extended = $this->getExtendedStatus($job); - $total = (int)($extended['steps'] ?? 0); - $total += $steps; - $extended['steps'] = $total; - - return $this->setExtendedStatus($job, $extended); - - } - - /** - * Return number of imported rows with this hash value. - * - * @param string $hash - * - * @return int - */ - public function countByHash(string $hash): int - { - $json = json_encode($hash); - $count = TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') - ->where('data', $json) - ->where('name', 'importHash') - ->count(); - - return $count; - } - /** * @param string $importProvider * @@ -243,111 +176,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface return []; } - /** - * @param ImportJob $job - * - * @return string - */ - public function getStatus(ImportJob $job): string - { - return $job->status; - } - - /** - * @param ImportJob $job - * @param UploadedFile $file - * - * @return bool - */ - public function processConfiguration(ImportJob $job, UploadedFile $file): bool - { - /** @var UserRepositoryInterface $repository */ - $repository = app(UserRepositoryInterface::class); - // demo user's configuration upload is ignored completely. - if (!$repository->hasRole($this->user, 'demo')) { - Log::debug( - 'Uploaded configuration file', - ['name' => $file->getClientOriginalName(), 'size' => $file->getSize(), 'mime' => $file->getClientMimeType()] - ); - - $configFileObject = new SplFileObject($file->getRealPath()); - $configRaw = $configFileObject->fread($configFileObject->getSize()); - $configuration = json_decode($configRaw, true); - Log::debug(sprintf('Raw configuration is %s', $configRaw)); - if (null !== $configuration && \is_array($configuration)) { - Log::debug('Found configuration', $configuration); - $this->setConfiguration($job, $configuration); - } - if (null === $configuration) { - Log::error('Uploaded configuration is NULL'); - } - if (false === $configuration) { - Log::error('Uploaded configuration is FALSE'); - } - } - - return true; - } - - /** - * @param ImportJob $job - * @param null|UploadedFile $file - * - * @return bool - * - * @throws \Illuminate\Contracts\Encryption\EncryptException - * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException - */ - public function processFile(ImportJob $job, ?UploadedFile $file): bool - { - if (null === $file) { - return false; - } - /** @var UserRepositoryInterface $repository */ - $repository = app(UserRepositoryInterface::class); - $newName = sprintf('%s.upload', $job->key); - $uploaded = new SplFileObject($file->getRealPath()); - $content = trim($uploaded->fread($uploaded->getSize())); - - // verify content: - $result = mb_detect_encoding($content, 'UTF-8', true); - if (false === $result) { - Log::error(sprintf('Cannot detect encoding for uploaded import file "%s".', $file->getClientOriginalName())); - - return false; - } - if ('ASCII' !== $result && 'UTF-8' !== $result) { - Log::error(sprintf('Uploaded import file is %s instead of UTF8!', var_export($result, true))); - - return false; - } - - $contentEncrypted = Crypt::encrypt($content); - $disk = Storage::disk('upload'); - - // user is demo user, replace upload with prepared file. - if ($repository->hasRole($this->user, 'demo')) { - $stubsDisk = Storage::disk('stubs'); - $content = $stubsDisk->get('demo-import.csv'); - $contentEncrypted = Crypt::encrypt($content); - $disk->put($newName, $contentEncrypted); - Log::debug('Replaced upload with demo file.'); - - // also set up prepared configuration. - $configuration = json_decode($stubsDisk->get('demo-configuration.json'), true); - $this->setConfiguration($job, $configuration); - Log::debug('Set configuration for demo user', $configuration); - } - - if (!$repository->hasRole($this->user, 'demo')) { - // user is not demo, process original upload: - $disk->put($newName, $contentEncrypted); - Log::debug('Uploaded file', ['name' => $file->getClientOriginalName(), 'size' => $file->getSize(), 'mime' => $file->getClientMimeType()]); - } - - return true; - } - /** * @param ImportJob $job * @param array $configuration @@ -368,22 +196,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $job; } - /** - * @param ImportJob $job - * @param array $array - * - * @return ImportJob - */ - public function setExtendedStatus(ImportJob $job, array $array): ImportJob - { - $currentStatus = $job->extended_status; - $newStatus = array_merge($currentStatus, $array); - $job->extended_status = $newStatus; - $job->save(); - - return $job; - } - /** * @param ImportJob $job * @param string $stage @@ -413,21 +225,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $job; } - /** - * @param ImportJob $job - * @param int $steps - * - * @return ImportJob - */ - public function setStepsDone(ImportJob $job, int $steps): ImportJob - { - $status = $this->getExtendedStatus($job); - $status['done'] = $steps; - Log::debug(sprintf('Set steps done for job "%s" to %d', $job->key, $steps)); - - return $this->setExtendedStatus($job, $status); - } - /** * @param ImportJob $job * @param Tag $tag @@ -442,21 +239,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $job; } - /** - * @param ImportJob $job - * @param int $count - * - * @return ImportJob - */ - public function setTotalSteps(ImportJob $job, int $count): ImportJob - { - $status = $this->getExtendedStatus($job); - $status['steps'] = $count; - Log::debug(sprintf('Set total steps for job "%s" to %d', $job->key, $count)); - - return $this->setExtendedStatus($job, $status); - } - /** * @param ImportJob $job * @param array $transactions @@ -599,20 +381,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $job; } - /** - * Return import file content. - * - * @deprecated - * - * @param ImportJob $job - * - * @return string - */ - public function uploadFileContents(ImportJob $job): string - { - return $job->uploadFileContents(); - } - /** * @codeCoverageIgnore * diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index e10d79be85..3e8e6a7de9 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -35,15 +35,6 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; */ interface ImportJobRepositoryInterface { - /** - * @param ImportJob $job - * @param int $index - * @param string $error - * - * @return ImportJob - */ - public function addError(ImportJob $job, int $index, string $error): ImportJob; - /** * Add message to job. * @@ -54,31 +45,6 @@ interface ImportJobRepositoryInterface */ public function addErrorMessage(ImportJob $job, string $error): ImportJob; - /** - * @param ImportJob $job - * @param int $steps - * - * @return ImportJob - */ - public function addStepsDone(ImportJob $job, int $steps = null): ImportJob; - - /** - * @param ImportJob $job - * @param int $steps - * - * @return ImportJob - */ - public function addTotalSteps(ImportJob $job, int $steps = null): ImportJob; - - /** - * Return number of imported rows with this hash value. - * - * @param string $hash - * - * @return int - */ - public function countByHash(string $hash): int; - /** * @param string $importProvider * @@ -120,29 +86,6 @@ interface ImportJobRepositoryInterface */ public function getExtendedStatus(ImportJob $job): array; - /** - * @param ImportJob $job - * - * @return string - */ - public function getStatus(ImportJob $job): string; - - /** - * @param ImportJob $job - * @param UploadedFile $file - * - * @return bool - */ - public function processConfiguration(ImportJob $job, UploadedFile $file): bool; - - /** - * @param ImportJob $job - * @param null|UploadedFile $file - * - * @return bool - */ - public function processFile(ImportJob $job, ?UploadedFile $file): bool; - /** * @param ImportJob $job * @param array $configuration @@ -151,14 +94,6 @@ interface ImportJobRepositoryInterface */ public function setConfiguration(ImportJob $job, array $configuration): ImportJob; - /** - * @param ImportJob $job - * @param array $array - * - * @return ImportJob - */ - public function setExtendedStatus(ImportJob $job, array $array): ImportJob; - /** * @param ImportJob $job * @param string $stage @@ -175,14 +110,6 @@ interface ImportJobRepositoryInterface */ public function setStatus(ImportJob $job, string $status): ImportJob; - /** - * @param ImportJob $job - * @param int $steps - * - * @return ImportJob - */ - public function setStepsDone(ImportJob $job, int $steps): ImportJob; - /** * @param ImportJob $job * @param Tag $tag @@ -191,14 +118,6 @@ interface ImportJobRepositoryInterface */ public function setTag(ImportJob $job, Tag $tag): ImportJob; - /** - * @param ImportJob $job - * @param int $count - * - * @return ImportJob - */ - public function setTotalSteps(ImportJob $job, int $count): ImportJob; - /** * @param ImportJob $job * @param array $transactions @@ -243,12 +162,4 @@ interface ImportJobRepositoryInterface */ public function updateStatus(ImportJob $job, string $status): ImportJob; - /** - * Return import file content. - * - * @param ImportJob $job - * - * @return string - */ - public function uploadFileContents(ImportJob $job): string; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 5c6a104a56..30882e0234 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -138,23 +138,6 @@ class JournalRepository implements JournalRepositoryInterface return true; } - /** - * @param int $journalId - * - * @return TransactionJournal - * @deprecated - */ - public function find(int $journalId): TransactionJournal - { - /** @var TransactionJournal $journal */ - $journal = $this->user->transactionJournals()->where('id', $journalId)->first(); - if (null === $journal) { - return new TransactionJournal; - } - - return $journal; - } - /** * Find a journal by its hash. * @@ -225,24 +208,6 @@ class JournalRepository implements JournalRepositoryInterface return $transaction; } - /** - * Get users first transaction journal. - * - * @deprecated - * @return TransactionJournal - */ - public function first(): TransactionJournal - { - /** @var TransactionJournal $entry */ - $entry = $this->user->transactionJournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']); - - if (null === $entry) { - return new TransactionJournal; - } - - return $entry; - } - /** * Get users first transaction journal or NULL. * @@ -522,16 +487,6 @@ class JournalRepository implements JournalRepositoryInterface return $return; } - /** - * @param TransactionJournal $journal - * - * @return Note|null - */ - public function getNote(TransactionJournal $journal): ?Note - { - return $journal->notes()->first(); - } - /** * Return text of a note attached to journal, or NULL * @@ -698,27 +653,6 @@ class JournalRepository implements JournalRepositoryInterface } - /** - * Set meta field for journal that contains string. - * - * @param TransactionJournal $journal - * @param string $name - * @param string $value - */ - public function setMetaString(TransactionJournal $journal, string $name, string $value): void - { - /** @var TransactionJournalMetaFactory $factory */ - $factory = app(TransactionJournalMetaFactory::class); - $factory->updateOrCreate( - [ - 'data' => $value, - 'journal' => $journal, - 'name' => $name, - ] - ); - - } - /** * @param TransactionJournal $journal * @param int $order diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 603685307b..4f2eccf58b 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -66,17 +66,6 @@ interface JournalRepositoryInterface */ public function destroy(TransactionJournal $journal): bool; - /** - * Find a specific journal. - * - * @param int $journalId - * - * @deprecated - * - * @return TransactionJournal - */ - public function find(int $journalId): TransactionJournal; - /** * Find a journal by its hash. * @@ -109,14 +98,6 @@ interface JournalRepositoryInterface */ public function findTransaction(int $transactionid): ?Transaction; - /** - * Get users very first transaction journal. - * - * @deprecated - * @return TransactionJournal - */ - public function first(): TransactionJournal; - /** * Get users very first transaction journal. * @@ -216,13 +197,6 @@ interface JournalRepositoryInterface */ public function getMetaField(TransactionJournal $journal, string $field): ?string; - /** - * @param TransactionJournal $journal - * - * @return Note|null - */ - public function getNote(TransactionJournal $journal): ?Note; - /** * Return text of a note attached to journal, or NULL * @@ -303,15 +277,6 @@ interface JournalRepositoryInterface */ public function setMetaDate(TransactionJournal $journal, string $name, Carbon $date): void; - /** - * Set meta field for journal that contains string. - * - * @param TransactionJournal $journal - * @param string $name - * @param string $value - */ - public function setMetaString(TransactionJournal $journal, string $name, string $value): void; - /** * @param TransactionJournal $journal * @param int $order diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index 0fa01718de..d0588e8b40 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -80,22 +80,6 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface return true; } - /** - * @param int $id - * - * @return LinkType - * @deprecated - */ - public function find(int $id): LinkType - { - $linkType = LinkType::find($id); - if (null === $linkType) { - return new LinkType; - } - - return $linkType; - } - /** * @param string|null $name * diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index a43ddaaefd..5d4a250614 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -55,14 +55,6 @@ interface LinkTypeRepositoryInterface */ public function destroyLink(TransactionJournalLink $link): bool; - /** - * @param int $id - * - * @deprecated - * @return LinkType - */ - public function find(int $id): LinkType; - /** * Find link type by name. * diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 4ca0715831..a87f30a3b6 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -175,22 +175,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return true; } - /** - * @param int $piggyBankid - * - * @deprecated - * @return PiggyBank - */ - public function find(int $piggyBankid): PiggyBank - { - $piggyBank = $this->user->piggyBanks()->where('piggy_banks.id', $piggyBankid)->first(['piggy_banks.*']); - if (null !== $piggyBank) { - return $piggyBank; - } - - return new PiggyBank(); - } - /** * Find by name or return NULL. * @@ -425,24 +409,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return true; } - /** - * Set all piggy banks to order 0. - * - * @return bool - */ - public function reset(): bool - { - // split query to make it work in sqlite: - $set = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id') - ->where('accounts.user_id', $this->user->id)->get(['piggy_banks.*']); - foreach ($set as $e) { - $e->order = 0; - $e->save(); - } - - return true; - } - /** * set id of piggy bank. * diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index 4b4d7d062e..dd606c48ba 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -100,14 +100,6 @@ interface PiggyBankRepositoryInterface */ public function destroy(PiggyBank $piggyBank): bool; - /** - * @param int $piggyBankid - * - * @deprecated - * @return PiggyBank - */ - public function find(int $piggyBankid): PiggyBank; - /** * Find by name or return NULL. * @@ -208,13 +200,6 @@ interface PiggyBankRepositoryInterface */ public function removeAmount(PiggyBank $piggyBank, string $amount): bool; - /** - * Set all piggy banks to order 0. - * - * @return bool - */ - public function reset(): bool; - /** * Set specific piggy bank to specific order. * diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index fad8c7d9ea..02f79607aa 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -68,13 +68,13 @@ class RuleRepository implements RuleRepositoryInterface /** * @param int $ruleId * - * @return Rule + * @return Rule|null */ - public function find(int $ruleId): Rule + public function find(int $ruleId): ?Rule { $rule = $this->user->rules()->find($ruleId); if (null === $rule) { - return new Rule; + return null; } return $rule; diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index cefbf46a95..25a7ac7df4 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -50,9 +50,9 @@ interface RuleRepositoryInterface /** * @param int $ruleId * - * @return Rule + * @return Rule|null */ - public function find(int $ruleId): Rule; + public function find(int $ruleId): ?Rule; /** * Get all the users rules. diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index aeedeab01c..54cbf8ef31 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -77,13 +77,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** * @param int $ruleGroupId * - * @return RuleGroup + * @return RuleGroup|null */ - public function find(int $ruleGroupId): RuleGroup + public function find(int $ruleGroupId): ?RuleGroup { $group = $this->user->ruleGroups()->find($ruleGroupId); if (null === $group) { - return new RuleGroup; + return null; } return $group; diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index 2082a78012..8bd103ed1a 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -47,9 +47,9 @@ interface RuleGroupRepositoryInterface /** * @param int $ruleGroupId * - * @return RuleGroup + * @return RuleGroup|null */ - public function find(int $ruleGroupId): RuleGroup; + public function find(int $ruleGroupId): ?RuleGroup; /** * Get all rule groups. diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index b494755695..d029ca559c 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -42,27 +42,6 @@ class TagRepository implements TagRepositoryInterface /** @var User */ private $user; - /** - * @param TransactionJournal $journal - * @param Tag $tag - * - * @return bool - */ - public function connect(TransactionJournal $journal, Tag $tag): bool - { - // Already connected: - if ($journal->tags()->find($tag->id)) { - Log::info(sprintf('Tag #%d is already connected to journal #%d.', $tag->id, $journal->id)); - - return false; - } - Log::debug(sprintf('Tag #%d connected', $tag->id)); - $journal->tags()->save($tag); - $journal->save(); - - return true; - } - /** * @return int */ @@ -177,16 +156,6 @@ class TagRepository implements TagRepositoryInterface return $tags; } - /** - * @param string $type - * - * @return Collection - */ - public function getByType(string $type): Collection - { - return $this->user->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get(); - } - /** * @param Tag $tag * @@ -267,32 +236,6 @@ class TagRepository implements TagRepositoryInterface return $tag; } - /** - * @param Tag $tag - * @param Carbon|null $start - * @param Carbon|null $end - * - * @return string - */ - public function sumOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string - { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - - if (null !== $start && null !== $end) { - $collector->setRange($start, $end); - } - - $collector->setAllAssetAccounts()->setTag($tag); - $journals = $collector->getJournals(); - $sum = '0'; - foreach ($journals as $journal) { - $sum = bcadd($sum, app('steam')->positive((string)$journal->transaction_amount)); - } - - return $sum; - } - /** * @param Tag $tag * @param Carbon|null $start diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 3b6b7cd19a..07fd40f2e8 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -33,16 +33,6 @@ use Illuminate\Support\Collection; */ interface TagRepositoryInterface { - /** - * This method will connect a journal with a tag. - * - * @param TransactionJournal $journal - * @param Tag $tag - * - * @return bool - */ - public function connect(TransactionJournal $journal, Tag $tag): bool; - /** * @return int */ @@ -102,13 +92,6 @@ interface TagRepositoryInterface */ public function get(): Collection; - /** - * @param string $type - * - * @return Collection - */ - public function getByType(string $type): Collection; - /** * @param Tag $tag * @@ -153,15 +136,6 @@ interface TagRepositoryInterface */ public function store(array $data): Tag; - /** - * @param Tag $tag - * @param Carbon|null $start - * @param Carbon|null $end - * - * @return string - */ - public function sumOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string; - /** * Calculates various amounts in tag. * diff --git a/app/Repositories/TransactionType/TransactionTypeRepository.php b/app/Repositories/TransactionType/TransactionTypeRepository.php deleted file mode 100644 index c01cc5dfd3..0000000000 --- a/app/Repositories/TransactionType/TransactionTypeRepository.php +++ /dev/null @@ -1,44 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Repositories\TransactionType; - -use FireflyIII\Models\TransactionType; - -/** - * Class TransactionTypeRepository - */ -class TransactionTypeRepository implements TransactionTypeRepositoryInterface -{ - /** - * Find a transaction type or return NULL. - * - * @param string $type - * - * @return TransactionType|null - */ - public function findByType(string $type): ?TransactionType - { - return TransactionType::where('type', ucfirst($type))->first(); - } -} diff --git a/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php b/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php deleted file mode 100644 index 0e84c6dbff..0000000000 --- a/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php +++ /dev/null @@ -1,43 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Repositories\TransactionType; - -use FireflyIII\Models\TransactionType; - -/** - * Interface TransactionTypeRepositoryInterface - * - */ -interface TransactionTypeRepositoryInterface -{ - /** - * Find a transaction type or return NULL. - * - * @param string $type - * - * @return TransactionType|null - */ - public function findByType(string $type): ?TransactionType; - -} From 4fa5f4e5a3a234e445148701d29a57cb6124f908 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 22 Jul 2018 21:32:58 +0200 Subject: [PATCH 57/86] Fix some issues that triggered in scrutinizer. --- app/Helpers/Attachments/AttachmentHelper.php | 2 +- app/Models/Category.php | 1 + app/Repositories/ImportJob/ImportJobRepository.php | 4 ++-- app/Repositories/Rule/RuleRepository.php | 6 +++--- app/Rules/BelongsUser.php | 2 +- app/Support/FireflyConfig.php | 4 ++-- app/Support/Preferences.php | 2 +- app/TransactionRules/Triggers/AmountExactly.php | 4 ++-- app/TransactionRules/Triggers/AmountLess.php | 4 ++-- app/TransactionRules/Triggers/AmountMore.php | 4 ++-- app/TransactionRules/Triggers/BudgetIs.php | 4 ++-- app/TransactionRules/Triggers/CategoryIs.php | 4 ++-- app/TransactionRules/Triggers/CurrencyIs.php | 4 ++-- app/TransactionRules/Triggers/DescriptionContains.php | 4 ++-- app/TransactionRules/Triggers/DescriptionEnds.php | 4 ++-- app/TransactionRules/Triggers/DescriptionIs.php | 4 ++-- app/TransactionRules/Triggers/DescriptionStarts.php | 4 ++-- app/TransactionRules/Triggers/FromAccountContains.php | 4 ++-- app/TransactionRules/Triggers/FromAccountEnds.php | 4 ++-- app/TransactionRules/Triggers/FromAccountIs.php | 4 ++-- app/TransactionRules/Triggers/FromAccountStarts.php | 4 ++-- app/TransactionRules/Triggers/HasAnyBudget.php | 4 ++-- app/TransactionRules/Triggers/HasAnyCategory.php | 4 ++-- app/TransactionRules/Triggers/HasAnyTag.php | 4 ++-- app/TransactionRules/Triggers/HasAttachment.php | 4 ++-- app/TransactionRules/Triggers/HasNoBudget.php | 4 ++-- app/TransactionRules/Triggers/HasNoCategory.php | 4 ++-- app/TransactionRules/Triggers/HasNoTag.php | 4 ++-- app/TransactionRules/Triggers/NotesAny.php | 4 ++-- app/TransactionRules/Triggers/NotesAre.php | 4 ++-- app/TransactionRules/Triggers/NotesContain.php | 4 ++-- app/TransactionRules/Triggers/NotesEmpty.php | 4 ++-- app/TransactionRules/Triggers/NotesEnd.php | 4 ++-- app/TransactionRules/Triggers/NotesStart.php | 4 ++-- app/TransactionRules/Triggers/TagIs.php | 4 ++-- app/TransactionRules/Triggers/ToAccountContains.php | 4 ++-- app/TransactionRules/Triggers/ToAccountEnds.php | 4 ++-- app/TransactionRules/Triggers/ToAccountIs.php | 4 ++-- app/TransactionRules/Triggers/ToAccountStarts.php | 4 ++-- app/TransactionRules/Triggers/TransactionType.php | 4 ++-- app/TransactionRules/Triggers/TriggerInterface.php | 4 ++-- app/TransactionRules/Triggers/UserAction.php | 4 ++-- 42 files changed, 81 insertions(+), 80 deletions(-) diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 12c61e22b5..3b607834fb 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -249,7 +249,7 @@ class AttachmentHelper implements AttachmentHelperInterface $attachment->filename = $file->getClientOriginalName(); $attachment->mime = $file->getMimeType(); $attachment->size = $file->getSize(); - $attachment->uploaded = 0; + $attachment->uploaded = false; $attachment->save(); Log::debug('Created attachment:', $attachment->toArray()); diff --git a/app/Models/Category.php b/app/Models/Category.php index b8ea97894d..359dd039e3 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Models; +use Carbon\Carbon; use Crypt; use FireflyIII\User; use Illuminate\Database\Eloquent\Model; diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index ca5f59ff8b..a722871f60 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -300,7 +300,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface $attachment->filename = $name; $attachment->mime = 'plain/txt'; $attachment->size = \strlen($content); - $attachment->uploaded = 0; + $attachment->uploaded = false; $attachment->save(); $encrypted = Crypt::encrypt($content); @@ -351,7 +351,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface $attachment->filename = $name; $attachment->mime = $file->getMimeType(); $attachment->size = $file->getSize(); - $attachment->uploaded = 0; + $attachment->uploaded = false; $attachment->save(); $fileObject = $file->openFile('r'); $fileObject->rewind(); diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 02f79607aa..c143a2e2ce 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -288,7 +288,7 @@ class RuleRepository implements RuleRepositoryInterface $rule->rule_group_id = $data['rule_group_id']; $rule->order = ($order + 1); - $rule->active = 1; + $rule->active = true; $rule->strict = $data['strict'] ?? false; $rule->stop_processing = 1 === (int)$data['stop-processing']; $rule->title = $data['title']; @@ -316,7 +316,7 @@ class RuleRepository implements RuleRepositoryInterface $ruleAction = new RuleAction; $ruleAction->rule()->associate($rule); $ruleAction->order = $values['order']; - $ruleAction->active = 1; + $ruleAction->active = true; $ruleAction->stop_processing = $values['stopProcessing']; $ruleAction->action_type = $values['action']; $ruleAction->action_value = $values['value'] ?? ''; @@ -336,7 +336,7 @@ class RuleRepository implements RuleRepositoryInterface $ruleTrigger = new RuleTrigger; $ruleTrigger->rule()->associate($rule); $ruleTrigger->order = $values['order']; - $ruleTrigger->active = 1; + $ruleTrigger->active = true; $ruleTrigger->stop_processing = $values['stopProcessing']; $ruleTrigger->trigger_type = $values['action']; $ruleTrigger->trigger_value = $values['value'] ?? ''; diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index bc1ee68f3e..b873b18fe2 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -52,7 +52,7 @@ class BelongsUser implements Rule * * @return string */ - public function message() + public function message(): string { return (string)trans('validation.belongs_user'); } diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index f3a1f688b9..17a0fe41a5 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -51,7 +51,7 @@ class FireflyConfig /** * @param string $name - * @param null $default + * @param mixed $default * * @return \FireflyIII\Models\Configuration|null */ @@ -79,7 +79,7 @@ class FireflyConfig /** * @param string $name - * @param null $default + * @param mixed $default * * @return \FireflyIII\Models\Configuration|null */ diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index e57cb53b3f..69a4a41e8a 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -80,7 +80,7 @@ class Preferences /** * @param string $name - * @param null $default + * @param mixed $default * * @return \FireflyIII\Models\Preference|null */ diff --git a/app/TransactionRules/Triggers/AmountExactly.php b/app/TransactionRules/Triggers/AmountExactly.php index 678cfd5f23..5ecba6a6b4 100644 --- a/app/TransactionRules/Triggers/AmountExactly.php +++ b/app/TransactionRules/Triggers/AmountExactly.php @@ -43,11 +43,11 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/AmountLess.php b/app/TransactionRules/Triggers/AmountLess.php index 13325ef037..bad0c9708e 100644 --- a/app/TransactionRules/Triggers/AmountLess.php +++ b/app/TransactionRules/Triggers/AmountLess.php @@ -43,11 +43,11 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/AmountMore.php b/app/TransactionRules/Triggers/AmountMore.php index 3914513bd8..c57eaf9621 100644 --- a/app/TransactionRules/Triggers/AmountMore.php +++ b/app/TransactionRules/Triggers/AmountMore.php @@ -43,11 +43,11 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = 0 === bccomp('0', (string)$value); diff --git a/app/TransactionRules/Triggers/BudgetIs.php b/app/TransactionRules/Triggers/BudgetIs.php index bdf2fc2533..bc48a87c58 100644 --- a/app/TransactionRules/Triggers/BudgetIs.php +++ b/app/TransactionRules/Triggers/BudgetIs.php @@ -43,11 +43,11 @@ final class BudgetIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/CategoryIs.php b/app/TransactionRules/Triggers/CategoryIs.php index 14fb50a6d9..ddce55d936 100644 --- a/app/TransactionRules/Triggers/CategoryIs.php +++ b/app/TransactionRules/Triggers/CategoryIs.php @@ -43,11 +43,11 @@ final class CategoryIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/CurrencyIs.php b/app/TransactionRules/Triggers/CurrencyIs.php index 120a938ea0..d936a47a5e 100644 --- a/app/TransactionRules/Triggers/CurrencyIs.php +++ b/app/TransactionRules/Triggers/CurrencyIs.php @@ -44,11 +44,11 @@ final class CurrencyIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/DescriptionContains.php b/app/TransactionRules/Triggers/DescriptionContains.php index 7a58121418..a991101a4e 100644 --- a/app/TransactionRules/Triggers/DescriptionContains.php +++ b/app/TransactionRules/Triggers/DescriptionContains.php @@ -42,11 +42,11 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/DescriptionEnds.php b/app/TransactionRules/Triggers/DescriptionEnds.php index f55f9c095a..71bb7e5f2f 100644 --- a/app/TransactionRules/Triggers/DescriptionEnds.php +++ b/app/TransactionRules/Triggers/DescriptionEnds.php @@ -42,11 +42,11 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/DescriptionIs.php b/app/TransactionRules/Triggers/DescriptionIs.php index 3f7e7c481e..49876e0b73 100644 --- a/app/TransactionRules/Triggers/DescriptionIs.php +++ b/app/TransactionRules/Triggers/DescriptionIs.php @@ -42,11 +42,11 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/DescriptionStarts.php b/app/TransactionRules/Triggers/DescriptionStarts.php index f8decc9ef0..250f0ae3e3 100644 --- a/app/TransactionRules/Triggers/DescriptionStarts.php +++ b/app/TransactionRules/Triggers/DescriptionStarts.php @@ -42,11 +42,11 @@ final class DescriptionStarts extends AbstractTrigger implements TriggerInterfac * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountContains.php b/app/TransactionRules/Triggers/FromAccountContains.php index 2434fdd217..a551afddc2 100644 --- a/app/TransactionRules/Triggers/FromAccountContains.php +++ b/app/TransactionRules/Triggers/FromAccountContains.php @@ -43,11 +43,11 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountEnds.php b/app/TransactionRules/Triggers/FromAccountEnds.php index 8b30c32c3d..a64b0ca254 100644 --- a/app/TransactionRules/Triggers/FromAccountEnds.php +++ b/app/TransactionRules/Triggers/FromAccountEnds.php @@ -43,11 +43,11 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountIs.php b/app/TransactionRules/Triggers/FromAccountIs.php index 100ba5970e..9354c832ae 100644 --- a/app/TransactionRules/Triggers/FromAccountIs.php +++ b/app/TransactionRules/Triggers/FromAccountIs.php @@ -43,11 +43,11 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/FromAccountStarts.php b/app/TransactionRules/Triggers/FromAccountStarts.php index 23987e3210..99a8ae1c49 100644 --- a/app/TransactionRules/Triggers/FromAccountStarts.php +++ b/app/TransactionRules/Triggers/FromAccountStarts.php @@ -43,11 +43,11 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/HasAnyBudget.php b/app/TransactionRules/Triggers/HasAnyBudget.php index 224c4b9212..89b451412d 100644 --- a/app/TransactionRules/Triggers/HasAnyBudget.php +++ b/app/TransactionRules/Triggers/HasAnyBudget.php @@ -43,11 +43,11 @@ final class HasAnyBudget extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasAnyCategory.php b/app/TransactionRules/Triggers/HasAnyCategory.php index 2f356f2eaa..d27f34fb8c 100644 --- a/app/TransactionRules/Triggers/HasAnyCategory.php +++ b/app/TransactionRules/Triggers/HasAnyCategory.php @@ -43,11 +43,11 @@ final class HasAnyCategory extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasAnyTag.php b/app/TransactionRules/Triggers/HasAnyTag.php index 5e1795bb20..a58ca924a3 100644 --- a/app/TransactionRules/Triggers/HasAnyTag.php +++ b/app/TransactionRules/Triggers/HasAnyTag.php @@ -42,11 +42,11 @@ final class HasAnyTag extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasAttachment.php b/app/TransactionRules/Triggers/HasAttachment.php index 0dba22509b..ec6601b0d1 100644 --- a/app/TransactionRules/Triggers/HasAttachment.php +++ b/app/TransactionRules/Triggers/HasAttachment.php @@ -42,11 +42,11 @@ class HasAttachment extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { $value = (int)$value; diff --git a/app/TransactionRules/Triggers/HasNoBudget.php b/app/TransactionRules/Triggers/HasNoBudget.php index fa4bae0539..a313ba75ce 100644 --- a/app/TransactionRules/Triggers/HasNoBudget.php +++ b/app/TransactionRules/Triggers/HasNoBudget.php @@ -43,11 +43,11 @@ final class HasNoBudget extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasNoCategory.php b/app/TransactionRules/Triggers/HasNoCategory.php index b0ebe78d6a..d986832e65 100644 --- a/app/TransactionRules/Triggers/HasNoCategory.php +++ b/app/TransactionRules/Triggers/HasNoCategory.php @@ -43,11 +43,11 @@ final class HasNoCategory extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/HasNoTag.php b/app/TransactionRules/Triggers/HasNoTag.php index 98e435e865..9077ef1ad7 100644 --- a/app/TransactionRules/Triggers/HasNoTag.php +++ b/app/TransactionRules/Triggers/HasNoTag.php @@ -42,11 +42,11 @@ final class HasNoTag extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/NotesAny.php b/app/TransactionRules/Triggers/NotesAny.php index 6be0eab197..b30c93a564 100644 --- a/app/TransactionRules/Triggers/NotesAny.php +++ b/app/TransactionRules/Triggers/NotesAny.php @@ -43,11 +43,11 @@ final class NotesAny extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/NotesAre.php b/app/TransactionRules/Triggers/NotesAre.php index 00275edecd..d08ff753bd 100644 --- a/app/TransactionRules/Triggers/NotesAre.php +++ b/app/TransactionRules/Triggers/NotesAre.php @@ -43,11 +43,11 @@ final class NotesAre extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/NotesContain.php b/app/TransactionRules/Triggers/NotesContain.php index 23c74cc74d..54901597b3 100644 --- a/app/TransactionRules/Triggers/NotesContain.php +++ b/app/TransactionRules/Triggers/NotesContain.php @@ -43,11 +43,11 @@ final class NotesContain extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/NotesEmpty.php b/app/TransactionRules/Triggers/NotesEmpty.php index dc548d40e5..bd42f18ab6 100644 --- a/app/TransactionRules/Triggers/NotesEmpty.php +++ b/app/TransactionRules/Triggers/NotesEmpty.php @@ -43,11 +43,11 @@ final class NotesEmpty extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return false; } diff --git a/app/TransactionRules/Triggers/NotesEnd.php b/app/TransactionRules/Triggers/NotesEnd.php index aa3f264c13..3eb265ab5c 100644 --- a/app/TransactionRules/Triggers/NotesEnd.php +++ b/app/TransactionRules/Triggers/NotesEnd.php @@ -43,11 +43,11 @@ final class NotesEnd extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/NotesStart.php b/app/TransactionRules/Triggers/NotesStart.php index 0346f6136a..4bef3f85e2 100644 --- a/app/TransactionRules/Triggers/NotesStart.php +++ b/app/TransactionRules/Triggers/NotesStart.php @@ -43,11 +43,11 @@ final class NotesStart extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/TagIs.php b/app/TransactionRules/Triggers/TagIs.php index 687f14cf5b..48bfa3841d 100644 --- a/app/TransactionRules/Triggers/TagIs.php +++ b/app/TransactionRules/Triggers/TagIs.php @@ -43,11 +43,11 @@ final class TagIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/ToAccountContains.php b/app/TransactionRules/Triggers/ToAccountContains.php index b0c78f7322..a4079522e5 100644 --- a/app/TransactionRules/Triggers/ToAccountContains.php +++ b/app/TransactionRules/Triggers/ToAccountContains.php @@ -43,11 +43,11 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/ToAccountEnds.php b/app/TransactionRules/Triggers/ToAccountEnds.php index d23cbee4e7..1ca88c56dc 100644 --- a/app/TransactionRules/Triggers/ToAccountEnds.php +++ b/app/TransactionRules/Triggers/ToAccountEnds.php @@ -43,11 +43,11 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/ToAccountIs.php b/app/TransactionRules/Triggers/ToAccountIs.php index 5754527ef7..658b96adf6 100644 --- a/app/TransactionRules/Triggers/ToAccountIs.php +++ b/app/TransactionRules/Triggers/ToAccountIs.php @@ -43,11 +43,11 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/ToAccountStarts.php b/app/TransactionRules/Triggers/ToAccountStarts.php index ab21f63b66..8583235369 100644 --- a/app/TransactionRules/Triggers/ToAccountStarts.php +++ b/app/TransactionRules/Triggers/ToAccountStarts.php @@ -43,11 +43,11 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { $res = '' === (string)$value; diff --git a/app/TransactionRules/Triggers/TransactionType.php b/app/TransactionRules/Triggers/TransactionType.php index 7d3d033197..8aa6699155 100644 --- a/app/TransactionRules/Triggers/TransactionType.php +++ b/app/TransactionRules/Triggers/TransactionType.php @@ -42,11 +42,11 @@ final class TransactionType extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { if (null !== $value) { return false; diff --git a/app/TransactionRules/Triggers/TriggerInterface.php b/app/TransactionRules/Triggers/TriggerInterface.php index 9877633e22..45b24847ba 100644 --- a/app/TransactionRules/Triggers/TriggerInterface.php +++ b/app/TransactionRules/Triggers/TriggerInterface.php @@ -41,11 +41,11 @@ interface TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @return bool */ - public static function willMatchEverything($value = null); + public static function willMatchEverything($value = null): bool; /** * Triggers on a value and journal. diff --git a/app/TransactionRules/Triggers/UserAction.php b/app/TransactionRules/Triggers/UserAction.php index 7a8ed85d7c..f54ac107dd 100644 --- a/app/TransactionRules/Triggers/UserAction.php +++ b/app/TransactionRules/Triggers/UserAction.php @@ -42,13 +42,13 @@ final class UserAction extends AbstractTrigger implements TriggerInterface * (even if it will still include 99.9% of the users transactions), this method MUST return * false. * - * @param null $value + * @param mixed $value * * @codeCoverageIgnore * * @return bool */ - public static function willMatchEverything($value = null) + public static function willMatchEverything($value = null): bool { return true; } From 06d22e843a03887c521f6075f7823fa4e906a6fc Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 23 Jul 2018 21:49:15 +0200 Subject: [PATCH 58/86] Code optimizations. --- app/Api/V1/Requests/RecurrenceRequest.php | 3 +- .../Report/Account/MonthReportGenerator.php | 2 +- .../Report/Audit/MonthReportGenerator.php | 3 +- .../Report/Budget/MonthReportGenerator.php | 2 +- .../Report/Category/MonthReportGenerator.php | 2 +- .../Report/Standard/MonthReportGenerator.php | 2 +- .../Standard/MultiYearReportGenerator.php | 2 +- .../Report/Standard/YearReportGenerator.php | 2 +- .../Report/Tag/MonthReportGenerator.php | 3 +- .../Events/VersionCheckEventHandler.php | 7 - .../Controllers/Chart/BudgetController.php | 3 +- .../Controllers/Popup/ReportController.php | 6 +- .../Controllers/TransactionController.php | 3 +- app/Http/Middleware/Range.php | 3 +- app/Http/Requests/RecurrenceFormRequest.php | 3 +- app/Providers/BroadcastServiceProvider.php | 1 + .../Account/AccountRepository.php | 212 +++++- .../Account/AccountRepositoryInterface.php | 2 +- .../Account/FindAccountsTrait.php | 248 ------- .../Attachment/AttachmentRepository.php | 8 +- .../AttachmentRepositoryInterface.php | 6 +- app/Repositories/Bill/BillRepository.php | 27 +- app/Repositories/Budget/BudgetRepository.php | 9 +- .../Budget/BudgetRepositoryInterface.php | 2 +- .../ExportJob/ExportJobRepository.php | 2 + .../ExportJobRepositoryInterface.php | 2 + .../ImportJob/ImportJobRepository.php | 4 +- .../ImportJobRepositoryInterface.php | 1 + .../Recurring/RecurringRepository.php | 630 ++++++++++++------ app/Repositories/Tag/TagRepository.php | 8 +- .../Tag/TagRepositoryInterface.php | 4 +- app/Support/ExpandedForm.php | 170 +++-- .../Transaction/SingleControllerTest.php | 5 +- 33 files changed, 784 insertions(+), 603 deletions(-) delete mode 100644 app/Repositories/Account/FindAccountsTrait.php diff --git a/app/Api/V1/Requests/RecurrenceRequest.php b/app/Api/V1/Requests/RecurrenceRequest.php index 5e4d646aa9..fd348c733d 100644 --- a/app/Api/V1/Requests/RecurrenceRequest.php +++ b/app/Api/V1/Requests/RecurrenceRequest.php @@ -84,8 +84,7 @@ class RecurrenceRequest extends Request */ public function rules(): array { - $today = new Carbon; - $today->addDay(); + $today = Carbon::create()->addDay(); return [ 'type' => 'required|in:withdrawal,transfer,deposit', diff --git a/app/Generator/Report/Account/MonthReportGenerator.php b/app/Generator/Report/Account/MonthReportGenerator.php index 4693e71c0d..49f0cbfbd7 100644 --- a/app/Generator/Report/Account/MonthReportGenerator.php +++ b/app/Generator/Report/Account/MonthReportGenerator.php @@ -44,7 +44,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * Generate the report. * * @return string - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 666738d73a..386f27ded2 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -51,7 +51,8 @@ class MonthReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - + * @throws FireflyException + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index dc9d47c244..ff4229ab26 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -64,7 +64,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface * Generates the report. * * @return string - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 8957ca3020..ef187a575b 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -68,7 +68,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface * Generates the report. * * @return string - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index 987b0ec304..e27f4d79ed 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -43,7 +43,7 @@ class MonthReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index 69174d06b8..ec507b9386 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -42,7 +42,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index ef844a4a85..47f92f47ad 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -42,7 +42,7 @@ class YearReportGenerator implements ReportGeneratorInterface * Generates the report. * * @return string - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index 2242381c2d..e367283624 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -70,8 +70,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface * Generate the report. * * @return string - - + * @throws \Throwable */ public function generate(): string { diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php index b7e7a14ced..3955de9098 100644 --- a/app/Handlers/Events/VersionCheckEventHandler.php +++ b/app/Handlers/Events/VersionCheckEventHandler.php @@ -80,13 +80,6 @@ class VersionCheckEventHandler // last check time was more than a week ago. Log::debug('Have not checked for a new version in a week!'); - // have actual permission? - if ($permission->data === -1) { - // never asked before. - //session()->flash('info', (string)trans('firefly.check_for_updates_permission', ['link' => route('admin.update-check')])); - //return; - } - $latestRelease = $this->getLatestRelease(); $versionCheck = $this->versionCheck($latestRelease); $resultString = $this->parseResult($latestRelease, $versionCheck); diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 90e647a768..8ca96aa5d9 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -83,7 +83,8 @@ class BudgetController extends Controller */ public function budget(Budget $budget): JsonResponse { - $start = $this->repository->firstUseDate($budget); + /** @var Carbon $start */ + $start = $this->repository->firstUseDate($budget) ?? session('start', new Carbon); /** @var Carbon $end */ $end = session('end', new Carbon); $cache = new CacheProperties(); diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index a9633c1826..1bdb211b1f 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -274,8 +274,7 @@ class ReportController extends Controller $attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate']); } catch (InvalidArgumentException $e) { Log::debug(sprintf('Not important error message: %s', $e->getMessage())); - $date = new Carbon; - $date->startOfMonth(); + $date = Carbon::create()->startOfMonth(); $attributes['startDate'] = $date; } @@ -283,8 +282,7 @@ class ReportController extends Controller $attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate']); } catch (InvalidArgumentException $e) { Log::debug('Not important error message: %s', $e->getMessage()); - $date = new Carbon; - $date->startOfMonth(); + $date = Carbon::create()->startOfMonth(); $attributes['endDate'] = $date; } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 815114325b..c9685012a6 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -262,8 +262,7 @@ class TransactionController extends Controller { $range = app('preferences')->get('viewRange', '1M')->data; $first = $this->repository->firstNull(); - $start = new Carbon; - $start->subYear(); + $start = Carbon::create()->subYear(); $types = config('firefly.transactionTypesByWhat.' . $what); $entries = new Collection; if (null !== $first) { diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 9ff1f89e1d..70acc493f0 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -124,8 +124,7 @@ class Range // ignore preference. set the range to be the current month: if (!app('session')->has('start') && !app('session')->has('end')) { $viewRange = app('preferences')->get('viewRange', '1M')->data; - $start = new Carbon; - $start = app('navigation')->updateStartDate($viewRange, $start); + $start = app('navigation')->updateStartDate($viewRange, new Carbon); $end = app('navigation')->updateEndDate($viewRange, $start); app('session')->put('start', $start); diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 59b62874bf..0ddd7bb8c2 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -149,8 +149,7 @@ class RecurrenceFormRequest extends Request public function rules(): array { $today = new Carbon; - $tomorrow = clone $today; - $tomorrow->addDay(); + $tomorrow = Carbon::create()->addDay(); $rules = [ // mandatory info for recurrence. 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 2b64d5d036..845be09666 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -38,6 +38,7 @@ class BroadcastServiceProvider extends ServiceProvider { Broadcast::routes(); + /** @noinspection PhpIncludeInspection */ require base_path('routes/channels.php'); } } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index f1074de2bf..56d2b8289c 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -23,23 +23,24 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Account; use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountFactory; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; -use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Update\AccountUpdateService; -use FireflyIII\Services\Internal\Update\JournalUpdateService; use FireflyIII\User; +use Illuminate\Support\Collection; +use Log; /** * Class AccountRepository. */ class AccountRepository implements AccountRepositoryInterface { - use FindAccountsTrait; + /** @var User */ private $user; @@ -72,6 +73,89 @@ class AccountRepository implements AccountRepositoryInterface return true; } + /** + * @param string $number + * @param array $types + * + * @return Account|null + */ + public function findByAccountNumber(string $number, array $types): ?Account + { + $query = $this->user->accounts() + ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id') + ->where('account_meta.name', 'accountNumber') + ->where('account_meta.data', json_encode($number)); + + if (\count($types) > 0) { + $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); + $query->whereIn('account_types.type', $types); + } + + /** @var Collection $accounts */ + $accounts = $query->get(['accounts.*']); + if ($accounts->count() > 0) { + return $accounts->first(); + } + + return null; + } + + /** + * @param string $iban + * @param array $types + * + * @return Account|null + */ + public function findByIbanNull(string $iban, array $types): ?Account + { + $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban'); + + if (\count($types) > 0) { + $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); + $query->whereIn('account_types.type', $types); + } + + $accounts = $query->get(['accounts.*']); + /** @var Account $account */ + foreach ($accounts as $account) { + if ($account->iban === $iban) { + return $account; + } + } + + return null; + } + + /** + * @param string $name + * @param array $types + * + * @return Account|null + */ + public function findByName(string $name, array $types): ?Account + { + $query = $this->user->accounts(); + + if (\count($types) > 0) { + $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); + $query->whereIn('account_types.type', $types); + } + Log::debug(sprintf('Searching for account named "%s" (of user #%d) of the following type(s)', $name, $this->user->id), ['types' => $types]); + + $accounts = $query->get(['accounts.*']); + /** @var Account $account */ + foreach ($accounts as $account) { + if ($account->name === $name) { + Log::debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id)); + + return $account; + } + } + Log::debug(sprintf('There is no account with name "%s" of types', $name), $types); + + return null; + } + /** * @param int $accountId * @@ -82,6 +166,96 @@ class AccountRepository implements AccountRepositoryInterface return $this->user->accounts()->find($accountId); } + /** + * @param array $accountIds + * + * @return Collection + */ + public function getAccountsById(array $accountIds): Collection + { + /** @var Collection $result */ + $query = $this->user->accounts(); + + if (\count($accountIds) > 0) { + $query->whereIn('accounts.id', $accountIds); + } + + $result = $query->get(['accounts.*']); + $result = $result->sortBy( + function (Account $account) { + return strtolower($account->name); + } + ); + + return $result; + } + + /** + * @param array $types + * + * @return Collection + */ + public function getAccountsByType(array $types): Collection + { + /** @var Collection $result */ + $query = $this->user->accounts(); + if (\count($types) > 0) { + $query->accountTypeIn($types); + } + + $result = $query->get(['accounts.*']); + $result = $result->sortBy( + function (Account $account) { + return strtolower($account->name); + } + ); + + return $result; + } + + /** + * @param array $types + * + * @return Collection + */ + public function getActiveAccountsByType(array $types): Collection + { + /** @var Collection $result */ + $query = $this->user->accounts()->with( + ['accountmeta' => function (HasMany $query) { + $query->where('name', 'accountRole'); + }] + ); + if (\count($types) > 0) { + $query->accountTypeIn($types); + } + $query->where('active', 1); + $result = $query->get(['accounts.*']); + $result = $result->sortBy( + function (Account $account) { + return strtolower($account->name); + } + ); + + return $result; + } + + /** + * @return Account + * + * @throws FireflyException + */ + public function getCashAccount(): Account + { + /** @var AccountType $type */ + $type = AccountType::where('type', AccountType::CASH)->first(); + /** @var AccountFactory $factory */ + $factory = app(AccountFactory::class); + $factory->setUser($this->user); + + return $factory->findOrCreate('Cash account', $type->type); + } + /** * Return meta value for account. Null if not found. * @@ -163,11 +337,41 @@ class AccountRepository implements AccountRepositoryInterface return $journal->date->format('Y-m-d'); } + /** + * @param Account $account + * + * @return Account|null + * + * @throws FireflyException + */ + public function getReconciliation(Account $account): ?Account + { + if (AccountType::ASSET !== $account->accountType->type) { + throw new FireflyException(sprintf('%s is not an asset account.', $account->name)); + } + $name = $account->name . ' reconciliation'; + /** @var AccountType $type */ + $type = AccountType::where('type', AccountType::RECONCILIATION)->first(); + $accounts = $this->user->accounts()->where('account_type_id', $type->id)->get(); + /** @var Account $current */ + foreach ($accounts as $current) { + if ($current->name === $name) { + return $current; + } + } + /** @var AccountFactory $factory */ + $factory = app(AccountFactory::class); + $factory->setUser($account->user); + $account = $factory->findOrCreate($name, $type->type); + + return $account; + } + /** * Returns the date of the very first transaction in this account. * * @param Account $account - * + * @deprecated * @return TransactionJournal */ public function oldestJournal(Account $account): TransactionJournal diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index e7399060a6..3ea3c1be42 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -164,7 +164,7 @@ interface AccountRepositoryInterface * Returns the date of the very first transaction in this account. * * @param Account $account - * + * @deprecated * @return TransactionJournal */ public function oldestJournal(Account $account): TransactionJournal; diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php deleted file mode 100644 index fa4254039b..0000000000 --- a/app/Repositories/Account/FindAccountsTrait.php +++ /dev/null @@ -1,248 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Repositories\Account; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Factory\AccountFactory; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\User; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Support\Collection; -use Log; - -/** - * @property User $user - * - * Trait FindAccountsTrait - */ -trait FindAccountsTrait -{ - - /** - * @param string $number - * @param array $types - * - * @return Account|null - */ - public function findByAccountNumber(string $number, array $types): ?Account - { - $query = $this->user->accounts() - ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id') - ->where('account_meta.name', 'accountNumber') - ->where('account_meta.data', json_encode($number)); - - if (\count($types) > 0) { - $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); - $query->whereIn('account_types.type', $types); - } - - /** @var Collection $accounts */ - $accounts = $query->get(['accounts.*']); - if ($accounts->count() > 0) { - return $accounts->first(); - } - - return null; - } - - /** - * @param string $iban - * @param array $types - * - * @return Account|null - */ - public function findByIbanNull(string $iban, array $types): ?Account - { - $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban'); - - if (\count($types) > 0) { - $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); - $query->whereIn('account_types.type', $types); - } - - $accounts = $query->get(['accounts.*']); - /** @var Account $account */ - foreach ($accounts as $account) { - if ($account->iban === $iban) { - return $account; - } - } - - return null; - } - - /** - * @param string $name - * @param array $types - * - * @return Account|null - */ - public function findByName(string $name, array $types): ?Account - { - $query = $this->user->accounts(); - - if (\count($types) > 0) { - $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); - $query->whereIn('account_types.type', $types); - } - Log::debug(sprintf('Searching for account named "%s" (of user #%d) of the following type(s)', $name, $this->user->id), ['types' => $types]); - - $accounts = $query->get(['accounts.*']); - /** @var Account $account */ - foreach ($accounts as $account) { - if ($account->name === $name) { - Log::debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id)); - - return $account; - } - if ($account->name !== $name) { - Log::debug(sprintf('"%s" does not equal "%s"', $account->name, $name)); - } - } - Log::debug(sprintf('There is no account with name "%s" of types', $name), $types); - - return null; - } - - /** - * @param array $accountIds - * - * @return Collection - */ - public function getAccountsById(array $accountIds): Collection - { - /** @var Collection $result */ - $query = $this->user->accounts(); - - if (\count($accountIds) > 0) { - $query->whereIn('accounts.id', $accountIds); - } - - $result = $query->get(['accounts.*']); - $result = $result->sortBy( - function (Account $account) { - return strtolower($account->name); - } - ); - - return $result; - } - - /** - * @param array $types - * - * @return Collection - */ - public function getAccountsByType(array $types): Collection - { - /** @var Collection $result */ - $query = $this->user->accounts(); - if (\count($types) > 0) { - $query->accountTypeIn($types); - } - - $result = $query->get(['accounts.*']); - $result = $result->sortBy( - function (Account $account) { - return strtolower($account->name); - } - ); - - return $result; - } - - /** - * @param array $types - * - * @return Collection - */ - public function getActiveAccountsByType(array $types): Collection - { - /** @var Collection $result */ - $query = $this->user->accounts()->with( - ['accountmeta' => function (HasMany $query) { - $query->where('name', 'accountRole'); - }] - ); - if (\count($types) > 0) { - $query->accountTypeIn($types); - } - $query->where('active', 1); - $result = $query->get(['accounts.*']); - $result = $result->sortBy( - function (Account $account) { - return strtolower($account->name); - } - ); - - return $result; - } - - /** - * @return Account - * - * @throws FireflyException - */ - public function getCashAccount(): Account - { - /** @var AccountType $type */ - $type = AccountType::where('type', AccountType::CASH)->first(); - /** @var AccountFactory $factory */ - $factory = app(AccountFactory::class); - $factory->setUser($this->user); - - return $factory->findOrCreate('Cash account', $type->type); - } - - /** - * @param Account $account - * - * @return Account|null - * - * @throws FireflyException - */ - public function getReconciliation(Account $account): ?Account - { - if (AccountType::ASSET !== $account->accountType->type) { - throw new FireflyException(sprintf('%s is not an asset account.', $account->name)); - } - $name = $account->name . ' reconciliation'; - /** @var AccountType $type */ - $type = AccountType::where('type', AccountType::RECONCILIATION)->first(); - $accounts = $this->user->accounts()->where('account_type_id', $type->id)->get(); - /** @var Account $current */ - foreach ($accounts as $current) { - if ($current->name === $name) { - return $current; - } - } - /** @var AccountFactory $factory */ - $factory = app(AccountFactory::class); - $factory->setUser($account->user); - $account = $factory->findOrCreate($name, $type->type); - - return $account; - } - -} diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 6d23f64480..cf723f56bb 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -80,14 +80,14 @@ class AttachmentRepository implements AttachmentRepositoryInterface } /** - * @param int $id - * + * @param int $attachmentId + * @deprecated * @return Attachment */ - public function findWithoutUser(int $id): Attachment + public function findWithoutUser(int $attachmentId): Attachment { - $attachment = Attachment::find($id); + $attachment = Attachment::find($attachmentId); if (null === $attachment) { return new Attachment; } diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index a0a0d44a72..2f25bf81a7 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -49,11 +49,11 @@ interface AttachmentRepositoryInterface public function exists(Attachment $attachment): bool; /** - * @param int $id - * + * @param int $attachmentId + * @deprecated * @return Attachment */ - public function findWithoutUser(int $id): Attachment; + public function findWithoutUser(int $attachmentId): Attachment; /** * @return Collection diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index d8861266a4..a855d305ab 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -136,21 +136,8 @@ class BillRepository implements BillRepositoryInterface */ public function getBillsForAccounts(Collection $accounts): Collection { - $fields = ['bills.id', - 'bills.created_at', - 'bills.updated_at', - 'bills.deleted_at', - 'bills.user_id', - 'bills.name', - 'bills.match', - 'bills.amount_min', - 'bills.amount_max', - 'bills.date', - 'bills.repeat_freq', - 'bills.skip', - 'bills.automatch', - 'bills.active', - 'bills.name_encrypted', + $fields = ['bills.id', 'bills.created_at', 'bills.updated_at', 'bills.deleted_at', 'bills.user_id', 'bills.name', 'bills.match', 'bills.amount_min', + 'bills.amount_max', 'bills.date', 'bills.repeat_freq', 'bills.skip', 'bills.automatch', 'bills.active', 'bills.name_encrypted', 'bills.match_encrypted',]; $ids = $accounts->pluck('id')->toArray(); $set = $this->user->bills() @@ -336,28 +323,22 @@ class BillRepository implements BillRepositoryInterface public function getPayDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection { $set = new Collection; - Log::debug(sprintf('Now at bill "%s" (%s)', $bill->name, $bill->repeat_freq)); - - // Start at 2016-10-01, see when we expect the bill to hit: $currentStart = clone $start; + Log::debug(sprintf('Now at bill "%s" (%s)', $bill->name, $bill->repeat_freq)); Log::debug(sprintf('First currentstart is %s', $currentStart->format('Y-m-d'))); while ($currentStart <= $end) { Log::debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d'))); $nextExpectedMatch = $this->nextDateMatch($bill, $currentStart); Log::debug(sprintf('Next Date match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d'))); - // If nextExpectedMatch is after end, we continue: - if ($nextExpectedMatch > $end) { + if ($nextExpectedMatch > $end) {// If nextExpectedMatch is after end, we continue Log::debug( sprintf('nextExpectedMatch %s is after %s, so we skip this bill now.', $nextExpectedMatch->format('Y-m-d'), $end->format('Y-m-d')) ); break; } - // add to set $set->push(clone $nextExpectedMatch); Log::debug(sprintf('Now %d dates in set.', $set->count())); - - // add day if necessary. $nextExpectedMatch->addDay(); Log::debug(sprintf('Currentstart (%s) has become %s.', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d'))); diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index b48bb98157..f71ec844b3 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -85,6 +85,7 @@ class BudgetRepository implements BudgetRepositoryInterface /** * @return bool + * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 5. */ public function cleanupBudgets(): bool { @@ -123,6 +124,8 @@ class BudgetRepository implements BudgetRepositoryInterface * @param Carbon $end * * @return array + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array { @@ -138,7 +141,6 @@ class BudgetRepository implements BudgetRepositoryInterface $return[$budgetId] = [ 'spent' => $this->spentInPeriod(new Collection([$budget]), $accounts, $start, $end), 'budgeted' => '0', - 'currentRep' => false, ]; $budgetLimits = $this->getBudgetLimits($budget, $start, $end); $otherLimits = new Collection; @@ -244,12 +246,11 @@ class BudgetRepository implements BudgetRepositoryInterface * Will cache result. * * @param Budget $budget - * * @return Carbon */ - public function firstUseDate(Budget $budget): Carbon + public function firstUseDate(Budget $budget): ?Carbon { - $oldest = Carbon::create()->startOfYear(); + $oldest = null; $journal = $budget->transactionJournals()->orderBy('date', 'ASC')->first(); if (null !== $journal) { $oldest = $journal->date < $oldest ? $journal->date : $oldest; diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 56a3ca82a6..d6df2f54c6 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -105,7 +105,7 @@ interface BudgetRepositoryInterface * * @return Carbon */ - public function firstUseDate(Budget $budget): Carbon; + public function firstUseDate(Budget $budget): ?Carbon; /** * @return Collection diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index 1745d1a14f..cb377a383b 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -81,6 +81,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * @return ExportJob + * @deprecated */ public function create(): ExportJob { @@ -120,6 +121,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * @param string $key + * * @deprecated * @return ExportJob */ diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 21ea419de4..3a9bd5c4fd 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -45,6 +45,7 @@ interface ExportJobRepositoryInterface /** * @return ExportJob + * @deprecated */ public function create(): ExportJob; @@ -57,6 +58,7 @@ interface ExportJobRepositoryInterface /** * @param string $key + * * @deprecated * @return ExportJob */ diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index a722871f60..24b7703719 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -27,14 +27,11 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Attachment; use FireflyIII\Models\ImportJob; use FireflyIII\Models\Tag; -use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Illuminate\Support\Str; use Log; -use SplFileObject; use Storage; use Symfony\Component\HttpFoundation\File\UploadedFile; @@ -118,6 +115,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface * @param string $key * * @return ImportJob + * @deprecated */ public function findByKey(string $key): ImportJob { diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index 3e8e6a7de9..0789741fc5 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -56,6 +56,7 @@ interface ImportJobRepositoryInterface * @param string $key * * @return ImportJob + * @deprecated */ public function findByKey(string $key): ImportJob; diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 3dd4db2028..d147cbd676 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -193,122 +193,34 @@ class RecurringRepository implements RecurringRepositoryInterface */ public function getOccurrencesInRange(RecurrenceRepetition $repetition, Carbon $start, Carbon $end): array { - $return = []; - $mutator = clone $start; + $occurrences = []; + $mutator = clone $start; $mutator->startOfDay(); - $skipMod = $repetition->repetition_skip + 1; - $attempts = 0; + $skipMod = $repetition->repetition_skip + 1; Log::debug(sprintf('Calculating occurrences for rep type "%s"', $repetition->repetition_type)); Log::debug(sprintf('Mutator is now: %s', $mutator->format('Y-m-d'))); - switch ($repetition->repetition_type) { - default: - throw new FireflyException( - sprintf('Cannot calculate occurrences for recurring transaction repetition type "%s"', $repetition->repetition_type) - ); - case 'daily': - Log::debug('Rep is daily. Start of loop.'); - while ($mutator <= $end) { - Log::debug(sprintf('Mutator is now: %s', $mutator->format('Y-m-d'))); - if (0 === $attempts % $skipMod) { - Log::debug(sprintf('Attempts modulo skipmod is zero, include %s', $mutator->format('Y-m-d'))); - $return[] = clone $mutator; - } - $mutator->addDay(); - $attempts++; - } - break; - case 'weekly': - Log::debug('Rep is weekly.'); - // monday = 1 - // sunday = 7 - $dayOfWeek = (int)$repetition->repetition_moment; - Log::debug(sprintf('DoW in repetition is %d, in mutator is %d', $dayOfWeek, $mutator->dayOfWeekIso)); - if ($mutator->dayOfWeekIso > $dayOfWeek) { - // day has already passed this week, add one week: - $mutator->addWeek(); - Log::debug(sprintf('Jump to next week, so mutator is now: %s', $mutator->format('Y-m-d'))); - } - // today is wednesday (3), expected is friday (5): add two days. - // today is friday (5), expected is monday (1), subtract four days. - Log::debug(sprintf('Mutator is now: %s', $mutator->format('Y-m-d'))); - $dayDifference = $dayOfWeek - $mutator->dayOfWeekIso; - $mutator->addDays($dayDifference); - Log::debug(sprintf('Mutator is now: %s', $mutator->format('Y-m-d'))); - while ($mutator <= $end) { - if (0 === $attempts % $skipMod && $start->lte($mutator) && $end->gte($mutator)) { - Log::debug('Date is in range of start+end, add to set.'); - $return[] = clone $mutator; - } - $attempts++; - $mutator->addWeek(); - Log::debug(sprintf('Mutator is now (end of loop): %s', $mutator->format('Y-m-d'))); - } - break; - case 'monthly': - $dayOfMonth = (int)$repetition->repetition_moment; - Log::debug(sprintf('Day of month in repetition is %d', $dayOfMonth)); - Log::debug(sprintf('Start is %s.', $start->format('Y-m-d'))); - Log::debug(sprintf('End is %s.', $end->format('Y-m-d'))); - if ($mutator->day > $dayOfMonth) { - Log::debug('Add a month.'); - // day has passed already, add a month. - $mutator->addMonth(); - } - Log::debug(sprintf('Start is now %s.', $mutator->format('Y-m-d'))); - Log::debug('Start loop.'); - while ($mutator < $end) { - Log::debug(sprintf('Mutator is now %s.', $mutator->format('Y-m-d'))); - $domCorrected = min($dayOfMonth, $mutator->daysInMonth); - Log::debug(sprintf('DoM corrected is %d', $domCorrected)); - $mutator->day = $domCorrected; - Log::debug(sprintf('Mutator is now %s.', $mutator->format('Y-m-d'))); - Log::debug(sprintf('$attempts %% $skipMod === 0 is %s', var_export(0 === $attempts % $skipMod, true))); - Log::debug(sprintf('$start->lte($mutator) is %s', var_export($start->lte($mutator), true))); - Log::debug(sprintf('$end->gte($mutator) is %s', var_export($end->gte($mutator), true))); - if (0 === $attempts % $skipMod && $start->lte($mutator) && $end->gte($mutator)) { - Log::debug(sprintf('ADD %s to return!', $mutator->format('Y-m-d'))); - $return[] = clone $mutator; - } - $attempts++; - $mutator->endOfMonth()->startOfDay()->addDay(); - } - break; - case 'ndom': - $mutator->startOfMonth(); - // this feels a bit like a cop out but why reinvent the wheel? - $counters = [1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth',]; - $daysOfWeek = [1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 7 => 'Sunday',]; - $parts = explode(',', $repetition->repetition_moment); - while ($mutator <= $end) { - $string = sprintf('%s %s of %s %s', $counters[$parts[0]], $daysOfWeek[$parts[1]], $mutator->format('F'), $mutator->format('Y')); - $newCarbon = new Carbon($string); - $return[] = clone $newCarbon; - $mutator->endOfMonth()->addDay(); - } - break; - case 'yearly': - $date = new Carbon($repetition->repetition_moment); - $date->year = $mutator->year; - if ($mutator > $date) { - $date->addYear(); - } - - // is $date between $start and $end? - $obj = clone $date; - $count = 0; - while ($obj <= $end && $obj >= $mutator && $count < 10) { - - $return[] = clone $obj; - $obj->addYears(1); - $count++; - } - break; + if ('daily' === $repetition->repetition_type) { + $occurrences = $this->getDailyInRange($mutator, $end, $skipMod); + } + if ('weekly' === $repetition->repetition_type) { + $occurrences = $this->getWeeklyInRange($mutator, $end, $skipMod, $repetition->repetition_moment); + } + if ('monthly' === $repetition->repetition_type) { + $occurrences = $this->getMonthlyInRange($mutator, $end, $skipMod, $repetition->repetition_moment); + } + if ('ndom' === $repetition->repetition_type) { + $occurrences = $this->getNdomInRange($mutator, $end, $skipMod, $repetition->repetition_moment); + } + if ('yearly' === $repetition->repetition_type) { + $occurrences = $this->getYearlyInRange($mutator, $end, $skipMod, $repetition->repetition_moment); } - // filter out all the weekend days: - $return = $this->filterWeekends($repetition, $return); - return $return; + + // filter out all the weekend days: + $occurrences = $this->filterWeekends($repetition, $occurrences); + + return $occurrences; } /** @@ -399,112 +311,31 @@ class RecurringRepository implements RecurringRepositoryInterface * @param int $count * * @return array - * @throws FireflyException */ public function getXOccurrences(RecurrenceRepetition $repetition, Carbon $date, int $count): array { - $return = []; - $mutator = clone $date; - $skipMod = $repetition->repetition_skip + 1; - $total = 0; - $attempts = 0; - switch ($repetition->repetition_type) { - default: - throw new FireflyException( - sprintf('Cannot calculate occurrences for recurring transaction repetition type "%s"', $repetition->repetition_type) - ); - case 'daily': - while ($total < $count) { - $mutator->addDay(); - if (0 === $attempts % $skipMod) { - $return[] = clone $mutator; - $total++; - } - $attempts++; - } - break; - case 'weekly': - // monday = 1 - // sunday = 7 - $mutator->addDay(); // always assume today has passed. - $dayOfWeek = (int)$repetition->repetition_moment; - if ($mutator->dayOfWeekIso > $dayOfWeek) { - // day has already passed this week, add one week: - $mutator->addWeek(); - } - // today is wednesday (3), expected is friday (5): add two days. - // today is friday (5), expected is monday (1), subtract four days. - $dayDifference = $dayOfWeek - $mutator->dayOfWeekIso; - $mutator->addDays($dayDifference); - - while ($total < $count) { - if (0 === $attempts % $skipMod) { - $return[] = clone $mutator; - $total++; - } - $attempts++; - $mutator->addWeek(); - } - break; - case 'monthly': - $mutator->addDay(); // always assume today has passed. - $dayOfMonth = (int)$repetition->repetition_moment; - if ($mutator->day > $dayOfMonth) { - // day has passed already, add a month. - $mutator->addMonth(); - } - - while ($total < $count) { - $domCorrected = min($dayOfMonth, $mutator->daysInMonth); - $mutator->day = $domCorrected; - if (0 === $attempts % $skipMod) { - $return[] = clone $mutator; - $total++; - } - $attempts++; - $mutator->endOfMonth()->addDay(); - } - break; - case 'ndom': - $mutator->addDay(); // always assume today has passed. - $mutator->startOfMonth(); - // this feels a bit like a cop out but why reinvent the wheel? - $counters = [1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth',]; - $daysOfWeek = [1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 7 => 'Sunday',]; - $parts = explode(',', $repetition->repetition_moment); - - while ($total < $count) { - $string = sprintf('%s %s of %s %s', $counters[$parts[0]], $daysOfWeek[$parts[1]], $mutator->format('F'), $mutator->format('Y')); - $newCarbon = new Carbon($string); - if (0 === $attempts % $skipMod) { - $return[] = clone $newCarbon; - $total++; - } - $attempts++; - $mutator->endOfMonth()->addDay(); - } - break; - case 'yearly': - $date = new Carbon($repetition->repetition_moment); - $date->year = $mutator->year; - if ($mutator > $date) { - $date->addYear(); - } - $obj = clone $date; - while ($total < $count) { - if (0 === $attempts % $skipMod) { - $return[] = clone $obj; - $total++; - } - $obj->addYears(1); - $attempts++; - } - break; + $skipMod = $repetition->repetition_skip + 1; + $occurrences = []; + if ('daily' === $repetition->repetition_type) { + $occurrences = $this->getXDailyOccurrences($date, $count, $skipMod); + } + if ('weekly' === $repetition->repetition_type) { + $occurrences = $this->getXWeeklyOccurrences($date, $count, $skipMod, $repetition->repetition_moment); + } + if ('monthly' === $repetition->repetition_type) { + $occurrences = $this->getXMonthlyOccurrences($date, $count, $skipMod, $repetition->repetition_moment); + } + if ('ndom' === $repetition->repetition_type) { + $occurrences = $this->getXNDomOccurrences($date, $count, $skipMod, $repetition->repetition_moment); + } + if ('yearly' === $repetition->repetition_type) { + $occurrences = $this->getXYearlyOccurrences($date, $count, $skipMod, $repetition->repetition_moment); } - // filter out all the weekend days: - $return = $this->filterWeekends($repetition, $return); - return $return; + // filter out all the weekend days: + $occurrences = $this->filterWeekends($repetition, $occurrences); + + return $occurrences; } /** @@ -545,8 +376,7 @@ class RecurringRepository implements RecurringRepositoryInterface break; case 'yearly': // - $today = new Carbon; - $today->endOfYear(); + $today = Carbon::create()->endOfYear(); $repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment); $diffInYears = $today->diffInYears($repDate); $repDate->addYears($diffInYears); // technically not necessary. @@ -658,4 +488,378 @@ class RecurringRepository implements RecurringRepositoryInterface return $return; } + + /** + * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. + * + * @param Carbon $start + * @param Carbon $end + * @param int $skipMod + * + * @return array + */ + private function getDailyInRange(Carbon $start, Carbon $end, int $skipMod): array + { + $return = []; + $attempts = 0; + Log::debug('Rep is daily. Start of loop.'); + while ($start <= $end) { + Log::debug(sprintf('Mutator is now: %s', $start->format('Y-m-d'))); + if (0 === $attempts % $skipMod) { + Log::debug(sprintf('Attempts modulo skipmod is zero, include %s', $start->format('Y-m-d'))); + $return[] = clone $start; + } + $start->addDay(); + $attempts++; + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. + * + * @param Carbon $start + * @param Carbon $end + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getMonthlyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array + { + $return = []; + $attempts = 0; + $dayOfMonth = (int)$moment; + Log::debug(sprintf('Day of month in repetition is %d', $dayOfMonth)); + Log::debug(sprintf('Start is %s.', $start->format('Y-m-d'))); + Log::debug(sprintf('End is %s.', $end->format('Y-m-d'))); + if ($start->day > $dayOfMonth) { + Log::debug('Add a month.'); + // day has passed already, add a month. + $start->addMonth(); + } + Log::debug(sprintf('Start is now %s.', $start->format('Y-m-d'))); + Log::debug('Start loop.'); + while ($start < $end) { + Log::debug(sprintf('Mutator is now %s.', $start->format('Y-m-d'))); + $domCorrected = min($dayOfMonth, $start->daysInMonth); + Log::debug(sprintf('DoM corrected is %d', $domCorrected)); + $start->day = $domCorrected; + Log::debug(sprintf('Mutator is now %s.', $start->format('Y-m-d'))); + Log::debug(sprintf('$attempts %% $skipMod === 0 is %s', var_export(0 === $attempts % $skipMod, true))); + Log::debug(sprintf('$start->lte($mutator) is %s', var_export($start->lte($start), true))); + Log::debug(sprintf('$end->gte($mutator) is %s', var_export($end->gte($start), true))); + if (0 === $attempts % $skipMod && $start->lte($start) && $end->gte($start)) { + Log::debug(sprintf('ADD %s to return!', $start->format('Y-m-d'))); + $return[] = clone $start; + } + $attempts++; + $start->endOfMonth()->startOfDay()->addDay(); + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. + * + * @param Carbon $start + * @param Carbon $end + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getNdomInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array + { + $return = []; + $attempts = 0; + $start->startOfMonth(); + // this feels a bit like a cop out but why reinvent the wheel? + $counters = [1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth',]; + $daysOfWeek = [1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 7 => 'Sunday',]; + $parts = explode(',', $moment); + while ($start <= $end) { + $string = sprintf('%s %s of %s %s', $counters[$parts[0]], $daysOfWeek[$parts[1]], $start->format('F'), $start->format('Y')); + $newCarbon = new Carbon($string); + if (0 === $attempts % $skipMod) { + $return[] = clone $newCarbon; + } + $attempts++; + $start->endOfMonth()->addDay(); + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. + * + * @param Carbon $start + * @param Carbon $end + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getWeeklyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array + { + $return = []; + $attempts = 0; + Log::debug('Rep is weekly.'); + // monday = 1 + // sunday = 7 + $dayOfWeek = (int)$moment; + Log::debug(sprintf('DoW in repetition is %d, in mutator is %d', $dayOfWeek, $start->dayOfWeekIso)); + if ($start->dayOfWeekIso > $dayOfWeek) { + // day has already passed this week, add one week: + $start->addWeek(); + Log::debug(sprintf('Jump to next week, so mutator is now: %s', $start->format('Y-m-d'))); + } + // today is wednesday (3), expected is friday (5): add two days. + // today is friday (5), expected is monday (1), subtract four days. + Log::debug(sprintf('Mutator is now: %s', $start->format('Y-m-d'))); + $dayDifference = $dayOfWeek - $start->dayOfWeekIso; + $start->addDays($dayDifference); + Log::debug(sprintf('Mutator is now: %s', $start->format('Y-m-d'))); + while ($start <= $end) { + if (0 === $attempts % $skipMod && $start->lte($start) && $end->gte($start)) { + Log::debug('Date is in range of start+end, add to set.'); + $return[] = clone $start; + } + $attempts++; + $start->addWeek(); + Log::debug(sprintf('Mutator is now (end of loop): %s', $start->format('Y-m-d'))); + } + + return $return; + } + + /** + * Calculates the number of daily occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip + * over $skipMod -1 recurrences. + * + * @param Carbon $date + * @param int $count + * @param int $skipMod + * + * @return array + */ + private function getXDailyOccurrences(Carbon $date, int $count, int $skipMod): array + { + $return = []; + $mutator = clone $date; + $total = 0; + $attempts = 0; + while ($total < $count) { + $mutator->addDay(); + if (0 === $attempts % $skipMod) { + $return[] = clone $mutator; + $total++; + } + $attempts++; + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Calculates the number of monthly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip + * over $skipMod -1 recurrences. + * + * @param Carbon $date + * @param int $count + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getXMonthlyOccurrences(Carbon $date, int $count, int $skipMod, string $moment): array + { + $return = []; + $mutator = clone $date; + $total = 0; + $attempts = 0; + $mutator->addDay(); // always assume today has passed. + $dayOfMonth = (int)$moment; + if ($mutator->day > $dayOfMonth) { + // day has passed already, add a month. + $mutator->addMonth(); + } + + while ($total < $count) { + $domCorrected = min($dayOfMonth, $mutator->daysInMonth); + $mutator->day = $domCorrected; + if (0 === $attempts % $skipMod) { + $return[] = clone $mutator; + $total++; + } + $attempts++; + $mutator->endOfMonth()->addDay(); + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Calculates the number of NDOM occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip + * over $skipMod -1 recurrences. + * + * @param Carbon $date + * @param int $count + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getXNDomOccurrences(Carbon $date, int $count, int $skipMod, string $moment): array + { + $return = []; + $total = 0; + $attempts = 0; + $mutator = clone $date; + $mutator->addDay(); // always assume today has passed. + $mutator->startOfMonth(); + // this feels a bit like a cop out but why reinvent the wheel? + $counters = [1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth',]; + $daysOfWeek = [1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 7 => 'Sunday',]; + $parts = explode(',', $moment); + + while ($total < $count) { + $string = sprintf('%s %s of %s %s', $counters[$parts[0]], $daysOfWeek[$parts[1]], $mutator->format('F'), $mutator->format('Y')); + $newCarbon = new Carbon($string); + if (0 === $attempts % $skipMod) { + $return[] = clone $newCarbon; + $total++; + } + $attempts++; + $mutator->endOfMonth()->addDay(); + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Calculates the number of weekly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip + * over $skipMod -1 recurrences. + * + * @param Carbon $date + * @param int $count + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getXWeeklyOccurrences(Carbon $date, int $count, int $skipMod, string $moment): array + { + $return = []; + $total = 0; + $attempts = 0; + $mutator = clone $date; + // monday = 1 + // sunday = 7 + $mutator->addDay(); // always assume today has passed. + $dayOfWeek = (int)$moment; + if ($mutator->dayOfWeekIso > $dayOfWeek) { + // day has already passed this week, add one week: + $mutator->addWeek(); + } + // today is wednesday (3), expected is friday (5): add two days. + // today is friday (5), expected is monday (1), subtract four days. + $dayDifference = $dayOfWeek - $mutator->dayOfWeekIso; + $mutator->addDays($dayDifference); + + while ($total < $count) { + if (0 === $attempts % $skipMod) { + $return[] = clone $mutator; + $total++; + } + $attempts++; + $mutator->addWeek(); + } + + return $return; + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Calculates the number of yearly occurrences for a recurring transaction, starting at the date, until $count is reached. It will skip + * over $skipMod -1 recurrences. + * + * @param Carbon $date + * @param int $count + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getXYearlyOccurrences(Carbon $date, int $count, int $skipMod, string $moment): array + { + $return = []; + $mutator = clone $date; + $total = 0; + $attempts = 0; + $date = new Carbon($moment); + $date->year = $mutator->year; + if ($mutator > $date) { + $date->addYear(); + } + $obj = clone $date; + while ($total < $count) { + if (0 === $attempts % $skipMod) { + $return[] = clone $obj; + $total++; + } + $obj->addYears(1); + $attempts++; + } + + return $return; + + } + + /** @noinspection MoreThanThreeArgumentsInspection */ + /** + * Get the number of daily occurrences for a recurring transaction until date $end is reached. Will skip every $skipMod-1 occurrences. + * + * @param Carbon $start + * @param Carbon $end + * @param int $skipMod + * @param string $moment + * + * @return array + */ + private function getYearlyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array + { + $attempts = 0; + $date = new Carbon($moment); + $date->year = $start->year; + $return = []; + if ($start > $date) { + $date->addYear(); + + } + + // is $date between $start and $end? + $obj = clone $date; + $count = 0; + while ($obj <= $end && $obj >= $start && $count < 10) { + if (0 === $attempts % $skipMod) { + $return[] = clone $obj; + } + $obj->addYears(1); + $count++; + $attempts++; + } + + return $return; + + } } diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index d029ca559c..83787ab59c 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -27,7 +27,6 @@ use DB; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Tag; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; @@ -101,6 +100,7 @@ class TagRepository implements TagRepositoryInterface * @param string $tag * * @return Tag + * @deprecated */ public function findByTag(string $tag): Tag { @@ -129,6 +129,7 @@ class TagRepository implements TagRepositoryInterface * @param Tag $tag * * @return Carbon + * @deprecated */ public function firstUseDate(Tag $tag): Carbon { @@ -160,6 +161,7 @@ class TagRepository implements TagRepositoryInterface * @param Tag $tag * * @return Carbon + * @deprecated */ public function lastUseDate(Tag $tag): Carbon { @@ -306,9 +308,7 @@ class TagRepository implements TagRepositoryInterface } if (null !== $year) { Log::debug(sprintf('Get tags with year %s.', $year)); - $start = $year . '-01-01 00:00:00'; - $end = $year . '-12-31 23:59:59'; - $tagQuery->where('tags.date', '>=', $start)->where('tags.date', '<=', $end); + $tagQuery->where('tags.date', '>=', $year . '-01-01 00:00:00')->where('tags.date', '<=', $year . '-12-31 23:59:59'); } $result = $tagQuery->get(['tags.id', 'tags.tag', DB::raw('SUM(transactions.amount) as amount_sum')]); diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 07fd40f2e8..15e30f9517 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -24,7 +24,6 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use FireflyIII\Models\Tag; -use FireflyIII\Models\TransactionJournal; use FireflyIII\User; use Illuminate\Support\Collection; @@ -68,6 +67,7 @@ interface TagRepositoryInterface * @param string $tag * * @return Tag + * @deprecated */ public function findByTag(string $tag): Tag; @@ -82,6 +82,7 @@ interface TagRepositoryInterface * @param Tag $tag * * @return Carbon + * @deprecated */ public function firstUseDate(Tag $tag): Carbon; @@ -96,6 +97,7 @@ interface TagRepositoryInterface * @param Tag $tag * * @return Carbon + * @deprecated */ public function lastUseDate(Tag $tag): Carbon; diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index de66d82467..340c78daa5 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -49,12 +49,14 @@ class ExpandedForm { /** * @param string $name - * @param null $options + * @param mixed $value + * @param array $options * * @return string */ - public function activeAssetAccountList(string $name, $value = null, array $options = []): string + public function activeAssetAccountList(string $name, $value = null, array $options = null): string { + $options = $options ?? []; // make repositories /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); @@ -87,26 +89,28 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string * @throws \FireflyIII\Exceptions\FireflyException */ - public function amount(string $name, $value = null, array $options = []): string + public function amount(string $name, $value = null, array $options = null): string { return $this->currencyField($name, 'amount', $value, $options); } /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function amountNoCurrency(string $name, $value = null, array $options = []): string + public function amountNoCurrency(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -126,24 +130,25 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string * @throws \FireflyIII\Exceptions\FireflyException */ - public function amountSmall(string $name, $value = null, array $options = []): string + public function amountSmall(string $name, $value = null, array $options = null): string { return $this->currencyField($name, 'amount-small', $value, $options); } /** * @param string $name - * @param null $options + * @param array $options * * @return string + * @throws \Throwable */ - public function assetAccountCheckList(string $name, $options = null): string + public function assetAccountCheckList(string $name, array $options = null): string { $options = $options ?? []; $label = $this->label($name, $options); @@ -175,13 +180,14 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string */ - public function assetAccountList(string $name, $value = null, array $options = []): string + public function assetAccountList(string $name, $value = null, array $options = null): string { + $options = $options ?? []; // make repositories /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); @@ -195,9 +201,9 @@ class ExpandedForm /** @var Account $account */ foreach ($assetAccounts as $account) { $balance = app('steam')->balance($account, new Carbon); - $currencyId = (int)$repository->getMetaValue($account,'currency_id'); + $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); $currency = $currencyRepos->findNull($currencyId); - $role = $repository->getMetaValue($account,'accountRole'); + $role = $repository->getMetaValue($account, 'accountRole'); if (0 === \strlen($role)) { $role = 'no_account_type'; // @codeCoverageIgnore } @@ -215,27 +221,31 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string * @throws \FireflyIII\Exceptions\FireflyException */ - public function balance(string $name, $value = null, array $options = []): string + public function balance(string $name, $value = null, array $options = null): string { return $this->currencyField($name, 'balance', $value, $options); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param string $name * @param int $value - * @param null $checked + * @param mixed $checked * @param array $options * * @return string + * @throws \Throwable */ - public function checkbox(string $name, $value = 1, $checked = null, $options = []): string + public function checkbox(string $name, int $value = null, $checked = null, array $options = null): string { + $options = $options ?? []; + $value = $value ?? 1; $options['checked'] = true === $checked ? true : false; if (Session::has('preFilled')) { @@ -257,13 +267,14 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string */ - public function currencyList(string $name, $value = null, array $options = []): string + public function currencyList(string $name, $value = null, array $options = null): string { + $options = $options ?? []; /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); @@ -274,20 +285,20 @@ class ExpandedForm foreach ($list as $currency) { $array[$currency->id] = $currency->name . ' (' . $currency->symbol . ')'; } - $res = $this->select($name, $array, $value, $options); - return $res; + return $this->select($name, $array, $value, $options); } /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string */ - public function currencyListEmpty(string $name, $value = null, array $options = []): string + public function currencyListEmpty(string $name, $value = null, array $options = null): string { + $options = $options ?? []; /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); @@ -307,13 +318,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function date(string $name, $value = null, array $options = []): string + public function date(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -329,9 +342,11 @@ class ExpandedForm * @param array $options * * @return string + * @throws \Throwable */ - public function file(string $name, array $options = []): string + public function file(string $name, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -342,13 +357,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function integer(string $name, $value = null, array $options = []): string + public function integer(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -361,13 +378,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function location(string $name, $value = null, array $options = []): string + public function location(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -430,16 +449,21 @@ class ExpandedForm return $selectList; } + /** @noinspection MoreThanThreeArgumentsInspection */ + /** * @param string $name * @param array $list - * @param null $selected + * @param mixed $selected * @param array $options * * @return string + * @throws \Throwable */ - public function multiRadio(string $name, array $list = [], $selected = null, array $options = []): string + public function multiRadio(string $name, array $list = null, $selected = null, array $options = null): string { + $options = $options ?? []; + $list = $list ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -453,14 +477,16 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string * @throws \FireflyIII\Exceptions\FireflyException + * @throws \Throwable */ - public function nonSelectableAmount(string $name, $value = null, array $options = []): string + public function nonSelectableAmount(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -481,14 +507,16 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string * @throws \FireflyIII\Exceptions\FireflyException + * @throws \Throwable */ - public function nonSelectableBalance(string $name, $value = null, array $options = []): string + public function nonSelectableBalance(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -510,13 +538,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function number(string $name, $value = null, array $options = []): string + public function number(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -534,12 +564,11 @@ class ExpandedForm * @param string $name * * @return string + * @throws \Throwable */ public function optionsList(string $type, string $name): string { - $html = view('form.options', compact('type', 'name'))->render(); - - return $html; + return view('form.options', compact('type', 'name'))->render(); } /** @@ -547,9 +576,11 @@ class ExpandedForm * @param array $options * * @return string + * @throws \Throwable */ public function password(string $name, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); @@ -561,7 +592,7 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string @@ -586,13 +617,14 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string */ - public function ruleGroupList(string $name, $value = null, array $options = []): string + public function ruleGroupList(string $name, $value = null, array $options = null): string { + $options = $options ?? []; /** @var RuleGroupRepositoryInterface $groupRepos */ $groupRepos = app(RuleGroupRepositoryInterface::class); @@ -609,12 +641,12 @@ class ExpandedForm /** * @param string $name - * @param null $value - * @param null $options + * @param mixed $value + * @param array $options * * @return \Illuminate\Support\HtmlString */ - public function ruleGroupListWithEmpty(string $name, $value = null, $options = null) + public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null) { $options = $options ?? []; $options['class'] = 'form-control'; @@ -636,16 +668,20 @@ class ExpandedForm return Form::select($name, $array, $value, $options); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param string $name * @param array $list - * @param null $selected + * @param mixed $selected * @param array $options * * @return string + * @throws \Throwable */ - public function select(string $name, array $list = [], $selected = null, array $options = []): string + public function select(string $name, array $list = null, $selected = null, array $options = null): string { + $list = $list ?? []; + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -658,13 +694,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function staticText(string $name, $value, array $options = []): string + public function staticText(string $name, $value, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -675,13 +713,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function tags(string $name, $value = null, array $options = []): string + public function tags(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -694,13 +734,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function text(string $name, $value = null, array $options = []): string + public function text(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -712,13 +754,15 @@ class ExpandedForm /** * @param string $name - * @param null $value + * @param mixed $value * @param array $options * * @return string + * @throws \Throwable */ - public function textarea(string $name, $value = null, array $options = []): string + public function textarea(string $name, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -736,8 +780,9 @@ class ExpandedForm * * @return array */ - protected function expandOptionArray(string $name, $label, array $options): array + protected function expandOptionArray(string $name, $label, array $options = null): array { + $options = $options ?? []; $name = str_replace('[]', '', $name); $options['class'] = 'form-control'; $options['id'] = 'ffInput_' . $name; @@ -808,18 +853,21 @@ class ExpandedForm return (string)trans('form.' . $name); } + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param string $name * @param string $view - * @param null $value + * @param mixed $value * @param array $options * * @return string * * @throws \FireflyIII\Exceptions\FireflyException + * @throws \Throwable */ - private function currencyField(string $name, string $view, $value = null, array $options = []): string + private function currencyField(string $name, string $view, $value = null, array $options = null): string { + $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index 836ae75cf3..2fc9ef1c1f 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -87,10 +87,7 @@ class SingleControllerTest extends TestCase $journalRepos->shouldReceive('getMetaField')->andReturnNull(); - $note = new Note(); - $note->id = 5; - $note->text = 'I see you...'; - $journalRepos->shouldReceive('getNote')->andReturn($note)->once(); + $journalRepos->shouldReceive('getNoteText')->andReturn('I see you...')->once(); $this->be($this->user()); From 59c005875a557a8b59438e56c10c54fe611dacd6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 17:46:34 +0200 Subject: [PATCH 59/86] Fix for #1568 --- app/Http/Middleware/Sandstorm.php | 11 +++++++++-- app/Repositories/User/UserRepository.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 479c9ba78d..905e840716 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -59,12 +59,19 @@ class Sandstorm /** @var UserRepositoryInterface $repository */ $repository = app(UserRepositoryInterface::class); $userId = (string)$request->header('X-Sandstorm-User-Id'); + // catch anonymous: $userId = '' === $userId ? 'anonymous' : $userId; $email = $userId . '@firefly'; - $user = $repository->findByEmail($email) ?? $this->createUser($email); - Log::debug(sprintf('Sandstorm user email is "%s"', $email)); + // always grab the first user in the Sandstorm DB: + $user = $repository->findByEmail($email) ?? $repository->first(); + // or create somebody if necessary. + $user = $user ?? $this->createUser($email); + + // then log this user in: + Log::info(sprintf('Sandstorm user ID is "%s"', $userId)); + Log::info(sprintf('Access to database under "%s"', $email)); Auth::guard($guard)->login($user); $repository->attachRole($user, 'owner'); app('view')->share('SANDSTORM_ANON', false); diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 174de7b430..f29f8f73eb 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -205,7 +205,7 @@ class UserRepository implements UserRepositoryInterface */ public function first(): ?User { - return User::first(); + return User::orderBy('id', 'ASC')->first(); } /** From 5d12f532834b88df09678e56116cb95d200d25be Mon Sep 17 00:00:00 2001 From: Jacob Weisz Date: Tue, 24 Jul 2018 12:14:35 -0500 Subject: [PATCH 60/86] Update Sandstorm build instructions I've moved this to official Jessie 64-bit. vagrant-spk currently uses Stretch, but that'd likely require more changes and testing on your other build files. --- .sandstorm/Vagrantfile | 9 ++++++++- .sandstorm/global-setup.sh | 4 ++++ .sandstorm/setup.sh | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile index 20c01b674b..03d3e332f4 100644 --- a/.sandstorm/Vagrantfile +++ b/.sandstorm/Vagrantfile @@ -9,9 +9,16 @@ VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Ti # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! VAGRANTFILE_API_VERSION = "2" +# ugly hack to prevent hashicorp's bitrot. See https://github.com/hashicorp/vagrant/issues/9442 +# this setting is required for pre-2.0 vagrant, but causes an error as of 2.0.3, +# remove entirely when confident nobody uses vagrant 1.x for anything. +unless Vagrant::DEFAULT_SERVER_URL.frozen? + Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') +end + Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Base on the Sandstorm snapshots of the official Debian 8 (jessie) box. - config.vm.box = "sandstorm/debian-jessie64" + config.vm.box = "debian/contrib-jessie64" if Vagrant.has_plugin?("vagrant-vbguest") then # vagrant-vbguest is a Vagrant plugin that upgrades diff --git a/.sandstorm/global-setup.sh b/.sandstorm/global-setup.sh index 219c770f63..6f1d1da99d 100755 --- a/.sandstorm/global-setup.sh +++ b/.sandstorm/global-setup.sh @@ -9,6 +9,10 @@ CURL_OPTS="--silent --show-error" echo localhost > /etc/hostname hostname localhost +# Install curl that is needed below. +apt-get update +apt-get install -y curl + # The following line copies stderr through stderr to cat without accidentally leaving it in the # output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159 curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 17f08e3a54..612d312770 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -32,7 +32,7 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E add-apt-repository "deb http://packages.dotdeb.org jessie all" # add another repos -apt-get install apt-transport-https lsb-release ca-certificates +apt-get install -y apt-transport-https lsb-release ca-certificates wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list From ccd727488fbf6ea033bd128b3d7db5765468551a Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 20:19:41 +0200 Subject: [PATCH 61/86] Update file list for Sandstorm. --- .sandstorm/sandstorm-files.list | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 793fc5da89..dbfa889c63 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -209,13 +209,6 @@ opt/app/.env.sandstorm opt/app/.gitattributes opt/app/.htaccess opt/app/.sandstorm/.gitattributes -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/action_provision -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/action_set_name -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/creator_uid -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/id -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/index_uuid -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/private_key -opt/app/.sandstorm/.vagrant/machines/default/virtualbox/synced_folders opt/app/.sandstorm/.vagrant/machines/default/virtualbox/vagrant_cwd opt/app/.sandstorm/Vagrantfile opt/app/.sandstorm/app-graphics/firefly-iii-128.png @@ -450,6 +443,7 @@ opt/app/app/Http/Controllers/Json/ExchangeController.php opt/app/app/Http/Controllers/Json/FrontpageController.php opt/app/app/Http/Controllers/Json/IntroController.php opt/app/app/Http/Controllers/Json/ReconcileController.php +opt/app/app/Http/Controllers/Json/RecurrenceController.php opt/app/app/Http/Controllers/JsonController.php opt/app/app/Http/Controllers/NewUserController.php opt/app/app/Http/Controllers/PiggyBankController.php @@ -467,7 +461,11 @@ opt/app/app/Http/Controllers/Report/CategoryController.php opt/app/app/Http/Controllers/Report/ExpenseController.php opt/app/app/Http/Controllers/Report/OperationsController.php opt/app/app/Http/Controllers/ReportController.php -opt/app/app/Http/Controllers/RuleController.php +opt/app/app/Http/Controllers/Rule/CreateController.php +opt/app/app/Http/Controllers/Rule/DeleteController.php +opt/app/app/Http/Controllers/Rule/EditController.php +opt/app/app/Http/Controllers/Rule/IndexController.php +opt/app/app/Http/Controllers/Rule/SelectController.php opt/app/app/Http/Controllers/RuleGroupController.php opt/app/app/Http/Controllers/SearchController.php opt/app/app/Http/Controllers/System/InstallController.php @@ -635,7 +633,6 @@ opt/app/app/Providers/ExportJobServiceProvider.php opt/app/app/Providers/FireflyServiceProvider.php opt/app/app/Providers/FireflySessionProvider.php opt/app/app/Providers/JournalServiceProvider.php -opt/app/app/Providers/LogServiceProvider.php opt/app/app/Providers/PiggyBankServiceProvider.php opt/app/app/Providers/RecurringServiceProvider.php opt/app/app/Providers/RouteServiceProvider.php @@ -648,7 +645,6 @@ opt/app/app/Repositories/Account/AccountRepository.php opt/app/app/Repositories/Account/AccountRepositoryInterface.php opt/app/app/Repositories/Account/AccountTasker.php opt/app/app/Repositories/Account/AccountTaskerInterface.php -opt/app/app/Repositories/Account/FindAccountsTrait.php opt/app/app/Repositories/Attachment/AttachmentRepository.php opt/app/app/Repositories/Attachment/AttachmentRepositoryInterface.php opt/app/app/Repositories/Bill/BillRepository.php @@ -677,8 +673,6 @@ opt/app/app/Repositories/RuleGroup/RuleGroupRepository.php opt/app/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php opt/app/app/Repositories/Tag/TagRepository.php opt/app/app/Repositories/Tag/TagRepositoryInterface.php -opt/app/app/Repositories/TransactionType/TransactionTypeRepository.php -opt/app/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php opt/app/app/Repositories/User/UserRepository.php opt/app/app/Repositories/User/UserRepositoryInterface.php opt/app/app/Rules/BelongsUser.php @@ -764,6 +758,7 @@ opt/app/app/Support/Facades/Preferences.php opt/app/app/Support/Facades/Steam.php opt/app/app/Support/FireflyConfig.php opt/app/app/Support/Http/Controllers/DateCalculation.php +opt/app/app/Support/Http/Controllers/RuleManagement.php opt/app/app/Support/Import/Information/BunqInformation.php opt/app/app/Support/Import/Information/GetSpectreCustomerTrait.php opt/app/app/Support/Import/Information/GetSpectreTokenTrait.php @@ -818,7 +813,6 @@ opt/app/app/Support/Twig/Journal.php opt/app/app/Support/Twig/Loader/AccountLoader.php opt/app/app/Support/Twig/Loader/TransactionJournalLoader.php opt/app/app/Support/Twig/Loader/TransactionLoader.php -opt/app/app/Support/Twig/PiggyBank.php opt/app/app/Support/Twig/Rule.php opt/app/app/Support/Twig/Transaction.php opt/app/app/Support/Twig/Translation.php @@ -915,7 +909,6 @@ opt/app/bootstrap/cache/services.php opt/app/changelog.md opt/app/composer.json opt/app/composer.lock -opt/app/composer.phar opt/app/config/app.php opt/app/config/auth.php opt/app/config/breadcrumbs.php @@ -4435,9 +4428,6 @@ opt/app/vendor/ramsey/uuid/CONTRIBUTING.md opt/app/vendor/ramsey/uuid/LICENSE opt/app/vendor/ramsey/uuid/README.md opt/app/vendor/ramsey/uuid/composer.json -opt/app/vendor/ramsey/uuid/docs/Makefile -opt/app/vendor/ramsey/uuid/docs/conf.py -opt/app/vendor/ramsey/uuid/docs/index.rst opt/app/vendor/ramsey/uuid/src/BinaryUtils.php opt/app/vendor/ramsey/uuid/src/Builder/DefaultUuidBuilder.php opt/app/vendor/ramsey/uuid/src/Builder/DegradedUuidBuilder.php From 871033501a5725c1203c534e260b5e43c07eb82a Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 20:29:39 +0200 Subject: [PATCH 62/86] Update file list for Sandstorm. --- .sandstorm/sandstorm-files.list | 54 ++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index dbfa889c63..3fafcba06e 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -7443,14 +7443,17 @@ usr/share/zoneinfo/Africa/Libreville usr/share/zoneinfo/Africa/Lome usr/share/zoneinfo/Africa/Luanda usr/share/zoneinfo/Africa/Lubumbashi +usr/share/zoneinfo/Africa/Lusaka usr/share/zoneinfo/Africa/Malabo usr/share/zoneinfo/Africa/Maputo usr/share/zoneinfo/Africa/Maseru +usr/share/zoneinfo/Africa/Mbabane usr/share/zoneinfo/Africa/Mogadishu usr/share/zoneinfo/Africa/Nairobi usr/share/zoneinfo/Africa/Niamey usr/share/zoneinfo/Africa/Nouakchott usr/share/zoneinfo/Africa/Ouagadougou +usr/share/zoneinfo/Africa/Porto-Novo usr/share/zoneinfo/Africa/Sao_Tome usr/share/zoneinfo/Africa/Timbuktu usr/share/zoneinfo/Africa/Tripoli @@ -7469,7 +7472,9 @@ usr/share/zoneinfo/America/Argentina/Mendoza usr/share/zoneinfo/America/Aruba usr/share/zoneinfo/America/Atikokan usr/share/zoneinfo/America/Atka +usr/share/zoneinfo/America/Cayman usr/share/zoneinfo/America/Chicago +usr/share/zoneinfo/America/Coral_Harbour usr/share/zoneinfo/America/Cordoba usr/share/zoneinfo/America/Curacao usr/share/zoneinfo/America/Denver @@ -7490,6 +7495,7 @@ usr/share/zoneinfo/America/Jamaica usr/share/zoneinfo/America/Kentucky usr/share/zoneinfo/America/Kentucky/Louisville usr/share/zoneinfo/America/Knox_IN +usr/share/zoneinfo/America/Kralendijk usr/share/zoneinfo/America/Los_Angeles usr/share/zoneinfo/America/Lower_Princes usr/share/zoneinfo/America/Manaus @@ -7508,6 +7514,7 @@ usr/share/zoneinfo/America/Porto_Acre usr/share/zoneinfo/America/Puerto_Rico usr/share/zoneinfo/America/Regina usr/share/zoneinfo/America/Rio_Branco +usr/share/zoneinfo/America/Santa_Isabel usr/share/zoneinfo/America/Santiago usr/share/zoneinfo/America/Sao_Paulo usr/share/zoneinfo/America/Shiprock @@ -7521,6 +7528,7 @@ usr/share/zoneinfo/America/Tijuana usr/share/zoneinfo/America/Toronto usr/share/zoneinfo/America/Tortola usr/share/zoneinfo/America/Vancouver +usr/share/zoneinfo/America/Virgin usr/share/zoneinfo/America/Whitehorse usr/share/zoneinfo/America/Winnipeg usr/share/zoneinfo/Antarctica @@ -7531,8 +7539,10 @@ usr/share/zoneinfo/Asia usr/share/zoneinfo/Asia/Aden usr/share/zoneinfo/Asia/Ashgabat usr/share/zoneinfo/Asia/Bangkok +usr/share/zoneinfo/Asia/Calcutta usr/share/zoneinfo/Asia/Chongqing usr/share/zoneinfo/Asia/Chungking +usr/share/zoneinfo/Asia/Dacca usr/share/zoneinfo/Asia/Dhaka usr/share/zoneinfo/Asia/Dubai usr/share/zoneinfo/Asia/Harbin @@ -7540,24 +7550,31 @@ usr/share/zoneinfo/Asia/Ho_Chi_Minh usr/share/zoneinfo/Asia/Hong_Kong usr/share/zoneinfo/Asia/Istanbul usr/share/zoneinfo/Asia/Jerusalem +usr/share/zoneinfo/Asia/Kashgar usr/share/zoneinfo/Asia/Kathmandu +usr/share/zoneinfo/Asia/Katmandu usr/share/zoneinfo/Asia/Kolkata +usr/share/zoneinfo/Asia/Macao usr/share/zoneinfo/Asia/Macau usr/share/zoneinfo/Asia/Makassar usr/share/zoneinfo/Asia/Nicosia usr/share/zoneinfo/Asia/Phnom_Penh usr/share/zoneinfo/Asia/Qatar usr/share/zoneinfo/Asia/Riyadh +usr/share/zoneinfo/Asia/Saigon usr/share/zoneinfo/Asia/Seoul usr/share/zoneinfo/Asia/Shanghai usr/share/zoneinfo/Asia/Singapore usr/share/zoneinfo/Asia/Taipei usr/share/zoneinfo/Asia/Tehran usr/share/zoneinfo/Asia/Tel_Aviv +usr/share/zoneinfo/Asia/Thimbu usr/share/zoneinfo/Asia/Thimphu usr/share/zoneinfo/Asia/Tokyo usr/share/zoneinfo/Asia/Ulaanbaatar +usr/share/zoneinfo/Asia/Ulan_Bator usr/share/zoneinfo/Asia/Urumqi +usr/share/zoneinfo/Asia/Yangon usr/share/zoneinfo/Atlantic usr/share/zoneinfo/Atlantic/Faroe usr/share/zoneinfo/Atlantic/Jan_Mayen @@ -7570,16 +7587,21 @@ usr/share/zoneinfo/Australia/Broken_Hill usr/share/zoneinfo/Australia/Canberra usr/share/zoneinfo/Australia/Darwin usr/share/zoneinfo/Australia/Hobart +usr/share/zoneinfo/Australia/LHI usr/share/zoneinfo/Australia/Lord_Howe usr/share/zoneinfo/Australia/Melbourne +usr/share/zoneinfo/Australia/NSW +usr/share/zoneinfo/Australia/North usr/share/zoneinfo/Australia/Perth +usr/share/zoneinfo/Australia/Queensland usr/share/zoneinfo/Australia/Sydney +usr/share/zoneinfo/Australia/West usr/share/zoneinfo/Brazil usr/share/zoneinfo/Canada usr/share/zoneinfo/Canada/Atlantic -usr/share/zoneinfo/Canada/East-Saskatchewan usr/share/zoneinfo/Canada/Saskatchewan usr/share/zoneinfo/Chile +usr/share/zoneinfo/Chile/EasterIsland usr/share/zoneinfo/Etc usr/share/zoneinfo/Etc/GMT usr/share/zoneinfo/Etc/GMT+0 @@ -7593,6 +7615,7 @@ usr/share/zoneinfo/Etc/Zulu usr/share/zoneinfo/Europe usr/share/zoneinfo/Europe/Belfast usr/share/zoneinfo/Europe/Belgrade +usr/share/zoneinfo/Europe/Bratislava usr/share/zoneinfo/Europe/Busingen usr/share/zoneinfo/Europe/Chisinau usr/share/zoneinfo/Europe/Dublin @@ -7604,25 +7627,37 @@ usr/share/zoneinfo/Europe/Jersey usr/share/zoneinfo/Europe/Lisbon usr/share/zoneinfo/Europe/Ljubljana usr/share/zoneinfo/Europe/London +usr/share/zoneinfo/Europe/Mariehamn usr/share/zoneinfo/Europe/Moscow +usr/share/zoneinfo/Europe/Nicosia usr/share/zoneinfo/Europe/Oslo usr/share/zoneinfo/Europe/Podgorica usr/share/zoneinfo/Europe/Prague usr/share/zoneinfo/Europe/Rome +usr/share/zoneinfo/Europe/San_Marino usr/share/zoneinfo/Europe/Sarajevo usr/share/zoneinfo/Europe/Skopje +usr/share/zoneinfo/Europe/Tiraspol +usr/share/zoneinfo/Europe/Vaduz usr/share/zoneinfo/Europe/Vatican usr/share/zoneinfo/Europe/Warsaw +usr/share/zoneinfo/Europe/Zagreb usr/share/zoneinfo/Europe/Zurich usr/share/zoneinfo/GB +usr/share/zoneinfo/GB-Eire usr/share/zoneinfo/GMT usr/share/zoneinfo/GMT+0 usr/share/zoneinfo/GMT-0 usr/share/zoneinfo/GMT0 +usr/share/zoneinfo/Greenwich usr/share/zoneinfo/Indian usr/share/zoneinfo/Indian/Antananarivo usr/share/zoneinfo/Indian/Comoro +usr/share/zoneinfo/Indian/Mayotte usr/share/zoneinfo/Mexico +usr/share/zoneinfo/Mexico/BajaNorte +usr/share/zoneinfo/Mexico/BajaSur +usr/share/zoneinfo/Mexico/General usr/share/zoneinfo/Pacific usr/share/zoneinfo/Pacific/Auckland usr/share/zoneinfo/Pacific/Chatham @@ -7639,18 +7674,35 @@ usr/share/zoneinfo/Pacific/Pitcairn usr/share/zoneinfo/Pacific/Pohnpei usr/share/zoneinfo/Pacific/Samoa usr/share/zoneinfo/Pacific/Truk +usr/share/zoneinfo/Pacific/Yap usr/share/zoneinfo/SystemV +usr/share/zoneinfo/SystemV/AST4 +usr/share/zoneinfo/SystemV/AST4ADT +usr/share/zoneinfo/SystemV/CST6 +usr/share/zoneinfo/SystemV/CST6CDT +usr/share/zoneinfo/SystemV/EST5 usr/share/zoneinfo/SystemV/EST5EDT +usr/share/zoneinfo/SystemV/HST10 +usr/share/zoneinfo/SystemV/MST7 usr/share/zoneinfo/SystemV/MST7MDT +usr/share/zoneinfo/SystemV/PST8 +usr/share/zoneinfo/SystemV/PST8PDT +usr/share/zoneinfo/SystemV/YST9 +usr/share/zoneinfo/SystemV/YST9YDT usr/share/zoneinfo/US usr/share/zoneinfo/US/Alaska +usr/share/zoneinfo/US/Aleutian usr/share/zoneinfo/US/Arizona usr/share/zoneinfo/US/Central +usr/share/zoneinfo/US/East-Indiana usr/share/zoneinfo/US/Eastern usr/share/zoneinfo/US/Hawaii +usr/share/zoneinfo/US/Indiana-Starke +usr/share/zoneinfo/US/Michigan usr/share/zoneinfo/US/Mountain usr/share/zoneinfo/US/Pacific usr/share/zoneinfo/US/Pacific-New +usr/share/zoneinfo/US/Samoa usr/share/zoneinfo/UTC usr/share/zoneinfo/Universal usr/share/zoneinfo/Zulu From 086eccaf4a398542f805a56dc638528b26c314b3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 20:30:52 +0200 Subject: [PATCH 63/86] Updates for new Sandstorm package. --- .../Account/AccountRepository.php | 9 +- .../Account/AccountRepositoryInterface.php | 5 +- app/Repositories/Account/AccountTasker.php | 2 +- .../Attachment/AttachmentRepository.php | 1 - .../ExportJob/ExportJobRepository.php | 11 +- .../ExportJobRepositoryInterface.php | 6 +- .../ImportJob/ImportJobRepository.php | 9 +- .../ImportJobRepositoryInterface.php | 6 +- .../Recurring/RecurringRepository.php | 1 - composer.lock | 126 +++++++++--------- 10 files changed, 83 insertions(+), 93 deletions(-) diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 56d2b8289c..458b0fed01 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -371,10 +371,9 @@ class AccountRepository implements AccountRepositoryInterface * Returns the date of the very first transaction in this account. * * @param Account $account - * @deprecated - * @return TransactionJournal + * @return TransactionJournal|null */ - public function oldestJournal(Account $account): TransactionJournal + public function oldestJournal(Account $account): ?TransactionJournal { $first = $account->transactions() ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') @@ -387,7 +386,7 @@ class AccountRepository implements AccountRepositoryInterface return TransactionJournal::find((int)$first->id); } - return new TransactionJournal(); + return null; } /** @@ -402,7 +401,7 @@ class AccountRepository implements AccountRepositoryInterface { $result = new Carbon; $journal = $this->oldestJournal($account); - if (null !== $journal->id) { + if (null !== $journal) { $result = $journal->date; } diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 3ea3c1be42..59e67acfc8 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -164,10 +164,9 @@ interface AccountRepositoryInterface * Returns the date of the very first transaction in this account. * * @param Account $account - * @deprecated - * @return TransactionJournal + * @return TransactionJournal|null */ - public function oldestJournal(Account $account): TransactionJournal; + public function oldestJournal(Account $account): ?TransactionJournal; /** * Returns the date of the very first transaction in this account. diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index e9e44b71c8..931b46747e 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -80,7 +80,7 @@ class AccountTasker implements AccountTaskerInterface $entry['end_balance'] = $endSet[$account->id] ?? '0'; // first journal exists, and is on start, then this is the actual opening balance: - if (null !== $first->id && $first->date->isSameDay($start)) { + if (null !== $first && $first->date->isSameDay($start)) { Log::debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d'))); $entry['start_balance'] = $first->transactions()->where('account_id', $account->id)->first()->amount; Log::debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $start->format('Y-m-d'), $entry['start_balance'])); diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index cf723f56bb..52b77fff68 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -127,7 +127,6 @@ class AttachmentRepository implements AttachmentRepositoryInterface * @return string * * @throws \Illuminate\Contracts\Encryption\DecryptException - * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException */ public function getContent(Attachment $attachment): string { diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index cb377a383b..70bf949732 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -89,7 +89,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface while ($count < 30) { $key = Str::random(12); $existing = $this->findByKey($key); - if (null === $existing->id) { + if (null === $existing) { $exportJob = new ExportJob; $exportJob->user()->associate($this->user); $exportJob->key = Str::random(12); @@ -121,16 +121,14 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * @param string $key - * - * @deprecated - * @return ExportJob + * @return ExportJob|null */ - public function findByKey(string $key): ExportJob + public function findByKey(string $key): ?ExportJob { /** @var ExportJob $result */ $result = $this->user->exportJobs()->where('key', $key)->first(['export_jobs.*']); if (null === $result) { - return new ExportJob; + return null; } return $result; @@ -141,7 +139,6 @@ class ExportJobRepository implements ExportJobRepositoryInterface * * @return string * - * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException */ public function getContent(ExportJob $job): string { diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 3a9bd5c4fd..90473ca3ed 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -58,11 +58,9 @@ interface ExportJobRepositoryInterface /** * @param string $key - * - * @deprecated - * @return ExportJob + * @return ExportJob|null */ - public function findByKey(string $key): ExportJob; + public function findByKey(string $key): ?ExportJob; /** * @param ExportJob $job diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 24b7703719..b439e7b518 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -86,7 +86,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface while ($count < 30) { $key = Str::random(12); $existing = $this->findByKey($key); - if (null === $existing->id) { + if (null === $existing) { $importJob = ImportJob::create( [ 'user_id' => $this->user->id, @@ -114,15 +114,14 @@ class ImportJobRepository implements ImportJobRepositoryInterface /** * @param string $key * - * @return ImportJob - * @deprecated + * @return ImportJob|null */ - public function findByKey(string $key): ImportJob + public function findByKey(string $key): ?ImportJob { /** @var ImportJob $result */ $result = $this->user->importJobs()->where('key', $key)->first(['import_jobs.*']); if (null === $result) { - return new ImportJob; + return null; } return $result; diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index 0789741fc5..6d151a4588 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -54,11 +54,9 @@ interface ImportJobRepositoryInterface /** * @param string $key - * - * @return ImportJob - * @deprecated + * @return ImportJob|null */ - public function findByKey(string $key): ImportJob; + public function findByKey(string $key): ?ImportJob; /** * Return all attachments for job. diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index d147cbd676..c67f1cc36b 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -187,7 +187,6 @@ class RecurringRepository implements RecurringRepositoryInterface * @param Carbon $start * @param Carbon $end * - * @throws FireflyException * * @return array */ diff --git a/composer.lock b/composer.lock index 2a96a6e3a3..acd955e4ec 100644 --- a/composer.lock +++ b/composer.lock @@ -2416,21 +2416,22 @@ }, { "name": "ramsey/uuid", - "version": "3.7.3", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76" + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76", - "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3", "shasum": "" }, "require": { - "paragonie/random_compat": "^1.0|^2.0", - "php": "^5.4 || ^7.0" + "paragonie/random_compat": "^1.0|^2.0|9.99.99", + "php": "^5.4 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "replace": { "rhumsaa/uuid": "self.version" @@ -2438,16 +2439,17 @@ "require-dev": { "codeception/aspect-mock": "^1.0 | ~2.0.0", "doctrine/annotations": "~1.2.0", - "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1", + "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0", "ircmaxell/random-lib": "^1.1", "jakub-onderka/php-parallel-lint": "^0.9.0", "mockery/mockery": "^0.9.9", "moontoast/math": "^1.1", "php-mock/php-mock-phpunit": "^0.3|^1.1", - "phpunit/phpunit": "^4.7|^5.0", + "phpunit/phpunit": "^4.7|^5.0|^6.5", "squizlabs/php_codesniffer": "^2.3" }, "suggest": { + "ext-ctype": "Provides support for PHP Ctype functions", "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", @@ -2492,7 +2494,7 @@ "identifier", "uuid" ], - "time": "2018-01-20T00:28:24+00:00" + "time": "2018-07-19T23:38:55+00:00" }, { "name": "rcrowe/twigbridge", @@ -2627,16 +2629,16 @@ }, { "name": "symfony/console", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f" + "reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f", - "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f", + "url": "https://api.github.com/repos/symfony/console/zipball/5c31f6a97c1c240707f6d786e7e59bfacdbc0219", + "reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219", "shasum": "" }, "require": { @@ -2691,11 +2693,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-05-31T10:17:53+00:00" + "time": "2018-07-16T14:05:40+00:00" }, { "name": "symfony/css-selector", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -2748,16 +2750,16 @@ }, { "name": "symfony/debug", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d" + "reference": "a1f2118cedb8731c45e945cdd2b808ca82abc4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d", - "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d", + "url": "https://api.github.com/repos/symfony/debug/zipball/a1f2118cedb8731c45e945cdd2b808ca82abc4b5", + "reference": "a1f2118cedb8731c45e945cdd2b808ca82abc4b5", "shasum": "" }, "require": { @@ -2800,20 +2802,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-06-08T09:39:36+00:00" + "time": "2018-07-06T14:52:28+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5" + "reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5", - "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f", + "reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f", "shasum": "" }, "require": { @@ -2863,11 +2865,11 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:57+00:00" + "time": "2018-07-10T11:02:47+00:00" }, { "name": "symfony/finder", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -2916,16 +2918,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3" + "reference": "8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f9c7cf962e635b0b26b14500ac046e07dbef7f3", - "reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0", + "reference": "8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0", "shasum": "" }, "require": { @@ -2966,20 +2968,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-06-19T21:38:16+00:00" + "time": "2018-07-16T14:05:40+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "29c094a1c4f8209b7e033f612cbbd69029e38955" + "reference": "ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/29c094a1c4f8209b7e033f612cbbd69029e38955", - "reference": "29c094a1c4f8209b7e033f612cbbd69029e38955", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3", + "reference": "ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3", "shasum": "" }, "require": { @@ -3053,7 +3055,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-06-25T13:06:45+00:00" + "time": "2018-07-23T17:16:22+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3334,7 +3336,7 @@ }, { "name": "symfony/process", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -3443,16 +3445,16 @@ }, { "name": "symfony/routing", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932" + "reference": "73770bf3682b4407b017c2bdcb2b11cdcbce5322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/b38b9797327b26ea2e4146a40e6e2dc9820a6932", - "reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932", + "url": "https://api.github.com/repos/symfony/routing/zipball/73770bf3682b4407b017c2bdcb2b11cdcbce5322", + "reference": "73770bf3682b4407b017c2bdcb2b11cdcbce5322", "shasum": "" }, "require": { @@ -3516,20 +3518,20 @@ "uri", "url" ], - "time": "2018-06-19T21:38:16+00:00" + "time": "2018-06-28T06:30:33+00:00" }, { "name": "symfony/translation", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854" + "reference": "2dd74d6b2dcbd46a93971e6ce7d245cf3123e957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854", - "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854", + "url": "https://api.github.com/repos/symfony/translation/zipball/2dd74d6b2dcbd46a93971e6ce7d245cf3123e957", + "reference": "2dd74d6b2dcbd46a93971e6ce7d245cf3123e957", "shasum": "" }, "require": { @@ -3585,20 +3587,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-06-22T08:59:39+00:00" + "time": "2018-07-23T08:20:20+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b" + "reference": "9f882aed43f364de1d43038e8fb39703c577afc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2eebaec085d1f2cafbad7644733d494a3bbbc9b", - "reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9f882aed43f364de1d43038e8fb39703c577afc1", + "reference": "9f882aed43f364de1d43038e8fb39703c577afc1", "shasum": "" }, "require": { @@ -3660,7 +3662,7 @@ "debug", "dump" ], - "time": "2018-06-23T12:23:56+00:00" + "time": "2018-07-05T11:54:23+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3827,16 +3829,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "63d920d1c9ebc009d860c3666593a66298727dd6" + "reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/63d920d1c9ebc009d860c3666593a66298727dd6", - "reference": "63d920d1c9ebc009d860c3666593a66298727dd6", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/273c18bf6aaab20be9667a3aa4e7702e1e4e7ced", + "reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced", "shasum": "" }, "require": { @@ -3886,7 +3888,7 @@ "psr", "psr-7" ], - "time": "2018-07-09T21:17:27+00:00" + "time": "2018-07-19T18:38:31+00:00" } ], "packages-dev": [ @@ -5855,7 +5857,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.12", + "version": "v3.4.13", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -5911,7 +5913,7 @@ }, { "name": "symfony/config", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -5974,7 +5976,7 @@ }, { "name": "symfony/filesystem", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -6024,7 +6026,7 @@ }, { "name": "symfony/stopwatch", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -6073,7 +6075,7 @@ }, { "name": "symfony/yaml", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", From abb249643f76e16d647f0526ea83a9a3380fb3d4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 20:49:25 +0200 Subject: [PATCH 64/86] Fix bad class reference. --- app/Repositories/Account/AccountRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 458b0fed01..705f32f7a2 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -32,6 +32,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Update\AccountUpdateService; use FireflyIII\User; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Collection; use Log; From 780a15fe4f96e4723d85d9f63b05098712e8da2e Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 21:12:48 +0200 Subject: [PATCH 65/86] Remove array calls and fix various bugs. --- .../Journal/JournalRepository.php | 2 +- .../PiggyBank/PiggyBankRepository.php | 13 +- app/Repositories/Tag/TagRepository.php | 3 + app/Support/ExpandedForm.php | 224 ++++++++++++------ .../views/transactions/single/create.twig | 6 +- 5 files changed, 163 insertions(+), 85 deletions(-) diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 30882e0234..57e37d48ea 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -496,7 +496,7 @@ class JournalRepository implements JournalRepositoryInterface */ public function getNoteText(TransactionJournal $journal): ?string { - $note = $this->getNote($journal); + $note = $journal->notes()->first(); if (null === $note) { return null; } diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index a87f30a3b6..d89ef493ba 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -310,14 +310,17 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function getPiggyBanksWithAmount(): Collection { - $currency = app('amount')->getDefaultCurrency(); - $set = $this->getPiggyBanks(); - foreach ($set as $piggy) { - $currentAmount = $piggy->currentRelevantRep()->currentamount ?? '0'; - $piggy->name = $piggy->name . ' (' . app('amount')->formatAnything($currency, $currentAmount, false) . ')'; + $currency = app('amount')->getDefaultCurrency(); + + $set = $this->getPiggyBanks(); + /** @var PiggyBank $piggy */ + foreach ($set as $piggy) { + $currentAmount = $this->getRepetition($piggy)->currentamount ?? '0'; + $piggy->name = $piggy->name . ' (' . app('amount')->formatAnything($currency, $currentAmount, false) . ')'; } + return $set; } diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 83787ab59c..dda282ba81 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -301,6 +301,7 @@ class TagRepository implements TagRepositoryInterface } ) ->groupBy(['tags.id', 'tags.tag']); + // add date range (or not): if (null === $year) { Log::debug('Get tags without a date.'); @@ -312,6 +313,8 @@ class TagRepository implements TagRepositoryInterface } $result = $tagQuery->get(['tags.id', 'tags.tag', DB::raw('SUM(transactions.amount) as amount_sum')]); + var_dump($result->toArray()); + exit; /** @var Tag $tag */ foreach ($result as $tag) { diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 340c78daa5..ea4747bc96 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -40,6 +40,7 @@ use Illuminate\Support\MessageBag; use Log; use RuntimeException; use Session; +use Throwable; /** * Class ExpandedForm. @@ -56,7 +57,6 @@ class ExpandedForm */ public function activeAssetAccountList(string $name, $value = null, array $options = null): string { - $options = $options ?? []; // make repositories /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); @@ -93,7 +93,6 @@ class ExpandedForm * @param array $options * * @return string - * @throws \FireflyIII\Exceptions\FireflyException */ public function amount(string $name, $value = null, array $options = null): string { @@ -106,7 +105,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function amountNoCurrency(string $name, $value = null, array $options = null): string { @@ -122,8 +121,12 @@ class ExpandedForm if (null !== $value && '' !== $value) { $value = round($value, 8); } - - $html = view('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render amountNoCurrency(): %s', $e->getMessage())); + $html = 'Could not render amountNoCurrency.'; + } return $html; } @@ -146,7 +149,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function assetAccountCheckList(string $name, array $options = null): string { @@ -173,7 +176,12 @@ class ExpandedForm } unset($options['class']); - $html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render(); + try { + $html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render assetAccountCheckList(): %s', $e->getMessage())); + $html = 'Could not render assetAccountCheckList.'; + } return $html; } @@ -187,7 +195,6 @@ class ExpandedForm */ public function assetAccountList(string $name, $value = null, array $options = null): string { - $options = $options ?? []; // make repositories /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); @@ -203,8 +210,8 @@ class ExpandedForm $balance = app('steam')->balance($account, new Carbon); $currencyId = (int)$repository->getMetaValue($account, 'currency_id'); $currency = $currencyRepos->findNull($currencyId); - $role = $repository->getMetaValue($account, 'accountRole'); - if (0 === \strlen($role)) { + $role = (string)$repository->getMetaValue($account, 'accountRole'); + if ('' === $role) { $role = 'no_account_type'; // @codeCoverageIgnore } if (null === $currency) { @@ -214,9 +221,8 @@ class ExpandedForm $key = (string)trans('firefly.opt_group_' . $role); $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')'; } - $res = $this->select($name, $grouped, $value, $options); - return $res; + return $this->select($name, $grouped, $value, $options); } /** @@ -225,7 +231,6 @@ class ExpandedForm * @param array $options * * @return string - * @throws \FireflyIII\Exceptions\FireflyException */ public function balance(string $name, $value = null, array $options = null): string { @@ -240,7 +245,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function checkbox(string $name, int $value = null, $checked = null, array $options = null): string { @@ -259,8 +264,12 @@ class ExpandedForm $value = $this->fillFieldValue($name, $value); unset($options['placeholder'], $options['autocomplete'], $options['class']); - - $html = view('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render checkbox(): %s', $e->getMessage())); + $html = 'Could not render checkbox.'; + } return $html; } @@ -274,7 +283,6 @@ class ExpandedForm */ public function currencyList(string $name, $value = null, array $options = null): string { - $options = $options ?? []; /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); @@ -298,7 +306,6 @@ class ExpandedForm */ public function currencyListEmpty(string $name, $value = null, array $options = null): string { - $options = $options ?? []; /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); @@ -311,9 +318,8 @@ class ExpandedForm foreach ($list as $currency) { $array[$currency->id] = $currency->name . ' (' . $currency->symbol . ')'; } - $res = $this->select($name, $array, $value, $options); - return $res; + return $this->select($name, $array, $value, $options); } /** @@ -322,17 +328,21 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function date(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); unset($options['placeholder']); - $html = view('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render date(): %s', $e->getMessage())); + $html = 'Could not render date.'; + } return $html; } @@ -342,7 +352,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function file(string $name, array $options = null): string { @@ -350,7 +360,12 @@ class ExpandedForm $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); - $html = view('form.file', compact('classes', 'name', 'label', 'options'))->render(); + try { + $html = view('form.file', compact('classes', 'name', 'label', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render file(): %s', $e->getMessage())); + $html = 'Could not render file.'; + } return $html; } @@ -361,7 +376,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function integer(string $name, $value = null, array $options = null): string { @@ -371,7 +386,12 @@ class ExpandedForm $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); $options['step'] = '1'; - $html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render integer(): %s', $e->getMessage())); + $html = 'Could not render integer.'; + } return $html; } @@ -382,7 +402,7 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function location(string $name, $value = null, array $options = null): string { @@ -391,7 +411,12 @@ class ExpandedForm $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); - $html = view('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render location(): %s', $e->getMessage())); + $html = 'Could not render location.'; + } return $html; } @@ -458,11 +483,10 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function multiRadio(string $name, array $list = null, $selected = null, array $options = null): string { - $options = $options ?? []; $list = $list ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); @@ -470,7 +494,12 @@ class ExpandedForm $selected = $this->fillFieldValue($name, $selected); unset($options['class']); - $html = view('form.multiRadio', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); + try { + $html = view('form.multiRadio', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render multiRadio(): %s', $e->getMessage())); + $html = 'Could not render multiRadio.'; + } return $html; } @@ -482,11 +511,10 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + * */ public function nonSelectableAmount(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -499,8 +527,12 @@ class ExpandedForm if (null !== $value && '' !== $value) { $value = round($value, $selectedCurrency->decimal_places); } - - $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render nonSelectableAmount(): %s', $e->getMessage())); + $html = 'Could not render nonSelectableAmount.'; + } return $html; } @@ -512,11 +544,10 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable + * */ public function nonSelectableBalance(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -530,8 +561,12 @@ class ExpandedForm $decimals = $selectedCurrency->decimal_places ?? 2; $value = round($value, $decimals); } - - $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render nonSelectableBalance(): %s', $e->getMessage())); + $html = 'Could not render nonSelectableBalance.'; + } return $html; } @@ -542,19 +577,22 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function number(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); $options['step'] = 'any'; unset($options['placeholder']); - - $html = view('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render number(): %s', $e->getMessage())); + $html = 'Could not render number.'; + } return $html; } @@ -564,11 +602,18 @@ class ExpandedForm * @param string $name * * @return string - * @throws \Throwable + * */ public function optionsList(string $type, string $name): string { - return view('form.options', compact('type', 'name'))->render(); + try { + $html = view('form.options', compact('type', 'name'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render select(): %s', $e->getMessage())); + $html = 'Could not render optionsList.'; + } + + return $html; } /** @@ -576,16 +621,20 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function password(string $name, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); - $html = view('form.password', compact('classes', 'name', 'label', 'options'))->render(); + try { + $html = view('form.password', compact('classes', 'name', 'label', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render password(): %s', $e->getMessage())); + $html = 'Could not render password.'; + } return $html; } @@ -599,7 +648,7 @@ class ExpandedForm */ public function piggyBankList(string $name, $value = null, array $options = null): string { - $options = $options ?? []; + // make repositories /** @var PiggyBankRepositoryInterface $repository */ $repository = app(PiggyBankRepositoryInterface::class); @@ -624,7 +673,6 @@ class ExpandedForm */ public function ruleGroupList(string $name, $value = null, array $options = null): string { - $options = $options ?? []; /** @var RuleGroupRepositoryInterface $groupRepos */ $groupRepos = app(RuleGroupRepositoryInterface::class); @@ -641,8 +689,8 @@ class ExpandedForm /** * @param string $name - * @param mixed $value - * @param array $options + * @param mixed $value + * @param array $options * * @return \Illuminate\Support\HtmlString */ @@ -672,22 +720,25 @@ class ExpandedForm /** * @param string $name * @param array $list - * @param mixed $selected + * @param mixed $selected * @param array $options * * @return string - * @throws \Throwable */ public function select(string $name, array $list = null, $selected = null, array $options = null): string { $list = $list ?? []; - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $selected = $this->fillFieldValue($name, $selected); unset($options['autocomplete'], $options['placeholder']); - $html = view('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); + try { + $html = view('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render select(): %s', $e->getMessage())); + $html = 'Could not render select.'; + } return $html; } @@ -698,15 +749,19 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function staticText(string $name, $value, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); - $html = view('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render staticText(): %s', $e->getMessage())); + $html = 'Could not render staticText.'; + } return $html; } @@ -717,17 +772,21 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function tags(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); $options['data-role'] = 'tagsinput'; - $html = view('form.tags', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.tags', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render tags(): %s', $e->getMessage())); + $html = 'Could not render tags.'; + } return $html; } @@ -738,16 +797,20 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function text(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); - $html = view('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render text(): %s', $e->getMessage())); + $html = 'Could not render text.'; + } return $html; } @@ -758,17 +821,21 @@ class ExpandedForm * @param array $options * * @return string - * @throws \Throwable + * */ public function textarea(string $name, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); $value = $this->fillFieldValue($name, $value); $options['rows'] = 4; - $html = view('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render textarea(): %s', $e->getMessage())); + $html = 'Could not render textarea.'; + } return $html; } @@ -793,8 +860,8 @@ class ExpandedForm } /** - * @param $name - * @param $value + * @param string $name + * @param $value * * @return mixed */ @@ -843,8 +910,9 @@ class ExpandedForm * * @return mixed */ - protected function label(string $name, array $options): string + protected function label(string $name, array $options = null): string { + $options = $options ?? []; if (isset($options['label'])) { return $options['label']; } @@ -861,13 +929,9 @@ class ExpandedForm * @param array $options * * @return string - * - * @throws \FireflyIII\Exceptions\FireflyException - * @throws \Throwable */ private function currencyField(string $name, string $view, $value = null, array $options = null): string { - $options = $options ?? []; $label = $this->label($name, $options); $options = $this->expandOptionArray($name, $label, $options); $classes = $this->getHolderClasses($name); @@ -897,8 +961,12 @@ class ExpandedForm if (null !== $value && '' !== $value) { $value = round($value, $defaultCurrency->decimal_places); } - - $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); + try { + $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage())); + $html = 'Could not render currencyField.'; + } return $html; } diff --git a/resources/views/transactions/single/create.twig b/resources/views/transactions/single/create.twig index 82da51a107..2419f000f2 100644 --- a/resources/views/transactions/single/create.twig +++ b/resources/views/transactions/single/create.twig @@ -45,7 +45,9 @@ {{ ExpandedForm.activeAssetAccountList('destination_id', null, {label: trans('form.asset_destination_account')} ) }} {# ALWAYS SHOW AMOUNT #} + {{ ExpandedForm.amount('amount') }} + {# INSTRUCTIONS FOR EXCHANGE RATES #} {{ ExpandedForm.staticText('exchange_rate_instruction','(here be text)') }} @@ -86,7 +88,9 @@ {{ ExpandedForm.text('tags') }} {# RELATE THIS TRANSFER TO A PIGGY BANK #} - {{ ExpandedForm.piggyBankList('piggy_bank_id',0) }} + + {{ ExpandedForm.piggyBankList('piggy_bank_id', 0) }} +
                                                                          From e504ee82e5352e0d34906d5899c08a901eb8e19b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 24 Jul 2018 21:13:12 +0200 Subject: [PATCH 66/86] Submitted debug code. --- app/Repositories/Tag/TagRepository.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index dda282ba81..4317a5b907 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -313,8 +313,6 @@ class TagRepository implements TagRepositoryInterface } $result = $tagQuery->get(['tags.id', 'tags.tag', DB::raw('SUM(transactions.amount) as amount_sum')]); - var_dump($result->toArray()); - exit; /** @var Tag $tag */ foreach ($result as $tag) { From dbf019135a515c4066c49a6740d4f9f9441ebdf7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Jul 2018 06:18:20 +0200 Subject: [PATCH 67/86] Simplified tag cloud. --- app/Repositories/Tag/TagRepository.php | 172 +++++++++++++++---------- 1 file changed, 107 insertions(+), 65 deletions(-) diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 4317a5b907..715ca44e13 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -286,82 +286,41 @@ class TagRepository implements TagRepositoryInterface public function tagCloud(?int $year): array { // Some vars - $min = null; - $max = '0'; $return = []; - // get all tags in the year (if present): - $tagQuery = $this->user->tags() - ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id') - ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->where( - function (Builder $query) { - $query->where('transactions.amount', '>', 0); - $query->orWhereNull('transactions.amount'); - } - ) - ->groupBy(['tags.id', 'tags.tag']); + $tags = $this->getTagsInYear($year); + $max = $this->getMaxAmount($tags); + $min = $this->getMinAmount($tags); + $diff = bcsub($max, $min); + $return = []; + Log::debug(sprintf('Minimum is %s, maximum is %s, difference is %s', $min, $max, $diff)); - // add date range (or not): - if (null === $year) { - Log::debug('Get tags without a date.'); - $tagQuery->whereNull('tags.date'); - } - if (null !== $year) { - Log::debug(sprintf('Get tags with year %s.', $year)); - $tagQuery->where('tags.date', '>=', $year . '-01-01 00:00:00')->where('tags.date', '<=', $year . '-12-31 23:59:59'); + // default scale is from 12 to 24, so 12 points. + $minimumFont = '12'; + $maxPoints = '12'; + $pointsPerCoin = '0'; + + // for each full coin in tag, add so many points: + if (0 !== bccomp($diff, '0')) { + $pointsPerCoin = bcdiv($maxPoints, $diff); } - $result = $tagQuery->get(['tags.id', 'tags.tag', DB::raw('SUM(transactions.amount) as amount_sum')]); + + Log::debug(sprintf('Each coin in a tag earns it %s points', $pointsPerCoin)); /** @var Tag $tag */ - foreach ($result as $tag) { - $tagsWithAmounts[$tag->id] = (string)$tag->amount_sum; - $amount = '' !== $tagsWithAmounts[$tag->id] ? $tagsWithAmounts[$tag->id] : '0'; - if (null === $min) { - $min = $amount; - } - $max = 1 === bccomp($amount, $max) ? $amount : $max; - $min = -1 === bccomp($amount, $min) ? $amount : $min; - - $temporary[] = [ - 'amount' => $amount, - 'tag' => [ - 'id' => $tag->id, - 'tag' => $tag->tag, - ], - ]; - Log::debug(sprintf('After tag "%s", max is %s and min is %s.', $tag->tag, $max, $min)); - } - $min = $min ?? '0'; - Log::debug(sprintf('FINAL max is %s, FINAL min is %s', $max, $min)); - // the difference between max and min: - $range = bcsub($max, $min); - Log::debug(sprintf('The range is: %s', $range)); - - // each euro difference is this step in the scale: - $step = 0.0 !== (float)$range ? 8 / (float)$range : 0; - Log::debug(sprintf('The step is: %f', $step)); - $size = 12; - - foreach ($result as $tag) { - if (0 === $step) { - // easy: size is 12: - $size = 12; - } - if (0 !== $step) { - $amount = bcsub((string)$tag->amount_sum, $min); - Log::debug(sprintf('Work with amount %s for tag %s', $amount, $tag->tag)); - $size = ((int)(float)$amount * $step) + 12; - } + foreach ($tags as $tag) { + $amount = (string)$tag->amount_sum; + $amount = '' === $amount ? '0' : $amount; + $pointsForTag = bcmul($amount, $pointsPerCoin); + $fontSize = bcadd($minimumFont, $pointsForTag); + Log::debug(sprintf('Tag "%s": Amount is %s, so points is %s', $tag->tag, $amount, $fontSize)); + // return value for tag cloud: $return[$tag->id] = [ - 'size' => $size, + 'size' => $fontSize, 'tag' => $tag->tag, 'id' => $tag->id, ]; - - Log::debug(sprintf('Size is %d', $size)); } return $return; @@ -385,4 +344,87 @@ class TagRepository implements TagRepositoryInterface return $tag; } + + /** + * @param Collection $tags + * + * @return string + */ + private function getMaxAmount(Collection $tags): string + { + $max = '0'; + /** @var Tag $tag */ + foreach ($tags as $tag) { + $amount = (string)$tag->amount_sum; + $amount = '' === $amount ? '0' : $amount; + $max = 1 === bccomp($amount, $max) ? $amount : $max; + + } + Log::debug(sprintf('Maximum is %s.', $max)); + + return $max; + } + + /** + * @param Collection $tags + * + * @return string + */ + private function getMinAmount(Collection $tags): string + { + $min = null; + + /** @var Tag $tag */ + foreach ($tags as $tag) { + $amount = (string)$tag->amount_sum; + $amount = '' === $amount ? '0' : $amount; + + if (null === $min) { + $min = $amount; + } + $min = -1 === bccomp($amount, $min) ? $amount : $min; + } + + + if (null === $min) { + $min = '0'; + } + Log::debug(sprintf('Minimum is %s.', $min)); + + return $min; + } + + /** + * @param int|null $year + * + * @return Collection + */ + private function getTagsInYear(?int $year): Collection + { + // get all tags in the year (if present): + $tagQuery = $this->user->tags() + ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id') + ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + ->where( + function (Builder $query) { + $query->where('transactions.amount', '>', 0); + $query->orWhereNull('transactions.amount'); + } + ) + ->groupBy(['tags.id', 'tags.tag']); + + // add date range (or not): + if (null === $year) { + Log::debug('Get tags without a date.'); + $tagQuery->whereNull('tags.date'); + } + if (null !== $year) { + Log::debug(sprintf('Get tags with year %s.', $year)); + $tagQuery->where('tags.date', '>=', $year . '-01-01 00:00:00')->where('tags.date', '<=', $year . '-12-31 23:59:59'); + } + + return $tagQuery->get(['tags.id', 'tags.tag', DB::raw('SUM(transactions.amount) as amount_sum')]); + + } } From 7c950c302296747fa28fec1465b26998df261b3d Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Jul 2018 06:45:25 +0200 Subject: [PATCH 68/86] Remove a lot of deprecated code. --- app/Console/Commands/DecryptAttachment.php | 2 +- app/Helpers/Attachments/AttachmentHelper.php | 2 +- app/Http/Controllers/TagController.php | 6 +- app/Http/Requests/ReportFormRequest.php | 2 +- app/Import/Specifics/RabobankDescription.php | 21 -- app/Models/TransactionJournal.php | 25 +- .../Attachment/AttachmentRepository.php | 12 +- .../AttachmentRepositoryInterface.php | 5 +- app/Repositories/Budget/BudgetRepository.php | 4 +- .../ExportJob/ExportJobRepository.php | 7 +- .../ExportJobRepositoryInterface.php | 5 +- .../ImportJob/ImportJobRepository.php | 4 +- .../Journal/JournalRepository.php | 20 +- .../PiggyBank/PiggyBankRepository.php | 1 + app/Repositories/Tag/TagRepository.php | 37 +-- .../Tag/TagRepositoryInterface.php | 21 +- app/Repositories/User/UserRepository.php | 16 -- .../User/UserRepositoryInterface.php | 8 - .../Import/Information/BunqInformation.php | 213 ------------------ .../Information/InformationInterface.php | 56 ----- .../Models/TransactionJournalTrait.php | 176 --------------- app/Support/Twig/Journal.php | 12 +- .../Triggers/FromAccountContains.php | 6 +- .../Triggers/FromAccountEnds.php | 6 +- .../Triggers/FromAccountIs.php | 6 +- .../Triggers/FromAccountStarts.php | 6 +- .../Triggers/ToAccountContains.php | 6 +- .../Triggers/ToAccountEnds.php | 6 +- app/TransactionRules/Triggers/ToAccountIs.php | 6 +- .../Triggers/ToAccountStarts.php | 6 +- app/User.php | 22 -- .../Triggers/FromAccountContainsTest.php | 6 + .../Triggers/FromAccountEndsTest.php | 7 + .../Triggers/FromAccountIsTest.php | 6 + .../Triggers/FromAccountStartsTest.php | 7 + .../Triggers/ToAccountContainsTest.php | 7 + .../Triggers/ToAccountEndsTest.php | 25 +- .../Triggers/ToAccountIsTest.php | 6 + .../Triggers/ToAccountStartsTest.php | 21 +- 39 files changed, 189 insertions(+), 621 deletions(-) delete mode 100644 app/Support/Import/Information/BunqInformation.php delete mode 100644 app/Support/Import/Information/InformationInterface.php delete mode 100644 app/Support/Models/TransactionJournalTrait.php diff --git a/app/Console/Commands/DecryptAttachment.php b/app/Console/Commands/DecryptAttachment.php index 056a638872..75cfaf6329 100644 --- a/app/Console/Commands/DecryptAttachment.php +++ b/app/Console/Commands/DecryptAttachment.php @@ -65,7 +65,7 @@ class DecryptAttachment extends Command $attachment = $repository->findWithoutUser($attachmentId); $attachmentName = trim($this->argument('name')); $storagePath = realpath(trim($this->argument('directory'))); - if (null === $attachment->id) { + if (null === $attachment) { $this->error(sprintf('No attachment with id #%d', $attachmentId)); Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId)); diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 3b607834fb..e68300bedb 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -262,7 +262,7 @@ class AttachmentHelper implements AttachmentHelperInterface // store it: $this->uploadDisk->put($attachment->fileName(), $encrypted); - $attachment->uploaded = 1; // update attachment + $attachment->uploaded = true; // update attachment $attachment->save(); $this->attachments->push($attachment); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 1e19e950f2..3183ee4228 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -196,7 +196,7 @@ class TagController extends Controller // prep for "all" view. if ('all' === $moment) { $subTitle = (string)trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]); - $start = $this->repository->firstUseDate($tag); + $start = $this->repository->firstUseDate($tag) ?? new Carbon; $end = new Carbon; $path = route('tags.show', [$tag->id, 'all']); } @@ -311,8 +311,8 @@ class TagController extends Controller // get first and last tag date from tag: $range = app('preferences')->get('viewRange', '1M')->data; /** @var Carbon $end */ - $end = app('navigation')->endOfX($this->repository->lastUseDate($tag), $range, null); - $start = $this->repository->firstUseDate($tag); + $end = app('navigation')->endOfX($this->repository->lastUseDate($tag) ?? new Carbon, $range, null); + $start = $this->repository->firstUseDate($tag) ?? new Carbon; // properties for entries with their amounts. diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index a5c8dc87e3..b59e8dbec5 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -211,7 +211,7 @@ class ReportFormRequest extends Request if (\is_array($set)) { foreach ($set as $tagTag) { $tag = $repository->findByTag($tagTag); - if (null !== $tag->id) { + if (null !== $tag) { $collection->push($tag); } } diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index 65ceaf0024..d27392ca80 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Import\Specifics; -use Log; - /** * Class RabobankDescription. * @@ -66,25 +64,6 @@ class RabobankDescription implements SpecificInterface public function run(array $row): array { $row = array_values($row); - Log::debug(sprintf('Now in RabobankSpecific::run(). Row has %d columns', \count($row))); - $oppositeAccount = isset($row[5]) ? trim($row[5]) : ''; - $oppositeName = isset($row[6]) ? trim($row[6]) : ''; - $alternateName = isset($row[10]) ? trim($row[10]) : ''; - - if ('' === $oppositeAccount && '' === $oppositeName) { - Log::debug( - sprintf( - 'Rabobank specific: Opposite account and opposite name are' . - ' both empty. Will use "%s" (from description) instead', - $alternateName - ) - ); - $row[6] = $alternateName; - $row[10] = ''; - } - if (!('' === $oppositeAccount && '' === $oppositeName)) { - Log::debug('Rabobank specific: either opposite account or name are filled.'); - } return $row; } diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 8f2ba2c186..b06185c07b 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -33,6 +33,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Illuminate\Database\Eloquent\Builder; + /** * Class TransactionJournal. @@ -62,7 +64,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class TransactionJournal extends Model { - use SoftDeletes, TransactionJournalTrait; + use SoftDeletes; /** * The attributes that should be casted to native types. @@ -264,6 +266,27 @@ class TransactionJournal extends Model return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d 00:00:00')); } + /** + * @param Builder $query + * @param string $table + * + * @return bool + */ + public static function isJoined(Builder $query, string $table): bool + { + $joins = $query->getQuery()->joins; + if (null === $joins) { + return false; + } + foreach ($joins as $join) { + if ($join->table === $table) { + return true; + } + } + + return false; + } + /** * @codeCoverageIgnore * diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 52b77fff68..caad252875 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -81,18 +81,12 @@ class AttachmentRepository implements AttachmentRepositoryInterface /** * @param int $attachmentId - * @deprecated - * @return Attachment + * @return Attachment|null */ - public function findWithoutUser(int $attachmentId): Attachment + public function findWithoutUser(int $attachmentId): ?Attachment { - $attachment = Attachment::find($attachmentId); - if (null === $attachment) { - return new Attachment; - } - - return $attachment; + return Attachment::find($attachmentId); } /** diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 2f25bf81a7..527d00f88e 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -50,10 +50,9 @@ interface AttachmentRepositoryInterface /** * @param int $attachmentId - * @deprecated - * @return Attachment + * @return Attachment|null */ - public function findWithoutUser(int $attachmentId): Attachment; + public function findWithoutUser(int $attachmentId): ?Attachment; /** * @return Collection diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index f71ec844b3..6556b7a24e 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -921,8 +921,8 @@ class BudgetRepository implements BudgetRepositoryInterface // or create one and return it. $limit = new BudgetLimit; $limit->budget()->associate($budget); - $limit->start_date = $start->format('Y-m-d 00:00:00'); - $limit->end_date = $end->format('Y-m-d 00:00:00'); + $limit->start_date = $start->startOfDay(); + $limit->end_date = $end->startOfDay(); $limit->amount = $amount; $limit->save(); Log::debug(sprintf('Created new budget limit with ID #%d and amount %s', $limit->id, $amount)); diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index 70bf949732..ec2e0c61a7 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -80,10 +80,9 @@ class ExportJobRepository implements ExportJobRepositoryInterface } /** - * @return ExportJob - * @deprecated + * @return ExportJob|null */ - public function create(): ExportJob + public function create(): ?ExportJob { $count = 0; while ($count < 30) { @@ -103,7 +102,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface ++$count; } - return new ExportJob; + return null; } /** diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 90473ca3ed..65d51523a4 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -44,10 +44,9 @@ interface ExportJobRepositoryInterface public function cleanup(): bool; /** - * @return ExportJob - * @deprecated + * @return ExportJob|null */ - public function create(): ExportJob; + public function create(): ?ExportJob; /** * @param ExportJob $job diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index b439e7b518..24b74bdb9e 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -303,7 +303,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface // store it: $this->uploadDisk->put($attachment->fileName(), $encrypted); - $attachment->uploaded = 1; // update attachment + $attachment->uploaded = true; // update attachment $attachment->save(); // return it. @@ -357,7 +357,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface // store it: $this->uploadDisk->put($attachment->fileName(), $encrypted); - $attachment->uploaded = 1; // update attachment + $attachment->uploaded = true; // update attachment $attachment->save(); // return it. diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 57e37d48ea..657b5faf61 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -29,7 +29,6 @@ use FireflyIII\Factory\TransactionJournalFactory; use FireflyIII\Factory\TransactionJournalMetaFactory; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; -use FireflyIII\Models\Note; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; @@ -59,6 +58,8 @@ class JournalRepository implements JournalRepositoryInterface * @param Account $destination * * @return MessageBag + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function convert(TransactionJournal $journal, TransactionType $type, Account $source, Account $destination): MessageBag { @@ -73,9 +74,9 @@ class JournalRepository implements JournalRepositoryInterface return $messages; } - $sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first(); - $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first(); - if (null === $sourceTransaction || null === $destinationTransaction) { + $srcTransaction = $journal->transactions()->where('amount', '<', 0)->first(); + $dstTransaction = $journal->transactions()->where('amount', '>', 0)->first(); + if (null === $srcTransaction || null === $dstTransaction) { // default message bag that shows errors for everything. $messages = new MessageBag; @@ -86,15 +87,18 @@ class JournalRepository implements JournalRepositoryInterface return $messages; } - $sourceTransaction->account_id = $source->id; - $sourceTransaction->save(); - $destinationTransaction->account_id = $destination->id; - $destinationTransaction->save(); + // update transactions, and update journal: + + $srcTransaction->account_id = $source->id; + $dstTransaction->account_id = $destination->id; $journal->transaction_type_id = $type->id; + $dstTransaction->save(); + $srcTransaction->save(); $journal->save(); // if journal is a transfer now, remove budget: if (TransactionType::TRANSFER === $type->type) { + $journal->budgets()->detach(); // also from transactions: foreach ($journal->transactions as $transaction) { diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index d89ef493ba..377b9d6331 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -340,6 +340,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface * @param PiggyBank $piggyBank * * @return string + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getSuggestedMonthlyAmount(PiggyBank $piggyBank): string { diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 715ca44e13..710e50df95 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -80,29 +80,12 @@ class TagRepository implements TagRepositoryInterface return (string)$set->sum('transaction_amount'); } - /** - * @param int $tagId - * - * @deprecated - * @return Tag - */ - public function find(int $tagId): Tag - { - $tag = $this->user->tags()->find($tagId); - if (null === $tag) { - $tag = new Tag; - } - - return $tag; - } - /** * @param string $tag * - * @return Tag - * @deprecated + * @return Tag|null */ - public function findByTag(string $tag): Tag + public function findByTag(string $tag): ?Tag { $tags = $this->user->tags()->get(); /** @var Tag $databaseTag */ @@ -112,7 +95,7 @@ class TagRepository implements TagRepositoryInterface } } - return new Tag; + return null; } /** @@ -128,17 +111,16 @@ class TagRepository implements TagRepositoryInterface /** * @param Tag $tag * - * @return Carbon - * @deprecated + * @return Carbon|null */ - public function firstUseDate(Tag $tag): Carbon + public function firstUseDate(Tag $tag): ?Carbon { $journal = $tag->transactionJournals()->orderBy('date', 'ASC')->first(); if (null !== $journal) { return $journal->date; } - return new Carbon; + return null; } /** @@ -160,17 +142,16 @@ class TagRepository implements TagRepositoryInterface /** * @param Tag $tag * - * @return Carbon - * @deprecated + * @return Carbon|null */ - public function lastUseDate(Tag $tag): Carbon + public function lastUseDate(Tag $tag): ?Carbon { $journal = $tag->transactionJournals()->orderBy('date', 'DESC')->first(); if (null !== $journal) { return $journal->date; } - return new Carbon; + return null; } /** diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 15e30f9517..c85b819de3 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -55,21 +55,12 @@ interface TagRepositoryInterface */ public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string; - /** - * @param int $tagId - * - * @deprecated - * @return Tag - */ - public function find(int $tagId): Tag; - /** * @param string $tag * - * @return Tag - * @deprecated + * @return Tag|null */ - public function findByTag(string $tag): Tag; + public function findByTag(string $tag):?Tag; /** * @param int $tagId @@ -82,9 +73,8 @@ interface TagRepositoryInterface * @param Tag $tag * * @return Carbon - * @deprecated */ - public function firstUseDate(Tag $tag): Carbon; + public function firstUseDate(Tag $tag): ?Carbon; /** * This method returns all the user's tags. @@ -96,10 +86,9 @@ interface TagRepositoryInterface /** * @param Tag $tag * - * @return Carbon - * @deprecated + * @return Carbon|null */ - public function lastUseDate(Tag $tag): Carbon; + public function lastUseDate(Tag $tag): ?Carbon; /** * Will return the newest tag (if known) or NULL. diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index f29f8f73eb..39508717cd 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -162,22 +162,6 @@ class UserRepository implements UserRepositoryInterface return true; } - /** - * @param int $userId - * - * @deprecated - * @return User - */ - public function find(int $userId): User - { - $user = User::find($userId); - if (null !== $user) { - return $user; - } - - return new User; - } - /** * @param string $email * diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php index 8839c738d2..c49c54df2d 100644 --- a/app/Repositories/User/UserRepositoryInterface.php +++ b/app/Repositories/User/UserRepositoryInterface.php @@ -101,14 +101,6 @@ interface UserRepositoryInterface */ public function destroy(User $user): bool; - /** - * @param int $userId - * - * @deprecated - * @return User - */ - public function find(int $userId): User; - /** * @param string $email * diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php deleted file mode 100644 index fe45cba550..0000000000 --- a/app/Support/Import/Information/BunqInformation.php +++ /dev/null @@ -1,213 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Information; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Services\Bunq\Object\Alias; -use FireflyIII\Services\Bunq\Object\MonetaryAccountBank; -use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest; -use FireflyIII\Services\Bunq\Request\DeviceSessionRequest; -use FireflyIII\Services\Bunq\Request\ListMonetaryAccountRequest; -use FireflyIII\Services\Bunq\Request\ListUserRequest; -use FireflyIII\Services\Bunq\Token\SessionToken; -use FireflyIII\Support\CacheProperties; -use FireflyIII\User; -use Illuminate\Support\Collection; -use Log; - -/** - * @codeCoverageIgnore - * @deprecated - * Class BunqInformation. - */ -class BunqInformation implements InformationInterface -{ - /** @var User */ - private $user; - - /** - * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks. - * - * The format for these bank accounts is basically this: - * - * id: bank specific id - * name: bank appointed name - * number: account number (usually IBAN) - * currency: ISO code of currency - * balance: current balance - * - * - * any other fields are optional but can be useful: - * image: logo or account specific thing - * color: any associated color. - * - * @return array - * - * @throws FireflyException - */ - public function getAccounts(): array - { - // cache for an hour: - $cache = new CacheProperties; - $cache->addProperty('bunq.get-accounts'); - $cache->addProperty(date('dmy h')); - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - Log::debug('Now in getAccounts()'); - $sessionToken = $this->startSession(); - $userId = $this->getUserInformation($sessionToken); - // get list of Bunq accounts: - $accounts = $this->getMonetaryAccounts($sessionToken, $userId); - $return = []; - /** @var MonetaryAccountBank $account */ - foreach ($accounts as $account) { - $current = [ - 'id' => $account->getId(), - 'name' => $account->getDescription(), - 'currency' => $account->getCurrency(), - 'balance' => $account->getBalance()->getValue(), - 'color' => $account->getSetting()->getColor(), - ]; - /** @var Alias $alias */ - foreach ($account->getAliases() as $alias) { - if ('IBAN' === $alias->getType()) { - $current['number'] = $alias->getValue(); - } - } - $return[] = $current; - } - $cache->store($return); - - $this->closeSession($sessionToken); - - return $return; - } - - /** - * Set the user for this Prerequisites-routine. Class is expected to implement and save this. - * - * @param User $user - */ - public function setUser(User $user): void - { - $this->user = $user; - } - - /** - * @param SessionToken $sessionToken - * - - */ - private function closeSession(SessionToken $sessionToken): void - { - Log::debug('Going to close session'); - $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; - $request = new DeleteDeviceSessionRequest(); - $request->setSecret($apiKey); - $request->setPrivateKey($privateKey); - $request->setServerPublicKey($serverPublicKey); - $request->setSessionToken($sessionToken); - $request->call(); - - } - - /** - * @param SessionToken $sessionToken - * @param int $userId - * - * @return Collection - * @throws FireflyException - */ - private function getMonetaryAccounts(SessionToken $sessionToken, int $userId): Collection - { - $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; - $request = new ListMonetaryAccountRequest; - - $request->setSessionToken($sessionToken); - $request->setSecret($apiKey); - $request->setServerPublicKey($serverPublicKey); - $request->setPrivateKey($privateKey); - $request->setUserId($userId); - $request->call(); - - return $request->getMonetaryAccounts(); - } - - /** - * @param SessionToken $sessionToken - * - * @return int - * - * @throws FireflyException - */ - private function getUserInformation(SessionToken $sessionToken): int - { - $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; - $request = new ListUserRequest; - $request->setSessionToken($sessionToken); - $request->setSecret($apiKey); - $request->setServerPublicKey($serverPublicKey); - $request->setPrivateKey($privateKey); - $request->call(); - // return the first that isn't null? - $company = $request->getUserCompany(); - if ($company->getId() > 0) { - return $company->getId(); - } - $user = $request->getUserPerson(); - if ($user->getId() > 0) { - return $user->getId(); - } - throw new FireflyException('Expected user or company from Bunq, but got neither.'); - } - - /** - * @return SessionToken - * @throws FireflyException - */ - private function startSession(): SessionToken - { - Log::debug('Now in startSession.'); - $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key')->data; - $serverPublicKey = app('preferences')->getForUser($this->user, 'bunq_server_public_key')->data; - $privateKey = app('preferences')->getForUser($this->user, 'bunq_private_key')->data; - $installationToken = app('preferences')->getForUser($this->user, 'bunq_installation_token')->data; - $request = new DeviceSessionRequest(); - $request->setSecret($apiKey); - $request->setServerPublicKey($serverPublicKey); - $request->setPrivateKey($privateKey); - $request->setInstallationToken($installationToken); - $request->call(); - $sessionToken = $request->getSessionToken(); - Log::debug(sprintf('Now have got session token: %s', serialize($sessionToken))); - - return $sessionToken; - } -} diff --git a/app/Support/Import/Information/InformationInterface.php b/app/Support/Import/Information/InformationInterface.php deleted file mode 100644 index 0e23f7df70..0000000000 --- a/app/Support/Import/Information/InformationInterface.php +++ /dev/null @@ -1,56 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Information; - -use FireflyIII\User; - -/** - * @deprecated - * Interface InformationInterface. - */ -interface InformationInterface -{ - /** - * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks. - * - * The format for these bank accounts is basically this: - * - * id: bank specific id - * name: bank appointed name - * number: account number (usually IBAN) - * currency: ISO code of currency - * - * any other fields are optional but can be useful: - * image: logo or account specific thing - * - * @return array - */ - public function getAccounts(): array; - - /** - * Set the user for this Prerequisites-routine. Class is expected to implement and save this. - * - * @param User $user - */ - public function setUser(User $user): void; -} diff --git a/app/Support/Models/TransactionJournalTrait.php b/app/Support/Models/TransactionJournalTrait.php deleted file mode 100644 index 943d5d9568..0000000000 --- a/app/Support/Models/TransactionJournalTrait.php +++ /dev/null @@ -1,176 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Models; - -use Carbon\Carbon; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionType; -use FireflyIII\Support\CacheProperties; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Support\Collection; - -/** - * Class TransactionJournalTrait. - * - * @property int $id - * @property Carbon $date - * @property string $transaction_type_type - * @property TransactionType $transactionType - */ -trait TransactionJournalTrait -{ - /** - * @param Builder $query - * @param string $table - * - * @return bool - */ - public static function isJoined(Builder $query, string $table): bool - { - $joins = $query->getQuery()->joins; - if (null === $joins) { - return false; - } - foreach ($joins as $join) { - if ($join->table === $table) { - return true; - } - } - - return false; - } - - /** - * @deprecated - * @return Collection - */ - public function destinationAccountList(): Collection - { - $cache = new CacheProperties; - $cache->addProperty($this->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('destination-account-list'); - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - $transactions = $this->transactions()->where('amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); - $list = new Collection; - /** @var Transaction $t */ - foreach ($transactions as $t) { - $list->push($t->account); - } - $list = $list->unique('id'); - $cache->store($list); - - return $list; - } - - /** - * @deprecated - * @return Collection - */ - public function destinationTransactionList(): Collection - { - $cache = new CacheProperties; - $cache->addProperty($this->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('destination-transaction-list'); - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - $list = $this->transactions()->where('amount', '>', 0)->with('account')->get(); - $cache->store($list); - - return $list; - } - - /** - * @deprecated - * @return Collection - */ - public function sourceAccountList(): Collection - { - $cache = new CacheProperties; - $cache->addProperty($this->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('source-account-list'); - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - $transactions = $this->transactions()->where('amount', '<', 0)->orderBy('transactions.account_id')->with('account')->get(); - $list = new Collection; - /** @var Transaction $t */ - foreach ($transactions as $t) { - $list->push($t->account); - } - $list = $list->unique('id'); - $cache->store($list); - - return $list; - } - - /** - * @deprecated - * @return Collection - */ - public function sourceTransactionList(): Collection - { - $cache = new CacheProperties; - $cache->addProperty($this->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('source-transaction-list'); - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - $list = $this->transactions()->where('amount', '<', 0)->with('account')->get(); - $cache->store($list); - - return $list; - } - - /** - * @deprecated - * @return string - */ - public function transactionTypeStr(): string - { - $cache = new CacheProperties; - $cache->addProperty($this->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('type-string'); - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - - $typeStr = $this->transaction_type_type ?? $this->transactionType->type; - $cache->store($typeStr); - - return $typeStr; - } - - /** - * @return HasMany - */ - abstract public function transactions(): HasMany; -} diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index c6502a8f72..632c80a2b3 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -26,6 +26,7 @@ use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Category; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use FireflyIII\Support\Twig\Extension\TransactionJournal as TransactionJournalExtension; use Twig_Extension; @@ -53,8 +54,10 @@ class Journal extends Twig_Extension return $cache->get(); // @codeCoverageIgnore } - $list = $journal->destinationAccountList(); - $array = []; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + $list = $repository->getJournalDestinationAccounts($journal); + $array = []; /** @var Account $entry */ foreach ($list as $entry) { if (AccountType::CASH === $entry->accountType->type) { @@ -119,7 +122,10 @@ class Journal extends Twig_Extension return $cache->get(); // @codeCoverageIgnore } - $list = $journal->sourceAccountList(); + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + + $list = $repository->getJournalSourceAccounts($journal); $array = []; /** @var Account $entry */ foreach ($list as $entry) { diff --git a/app/TransactionRules/Triggers/FromAccountContains.php b/app/TransactionRules/Triggers/FromAccountContains.php index a551afddc2..efde3010eb 100644 --- a/app/TransactionRules/Triggers/FromAccountContains.php +++ b/app/TransactionRules/Triggers/FromAccountContains.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf { $fromAccountName = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->sourceAccountList() as $account) { + foreach ($repository->getJournalSourceAccounts($journal) as $account) { $fromAccountName .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/FromAccountEnds.php b/app/TransactionRules/Triggers/FromAccountEnds.php index a64b0ca254..a0d4eed713 100644 --- a/app/TransactionRules/Triggers/FromAccountEnds.php +++ b/app/TransactionRules/Triggers/FromAccountEnds.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface { $name = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->sourceAccountList() as $account) { + foreach ($repository->getJournalSourceAccounts($journal) as $account) { $name .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/FromAccountIs.php b/app/TransactionRules/Triggers/FromAccountIs.php index 9354c832ae..f2926767c5 100644 --- a/app/TransactionRules/Triggers/FromAccountIs.php +++ b/app/TransactionRules/Triggers/FromAccountIs.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface { $name = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->sourceAccountList() as $account) { + foreach ($repository->getJournalSourceAccounts($journal) as $account) { $name .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/FromAccountStarts.php b/app/TransactionRules/Triggers/FromAccountStarts.php index 99a8ae1c49..c0283d7f86 100644 --- a/app/TransactionRules/Triggers/FromAccountStarts.php +++ b/app/TransactionRules/Triggers/FromAccountStarts.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac { $name = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->sourceAccountList() as $account) { + foreach ($repository->getJournalSourceAccounts($journal) as $account) { $name .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/ToAccountContains.php b/app/TransactionRules/Triggers/ToAccountContains.php index a4079522e5..f70c54adca 100644 --- a/app/TransactionRules/Triggers/ToAccountContains.php +++ b/app/TransactionRules/Triggers/ToAccountContains.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac { $toAccountName = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->destinationAccountList() as $account) { + foreach ($repository->getJournalDestinationAccounts($journal) as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/ToAccountEnds.php b/app/TransactionRules/Triggers/ToAccountEnds.php index 1ca88c56dc..b058c53117 100644 --- a/app/TransactionRules/Triggers/ToAccountEnds.php +++ b/app/TransactionRules/Triggers/ToAccountEnds.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface { $toAccountName = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->destinationAccountList() as $account) { + foreach ($repository->getJournalDestinationAccounts($journal) as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/ToAccountIs.php b/app/TransactionRules/Triggers/ToAccountIs.php index 658b96adf6..1e9a1d8051 100644 --- a/app/TransactionRules/Triggers/ToAccountIs.php +++ b/app/TransactionRules/Triggers/ToAccountIs.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface { $toAccountName = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->destinationAccountList() as $account) { + foreach ($repository->getJournalDestinationAccounts($journal) as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/TransactionRules/Triggers/ToAccountStarts.php b/app/TransactionRules/Triggers/ToAccountStarts.php index 8583235369..c8486941ea 100644 --- a/app/TransactionRules/Triggers/ToAccountStarts.php +++ b/app/TransactionRules/Triggers/ToAccountStarts.php @@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Triggers; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Log; /** @@ -73,8 +74,11 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface { $toAccountName = ''; + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + /** @var Account $account */ - foreach ($journal->destinationAccountList() as $account) { + foreach ($repository->getJournalDestinationAccounts($journal) as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/User.php b/app/User.php index e0f7c618bf..2fbca22b1d 100644 --- a/app/User.php +++ b/app/User.php @@ -219,28 +219,6 @@ class User extends Authenticatable return (string)bin2hex($bytes); } - /** - * @codeCoverageIgnore - * Checks if the user has a role by its name. - * - * Full credit goes to: https://github.com/Zizaco/entrust - * - * @param string $name - * - * @deprecated - * @return bool - */ - public function hasRole(string $name): bool - { - foreach ($this->roles as $role) { - if ($role->name === $name) { - return true; - } - } - - return false; - } - /** * @codeCoverageIgnore * Link to import jobs. diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php index 39e17cd036..e96de4909b 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountContains; use Tests\TestCase; @@ -36,6 +37,7 @@ class FromAccountContainsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $count = 0; while ($count === 0) { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -54,6 +56,7 @@ class FromAccountContainsTest extends TestCase */ public function testTriggeredNot(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = FromAccountContains::makeFromStrings('some name' . random_int(1, 234), false); @@ -66,6 +69,7 @@ class FromAccountContainsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = ''; $result = FromAccountContains::willMatchEverything($value); $this->assertTrue($result); @@ -76,6 +80,7 @@ class FromAccountContainsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = 'x'; $result = FromAccountContains::willMatchEverything($value); $this->assertFalse($result); @@ -86,6 +91,7 @@ class FromAccountContainsTest extends TestCase */ public function testWillMatchEverythingNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = null; $result = FromAccountContains::willMatchEverything($value); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php index 0c362edd1f..5fb022732f 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountEnds; use Tests\TestCase; @@ -36,6 +37,7 @@ class FromAccountEndsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $count = 0; while ($count === 0) { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -54,6 +56,7 @@ class FromAccountEndsTest extends TestCase */ public function testTriggeredLonger(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $count = 0; while ($count === 0) { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -72,6 +75,7 @@ class FromAccountEndsTest extends TestCase */ public function testTriggeredNot(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = FromAccountEnds::makeFromStrings('some name' . random_int(1, 234), false); @@ -84,6 +88,7 @@ class FromAccountEndsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = ''; $result = FromAccountEnds::willMatchEverything($value); $this->assertTrue($result); @@ -94,6 +99,7 @@ class FromAccountEndsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = 'x'; $result = FromAccountEnds::willMatchEverything($value); $this->assertFalse($result); @@ -104,6 +110,7 @@ class FromAccountEndsTest extends TestCase */ public function testWillMatchEverythingNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = null; $result = FromAccountEnds::willMatchEverything($value); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php index d4ef43b734..c746a39b85 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountIs; use Tests\TestCase; use Log; @@ -36,6 +37,7 @@ class FromAccountIsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $loops = 0; // FINAL LOOP METHOD. do { /** @var TransactionJournal $journal */ @@ -62,6 +64,7 @@ class FromAccountIsTest extends TestCase */ public function testTriggeredNot(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = FromAccountIs::makeFromStrings('some name' . random_int(1, 234), false); @@ -74,6 +77,7 @@ class FromAccountIsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = ''; $result = FromAccountIs::willMatchEverything($value); $this->assertTrue($result); @@ -84,6 +88,7 @@ class FromAccountIsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = 'x'; $result = FromAccountIs::willMatchEverything($value); $this->assertFalse($result); @@ -94,6 +99,7 @@ class FromAccountIsTest extends TestCase */ public function testWillMatchEverythingNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = null; $result = FromAccountIs::willMatchEverything($value); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index ecf2f2e8cc..467f57c438 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountStarts; use Log; use Tests\TestCase; @@ -46,6 +47,7 @@ class FromAccountStartsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); Log::debug('In testTriggered()'); $loops = 0; // FINAL LOOP METHOD. do { @@ -77,6 +79,7 @@ class FromAccountStartsTest extends TestCase */ public function testTriggeredLonger(): void { + $repository = $this->mock(JournalRepositoryInterface::class); Log::debug('In testTriggeredLonger()'); $loops = 0; // FINAL LOOP METHOD. do { @@ -108,6 +111,7 @@ class FromAccountStartsTest extends TestCase */ public function testTriggeredNot(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = FromAccountStarts::makeFromStrings('some name' . random_int(1, 234), false); @@ -120,6 +124,7 @@ class FromAccountStartsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = ''; $result = FromAccountStarts::willMatchEverything($value); $this->assertTrue($result); @@ -130,6 +135,7 @@ class FromAccountStartsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = 'x'; $result = FromAccountStarts::willMatchEverything($value); $this->assertFalse($result); @@ -140,6 +146,7 @@ class FromAccountStartsTest extends TestCase */ public function testWillMatchEverythingNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = null; $result = FromAccountStarts::willMatchEverything($value); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php index cfff2cd793..a441ac7b20 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountContains; use Tests\TestCase; @@ -36,6 +37,8 @@ class ToAccountContainsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); + $count = 0; do { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -56,6 +59,7 @@ class ToAccountContainsTest extends TestCase */ public function testTriggeredNot(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $count = 0; do { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -76,6 +80,7 @@ class ToAccountContainsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = ''; $result = ToAccountContains::willMatchEverything($value); $this->assertTrue($result); @@ -86,6 +91,7 @@ class ToAccountContainsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = 'x'; $result = ToAccountContains::willMatchEverything($value); $this->assertFalse($result); @@ -96,6 +102,7 @@ class ToAccountContainsTest extends TestCase */ public function testWillMatchEverythingNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = null; $result = ToAccountContains::willMatchEverything($value); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php index 795eb179fa..91d46c04a9 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountEnds; use Log; use Tests\TestCase; @@ -37,7 +38,8 @@ class ToAccountEndsTest extends TestCase */ public function testTriggered(): void { - $loops = 0; // FINAL LOOP METHOD. + $repository = $this->mock(JournalRepositoryInterface::class); + $loops = 0; // FINAL LOOP METHOD. do { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); @@ -68,7 +70,8 @@ class ToAccountEndsTest extends TestCase */ public function testTriggeredLonger(): void { - $loops = 0; // FINAL LOOP METHOD. + $repository = $this->mock(JournalRepositoryInterface::class); + $loops = 0; // FINAL LOOP METHOD. do { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); @@ -98,7 +101,8 @@ class ToAccountEndsTest extends TestCase */ public function testTriggeredNot(): void { - $loops = 0; // FINAL LOOP METHOD. + $repository = $this->mock(JournalRepositoryInterface::class); + $loops = 0; // FINAL LOOP METHOD. do { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); @@ -128,8 +132,9 @@ class ToAccountEndsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { - $value = ''; - $result = ToAccountEnds::willMatchEverything($value); + $repository = $this->mock(JournalRepositoryInterface::class); + $value = ''; + $result = ToAccountEnds::willMatchEverything($value); $this->assertTrue($result); } @@ -138,8 +143,9 @@ class ToAccountEndsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { - $value = 'x'; - $result = ToAccountEnds::willMatchEverything($value); + $repository = $this->mock(JournalRepositoryInterface::class); + $value = 'x'; + $result = ToAccountEnds::willMatchEverything($value); $this->assertFalse($result); } @@ -148,8 +154,9 @@ class ToAccountEndsTest extends TestCase */ public function testWillMatchEverythingNull(): void { - $value = null; - $result = ToAccountEnds::willMatchEverything($value); + $repository = $this->mock(JournalRepositoryInterface::class); + $value = null; + $result = ToAccountEnds::willMatchEverything($value); $this->assertTrue($result); } } diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php index 44ef88bd18..a2ac324a0e 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountIs; use Tests\TestCase; use Log; @@ -37,6 +38,7 @@ class ToAccountIsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $loops = 0; // FINAL LOOP METHOD. do { /** @var TransactionJournal $journal */ @@ -64,6 +66,7 @@ class ToAccountIsTest extends TestCase */ public function testTriggeredNot(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $loops = 0; // FINAL LOOP METHOD. do { /** @var TransactionJournal $journal */ @@ -89,6 +92,7 @@ class ToAccountIsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = ''; $result = ToAccountIs::willMatchEverything($value); $this->assertTrue($result); @@ -99,6 +103,7 @@ class ToAccountIsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = 'x'; $result = ToAccountIs::willMatchEverything($value); $this->assertFalse($result); @@ -109,6 +114,7 @@ class ToAccountIsTest extends TestCase */ public function testWillMatchEverythingNull(): void { + $repository = $this->mock(JournalRepositoryInterface::class); $value = null; $result = ToAccountIs::willMatchEverything($value); $this->assertTrue($result); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php index 8b05f84aac..2eeb5b1fc7 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountStarts; use Log; use Tests\TestCase; @@ -37,6 +38,7 @@ class ToAccountStartsTest extends TestCase */ public function testTriggered(): void { + $repository = $this->mock(JournalRepositoryInterface::class); Log::debug('Now in testTriggered'); $loops = 0; // FINAL LOOP METHOD. @@ -65,6 +67,7 @@ class ToAccountStartsTest extends TestCase */ public function testTriggeredLonger(): void { + $repository = $this->mock(JournalRepositoryInterface::class); Log::debug('Now in testTriggeredLonger'); @@ -93,7 +96,8 @@ class ToAccountStartsTest extends TestCase */ public function testTriggeredNot(): void { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $repository = $this->mock(JournalRepositoryInterface::class); + $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = ToAccountStarts::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); @@ -105,8 +109,9 @@ class ToAccountStartsTest extends TestCase */ public function testWillMatchEverythingEmpty(): void { - $value = ''; - $result = ToAccountStarts::willMatchEverything($value); + $repository = $this->mock(JournalRepositoryInterface::class); + $value = ''; + $result = ToAccountStarts::willMatchEverything($value); $this->assertTrue($result); } @@ -115,8 +120,9 @@ class ToAccountStartsTest extends TestCase */ public function testWillMatchEverythingNotNull(): void { - $value = 'x'; - $result = ToAccountStarts::willMatchEverything($value); + $repository = $this->mock(JournalRepositoryInterface::class); + $value = 'x'; + $result = ToAccountStarts::willMatchEverything($value); $this->assertFalse($result); } @@ -125,8 +131,9 @@ class ToAccountStartsTest extends TestCase */ public function testWillMatchEverythingNull(): void { - $value = null; - $result = ToAccountStarts::willMatchEverything($value); + $repository = $this->mock(JournalRepositoryInterface::class); + $value = null; + $result = ToAccountStarts::willMatchEverything($value); $this->assertTrue($result); } } From 7f4ecd40cecebdaa5d6c625988eb050460118119 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Jul 2018 07:11:04 +0200 Subject: [PATCH 69/86] Fix issues where data-variable was not initialized properly. --- app/Console/Commands/UpgradeDatabase.php | 4 +- app/Http/Controllers/BillController.php | 4 +- .../Controllers/Popup/ReportController.php | 2 +- .../Controllers/Rule/CreateController.php | 4 +- app/Http/Requests/JournalFormRequest.php | 2 + app/Models/TransactionJournal.php | 47 ++++++++++--------- .../LinkType/LinkTypeRepository.php | 4 +- app/Repositories/Tag/TagRepository.php | 1 - app/Support/Facades/Steam.php | 3 +- app/Support/Twig/General.php | 1 + app/Transformers/BillTransformer.php | 4 +- 11 files changed, 40 insertions(+), 36 deletions(-) diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index 927630bc50..b126e38850 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -199,7 +199,7 @@ class UpgradeDatabase extends Command [ 'rule_id' => $rule->id, 'trigger_type' => 'amount_more', - 'trigger_value' => round($bill->amount_min, $currency->decimal_places), + 'trigger_value' => round((float)$bill->amount_min, $currency->decimal_places), 'active' => 1, 'stop_processing' => 0, 'order' => 4, @@ -211,7 +211,7 @@ class UpgradeDatabase extends Command [ 'rule_id' => $rule->id, 'trigger_type' => 'amount_exactly', - 'trigger_value' => round($bill->amount_min, $currency->decimal_places), + 'trigger_value' => round((float)$bill->amount_min, $currency->decimal_places), 'active' => 1, 'stop_processing' => 0, 'order' => 3, diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 9faf24e25f..0bee14bc8b 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -166,8 +166,8 @@ class BillController extends Controller } $currency = app('amount')->getDefaultCurrency(); - $bill->amount_min = round($bill->amount_min, $currency->decimal_places); - $bill->amount_max = round($bill->amount_max, $currency->decimal_places); + $bill->amount_min = round((float)$bill->amount_min, $currency->decimal_places); + $bill->amount_max = round((float)$bill->amount_max, $currency->decimal_places); $defaultCurrency = app('amount')->getDefaultCurrency(); // code to handle active-checkboxes diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 1bdb211b1f..d07a09ab63 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -281,7 +281,7 @@ class ReportController extends Controller try { $attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate']); } catch (InvalidArgumentException $e) { - Log::debug('Not important error message: %s', $e->getMessage()); + Log::debug(sprintf('Not important error message: %s', $e->getMessage())); $date = Carbon::create()->startOfMonth(); $attributes['endDate'] = $date; } diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index 68ae618735..ce11445340 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -223,8 +223,8 @@ class CreateController extends Controller $triggers = ['currency_is', 'amount_more', 'amount_less', 'description_contains']; $values = [ $bill->transactionCurrency()->first()->name, - round($bill->amount_min, 12), - round($bill->amount_max, 12), + round((float)$bill->amount_min, 12), + round((float)$bill->amount_max, 12), $bill->name, ]; foreach ($triggers as $index => $trigger) { diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index c8b549e9be..e63b041a1f 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -270,6 +270,7 @@ class JournalFormRequest extends Request */ private function validateDeposit(Validator $validator): void { + $data = $validator->getData(); $selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0); $accountCurrency = (int)($data['destination_account_currency'] ?? 0); $nativeAmount = (string)($data['native_amount'] ?? ''); @@ -289,6 +290,7 @@ class JournalFormRequest extends Request */ private function validateTransfer(Validator $validator): void { + $data = $validator->getData(); $sourceCurrency = (int)($data['source_account_currency'] ?? 0); $destinationCurrency = (int)($data['destination_account_currency'] ?? 0); $sourceAmount = (string)($data['source_amount'] ?? ''); diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index b06185c07b..eba8e70d3d 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -24,8 +24,8 @@ namespace FireflyIII\Models; use Carbon\Carbon; use Crypt; -use FireflyIII\Support\Models\TransactionJournalTrait; use FireflyIII\User; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; @@ -33,7 +33,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Illuminate\Database\Eloquent\Builder; /** @@ -58,6 +57,8 @@ use Illuminate\Database\Eloquent\Builder; * @property int order * @property int budget_id * @property string period_marker + * @property Carbon $date + * @property string $transaction_type_type * * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -94,6 +95,27 @@ class TransactionJournal extends Model /** @var array */ protected $hidden = ['encrypted']; + /** + * @param Builder $query + * @param string $table + * + * @return bool + */ + public static function isJoined(Builder $query, string $table): bool + { + $joins = $query->getQuery()->joins; + if (null === $joins) { + return false; + } + foreach ($joins as $join) { + if ($join->table === $table) { + return true; + } + } + + return false; + } + /** * @param string $value * @@ -266,27 +288,6 @@ class TransactionJournal extends Model return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d 00:00:00')); } - /** - * @param Builder $query - * @param string $table - * - * @return bool - */ - public static function isJoined(Builder $query, string $table): bool - { - $joins = $query->getQuery()->joins; - if (null === $joins) { - return false; - } - foreach ($joins as $join) { - if ($join->table === $table) { - return true; - } - } - - return false; - } - /** * @codeCoverageIgnore * diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index d0588e8b40..5fe1ad3db1 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -229,8 +229,8 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface */ public function storeLink(array $information, TransactionJournal $inward, TransactionJournal $outward): TransactionJournalLink { - $linkType = $this->find((int)($information['link_type_id'] ?? 0)); - if (null === $linkType->id) { + $linkType = $this->findNull((int)($information['link_type_id'] ?? 0)); + if (null === $linkType) { throw new FireflyException(sprintf('Link type #%d cannot be resolved to an actual link type', $information['link_type_id'] ?? 0)); } diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 710e50df95..fc5526f74f 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -267,7 +267,6 @@ class TagRepository implements TagRepositoryInterface public function tagCloud(?int $year): array { // Some vars - $return = []; $tags = $this->getTagsInYear($year); $max = $this->getMaxAmount($tags); $min = $this->getMinAmount($tags); diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index 7a9bee11e8..d30951d449 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -28,8 +28,8 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Facade; /** - * @codeCoverageIgnore * Class Steam. + * * @method string balance(Account $account, Carbon $date) * @method string balanceIgnoreVirtual(Account $account, Carbon $date) * @method array balanceInRange(Account $account, Carbon $start, Carbon $end) @@ -42,6 +42,7 @@ use Illuminate\Support\Facades\Facade; * @method tryDecrypt($value) * @method string positive(string $amount) * + * @codeCoverageIgnore */ class Steam extends Facade { diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index e744976414..d7e3d16355 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -150,6 +150,7 @@ class General extends Twig_Extension if (null === $account) { return 'NULL'; } + /** @var Carbon $date */ $date = session('end', Carbon::now()->endOfMonth()); return app('steam')->balance($account, $date); diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index 86c7516833..2654d304d8 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -174,8 +174,8 @@ class BillTransformer extends TransformerAbstract 'name' => $bill->name, 'currency_id' => $bill->transaction_currency_id, 'currency_code' => $bill->transactionCurrency->code, - 'amount_min' => round($bill->amount_min, 2), - 'amount_max' => round($bill->amount_max, 2), + 'amount_min' => round((float)$bill->amount_min, 2), + 'amount_max' => round((float)$bill->amount_max, 2), 'date' => $bill->date->format('Y-m-d'), 'repeat_freq' => $bill->repeat_freq, 'skip' => (int)$bill->skip, From 5a73e79475cc50cdceededf7d21607cf38f349f7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Jul 2018 16:14:24 +0200 Subject: [PATCH 70/86] Update explanation about sha1 [skip ci] --- resources/lang/en_US/firefly.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 303114c145..ef30dadf9d 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).', 'secure_pw_check_box' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', 'secure_pw_sha1' => 'But I thought SHA1 was broken?', - 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', - 'secure_pw_hash_security' => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this hash are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Should I check the box?', 'secure_pw_long_password' => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: no.', 'secure_pw_short' => 'If you just entered the password you always use: Please yes.', From 02272f7db0b14280cee7216f2faeb3c44e6ff52e Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Jul 2018 16:44:06 +0200 Subject: [PATCH 71/86] New strings [skip ci] --- resources/lang/de_DE/firefly.php | 6 +- resources/lang/de_DE/import.php | 1 + resources/lang/de_DE/list.php | 1 + resources/lang/de_DE/validation.php | 3 +- resources/lang/es_ES/config.php | 14 +- resources/lang/es_ES/firefly.php | 46 +++--- resources/lang/es_ES/form.php | 2 +- resources/lang/es_ES/import.php | 33 ++-- resources/lang/es_ES/list.php | 15 +- resources/lang/es_ES/validation.php | 3 +- resources/lang/fr_FR/demo.php | 2 +- resources/lang/fr_FR/firefly.php | 82 +++++----- resources/lang/fr_FR/form.php | 22 +-- resources/lang/fr_FR/import.php | 225 ++++++++++++++-------------- resources/lang/fr_FR/intro.php | 18 +-- resources/lang/fr_FR/list.php | 7 +- resources/lang/fr_FR/validation.php | 7 +- resources/lang/id_ID/firefly.php | 4 +- resources/lang/id_ID/import.php | 1 + resources/lang/id_ID/list.php | 1 + resources/lang/id_ID/validation.php | 3 +- resources/lang/it_IT/firefly.php | 4 +- resources/lang/it_IT/import.php | 1 + resources/lang/it_IT/list.php | 1 + resources/lang/it_IT/validation.php | 3 +- resources/lang/nl_NL/firefly.php | 4 +- resources/lang/nl_NL/import.php | 1 + resources/lang/nl_NL/list.php | 1 + resources/lang/nl_NL/validation.php | 3 +- resources/lang/pl_PL/firefly.php | 4 +- resources/lang/pl_PL/import.php | 1 + resources/lang/pl_PL/list.php | 1 + resources/lang/pl_PL/validation.php | 3 +- resources/lang/pt_BR/firefly.php | 4 +- resources/lang/pt_BR/import.php | 1 + resources/lang/pt_BR/list.php | 1 + resources/lang/pt_BR/validation.php | 3 +- resources/lang/ru_RU/firefly.php | 4 +- resources/lang/ru_RU/import.php | 1 + resources/lang/ru_RU/list.php | 1 + resources/lang/ru_RU/validation.php | 3 +- resources/lang/tr_TR/firefly.php | 4 +- resources/lang/tr_TR/import.php | 1 + resources/lang/tr_TR/list.php | 1 + resources/lang/tr_TR/validation.php | 3 +- 45 files changed, 290 insertions(+), 260 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 47c2fb2cf1..87d666267a 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -521,8 +521,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'secure_pw_history' => 'Im August 2017 veröffentlichte die bekannte Sicherheitsforscherin Troy Hunt eine Liste von 306 Millionen gestohlenen Passwörtern. Diese Passwörter wurden während der Einbrüche bei Firmen wie LinkedIn, Adobe und NeoPets (und vielen mehr) gestohlen.', 'secure_pw_check_box' => 'Durch Ankreuzen des Kästchens sendet Firefly III die ersten fünf Zeichen des SHA1-Hash Ihres Passworts an die Website von Troy Hunt, um festzustellen, ob es auf der Liste enthalten ist. Dies wird Sie davon abhalten, unsichere Passwörter zu verwenden, wie es in der neuesten NIST Sonderveröffentlichung zu diesem Thema empfohlen wird.', 'secure_pw_sha1' => 'Aber ich dachte, dass SHA1 schon geknackt wurde?', - 'secure_pw_hash_speed' => 'Ja, aber nicht in diesem Zusammenhang. Wie Sie auf auf der Website, die erklärt, wie SHA1 gebrochen wurde, lesen können, ist es jetzt etwas leichter, eine "Kollision" zu finden: eine andere Zeichenfolge, die zu demselben SHA1-Hash führt. Es dauert nur mehr 10.000 Jahre mit einer Single-GPU-Maschine.', - 'secure_pw_hash_security' => 'Diese Kollision wäre weder mit Ihrem Passwort gleichzusetzen, noch wäre sie auf einer Seite wie Firefly III nützlich. Diese Anwendung verwendet SHA1 nicht zur Passwortverifizierung. Es ist also sicher, dieses Kontrollkästchen zu aktivieren. Ihr Passwort wird verschlüsselt und nur die ersten fünf Zeichen dieses Hashes werden über HTTPS gesendet.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Soll ich die Box ankreuzen?', 'secure_pw_long_password' => 'Wenn Sie gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert haben: Nein.', 'secure_pw_short' => 'Wenn Sie gerade das Passwort eingegeben haben, welches Sie immer verwenden: Bitte ja.', @@ -608,7 +608,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'cannot_delete_currency' => '„:name” konnte nicht gelöscht werden, da dieser noch verwendet wird', 'deleted_currency' => 'Währung :name gelöscht', 'created_currency' => 'Währung :name erstellt', - 'could_not_store_currency' => 'Could not store the new currency.', + 'could_not_store_currency' => 'Die neue Währung konnte nicht gespeichert werden.', 'updated_currency' => 'Währung :name aktualisiert', 'ask_site_owner' => 'Bitte fragen sie :owner zum Hinzufügen, Entfernen oder Bearbeiten von Währungen.', 'currencies_intro' => 'Firefly III unterstützt verschiedene Währungen, welche hier eingestellt und aktiviert werden können.', diff --git a/resources/lang/de_DE/import.php b/resources/lang/de_DE/import.php index e19c46222c..e5c50db546 100644 --- a/resources/lang/de_DE/import.php +++ b/resources/lang/de_DE/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Bestandskonto (IBAN)', 'column_account-id' => 'Kennung des Bestandkontos (passend zu FF3)', 'column_account-name' => 'Bestandskonto (Name)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Betrag', 'column_amount_foreign' => 'Betrag (in Fremdwährung)', 'column_amount_debit' => 'Betrag (Debitoren-Spalte)', diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index fe4b250ed6..74cfa4d88e 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'SEPA • Verrechnungsschlüssel', 'sepa-ep' => 'SEPA • Externer Verwendungszweck', 'sepa-ci' => 'SEPA • Identifikationsnummer des Zahlungsempfängers', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'Externe Kennung', 'account_at_bunq' => 'Konto bei „bunq”', 'file_name' => 'Dateiname', diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php index d30156cb75..1541442491 100644 --- a/resources/lang/de_DE/validation.php +++ b/resources/lang/de_DE/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Regel muss mindestens eine Aktion enthalten', 'base64' => 'Dies sind keine gültigen base64-kodierten Daten.', 'model_id_invalid' => 'Die angegebene ID scheint für dieses Modell ungültig zu sein.', - 'more' => ':attribute muss größer als Null sein.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute ist keine gültige URL.', 'after' => ':attribute muss ein Datum nach :date sein.', 'alpha' => ':attribute darf nur Buchstaben enthalten.', diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php index f4981713fe..7cf9c9b0ac 100644 --- a/resources/lang/es_ES/config.php +++ b/resources/lang/es_ES/config.php @@ -41,11 +41,11 @@ return [ 'week_in_year_js' => '[Week] w, YYYY', 'year_js' => 'YYYY', 'half_year_js' => 'Q YYYY', - 'dow_1' => 'Monday', - 'dow_2' => 'Tuesday', - 'dow_3' => 'Wednesday', - 'dow_4' => 'Thursday', - 'dow_5' => 'Friday', - 'dow_6' => 'Saturday', - 'dow_7' => 'Sunday', + 'dow_1' => 'Lunes', + 'dow_2' => 'Martes', + 'dow_3' => 'Miércoles', + 'dow_4' => 'Jueves', + 'dow_5' => 'Viernes', + 'dow_6' => 'Sábado', + 'dow_7' => 'Domingo', ]; diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 3b7353af44..8c1bb6bf30 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -171,7 +171,7 @@ return [ 'reset_button' => 'Reiniciar', 'want_to_login' => 'Yo quiero entrar al sistema', 'button_register' => 'Registrar', - 'authorization' => 'Authorization', + 'authorization' => 'Autorización', 'active_bills_only' => 'active bills only', 'average_per_bill' => 'average per bill', 'expected_total' => 'expected total', @@ -464,7 +464,7 @@ return [ 'pref_two_factor_auth_code' => 'Verificar código', 'pref_two_factor_auth_code_help' => 'Escanee el código QR con una aplicación en su teléfono como Authy o Google autenticator y ingrese el código generado.', 'pref_two_factor_auth_reset_code' => 'Reiniciar código de verificación', - 'pref_two_factor_auth_disable_2fa' => 'Disable 2FA', + 'pref_two_factor_auth_disable_2fa' => 'Deshabilitar 2FA', '2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: :secret.', 'pref_save_settings' => 'Guardar la configuración', 'saved_preferences' => '¡Preferencias guardadas!', @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'En agosto de 2017 el conocido investigador de seguridad Troy Hunt publicó una lista de 306 millones de contraseñas robadas. Estas contraseñas fueron robadas durante intrusiones a empresas como LinkedIn, Adobe y NeoPets (y muchos más).', 'secure_pw_check_box' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', 'secure_pw_sha1' => '¿Pero pensé que SHA1 estaba dañado?', - 'secure_pw_hash_speed' => 'Si, pero no en este contexto. Como usted puede leer en el sitio web que detalla como rompieron SHA1-hash. Ahora solo toma 10,000 años usando una sola maquina GPU.', - 'secure_pw_hash_security' => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this hash are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => '¿Debo chequear la casilla?', 'secure_pw_long_password' => 'Si usted acaba de generar una contraseña larga de un solo uso para Firefly III usando algún tipo de generador de contraseñas:no.', 'secure_pw_short' => 'Si usted acaba de entrar la contraseña que siempre usa:Por favor si .', @@ -544,7 +544,7 @@ return [ 'attachment_deleted' => 'Eliminar archivo adjunto ":name"', 'attachment_updated' => 'Actualizar archivo adjunto ":name"', 'upload_max_file_size' => 'Tamaño máximo de archivo::size', - 'list_all_attachments' => 'List of all attachments', + 'list_all_attachments' => 'Listado de documentos adjuntos', // transaction index 'title_expenses' => 'Gastos', @@ -670,7 +670,7 @@ return [ 'bill_will_automatch' => 'Bill se vinculara automáticamente a transacciones coincidentes', 'skips_over' => 'salta sobre', 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files', - 'list_inactive_rule' => 'inactive rule', + 'list_inactive_rule' => 'regla inactiva', // accounts: 'details_for_asset' => 'Detalles para la cuenta de activos ":name"', @@ -1219,30 +1219,30 @@ return [ 'no_recurring_imperative_default' => 'This is a pretty advanced feature but it can be extremely useful. Make sure you read the documentation (?)-icon in the top right corner) before you continue.', 'no_recurring_create_default' => 'Create a recurring transaction', 'make_new_recurring' => 'Create a recurring transaction', - 'recurring_daily' => 'Every day', - 'recurring_weekly' => 'Every week on :weekday', + 'recurring_daily' => 'Diario', + 'recurring_weekly' => 'Cada semana los :weekday', 'recurring_monthly' => 'Every month on the :dayOfMonth(st/nd/rd/th) day', 'recurring_ndom' => 'Every month on the :dayOfMonth(st/nd/rd/th) :weekday', - 'recurring_yearly' => 'Every year on :date', + 'recurring_yearly' => 'Cada año en :date', 'overview_for_recurrence' => 'Overview for recurring transaction ":title"', - 'warning_duplicates_repetitions' => 'In rare instances, dates appear twice in this list. This can happen when multiple repetitions collide. Firefly III will always generate one transaction per day.', - 'created_transactions' => 'Related transactions', - 'expected_Withdrawals' => 'Expected withdrawals', + 'warning_duplicates_repetitions' => 'En algunas ocasiones, las fechas aparecen duplicadas en esta lista. Esto puede ocurrir porque múltiples repeticiones chocan. Firefly III siempre generará una transacción por día.', + 'created_transactions' => 'Transacciones relacionadas', + 'expected_Withdrawals' => 'Retiradas previstas', 'expected_Deposits' => 'Expected deposits', - 'expected_Transfers' => 'Expected transfers', - 'created_Withdrawals' => 'Created withdrawals', + 'expected_Transfers' => 'Transferencias previstas', + 'created_Withdrawals' => 'Retiradas creadas', 'created_Deposits' => 'Created deposits', - 'created_Transfers' => 'Created transfers', + 'created_Transfers' => 'Transferencias creadas', 'created_from_recurrence' => 'Created from recurring transaction ":title" (#:id)', - 'recurring_meta_field_tags' => 'Tags', - 'recurring_meta_field_notes' => 'Notes', - 'recurring_meta_field_bill_id' => 'Bill', - 'recurring_meta_field_piggy_bank_id' => 'Piggy bank', - 'create_new_recurrence' => 'Create new recurring transaction', + 'recurring_meta_field_tags' => 'Etiquetas', + 'recurring_meta_field_notes' => 'Notas', + 'recurring_meta_field_bill_id' => 'Factura', + 'recurring_meta_field_piggy_bank_id' => 'Hucha', + 'create_new_recurrence' => 'Crear transacción recurrente', 'help_first_date' => 'Indicate the first expected recurrence. This must be in the future.', 'help_first_date_no_past' => 'Indicate the first expected recurrence. Firefly III will not create transactions in the past.', - 'no_currency' => '(no currency)', + 'no_currency' => '(sin moneda)', 'mandatory_for_recurring' => 'Mandatory recurrence information', 'mandatory_for_transaction' => 'Mandatory transaction information', 'optional_for_recurring' => 'Optional recurrence information', @@ -1251,14 +1251,14 @@ return [ 'mandatory_fields_for_tranaction' => 'The values here will end up in the transaction(s) being created', 'click_for_calendar' => 'Click here for a calendar that shows you when the transaction would repeat.', 'repeat_forever' => 'Repeat forever', - 'repeat_until_date' => 'Repeat until date', + 'repeat_until_date' => 'Repetir hasta', 'repeat_times' => 'Repeat a number of times', 'recurring_skips_one' => 'Every other', 'recurring_skips_more' => 'Skips :count occurrences', 'store_new_recurrence' => 'Store recurring transaction', 'stored_new_recurrence' => 'Recurring transaction ":title" stored successfully.', 'edit_recurrence' => 'Edit recurring transaction ":title"', - 'recurring_repeats_until' => 'Repeats until :date', + 'recurring_repeats_until' => 'Repetir hasta :date', 'recurring_repeats_forever' => 'Repeats forever', 'recurring_repeats_x_times' => 'Repeats :count time(s)', 'update_recurrence' => 'Update recurring transaction', diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php index b2162ec655..b0ec046275 100644 --- a/resources/lang/es_ES/form.php +++ b/resources/lang/es_ES/form.php @@ -105,7 +105,7 @@ return [ 'tags' => 'Etiquetas', 'deletePermanently' => 'Borrar permanentemente', 'cancel' => 'Cancelar', - 'targetdate' => 'Fecha tope', + 'targetdate' => 'Fecha límite', 'startdate' => 'Fecha de inicio', 'tag' => 'Etiqueta', 'under' => 'Debajo', diff --git a/resources/lang/es_ES/import.php b/resources/lang/es_ES/import.php index 3676742295..a5540e4879 100644 --- a/resources/lang/es_ES/import.php +++ b/resources/lang/es_ES/import.php @@ -24,30 +24,30 @@ declare(strict_types=1); return [ // ALL breadcrumbs and subtitles: - 'index_breadcrumb' => 'Import data into Firefly III', - 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', - 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', - 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', - 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'index_breadcrumb' => 'Importar datos a Firefly III', + 'prerequisites_breadcrumb_fake' => 'Requisitos para el proveedor de importación falso', + 'prerequisites_breadcrumb_spectre' => 'Requisitos previos para Spectre', + 'prerequisites_breadcrumb_bunq' => 'Requisitos previos para bunq', + 'job_configuration_breadcrumb' => 'Configuración para ":key"', 'job_status_breadcrumb' => 'Import status for ":key"', 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', // index page: - 'general_index_title' => 'Import a file', + 'general_index_title' => 'Importar un archivo', 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', // import provider strings (index): 'button_fake' => 'Fake an import', - 'button_file' => 'Import a file', - 'button_bunq' => 'Import from bunq', - 'button_spectre' => 'Import using Spectre', - 'button_plaid' => 'Import using Plaid', - 'button_yodlee' => 'Import using Yodlee', - 'button_quovo' => 'Import using Quovo', + 'button_file' => 'Importar un archivo', + 'button_bunq' => 'Importar desde bunq', + 'button_spectre' => 'Importar usando Spectre', + 'button_plaid' => 'Importar usando Plaid', + 'button_yodlee' => 'Importar usando Yodlee', + 'button_quovo' => 'Importar usando Quovo', // global config box (index) 'global_config_title' => 'Global import configuration', 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', // prerequisites box (index) - 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_title' => 'Importar requisitos previos', 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', 'do_prereq_fake' => 'Prerequisites for the fake provider', 'do_prereq_file' => 'Prerequisites for file imports', @@ -78,8 +78,8 @@ return [ 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', // prerequisites success messages: 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', - 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', - 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + 'prerequisites_saved_for_spectre' => '¡App ID y secreto guardados!', + 'prerequisites_saved_for_bunq' => '¡Clave de API e IP almacenadas!', // job configuration: 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', @@ -107,7 +107,7 @@ return [ 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', - 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_title' => 'Aplicar reglas', 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', 'job_config_uc_specifics_title' => 'Bank-specific options', 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Caja de ahorros (IBAN)', 'column_account-id' => 'Identificación de Cuenta de ingresos (coincide con FF3)', 'column_account-name' => 'Caja de ahorros (nombre)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Cantidad', 'column_amount_foreign' => 'Monto ( en moneda extranjera)', 'column_amount_debit' => 'Cantidad (columna de débito)', diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php index ea67eabb8a..0e74c7fa7e 100644 --- a/resources/lang/es_ES/list.php +++ b/resources/lang/es_ES/list.php @@ -112,19 +112,20 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', - 'file_size' => 'File size', - 'file_type' => 'File type', - 'attached_to' => 'Attached to', - 'file_exists' => 'File exists', - 'spectre_bank' => 'Bank', + 'file_size' => 'Tamaño de fichero', + 'file_type' => 'Tipo de fichero', + 'attached_to' => 'Adjunto a', + 'file_exists' => 'El fichero existe', + 'spectre_bank' => 'Banco', 'spectre_last_use' => 'Last login', 'spectre_status' => 'Status', 'bunq_payment_id' => 'bunq payment ID', - 'repetitions' => 'Repetitions', - 'title' => 'Title', + 'repetitions' => 'Repeticiones', + 'title' => 'Título', 'transaction_s' => 'Transaction(s)', 'field' => 'Field', 'value' => 'Value', diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php index 106e5f668c..1deea71386 100644 --- a/resources/lang/es_ES/validation.php +++ b/resources/lang/es_ES/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'This is not valid base64 encoded data.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute debe ser mayor que cero.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => 'El campo :attribute no es una URL válida.', 'after' => 'El campo :attribute debe ser una fecha posterior a :date.', 'alpha' => 'El campo :attribute sólo puede contener letras.', diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index 2f90cf6cc1..83d358dc3f 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -33,7 +33,7 @@ return [ 'currencies-index' => 'Firefly III prend en charge plusieurs devises. Bien que l\'Euro soit la devise par défaut, cette dernière peut être changée pour le Dollar américain et de nombreuses autres devises. Comme vous pouvez le remarquer une petite sélection des monnaies a été incluse, mais vous pouvez ajouter vos propres devises si vous le souhaitez. Gardez à l\'esprit que la modification de la devise par défaut ne modifie pas la monnaie des transactions existantes : Firefly III prend en charge l’utilisation de plusieurs devises en même temps.', 'transactions-index' => 'Ces dépenses, dépôts et transferts ne sont pas particulièrement imaginatifs. Ils ont été générés automatiquement.', 'piggy-banks-index' => 'Comme vous pouvez le voir, il y a trois tirelires. Utilisez les boutons plus et moins pour influer sur le montant d’argent dans chaque tirelire. Cliquez sur le nom de la tirelire pour voir l’administration pour chaque tirelire.', - 'import-index' => 'Tout fichier CSV peut être importé dans Firefly III. L\'importation de données depuis bunq et Specter est également prise en charge. D\'autres banques et agrégateurs financiers seront mis en place dans le futur. En tant qu\'utilisateur du site de démonstration, vous ne pouvez voir que le «faux» service en action. Il va générer des transactions aléatoires pour vous montrer comment se déroule le processus.', + 'import-index' => 'Tout fichier CSV peut être importé dans Firefly III. L\'importation de données depuis bunq et Spectre est également supportée. D\'autres banques et agrégateurs financiers seront mis en place dans le futur. En tant qu\'utilisateur du site de démonstration, vous ne pouvez voir que le «faux» service en action. Il va générer des transactions aléatoires pour vous montrer comment se déroule le processus.', 'recurring-index' => 'Veuillez noter que cette fonctionnalité est en cours de développement et peut ne pas fonctionner comme prévu.', 'recurring-create' => 'Veuillez noter que cette fonctionnalité est en cours de développement et peut ne pas fonctionner comme prévu.', ]; diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 3a515fa727..c8b87448d1 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -88,7 +88,7 @@ return [ 'warning_much_data' => ':days jours de données peuvent prendre un certain temps à charger.', 'registered' => 'Vous avez été enregistré avec succès !', 'Default asset account' => 'Compte d’actif par défaut', - 'no_budget_pointer' => 'Vous semblez n’avoir encore aucun budget. Vous devez en créer un sur la page des budgets. Les budgets peuvent vous aider à garder une trace des dépenses.', + 'no_budget_pointer' => 'Vous semblez n’avoir encore aucun budget. Vous devriez en créer un sur la page des budgets. Les budgets peuvent vous aider à garder une trace des dépenses.', 'Savings account' => 'Compte d’épargne', 'Credit card' => 'Carte de Crédit', 'source_accounts' => 'Compte(s) source', @@ -161,8 +161,8 @@ return [ 'invalid_server_configuration' => 'Configuration de serveur invalide', 'invalid_locale_settings' => 'Firefly III ne parvient pas à formater les montants monétaires car il manque des paquets logiciels sur votre serveur. Voici des instructions sur comment procéder.', 'quickswitch' => 'Changement rapide', - 'sign_in_to_start' => 'Connectez-vous pour commencer votre session', - 'sign_in' => 'Connectez-vous', + 'sign_in_to_start' => 'Identifiez-vous pour commencer votre session', + 'sign_in' => 'S\'identifier', 'register_new_account' => 'Créer un nouveau compte', 'forgot_my_password' => 'J\'ai oublié mon mot de passe', 'problems_with_input' => 'Il y a eu quelques problèmes avec votre entrée.', @@ -203,7 +203,7 @@ return [ 'search_query' => 'Requête', 'search_found_transactions' => 'Nombre de transactions trouvées :', 'general_search_error' => 'Une erreur s’est produite lors de la recherche. S’il vous plaît vérifiez les fichiers de log pour plus d’informations.', - 'search_box' => 'Chercher', + 'search_box' => 'Rechercher', 'search_box_intro' => 'Bienvenue à la fonction de recherche de Firefly III. Entrez votre requête de recherche dans la zone. Assurez-vous de consulter le fichier d’aide parce que la recherche est assez avancée.', 'search_error' => 'Erreur lors de la recherche', 'search_searching' => 'Recherche ...', @@ -233,17 +233,17 @@ return [ 'export_status_never_started' => 'L’exportation n’a pas encore commencé', 'export_status_make_exporter' => 'Créer un export...', 'export_status_collecting_journals' => 'Collecte de vos opérations...', - 'export_status_collected_journals' => 'Vos opérations sont collectées!', + 'export_status_collected_journals' => 'Vos opérations sont collectées !', 'export_status_converting_to_export_format' => 'Conversion de vos opérations...', - 'export_status_converted_to_export_format' => 'Vos opérations sont converties!', + 'export_status_converted_to_export_format' => 'Vos opérations sont converties !', 'export_status_creating_journal_file' => 'Création du fichier d\'export...', - 'export_status_created_journal_file' => 'Fichier d\'export créé!', + 'export_status_created_journal_file' => 'Fichier d\'export créé !', 'export_status_collecting_attachments' => 'Collecte toutes vos pièces jointes...', 'export_status_collected_attachments' => 'Toutes vos pièces jointes sont collectées !', 'export_status_collecting_old_uploads' => 'Tous vos précédents uploads sont en cours de collecte...', 'export_status_collected_old_uploads' => 'Tous vos précédents uploads sont collectés !', 'export_status_creating_zip_file' => 'Création d’un fichier zip...', - 'export_status_created_zip_file' => 'Fichier zip créé!', + 'export_status_created_zip_file' => 'Fichier zip créé !', 'export_status_finished' => 'L\'export s\'est terminé avec succès ! Yay !', 'export_data_please_wait' => 'Veuillez patienter...', @@ -277,7 +277,7 @@ return [ 'stored_new_rule' => 'Nouvelle règle créée avec le titre ":title"', 'deleted_rule' => 'Règle supprimée avec le titre ":title"', 'store_new_rule' => 'Créer une nouvelle règle', - 'updated_rule' => 'Nouvelle règle avec le titre ":title" enregistrée', + 'updated_rule' => 'Règle avec le titre ":title" mise à jour', 'default_rule_group_name' => 'Règles par défaut', 'default_rule_group_description' => 'Toutes vos règles n\'étant pas dans un groupe particulier.', 'default_rule_name' => 'Votre première règle par défaut', @@ -381,12 +381,12 @@ return [ 'rule_trigger_notes_end_choice' => 'Les notes se terminent par..', 'rule_trigger_notes_end' => 'Les notes se finissent par ":trigger_value"', 'rule_action_set_category' => 'Définir la catégorie à ":action_value"', - 'rule_action_clear_category' => 'Supprimer la catégorie', + 'rule_action_clear_category' => 'Supprimer de la catégorie', 'rule_action_set_budget' => 'Définir le budget à ":action_value"', - 'rule_action_clear_budget' => 'Supprimer le budget', + 'rule_action_clear_budget' => 'Supprimer du budget', 'rule_action_add_tag' => 'Ajouter un tag ":action_value"', - 'rule_action_remove_tag' => 'Supprimer un tag ":action_value"', - 'rule_action_remove_all_tags' => 'Supprimer tous les tags', + 'rule_action_remove_tag' => 'Retirer le tag ":action_value"', + 'rule_action_remove_all_tags' => 'Retirer tous les tags', 'rule_action_set_description' => 'Définir la description à ":action_value"', 'rule_action_append_description' => 'Ajouter à la description ":action_value"', 'rule_action_prepend_description' => 'Préfixer la description avec ":action_value"', @@ -395,7 +395,7 @@ return [ 'rule_action_set_budget_choice' => 'Définir le budget à..', 'rule_action_clear_budget_choice' => 'Effacer les budgets', 'rule_action_add_tag_choice' => 'Ajouter un tag..', - 'rule_action_remove_tag_choice' => 'Supprimer le tag..', + 'rule_action_remove_tag_choice' => 'Retirer le tag..', 'rule_action_remove_all_tags_choice' => 'Supprimer tous les tags', 'rule_action_set_description_choice' => 'Définir la description à..', 'rule_action_append_description_choice' => 'Suffixer la description avec..', @@ -422,7 +422,7 @@ return [ 'rule_for_bill_title' => 'Règle générée automatiquement pour la facture ":name"', 'rule_for_bill_description' => 'Cette règle est générée automatiquement pour essayer de faire correspondre la facture ":name".', 'create_rule_for_bill' => 'Créer une nouvelle règle pour la facture ":name"', - 'create_rule_for_bill_txt' => 'Vous venez de créer une nouvelle facture appelée ":name", félicitations! Firefly III peut automagiquement faire correspondre de nouvelles dépenses à cette facture. Par exemple, chaque fois que vous payez votre loyer, la facture "loyer" sera liée à la dépense. De cette façon, Firefly III peut vous montrer exactement quelles factures sont dues et lesquelles ne le sont pas. Pour ce faire, une nouvelle règle doit être créée. Firefly III a rempli certaines valeurs par défaut raisonnables pour vous. S\'il vous plaît assurez-vous que ceux-ci sont corrects. Si ces valeurs sont correctes, Firefly III liera automatiquement la bonne dépense à la bonne facture. S\'il vous plaît vérifier les déclencheurs pour voir si elles sont correctes, et en ajouter si elles sont fausses.', + 'create_rule_for_bill_txt' => 'Vous venez de créer une nouvelle facture appelée ":name", félicitations ! Firefly III peut automatiquement faire correspondre de nouvelles dépenses à cette facture. Par exemple, chaque fois que vous payez votre loyer, la facture "loyer" sera liée à la dépense. De cette façon, Firefly III peut vous montrer exactement quelles factures sont dues et lesquelles ne le sont pas. Pour ce faire, une nouvelle règle doit être créée. Firefly III a rempli certaines valeurs qui doivent être logiques pour vous. Veuillez vous assurer qu\'elles sont correctes. Si c\'est le cas, Firefly III liera automatiquement la bonne dépense à la bonne facture. S\'il vous plaît vérifier également les déclencheurs pour voir s\'ils sont corrects, en ajouter ou les corriger si nécessaire.', 'new_rule_for_bill_title' => 'Règle pour la facture ":name"', 'new_rule_for_bill_description' => 'Cette règle marque les transactions pour la facture ":name".', @@ -430,18 +430,18 @@ return [ 'store_new_tag' => 'Créer un nouveau tag', 'update_tag' => 'Mettre à jour le tag', 'no_location_set' => 'Aucun emplacement défini.', - 'meta_data' => 'Meta-données', + 'meta_data' => 'Métadonnées', 'location' => 'Emplacement', 'without_date' => 'Sans date', 'result' => 'Résultat', 'sums_apply_to_range' => 'Toutes les sommes s\'appliquent à l\'ensemble sélectionné', 'mapbox_api_key' => 'Pour utiliser la carte, obtenez une clé API à partir de Mapbox. Ouvrez votre fichier .env et entrez ce code après MAPBOX_API_KEY = .', - 'press_tag_location' => 'Faites un clic droit ou appuyez longuement sur pour définir l\'emplacement du tag.', + 'press_tag_location' => 'Faites un clic droit ou appuyez longuement pour définir l\'emplacement du tag.', 'clear_location' => 'Effacer la localisation', // preferences 'pref_home_screen_accounts' => 'Comptes de l’écran d’accueil', - 'pref_home_screen_accounts_help' => 'Quel compte doit être affiché sur l\'écran d’accueil?', + 'pref_home_screen_accounts_help' => 'Quels sont les comptes à afficher sur la page d’accueil ?', 'pref_view_range' => 'Voir l\'étendue', 'pref_view_range_help' => 'Certains graphiques sont automatiquement groupés par périodes. Quelle période préférez-vous ?', 'pref_1D' => 'Un jour', @@ -467,7 +467,7 @@ return [ 'pref_two_factor_auth_disable_2fa' => 'Désactiver l\'authentification en deux étapes', '2fa_use_secret_instead' => 'Si vous ne pouvez pas scanner le code QR, vous pouvez utiliser le secret : :secret.', 'pref_save_settings' => 'Enregistrer les paramètres', - 'saved_preferences' => 'Préférences enregistrées!', + 'saved_preferences' => 'Préférences enregistrées !', 'preferences_general' => 'Général', 'preferences_frontpage' => 'Écran d\'accueil', 'preferences_security' => 'Sécurité', @@ -477,8 +477,8 @@ return [ 'pref_home_do_show_deposits' => 'Oui, montrez-les', 'successful_count' => 'dont :count avec succès', 'list_page_size_title' => 'Taille de la page', - 'list_page_size_help' => 'Toute liste de choses (comptes, transactions, etc) montre au plus tant par page.', - 'list_page_size_label' => 'Taille de la page', + 'list_page_size_help' => 'Les listes d\'éléments (comptes, transactions, etc) affichent un nombre maximum d\'élément par page.', + 'list_page_size_label' => 'Nombre d\'élément par page', 'between_dates' => '(:start et :end)', 'pref_optional_fields_transaction' => 'Champs optionnels pour les transactions', 'pref_optional_fields_transaction_help' => 'Par défaut, tous les champs ne sont pas activés lors de la création d\'une nouvelle transaction (en raison de possibles problèmes d', @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'En août 2017, le réputé chercheur en sécurité Troy Hunt a publié une liste de 306 millions de mots de passe volés. Ces mots de passe ont été volés lors de cambriolages d\'entreprises comme LinkedIn, Adobe ou NeoPets (et bien d’autres).', 'secure_pw_check_box' => 'En cochant la case, Firefly III enverra l\'empreinte SHA1 de votre mot de passe au site Web de Troy Hunt pour voir si c’est sur la liste. Cela vous empêchera d\'utiliser des mots de passe non sûr comme cela est recommandé dans les dernières Publication Special NIST à ce sujet.', 'secure_pw_sha1' => 'Mais je pensais que SHA1 était cassé ?', - 'secure_pw_hash_speed' => 'Oui, mais pas dans ce contexte. Comme vous pouvez le lire sur le site web détaillant comment ils ont cassé SHA1, c’est maintenant légèrement plus facile de trouver une « collision » : une autre chaîne qui aboutit à la même empreinte SHA1. Maintenant, cela prend seulement 10 000 ans, à l’aide d’une machine mono-GPU.', - 'secure_pw_hash_security' => 'Cette collision ne serait pas égale à votre mot de passe, et ne serait pas utile sur (un site comme) Firefly III. Cette application n\'utilise pas SHA1 pour la vérification du mot de passe. Il est donc sûr de cocher cette case. Votre mot de passe est haché et envoyé par HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Dois-je cocher la case ?', 'secure_pw_long_password' => 'Si vous venez de générer un long mot de passe unique pour Firefly III à l\'aide d\'un type de générateur de mot de passe : non.', 'secure_pw_short' => 'Si vous venez d\'entrer le mot de passe que vous utilisez toujours : oui.', @@ -607,7 +607,7 @@ return [ 'cannot_delete_currency' => 'Impossible de supprimer :name car il est encore utilisé.', 'deleted_currency' => 'Devise ":name" supprimée', 'created_currency' => 'Devise ":name" créée', - 'could_not_store_currency' => 'Could not store the new currency.', + 'could_not_store_currency' => 'Impossible d\'enregistrer la nouvelle devise.', 'updated_currency' => 'Devise ":name" mise à jour', 'ask_site_owner' => 'Merci de demander à :owner pour ajouter, modifier ou supprimer des devises.', 'currencies_intro' => 'Firefly III prend en charge diverses devises que vous pouvez configurer et activer ici.', @@ -645,7 +645,7 @@ return [ 'over_budget_warn' => ' Normalement vous budgétez :amount par jour. Là c\'est :over_amount par jour.', // bills: - 'match_between_amounts' => 'Factures correspondes à des transactions entre :low et :high.', + 'match_between_amounts' => 'La facture correspond à des transactions entre :low et :high.', 'bill_related_rules' => 'Règles reliées à cette facture', 'repeats' => 'Répétitions', 'connected_journals' => 'Opérations liées', @@ -662,7 +662,7 @@ return [ 'store_new_bill' => 'Créer une nouvelle facture', 'stored_new_bill' => 'Nouvelle facture ":name" créée', 'cannot_scan_inactive_bill' => 'Les factures inactives ne peuvent pas être analysées.', - 'rescanned_bill' => 'Tout a été redéfini et lié aux :total transaction(s) de la facture.', + 'rescanned_bill' => 'Tout a été réexaminé, :total transaction(s) a/ont été liée(s) à la facture.', 'average_bill_amount_year' => 'Montant moyen des factures ( :year)', 'average_bill_amount_overall' => 'Montant moyen de la facture (global)', 'bill_is_active' => 'Facture en cours', @@ -714,7 +714,7 @@ return [ 'date_change_instruction' => 'Si vous modifiez la plage des dates maintenant, toute progression sera perdue.', 'update_selection' => 'Mettre à jour la sélection', 'store_reconcile' => 'Stocker le rapprochement', - 'reconciliation_transaction' => 'Transaction de rapprochement', + 'reconciliation_transaction' => 'Transaction de régularisation', 'Reconciliation' => 'Rapprochement', 'reconciliation' => 'Rapprochement', 'reconcile_options' => 'Options de rapprochement', @@ -733,12 +733,12 @@ return [ 'select_more_than_one_budget' => 'Veuillez sélectionner plus d\'un budget', 'select_more_than_one_tag' => 'Veuillez sélectionner plus d\'un tag', 'account_default_currency' => 'Si vous sélectionnez une autre devise, les nouvelles transactions de ce compte auront cette devise pré-sélectionnée.', - 'reconcile_has_more' => 'Votre registre Firefly III a plus d\'argent que ce que votre banque prétend que vous devriez avoir. Il y a plusieurs options. S\'il vous plaît choisir quoi faire. Ensuite, appuyez sur "Confirmer le rapprochement".', - 'reconcile_has_less' => 'Votre registre Firefly III a moins d\'argent que ce que votre banque prétend que vous devriez avoir. Il y a plusieurs options. S\'il vous plaît choisir quoi faire. Ensuite, appuyez sur "Confirmer le rapprochement".', + 'reconcile_has_more' => 'Votre registre Firefly III a plus d\'argent que ce que votre banque prétend que vous devriez avoir. Veuillez choisir comment gérer la situation parmi les différentes possibilités offertes. Ensuite, appuyez sur "Confirmer le rapprochement".', + 'reconcile_has_less' => 'Votre registre Firefly III a moins d\'argent que ce que votre banque prétend que vous devriez avoir. Veuillez choisir comment gérer la situation parmi les différentes possibilités offertes. Ensuite, appuyez sur "Confirmer le rapprochement".', 'reconcile_is_equal' => 'Votre registre Firefly III et vos relevés bancaires correspondent. Il n\'y a rien à faire. Appuyez sur "Confirmer le rapprochement" pour confirmer votre entrée.', - 'create_pos_reconcile_transaction' => 'Effacez les transactions sélectionnées et créez une correction en ajoutant :amount à ce compte d\'actif.', - 'create_neg_reconcile_transaction' => 'Effacez les transactions sélectionnées et créez une correction en enlevant :amount à ce compte d\'actif.', - 'reconcile_do_nothing' => 'Effacez les transactions sélectionnées, mais ne les corrigez pas.', + 'create_pos_reconcile_transaction' => 'Pointer les transactions sélectionnées et créez une correction en ajoutant :amount à ce compte d\'actif.', + 'create_neg_reconcile_transaction' => 'Pointer les transactions sélectionnées et créez une correction en enlevant :amount à ce compte d\'actif.', + 'reconcile_do_nothing' => 'Pointer les transactions sélectionnées, mais ne les corrigez pas.', 'reconcile_go_back' => 'Vous pouvez toujours modifier ou supprimer une correction ultérieurement.', 'must_be_asset_account' => 'Vous pouvez uniquement rapprocher les comptes d\'actifs', 'reconciliation_stored' => 'Rapprochement stocké', @@ -747,7 +747,7 @@ return [ 'confirm_reconciliation' => 'Confirmer le rapprochement', 'submitted_start_balance' => 'Solde initial soumis', 'selected_transactions' => 'Transactions sélectionnées ( :count)', - 'already_cleared_transactions' => 'Transactions déjà effacées ( :count)', + 'already_cleared_transactions' => 'Transactions déjà pointées ( :count)', 'submitted_end_balance' => 'Solde final soumis', 'initial_balance_description' => 'Balance initiale pour ":account"', @@ -806,12 +806,12 @@ return [ 'opt_group_savingAsset' => 'Comptes d\'épargne', 'opt_group_sharedAsset' => 'Comptes d\'actifs partagés', 'opt_group_ccAsset' => 'Cartes de crédit', - 'opt_group_cashWalletAsset' => 'Portefeuilles d\'argent', + 'opt_group_cashWalletAsset' => 'Porte-monnaie', 'notes' => 'Notes', 'unknown_journal_error' => 'Impossible de stocker la transaction. Veuillez vérifier les fichiers journaux.', // new user: - 'welcome' => 'Bienvenue sur Firefly III!', + 'welcome' => 'Bienvenue sur Firefly III !', 'submit' => 'Soumettre', 'getting_started' => 'Mise en route', 'to_get_started' => 'Vous venez d\'installer Firefly III avec succès. Pour commencer avec cet outil, entrez le nom de votre banque et le solde de votre compte courant principal. Ne vous inquiétez pas si vous avez plusieurs comptes. Vous pourrez les ajouter plus tard. Firefly III a simplement besoin de quelque chose pour commencer.', @@ -819,7 +819,7 @@ return [ 'finish_up_new_user' => 'C\'est tout ! Vous pouvez continuer en appuyant sur Envoyer. Vous passerez à l\'index de Firefly III.', 'stored_new_accounts_new_user' => 'Super ! Vos nouveaux comptes ont été créés.', 'set_preferred_language' => 'Si vous préférez utiliser Firefly III dans une autre langue, veuillez l\'indiquer ici.', - 'language' => 'Langage', + 'language' => 'Langue', 'new_savings_account' => ':bank_name compte d\'épargne', 'cash_wallet' => 'Porte-monnaie', 'currency_not_present' => 'Si la devise que vous utilisez habituellement n\'est pas répertoriée, ne vous inquiétez pas. Vous pouvez créer vos propres devises dans Options > Devises.', @@ -1103,9 +1103,9 @@ return [ 'deleted_link_type' => 'Type de lien supprimé ":name"', 'stored_new_link_type' => 'Enregistrer le nouveau type de lien ":name"', 'cannot_edit_link_type' => 'Impossible d\'éditer le type de lien ":name"', - 'link_type_help_name' => 'C\'est à dire "Doublons"', - 'link_type_help_inward' => 'C\'est à dire "doublons"', - 'link_type_help_outward' => 'C\'est à dire "est dupliqué par"', + 'link_type_help_name' => 'Par exemple "Duplique"', + 'link_type_help_inward' => 'Par exemple "duplique"', + 'link_type_help_outward' => 'Par exemple "est dupliqué par"', 'save_connections_by_moving' => 'Enregistrez le lien entre ces transactions en les déplaçant vers un autre type de lien :', 'do_not_save_connection' => '(ne pas enregistrer la connexion)', 'link_transaction' => 'Lien transaction', @@ -1234,7 +1234,7 @@ return [ 'created_Transfers' => 'Transferts créés', 'created_from_recurrence' => 'Créé à partir de l\'opération périodique ":title" (#:id)', - 'recurring_meta_field_tags' => 'Mots-clés', + 'recurring_meta_field_tags' => 'Tags', 'recurring_meta_field_notes' => 'Notes', 'recurring_meta_field_bill_id' => 'Facture', 'recurring_meta_field_piggy_bank_id' => 'Tirelire', @@ -1253,7 +1253,7 @@ return [ 'repeat_until_date' => 'Répéter jusqu\'à une date', 'repeat_times' => 'Répéter un nombre de fois', 'recurring_skips_one' => 'Tous les', - 'recurring_skips_more' => 'Passer :count répétitions', + 'recurring_skips_more' => 'Omettre :count répétitions', 'store_new_recurrence' => 'Enregistrer l\'opération périodique', 'stored_new_recurrence' => 'Opération périodique ":title" enregistrée avec succès.', 'edit_recurrence' => 'Modifier l\'opération périodique ":title"', diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php index 1577844085..c535a3db39 100644 --- a/resources/lang/fr_FR/form.php +++ b/resources/lang/fr_FR/form.php @@ -55,13 +55,13 @@ return [ 'journal_description' => 'Description', 'note' => 'Notes', 'split_journal' => 'Ventiler cette opération', - 'split_journal_explanation' => 'Diviser cette opération en plusieurs parties', + 'split_journal_explanation' => 'Ventiler cette opération en plusieurs parties', 'currency' => 'Devise', 'account_id' => 'Compte d’actif', 'budget_id' => 'Budget', 'openingBalance' => 'Solde initial', - 'tagMode' => 'Mode tag', - 'tag_position' => 'Localisation de l\'étiquette', + 'tagMode' => 'Mode du tag', + 'tag_position' => 'Localisation du tag', 'virtualBalance' => 'Solde virtuel', 'targetamount' => 'Montant cible', 'accountRole' => 'Rôle du compte', @@ -102,12 +102,12 @@ return [ 'book_date' => 'Date de réservation', 'process_date' => 'Date de traitement', 'category' => 'Catégorie', - 'tags' => 'Mots-clés', + 'tags' => 'Tags', 'deletePermanently' => 'Supprimer définitivement', 'cancel' => 'Annuler', 'targetdate' => 'Date cible', 'startdate' => 'Date de début', - 'tag' => 'Mot-clé', + 'tag' => 'Tag', 'under' => 'En dessous de', 'symbol' => 'Symbole', 'code' => 'Code', @@ -136,7 +136,7 @@ return [ 'export_start_range' => 'Début de l’étendue d’exportation', 'export_end_range' => 'Fin de l’étendue d\'exportation', 'export_format' => 'Format de fichier', - 'include_attachments' => 'Inclure des pièces jointes téléchargées', + 'include_attachments' => 'Inclure les pièces jointes téléchargées', 'include_old_uploads' => 'Inclure les données importées', 'accounts' => 'Exporter les opérations depuis ces comptes', 'delete_account' => 'Supprimer le compte ":name"', @@ -151,7 +151,7 @@ return [ 'delete_link_type' => 'Supprimer le type de lien ":name"', 'delete_user' => 'Supprimer l\'utilisateur ":email"', 'delete_recurring' => 'Supprimer l\'opération périodique ":title"', - 'user_areYouSure' => 'Si vous supprimez l\'utilisateur ":email", tout disparaitra. Il n\'y a pas d\'annulation, de "dé-suppression" ou quoi que ce soit de la sorte. Si vous supprimez votre propre compte, vous n\'aurez plus accès à cette instance de Firefly III.', + 'user_areYouSure' => 'Si vous supprimez l\'utilisateur ":email", tout sera perdu. Il n\'y a pas d\'annulation, de restauration ou quoi que ce soit de la sorte. Si vous supprimez votre propre compte, vous n\'aurez plus accès à cette instance de Firefly III.', 'attachment_areYouSure' => 'Êtes-vous sûr de vouloir supprimer la pièce jointe nommée ":name" ?', 'account_areYouSure' => 'Êtes-vous sûr de vouloir supprimer le compte nommé ":name" ?', 'bill_areYouSure' => 'Êtes-vous sûr de vouloir supprimer la facture nommée ":name" ?', @@ -169,7 +169,7 @@ return [ 'linkType_areYouSure' => 'Êtes-vous sûr de vouloir supprimer le type de lien ":name" (":inward" / ":outward") ?', 'permDeleteWarning' => 'Supprimer quelque chose dans Firefly est permanent et ne peut pas être annulé.', 'mass_make_selection' => 'Vous pouvez toujours empêcher des éléments d’être supprimés en décochant la case à cocher.', - 'delete_all_permanently' => 'Supprimer la selection définitivement', + 'delete_all_permanently' => 'Supprimer la sélection définitivement', 'update_all_journals' => 'Mettre à jour ces opérations', 'also_delete_transactions' => 'La seule opération liée à ce compte sera aussi supprimée.|Les :count opérations liées à ce compte seront aussi supprimées.', 'also_delete_connections' => 'La seule transaction liée à ce type de lien perdra cette connexion. | Toutes les transactions :count liées à ce type de lien perdront leur connexion.', @@ -185,7 +185,7 @@ return [ 'email' => 'Adresse Email', 'password' => 'Mot de passe', 'password_confirmation' => 'Entrer à nouveau le mot de passe', - 'blocked' => 'Est bloqué?', + 'blocked' => 'Est bloqué ?', 'blocked_code' => 'Raison du blocage', // import @@ -206,7 +206,7 @@ return [ 'import_file_type' => 'Type de fichier de configuration', 'csv_comma' => 'Une virgule (,)', 'csv_semicolon' => 'Un point-virgule (;)', - 'csv_tab' => 'Un onglet (invisible)', + 'csv_tab' => 'Une tabulation (invisible)', 'csv_delimiter' => 'Délimiteur de champ CSV', 'csv_import_account' => 'Compte d’importation par défaut', 'csv_config' => 'Configuration d\'importation CSV', @@ -224,7 +224,7 @@ return [ 'invoice_date' => 'Date de facturation', 'internal_reference' => 'Référence interne', 'inward' => 'Description vers l’intérieur', - 'outward' => 'Description de l’extérieur', + 'outward' => 'Impact de l\'autre transaction', 'rule_group_id' => 'Groupe de règles', 'transaction_description' => 'Description de la transaction', 'first_date' => 'Date de début', diff --git a/resources/lang/fr_FR/import.php b/resources/lang/fr_FR/import.php index 511bba370b..458d4bba90 100644 --- a/resources/lang/fr_FR/import.php +++ b/resources/lang/fr_FR/import.php @@ -70,125 +70,125 @@ return [ // prerequisites: 'prereq_fake_title' => 'Prérequis pour une importation utilisant le simulateur d\'importation', 'prereq_fake_text' => 'Le simulateur d\'importation nécessite une fausse clé d\'API. Vous pouvez utiliser la clé suivante : 123456789012345678901234567890AA', - 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', - 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', - 'prereq_bunq_title' => 'Prerequisites for an import from bunq', - 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + 'prereq_spectre_title' => 'Prérequis à l\'importation de données avec Spectre', + 'prereq_spectre_text' => 'Pour importer des données avec l\'API Spectre (v4) vous devez fournir à Firefly III deux secrets. Vous les trouverez sur la page des secrets.', + 'prereq_spectre_pub' => 'De même, l\'API Spectre doit connaitre votre clé publique affichée ci-dessous. Sans elle, vous ne serez pas reconnu. Merci de renseigner votre clé publique dans la page des secrets.', + 'prereq_bunq_title' => 'Prérequis à l\'importation de données depuis bunq', + 'prereq_bunq_text' => 'Pour importer des données depuis bunq vous devez obtenir un clé d\'API. Cette clé peut être obtenue depuis l\'application. Merci de prendre en compte que la fonction d\'importation depuis bunq est en BETA. Elle a été testée uniquement au travers de l\'API bac à sable.', + 'prereq_bunq_ip' => 'bunq a besoin de votre adresse IP publique. Firefly III a tenté de la déterminer grâce au service ipify. Assurez-vous que l\'adresse IP est correcte ou l\'importation échouera.', // prerequisites success messages: - 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', - 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', - 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + 'prerequisites_saved_for_fake' => 'Fausse clé API enregistrée avec succès !', + 'prerequisites_saved_for_spectre' => 'ID App et secret enregistrés !', + 'prerequisites_saved_for_bunq' => 'Clé API et adresse IP enregistrées !', // job configuration: - 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', - 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', - 'job_config_input' => 'Your input', + 'job_config_apply_rules_title' => 'Configuration de la tâche - Appliquer vos règles ?', + 'job_config_apply_rules_text' => 'Une fois le fournisseur de la simulation exécuté, vos règles peuvent être appliquées aux transactions. Notez que ceci allongera le temps de l\'importation.', + 'job_config_input' => 'Vos données d\'entrée', // job configuration for the fake provider: - 'job_config_fake_artist_title' => 'Enter album name', - 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', - 'job_config_fake_song_title' => 'Enter song name', - 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', - 'job_config_fake_album_title' => 'Enter album name', - 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + 'job_config_fake_artist_title' => 'Saisir un nom d\'album', + 'job_config_fake_artist_text' => 'Beaucoup de routines d\'importation ont quelques étapes de configuration par lesquelles vous devez passer. Dans le cas du fournisseur du simulateur d\'importation, vous devez répondre à des questions étranges. Dans ce cas, saisissez "David Bowie" pour continuer.', + 'job_config_fake_song_title' => 'Saisir un nom de chanson', + 'job_config_fake_song_text' => 'Citez la chanson "Golden years" pour continuer la simulation d\'importation.', + 'job_config_fake_album_title' => 'Saisir un nom d\'album', + 'job_config_fake_album_text' => 'Certaines routines d\'importation nécessitent des données complémentaires en milieu d\'exécution. Dans le cas du fournisseur du simulateur d\'importation, vous devez répondre à des questions étranges. Saisissez "Station to station" pour continuer.', // job configuration form the file provider - 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', - 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', - 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', - 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', - 'job_config_file_upload_type_help' => 'Select the type of file you will upload', - 'job_config_file_upload_submit' => 'Upload files', + 'job_config_file_upload_title' => 'Configuration de l\'importation (1/4) - Téléchargez votre fichier', + 'job_config_file_upload_text' => 'Cette routine vous aidera à importer des fichiers depuis votre banque vers Firefly III. ', + 'job_config_file_upload_help' => 'Choisissez votre fichier. Veuillez vous assurer qu\'il est encodé en UTF-8.', + 'job_config_file_upload_config_help' => 'Si vous avez précédemment importé des données dans Firefly III, vous avez peut-être téléchargé un fichier de configuration qui définit les relations entre les différents champs. Pour certaines banques, des utilisateurs ont bien voulu partager leur fichier ici : fichiers de configuration', + 'job_config_file_upload_type_help' => 'Sélectionnez le type de fichier que vous allez télécharger', + 'job_config_file_upload_submit' => 'Envoyer des fichiers', 'import_file_type_csv' => 'CSV (valeurs séparées par des virgules)', - 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', - 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', - 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', - 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', - 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', - 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', - 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', - 'job_config_uc_apply_rules_title' => 'Apply rules', - 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', - 'job_config_uc_specifics_title' => 'Bank-specific options', - 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', - 'job_config_uc_submit' => 'Continue', - 'invalid_import_account' => 'You have selected an invalid account to import into.', + 'file_not_utf8' => 'Le fichier téléchargé n\'est pas encodé en UTF-8 ou en ASCII. Firefly ne peut pas gérer un tel fichier. Veuillez utiliser Notepad++ ou Sublime Text pour convertir votre fichier en UTF-8.', + 'job_config_uc_title' => 'Configuration de l\'importation (2/4) - Configuration du fichier importé', + 'job_config_uc_text' => 'Pour pouvoir importer votre fichier correctement, veuillez valider les options ci-dessous.', + 'job_config_uc_header_help' => 'Cochez cette case si la première ligne de votre fichier CSV contient les entêtes des colonnes.', + 'job_config_uc_date_help' => 'Le format de la date et de l’heure dans votre fichier. Suivez les options de formatage décrites sur cette page. La valeur par défaut va analyser les dates ayant cette syntaxe : :dateExample.', + 'job_config_uc_delimiter_help' => 'Choisissez le délimiteur de champ qui est utilisé dans votre fichier d’entrée. Si vous n\'en êtes pas certain, la virgule est l’option la plus sûre.', + 'job_config_uc_account_help' => 'Si votre fichier ne contient AUCUNE information concernant vos compte(s) actif, utilisez cette liste déroulante pour choisir à quel compte les opérations contenues dans le fichier s\'appliquent.', + 'job_config_uc_apply_rules_title' => 'Appliquer les règles', + 'job_config_uc_apply_rules_text' => 'Appliquer vos règles à chaque opération importée. Notez que cela peut ralentir significativement l\'importation .', + 'job_config_uc_specifics_title' => 'Options spécifiques à la banque', + 'job_config_uc_specifics_txt' => 'Certaines banques délivrent des fichiers mal formatés. Firefly III peut les corriger automatiquement. Si votre banque délivre de tels fichiers mais qu\'elle n\'est pas listée ici, merci d\'ouvrir une demande sur GitHub.', + 'job_config_uc_submit' => 'Continuer', + 'invalid_import_account' => 'Vous avez sélectionné un compte non valide pour l\'importation.', // job configuration for Spectre: - 'job_config_spectre_login_title' => 'Choose your login', - 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', - 'spectre_login_status_active' => 'Active', - 'spectre_login_status_inactive' => 'Inactive', - 'spectre_login_status_disabled' => 'Disabled', - 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', - 'job_config_spectre_accounts_title' => 'Select accounts to import from', - 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - 'spectre_do_not_import' => '(do not import)', - 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', - 'imported_from_account' => 'Imported from ":account"', - 'spectre_account_with_number' => 'Account :number', - 'job_config_spectre_apply_rules' => 'Apply rules', - 'job_config_spectre_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.', + 'job_config_spectre_login_title' => 'Choisissez votre identifiant', + 'job_config_spectre_login_text' => 'Firefly III a trouvé :count identifiant·s dans votre compte Spectre. Lequel voulez-vous utiliser pour importer des données ?', + 'spectre_login_status_active' => 'Actif', + 'spectre_login_status_inactive' => 'Inactif', + 'spectre_login_status_disabled' => 'Désactivé', + 'spectre_login_new_login' => 'S\'identifier avec une autre banque, ou à une de ces banques avec un autre identifiant.', + 'job_config_spectre_accounts_title' => 'Sélectionnez le·s compte·s à importer', + 'job_config_spectre_accounts_text' => 'Vous avez sélectionné ":name" (:country). Vous avez :count compte·s disponible·s chez ce fournisseur. Veuillez sélectionner le·s compte·s d\'actifs Firefly III dans le·s·quel·s enregistrer les opérations. Souvenez-vous, pour importer des données, le compte Firefly III et le compte ":name" doivent avoir la même devise.', + 'spectre_no_supported_accounts' => 'Vous ne pouvez pas importer de données depuis ce compte car les devises ne sont pas identiques.', + 'spectre_do_not_import' => '(ne pas importer)', + 'spectre_no_mapping' => 'Il semble que vous n\'avez sélectionné aucun compte depuis lequel importer.', + 'imported_from_account' => 'Importé depuis ":account"', + 'spectre_account_with_number' => 'Compte :number', + 'job_config_spectre_apply_rules' => 'Appliquer les règles', + 'job_config_spectre_apply_rules_text' => 'Par défaut vos règles seront appliquées aux opérations créées pendant l\'importation. Si vous ne voulez pas que vos règles s\'appliquent, décochez cette case.', // job configuration for bunq: - 'job_config_bunq_accounts_title' => 'bunq accounts', - 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - 'bunq_no_mapping' => 'It seems you have not selected any accounts.', - 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', - 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', - 'job_config_bunq_apply_rules' => 'Apply rules', - 'job_config_bunq_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.', + 'job_config_bunq_accounts_title' => 'Comptes bunq', + 'job_config_bunq_accounts_text' => 'Voici les comptes associés à votre compte bunq. Veuillez sélectionner les comptes depuis lesquels vous voulez importer et le compte vers lequel vous voulez importer les opérations.', + 'bunq_no_mapping' => 'Il semble que vous n\'avez sélectionné aucun compte.', + 'should_download_config' => 'Vous devriez télécharger le fichier de configuration de cette tâche. Cela rendra vos futures importations plus faciles.', + 'share_config_file' => 'Si vous avez importé des données depuis une banque publique, vous devriez partager votre fichier de configuration. Il sera ainsi plus facile pour les autres utilisateurs d\'importer leurs données. Le partage de votre fichier de configuration n\'expose pas vos informations financières.', + 'job_config_bunq_apply_rules' => 'Appliquer les règles', + 'job_config_bunq_apply_rules_text' => 'Par défaut vos règles seront appliquées aux opérations créées pendant l\'importation. Si vous ne voulez pas que vos règles s\'appliquent, décochez cette case.', // keys from "extra" array: 'spectre_extra_key_iban' => 'IBAN', 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Card type', - 'spectre_extra_key_account_name' => 'Account name', - 'spectre_extra_key_client_name' => 'Client name', - 'spectre_extra_key_account_number' => 'Account number', - 'spectre_extra_key_blocked_amount' => 'Blocked amount', - 'spectre_extra_key_available_amount' => 'Available amount', - 'spectre_extra_key_credit_limit' => 'Credit limit', - 'spectre_extra_key_interest_rate' => 'Interest rate', - 'spectre_extra_key_expiry_date' => 'Expiry date', - 'spectre_extra_key_open_date' => 'Open date', - 'spectre_extra_key_current_time' => 'Current time', - 'spectre_extra_key_current_date' => 'Current date', - 'spectre_extra_key_cards' => 'Cards', - 'spectre_extra_key_units' => 'Units', - 'spectre_extra_key_unit_price' => 'Unit price', - 'spectre_extra_key_transactions_count' => 'Transaction count', + 'spectre_extra_key_status' => 'Statut', + 'spectre_extra_key_card_type' => 'Type de carte', + 'spectre_extra_key_account_name' => 'Nom du compte', + 'spectre_extra_key_client_name' => 'Nom du client', + 'spectre_extra_key_account_number' => 'N° de compte', + 'spectre_extra_key_blocked_amount' => 'Montant bloqué', + 'spectre_extra_key_available_amount' => 'Montant disponible', + 'spectre_extra_key_credit_limit' => 'Plafond de crédit', + 'spectre_extra_key_interest_rate' => 'Taux d\'intérêt', + 'spectre_extra_key_expiry_date' => 'Date d’expiration', + 'spectre_extra_key_open_date' => 'Date d\'ouverture', + 'spectre_extra_key_current_time' => 'Heure actuelle', + 'spectre_extra_key_current_date' => 'Date actuelle', + 'spectre_extra_key_cards' => 'Cartes', + 'spectre_extra_key_units' => 'Unités', + 'spectre_extra_key_unit_price' => 'Prix unitaire', + 'spectre_extra_key_transactions_count' => 'Nombre de transactions', // specifics: 'specific_ing_name' => 'ING NL', - 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_ing_descr' => 'Créer de meilleures descriptions dans les exports ING', 'specific_sns_name' => 'SNS / Volksbank NL', - 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_sns_descr' => 'Supprime les guillemets des fichiers SNS / Volksbank', 'specific_abn_name' => 'ABN AMRO NL', - 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_abn_descr' => 'Corrige d\'éventuels problèmes avec les fichiers ABN AMRO', 'specific_rabo_name' => 'Rabobank NL', - 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_rabo_descr' => 'Corrige d\'éventuels problèmes avec les fichiers Rabobank', 'specific_pres_name' => 'President\'s Choice Financial CA', - 'specific_pres_descr' => 'Fixes potential problems with PC files', + 'specific_pres_descr' => 'Corrige d\'éventuels problèmes avec les fichiers PC', // job configuration for file provider (stage: roles) - 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', - 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', - 'job_config_roles_submit' => 'Continue', - 'job_config_roles_column_name' => 'Name of column', - 'job_config_roles_column_example' => 'Column example data', - 'job_config_roles_column_role' => 'Column data meaning', - 'job_config_roles_do_map_value' => 'Map these values', - 'job_config_roles_no_example' => 'No example data available', - 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', - 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', - 'job_config_roles_colum_count' => 'Column', + 'job_config_roles_title' => 'Configuration de l\'importation (3/4) - Définir le rôle de chaque colonne', + 'job_config_roles_text' => 'Chaque colonne de votre fichier CSV contient des données différentes. Veuillez indiquer quel type de données l’importateur doit attendre. L’option de « mapper » les données signifie que vous allez lier chaque entrée trouvée dans la colonne à une valeur dans votre base de données. Une colonne souvent mappée est celle contenant l\'IBAN du compte opposé. Il est facile de le faire correspondre avec un IBAN déjà présent dans votre base de données.', + 'job_config_roles_submit' => 'Continuer', + 'job_config_roles_column_name' => 'Nom de colonne', + 'job_config_roles_column_example' => 'Données d’exemple de colonne', + 'job_config_roles_column_role' => 'Signification des données de colonne', + 'job_config_roles_do_map_value' => 'Mapper ces valeurs', + 'job_config_roles_no_example' => 'Aucun exemple de données disponible', + 'job_config_roles_fa_warning' => 'Si vous marquez une colonne comme contenant un montant dans une devise étrangère, vous devez également indiquer quelle colonne définie cette devise.', + 'job_config_roles_rwarning' => 'Vous devez à minima marquer une colonne en tant que colonne "Montant". Il est également conseillé de sélectionner une colonne pour la description, la date et le compte opposé.', + 'job_config_roles_colum_count' => 'Colonne', // job config for the file provider (stage: mapping): - 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', - 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', - 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', - 'job_config_field_value' => 'Field value', - 'job_config_field_mapped' => 'Mapped to', + 'job_config_map_title' => 'Configuration de l\'importation (4/4) - Connecter les données à importer aux données de Firefly III', + 'job_config_map_text' => 'Dans les tableaux suivants, la valeur située à gauche vous montre l\'information trouvée dans votre fichier téléchargé. C’est à vous de mapper cette valeur, si possible, avec une valeur déjà présente dans votre base de données. Firefly III s’en tiendra à ce mappage. Si il n’y a pas de valeur correspondante ou que vous ne souhaitez pas mapper de valeur spécifique, ne sélectionnez rien.', + 'job_config_map_nothing' => 'Il n\'y a aucun donnée dans votre fichier qui puisse être mappée aux valeurs existantes. Merci de cliquer sur "Démarrez l\'importation" pour continuer.', + 'job_config_field_value' => 'Valeur du champ', + 'job_config_field_mapped' => 'Mappé à', 'map_do_not_map' => '(ne pas mapper)', - 'job_config_map_submit' => 'Start the import', + 'job_config_map_submit' => 'Démarrez l\'importation', // import status page: @@ -196,17 +196,17 @@ return [ 'status_wait_title' => 'Veuillez patienter...', 'status_wait_text' => 'Cette boîte disparaîtra dans un instant.', 'status_running_title' => 'L\'importation est en cours d\'exécution', - 'status_job_running' => 'Please wait, running the import...', - 'status_job_storing' => 'Please wait, storing data...', - 'status_job_rules' => 'Please wait, running rules...', - 'status_fatal_title' => 'Fatal error', - 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', - 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', - 'status_finished_title' => 'Import finished', - 'status_finished_text' => 'The import has finished.', - 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', - 'unknown_import_result' => 'Unknown import result', - 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'status_job_running' => 'Veuillez patienter, importation des données en cours...', + 'status_job_storing' => 'Veuillez patientez, enregistrement des données en cours...', + 'status_job_rules' => 'Veuillez patienter, exécution des règles...', + 'status_fatal_title' => 'Erreur fatale', + 'status_fatal_text' => 'L\'importation a rencontré une erreur qui l\'a empêché de s\'achever correctement. Toutes nos excuses !', + 'status_fatal_more' => 'Ce message d\'erreur (probablement très énigmatique) est complété par les fichiers de log que vous trouverez sur votre disque dur ou dans le container Docker depuis lequel vous exécutez Firefly III.', + 'status_finished_title' => 'Importation terminée', + 'status_finished_text' => 'L\'importation est terminée.', + 'finished_with_errors' => 'Des erreurs se sont produites pendant l\'importation. Veuillez les examiner avec attention.', + 'unknown_import_result' => 'Résultat de l\'importation inconnu', + 'result_no_transactions' => 'Aucune opération n\'a été importée. Il s\'agissait peut être de doublons, ou il n\'y avait simplement aucune opération a importer. Le fichier de log pourra peut être vous en dire plus sur ce qu\'il s\'est passé. Si vous importez des données régulièrement, ceci est normal.', 'result_one_transaction' => 'Une seule transaction a été importée. Elle est stockée sous le tag :tag où vous pouvez l\'afficher en détail.', 'result_many_transactions' => 'Firefly III a importé :count transactions. Elles sont stockées sous le tag :tag où vous pouvez les afficher en détail.', @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Compte d’actif (IBAN)', 'column_account-id' => 'Compte d\'actif (ID correspondant à FF3)', 'column_account-name' => 'Compte d’actif (nom)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Montant', 'column_amount_foreign' => 'Montant (en devise étrangère)', 'column_amount_debit' => 'Montant (colonne débit)', @@ -251,16 +252,16 @@ return [ 'column_rabo-debit-credit' => 'Indicateur de débit/crédit spécifique à Rabobank', 'column_ing-debit-credit' => 'Indicateur de débit/crédit spécifique à ING', 'column_sepa-ct-id' => 'Référence de bout en bout SEPA', - 'column_sepa-ct-op' => 'Référence SEPA du compte destinataire', + 'column_sepa-ct-op' => 'Référence SEPA du compte opposé', 'column_sepa-db' => 'Référence Unique de Mandat SEPA', 'column_sepa-cc' => 'Code de rapprochement SEPA', 'column_sepa-ci' => 'Identifiant Créancier SEPA', 'column_sepa-ep' => 'Objectif externe SEPA', 'column_sepa-country' => 'Code de pays SEPA', 'column_tags-comma' => 'Tags (séparés par des virgules)', - 'column_tags-space' => 'Tags (séparé par un espace)', + 'column_tags-space' => 'Tags (séparés par un espace)', 'column_account-number' => 'Compte d’actif (numéro de compte)', - 'column_opposing-number' => 'Compte destinataire (numéro de compte)', + 'column_opposing-number' => 'Compte opposé (numéro de compte)', 'column_note' => 'Note(s)', 'column_internal-reference' => 'Référence interne', diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php index cfed1ec1ca..4284be5cbe 100644 --- a/resources/lang/fr_FR/intro.php +++ b/resources/lang/fr_FR/intro.php @@ -24,7 +24,7 @@ declare(strict_types=1); return [ // index - 'index_intro' => 'Bienvenue sur la page index de Firefly III. Veuillez prendre le temps de parcourir l\'introduction pour comprendre comment Firefly III fonctionne.', + 'index_intro' => 'Bienvenue sur la page d\'accueil de Firefly III. Veuillez prendre le temps de parcourir l\'introduction pour comprendre comment Firefly III fonctionne.', 'index_accounts-chart' => 'Ce tableau montre le solde actuel de vos comptes d\'actifs. Vous pouvez sélectionner les comptes visibles ici dans vos préférences.', 'index_box_out_holder' => 'Cette petite boîte et les cases à côté de celle-ci vous donneront un rapide aperçu de votre situation financière.', 'index_help' => 'Si vous avez besoin d’aide avec une page ou un formulaire, appuyez sur ce bouton.', @@ -54,7 +54,7 @@ return [ 'reports_index_extra-options-box' => 'Selon le rapport que vous avez sélectionné, vous pouvez sélectionner des filtres et options supplémentaires ici. Regardez cette case lorsque vous modifiez les types de rapport.', // reports (reports) - 'reports_report_default_intro' => 'Ce rapport vous donnera un aperçu complet et rapide de vos finances. Si vous souhaitez y voir autre chose, n\'hésitez pas à me contacter!', + 'reports_report_default_intro' => 'Ce rapport vous donnera un aperçu rapide et complet de vos finances. Si vous souhaitez y voir autre chose, n\'hésitez pas à me contacter !', 'reports_report_audit_intro' => 'Ce rapport vous donnera des informations détaillées sur vos comptes d\'actifs.', 'reports_report_audit_optionsBox' => 'Utilisez ces cases à cocher pour afficher ou masquer les colonnes qui vous intéressent.', @@ -62,9 +62,9 @@ return [ 'reports_report_category_pieCharts' => 'Ces tableaux vous donneront un aperçu des dépenses et du revenu par catégorie ou par compte.', 'reports_report_category_incomeAndExpensesChart' => 'Ce tableau montre vos dépenses et votre revenu par catégorie.', - 'reports_report_tag_intro' => 'Ce rapport vous donnera un aperçu d\'une ou de plusieurs étiquettes.', - 'reports_report_tag_pieCharts' => 'Ces tableaux vous donneront un aperçu des dépenses et du revenu par étiquette, catégorie, ou budget.', - 'reports_report_tag_incomeAndExpensesChart' => 'Ce tableau montre vos dépenses et votre revenu par étiquette.', + 'reports_report_tag_intro' => 'Ce rapport vous donnera un aperçu d\'un ou plusieurs tags.', + 'reports_report_tag_pieCharts' => 'Ces tableaux vous donneront un aperçu des dépenses et du revenu par tag, catégorie, ou budget.', + 'reports_report_tag_incomeAndExpensesChart' => 'Ce tableau montre vos dépenses et votre revenu par tag.', 'reports_report_budget_intro' => 'Ce rapport vous donnera un aperçu d\'un ou plusieurs budgets.', 'reports_report_budget_pieCharts' => 'Ces tableaux vous donneront un aperçu des dépenses par budget ou par compte.', @@ -104,20 +104,20 @@ return [ // create bill 'bills_create_intro' => 'Utilisez des factures pour suivre les sommes que vous avez à payer à chaque période. Pensez aux dépenses comme le loyer, l\'assurance ou les remboursements d\'emprunts.', - 'bills_create_name' => 'Utilisez un nom équivoque tel que "Loyer" ou "Assurance maladie".', + 'bills_create_name' => 'Utilisez un nom parlant tel que "Loyer" ou "Assurance maladie".', //'bills_create_match' => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.', 'bills_create_amount_min_holder' => 'Sélectionnez un montant minimum et maximum pour cette facture.', 'bills_create_repeat_freq_holder' => 'La plupart des factures sont mensuelles, mais vous pouvez définir une autre fréquence ici.', 'bills_create_skip_holder' => 'Si une facture se répète toutes les 2 semaines, le champ "sauter" doit être réglé sur "1" pour sauter une semaine sur deux.', // rules index - 'rules_index_intro' => 'Firefly III vous permet de gérer les règles, qui seront automagiquement appliquées à toute transaction que vous créez ou modifiez.', + 'rules_index_intro' => 'Firefly III vous permet de gérer des règles, qui seront automatiquement appliquées à toute transaction que vous créez ou modifiez.', 'rules_index_new_rule_group' => 'Vous pouvez rassembler les règles en groupes pour une gestion plus facile.', 'rules_index_new_rule' => 'Créez autant de règles que vous le souhaitez.', 'rules_index_prio_buttons' => 'Mettez-les dans l\'ordre que vous jugez convenable.', 'rules_index_test_buttons' => 'Vous pouvez tester vos règles ou les appliquer aux transactions existantes.', 'rules_index_rule-triggers' => 'Les règles ont des "déclencheurs" et des "actions" que vous pouvez ordonner en glisser-déposer.', - 'rules_index_outro' => 'Pensez à consulter les pages d\'aide en utilisant l\'icône (?) En haut à droite!', + 'rules_index_outro' => 'Pensez à consulter les pages d\'aide en utilisant l\'icône (?) en haut à droite !', // create rule: 'rules_create_mandatory' => 'Choisissez un titre parlant et définissez quand est-ce que la règle doit être déclenchée.', @@ -130,7 +130,7 @@ return [ // currencies 'currencies_index_intro' => 'Firefly III prend en charge plusieurs devises, que vous pouvez modifier sur cette page.', - 'currencies_index_default' => 'Firefly III a une devise par défaut. Vous pouvez toujours en changer de l\'aide à ces boutons, bien entendu.', + 'currencies_index_default' => 'Firefly III a une devise par défaut. Vous pouvez toujours en changer à l\'aide de ces boutons, bien entendu.', // create currency 'currencies_create_code' => 'Ce code devrait être conforme à l\'ISO (recherchez-le sur google votre nouvelle devise).', diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php index 2b744d390b..24f87d378c 100644 --- a/resources/lang/fr_FR/list.php +++ b/resources/lang/fr_FR/list.php @@ -43,7 +43,7 @@ return [ 'created_at' => 'Créé le', 'account' => 'Compte', 'matchingAmount' => 'Montant', - 'split_number' => 'Segmenter en', + 'split_number' => 'Ventilation n°', 'destination' => 'Destination', 'source' => 'Source', 'next_expected_match' => 'Prochaine association attendue', @@ -95,7 +95,7 @@ return [ 'tags' => 'Tags', 'inward' => 'Description vers l’intérieur', 'outward' => 'Description de l’extérieur', - 'number_of_transactions' => 'Nombre de transactions', + 'number_of_transactions' => 'Impact sur l\'autre transaction', 'total_amount' => 'Montant total', 'sum' => 'Somme', 'sum_excluding_transfers' => 'Somme (hors transferts)', @@ -111,7 +111,8 @@ return [ 'sepa-country' => 'Pays SEPA', 'sepa-cc' => 'Code de compensation SEPA', 'sepa-ep' => 'Objectif externe SEPA', - 'sepa-ci' => 'Identifiant SEPA Creditor', + 'sepa-ci' => 'Identifiant Créancier SEPA', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'ID externe', 'account_at_bunq' => 'Compte avec bunq', 'file_name' => 'Nom du fichier', diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php index 1ae9f2a1f3..e8d28df7a6 100644 --- a/resources/lang/fr_FR/validation.php +++ b/resources/lang/fr_FR/validation.php @@ -24,7 +24,7 @@ declare(strict_types=1); return [ 'iban' => 'Il ne s\'agit pas d\'un IBAN valide.', - 'source_equals_destination' => 'Le compte source est égal au compte de destination.', + 'source_equals_destination' => 'Le compte source est identique au compte de destination.', 'unique_account_number_for_user' => 'Il semble que ce numéro de compte est déjà utilisé.', 'unique_iban_for_user' => 'Il semble que cet IBAN soit déjà utilisé.', 'deleted_user' => 'Compte tenu des contraintes de sécurité, vous ne pouvez pas vous inscrire en utilisant cette adresse e-mail.', @@ -40,7 +40,7 @@ return [ 'at_least_one_repetition' => 'Besoin d\'au moins une répétition.', 'require_repeat_until' => 'Besoin d’un certain nombre de répétitions ou d\'une date de fin (repeat_until). Pas les deux.', 'require_currency_info' => 'Le contenu de ce champ n\'est pas valide sans informations sur la devise.', - 'equal_description' => 'La description de la transaction ne doit pas être égale à la description globale.', + 'equal_description' => 'La description de la transaction ne doit pas être identique à la description globale.', 'file_invalid_mime' => 'Le fichier ":name" est du type ":mime" ce qui n\'est pas accepté pour un nouvel envoi.', 'file_too_large' => 'Le fichier ":name" est trop grand.', 'belongs_to_user' => 'La valeur de :attribute est inconnue.', @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Une règle doit avoir au moins une action.', 'base64' => 'Il ne s\'agit pas de données base64 valides.', 'model_id_invalid' => 'L’ID fournit ne semble pas valide pour ce modèle.', - 'more' => ':attribute doit être supérieur à zéro.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => 'Le champ :attribute n\'est pas une URL valide.', 'after' => 'Le champ :attribute doit être une date postérieure à :date.', 'alpha' => 'Le champ :attribute doit seulement contenir des lettres.', diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php index 9ca397822f..8c4c210e77 100644 --- a/resources/lang/id_ID/firefly.php +++ b/resources/lang/id_ID/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'Pada Agustus 2017 terkenal peneliti keamanan Troy berburu merilis daftar 306 juta password dicuri. password tersebut dicuri selama breakins di perusahaan seperti LinkedIn, Adobe dan Neopets (dan banyak lagi).', 'secure_pw_check_box' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', 'secure_pw_sha1' => 'Tapi saya pikir SHA1 rusak?', - 'secure_pw_hash_speed' => 'Ya, tapi tidak dalam konteks ini. Seperti yang bisa Anda baca di situs web yang merinci bagaimana mereka melanggar SHA1, sekarang sedikit lebih mudah untuk menemukan "tabrakan": string lain yang menghasilkan sama SHA1-hash Sekarang hanya membutuhkan waktu 10.000 tahun dengan menggunakan mesin GPU tunggal.', - 'secure_pw_hash_security' => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this hash are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Haruskah saya mencentang kotaknya?', 'secure_pw_long_password' => 'Jika Anda baru saja menghasilkan kata sandi penggunaan tunggal yang hebat untuk Firefly III menggunakan beberapa jenis generator kata kunci: tidak.', 'secure_pw_short' => 'Jika Anda baru memasukkan kata sandi yang selalu Anda gunakan: Please yes.', diff --git a/resources/lang/id_ID/import.php b/resources/lang/id_ID/import.php index e726d3e7a7..dfb98557cc 100644 --- a/resources/lang/id_ID/import.php +++ b/resources/lang/id_ID/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Akun aset (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', 'column_account-name' => 'Akun aset (nama)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Jumlah', 'column_amount_foreign' => 'Amount (in foreign currency)', 'column_amount_debit' => 'Jumlah (kolom debit)', diff --git a/resources/lang/id_ID/list.php b/resources/lang/id_ID/list.php index 98106680de..b427560515 100644 --- a/resources/lang/id_ID/list.php +++ b/resources/lang/id_ID/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', diff --git a/resources/lang/id_ID/validation.php b/resources/lang/id_ID/validation.php index 3175395fc5..bc80cc3711 100644 --- a/resources/lang/id_ID/validation.php +++ b/resources/lang/id_ID/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'This is not valid base64 encoded data.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute harus lebih besar dari nol.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute bukan URL yang valid.', 'after' => ':attribute harus tanggal setelah :date.', 'alpha' => ':attribute hanya boleh berisi huruf.', diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 6006229752..11ed5e9acf 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'Nell\'agosto 2017 il noto ricercatore di sicurezza Troy Hunt ha pubblicato una lista di 306 milioni di password rubate. Queste password sono state rubate durante incursioni in aziende come LinkedIn, Adobe e NeoPets (e molte altre).', 'secure_pw_check_box' => 'Selezionando la casella, Firefly III invierà l\'hash SHA1 della tua password a il sito web di Troy Hunt per vedere se è presente nell\'elenco. Questo ti impedirà di usare password non sicure come raccomandato nell\'ultima Pubblicazione speciale NIST su questo argomento.', 'secure_pw_sha1' => 'Ma pensavo che SHA1 fosse rotto?', - 'secure_pw_hash_speed' => 'Sì, ma non in questo contesto. Come puoi leggere su il sito web che spiega come hanno rotto SHA1 , ora è leggermente più facile trovare una "collisione": un\'altra stringa che risulta nello stesso hash SHA1. Ora ci vogliono solo 10.000 anni usando una macchina a GPU singola.', - 'secure_pw_hash_security' => 'Questa collisione non sarebbe uguale alla tua password, né sarebbe utile su (un sito come) Firefly III. Questa applicazione non utilizza SHA1 per la verifica della password. Quindi è sicuro selezionare questa casella. La tua password viene sottoposta a hash e solo i primi cinque caratteri di questo hash vengono inviati tramite HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Devo controllare la scatola?', 'secure_pw_long_password' => 'Se hai appena generato una password lunga e monouso per Firefly III utilizzando un qualche tipo di generatore di password: no.', 'secure_pw_short' => 'Se hai appena inserito la password, usi sempre: Si prega di.', diff --git a/resources/lang/it_IT/import.php b/resources/lang/it_IT/import.php index 5fd4aa332c..0a410bf86e 100644 --- a/resources/lang/it_IT/import.php +++ b/resources/lang/it_IT/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Conto attività (IBAN)', 'column_account-id' => 'ID conto attività (mappa FF3)', 'column_account-name' => 'Conto attività (nome)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Importo', 'column_amount_foreign' => 'Importo (in altra valuta)', 'column_amount_debit' => 'Importo (colonna debito)', diff --git a/resources/lang/it_IT/list.php b/resources/lang/it_IT/list.php index a4d4346fd7..6c3fa9e8e8 100644 --- a/resources/lang/it_IT/list.php +++ b/resources/lang/it_IT/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'Codice Compensazione SEPA', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'Identificativo Creditore SEPA', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'ID esterno', 'account_at_bunq' => 'Conto con Bunq', 'file_name' => 'Nome del file', diff --git a/resources/lang/it_IT/validation.php b/resources/lang/it_IT/validation.php index c5d8699a6b..d0daff498d 100644 --- a/resources/lang/it_IT/validation.php +++ b/resources/lang/it_IT/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Una regola deve avere almeno una azione.', 'base64' => 'Questi non sono dati codificati in base64 validi.', 'model_id_invalid' => 'L\'ID fornito sembra non essere valido per questo modello.', - 'more' => ':attribute deve essere maggiore di zero.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute non è un URL valido.', 'after' => ':attribute deve essere una data dopo :date.', 'alpha' => ':attribute può contenere solo lettere.', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 3a66818cd8..cef0735c87 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'De bekende security onderzoeker Troy Hunt gaf in augustus 2017 een lijst vrij van 306 miljoen gestolen wachtwoorden. Deze wachtwoorden waren gestolen tijdens hacks van bekende bedrijven zoals LinkedIn, Adobe en NeoPets (en vele anderen).', 'secure_pw_check_box' => 'Zet het vinkje, en Firefly III stuurt de eerste vijf karakters van de SHA1-hash van je wachtwoord naar de website van Troy Hunt om te zien of-ie op de lijst staat. Dit voorkomt dat je een onveilig wachtwoord gebruikt, zoals is voorgeschreven in een speciale publicatie van het NIST over dit onderwerp.', 'secure_pw_sha1' => 'Maar SHA1 is toch gebroken?', - 'secure_pw_hash_speed' => 'Ja, maar niet in deze context. Zoals je kan lezen op de website over SHA1 is het nu makkelijker geworden om een "collision" te vinden: twee stukken tekst die dezelfde SHA1-hash opleveren. Dit kan nu in 10.000 jaar op een machine met één grafische kaart.', - 'secure_pw_hash_security' => 'Deze collision is niet gelijk aan jouw wachtwoord, noch is deze te gebruiken op een site (zoals) Firefly III. Deze app gebruikt geen SHA1 voor wachtwoordverificatie. Dat maakt het veilig om de checkbox aan te vinken. Je wachtwoord wordt gehasht en alleen de eerste vijf karakters van die hash worden verstuurt over HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Vinkje zetten of niet?', 'secure_pw_long_password' => 'Als je net een lang wachtwoord hebt gegenereerd met een password generator tool: nee.', 'secure_pw_short' => 'Gebruik je het wachtwoord dat je altijd gebruikt? Ja, doen!', diff --git a/resources/lang/nl_NL/import.php b/resources/lang/nl_NL/import.php index b68492eeaf..1f8d4b461b 100644 --- a/resources/lang/nl_NL/import.php +++ b/resources/lang/nl_NL/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Betaalrekening (IBAN)', 'column_account-id' => 'Betaalrekening (ID gelijk aan FF3)', 'column_account-name' => 'Betaalrekeningnaam', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Bedrag', 'column_amount_foreign' => 'Bedrag (in vreemde valuta)', 'column_amount_debit' => 'Bedrag (debetkolom)', diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index db765f8c4f..b52c48113a 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'SEPA vrijwaringscode', 'sepa-ep' => 'SEPA transactiedoeleinde', 'sepa-ci' => 'SEPA crediteuridentificatie', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'Externe ID', 'account_at_bunq' => 'Bunq-account', 'file_name' => 'Bestandsnaam', diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php index add99c5012..06eeccb120 100644 --- a/resources/lang/nl_NL/validation.php +++ b/resources/lang/nl_NL/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'De regel moet minstens één actie hebben.', 'base64' => 'Dit is geen geldige base64 gecodeerde data.', 'model_id_invalid' => 'Dit ID past niet bij dit object.', - 'more' => ':attribute moet groter zijn dan nul.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute is geen geldige URL.', 'after' => ':attribute moet een datum na :date zijn.', 'alpha' => ':attribute mag alleen letters bevatten.', diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 0ecac118f5..428c7b4372 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'W sierpniu 2017 r. znany analityk ds. bezpieczeństwa Troy Hunt opublikował listę 306 milionów skradzionych haseł. Hasła zostały skradzione podczas włamań w firmach takich jak LinkedIn, Adobe i NeoPets (i wiele innych).', 'secure_pw_check_box' => 'Zaznaczając to pole, Firefly III wyśle pierwsze pięć znaków skrótu SHA1 Twojego hasła do strony internetowej Troy Hunt, aby sprawdzić, czy znajduje się na liście. To powstrzyma Cię przed używaniem niebezpiecznych haseł, co jest zalecane w najnowszej specjalnej publikacji Narodowy Instytut Standaryzacji i Technologii (NIST) na ten temat.', 'secure_pw_sha1' => 'Myślałem, że SHA1 zostało złamane?', - 'secure_pw_hash_speed' => 'Tak, ale nie w tym kontekście. Jak można przeczytać na stronie z wyszczególnieniem sposobu ich złamania SHA1, teraz jest nieco łatwiej znaleźć "kolizję": inny ciąg znaków, który prowadzi do tego samego skrótu SHA1. Teraz trwa to tylko 10 000 lat przy użyciu maszyny z jedną kartą graficzną.', - 'secure_pw_hash_security' => 'Ta kolizja nie byłaby równa Twojemu hasłu ani nie byłaby użyteczna na stronie takiej jak Firefly III. Ta aplikacja nie używa algorytmu SHA1 do weryfikacji hasła. Można więc bezpiecznie zaznaczyć to pole. Twoje hasło jest skracane (mieszane, hashowane) i tylko pięć pierwszych znaków tego skrótu jest wysyłanych szyfrowanym połączeniem (HTTPS).', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Czy powinienem zaznaczyć to pole?', 'secure_pw_long_password' => 'Jeśli wygenerowałeś długie, jednorazowe hasło dla Firefly III, używając pewnego rodzaju generatora haseł: no.', 'secure_pw_short' => 'Jeśli wpisałeś hasło, którego zawsze używasz: tak, proszę.', diff --git a/resources/lang/pl_PL/import.php b/resources/lang/pl_PL/import.php index 7fb904c8e4..978e9f65c0 100644 --- a/resources/lang/pl_PL/import.php +++ b/resources/lang/pl_PL/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Konto aktywów (IBAN)', 'column_account-id' => 'ID konta aktywów (z bazy FF3)', 'column_account-name' => 'Konto aktywów (nazwa)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Kwota', 'column_amount_foreign' => 'Kwota (w obcej walucie)', 'column_amount_debit' => 'Kwota (kolumna debetowa)', diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php index f2a7bfedff..2411a3e125 100644 --- a/resources/lang/pl_PL/list.php +++ b/resources/lang/pl_PL/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'External ID', 'account_at_bunq' => 'Konto bunq', 'file_name' => 'Nazwa pliku', diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php index 0e8adfdf34..a776c0faa0 100644 --- a/resources/lang/pl_PL/validation.php +++ b/resources/lang/pl_PL/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Reguła powinna mieć co najmniej jedną akcję.', 'base64' => 'To nie są prawidłowe dane zakodowane w base64.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute musi być większy od zera.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute nie jest prawidłowym adresem URL.', 'after' => ':attribute musi być datą późniejszą od :date.', 'alpha' => ':attribute może zawierać tylko litery.', diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index b69e504001..60e987e3fa 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'Em agosto de 2017, a conhecida pesquisadora de segurança Troy Hunt lançou uma lista de 306 milhões de senhas roubadas. Essas senhas foram roubadas durante assalto em empresas como LinkedIn, Adobe e NeoPets (e muito mais).', 'secure_pw_check_box' => 'Ao marcar a caixa de seleção, Firefly III irá enviar os cinco primeiros caracteres do hash SHA1 de sua senha ao site Troy Hunt, para verificar se ela está na lista. Isso impede que você use senhas inseguras, como recomendado na última publicação NIST Special sobre esse tema.', 'secure_pw_sha1' => 'Mas pensei que SHA1 estava quebrado?', - 'secure_pw_hash_speed' => 'Sim, mas não neste contexto. Como você pode ler no site, detalhando como eles quebraram SHA1, agora é um pouco mais fácil encontrar uma "colisão": outra seqüência que resulta na mesma marca SHA1-hash. Agora, apenas leva 10.000 anos usando uma máquina de GPU única.', - 'secure_pw_hash_security' => 'Essa colisão não será igual à sua senha, e tampouco será útil no Firefly III (ou em um site semelhante). Esse aplicativo não usa SHA1 para a verificação de senha. Portanto, é seguro marcar essa caixa de seleção. O hash de sua senha é calculado é apenas os cinco primeiros caracteres são enviados via HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Devo verificar a caixa?', 'secure_pw_long_password' => 'Se você apenas gerou uma senha longa e de uso único para o Firefly III usando algum tipo de gerador de senhas: não.', 'secure_pw_short' => 'Se você acabou de inserir a senha que você usa sempre: Por favor, sim.', diff --git a/resources/lang/pt_BR/import.php b/resources/lang/pt_BR/import.php index 5766b66116..67c3bf11e9 100644 --- a/resources/lang/pt_BR/import.php +++ b/resources/lang/pt_BR/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Conta de Ativo (IBAN)', 'column_account-id' => 'ID da Conta de Ativo (correspondente FF3)', 'column_account-name' => 'Conta de Ativo (nome)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Montante', 'column_amount_foreign' => 'Montante (em moeda estrangeira)', 'column_amount_debit' => 'Montante (coluna de débito)', diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php index 5c90f01f42..96df1164db 100644 --- a/resources/lang/pt_BR/list.php +++ b/resources/lang/pt_BR/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'SEPA Código de Compensação', 'sepa-ep' => 'SEPA Finalidade Externa', 'sepa-ci' => 'SEPA Identificador do Credor', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'External ID', 'account_at_bunq' => 'Loja com bunq', 'file_name' => 'Nome do arquivo', diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php index eec02240af..9d498a54db 100644 --- a/resources/lang/pt_BR/validation.php +++ b/resources/lang/pt_BR/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'This is not valid base64 encoded data.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute deve ser maior que zero.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => 'O campo :attribute não contém um URL válido.', 'after' => 'O campo :attribute deverá conter uma data posterior a :date.', 'alpha' => 'O campo :attribute deverá conter apenas letras.', diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index ada0cadb33..de71fae926 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'В августе 2017 года известный исследователь безопасности Трой Хант опубликовал список из 306 миллионов украденных паролей. Эти пароли были украдены во время взломов в таких компаниях, как LinkedIn, Adobe и NeoPets (и многих других).', 'secure_pw_check_box' => 'Если вы установите данный флажок, Firefly III отправит первые 5 символов SHA1-хэша вашего пароля на сайт Troy Hunt, чтобы узнать, есть ли он в списке. Согласно рекомендациям по данному вопросу, опубликованным недавно в NIST Special Publication, такая проверка защитит вас от использования небезопасных паролей.', 'secure_pw_sha1' => 'Но я думал, что SHA1 был взломан?', - 'secure_pw_hash_speed' => 'Да, но не в этом контексте. На сайте https://shattered.io вы можете подробно узнать о том, как именно был взломан SHA1. На самом деле, теперь просто немного проще найти «коллизию», т.е. другую строку с таким же точно хэшем SHA1. Теперь на поиск потребуется всего около 10 000 лет расчётов на компьютере с одним GPU.', - 'secure_pw_hash_security' => 'Причём, эта строка-"коллизия" точно не будет совпадать с вашим паролем, а значит будет бесполезна на сайтах (в т. ч. и на Firefly III). К тому же Firefly III использует SHA1 не для верификации пароля, а только для проверки его безопасности через упомянутый выше сайт. Причём перед отправкой ваш пароль хэшируется, а на проверку через HTTPS передаются только первые 5 символов хэша.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Должен ли я установить флажок?', 'secure_pw_long_password' => 'Если вы только что создали длинный одноразовый пароль для Firefly III с использованием какого-либо генератора паролей: нет.', 'secure_pw_short' => 'Если вы только что ввели пароль, который вы используете на нескольких сайтах: пожалуйста, да.', diff --git a/resources/lang/ru_RU/import.php b/resources/lang/ru_RU/import.php index 3f572ed187..5ac24b037f 100644 --- a/resources/lang/ru_RU/import.php +++ b/resources/lang/ru_RU/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Счет актива (IBAN)', 'column_account-id' => 'ID основного счёта (соответствующий FF3)', 'column_account-name' => 'Основной счёт (название)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Сумма', 'column_amount_foreign' => 'Сумма (в иностранной валюте)', 'column_amount_debit' => 'Сумма (столбец с дебетом)', diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php index 3d285ed97e..a9d4e44c18 100644 --- a/resources/lang/ru_RU/list.php +++ b/resources/lang/ru_RU/list.php @@ -112,6 +112,7 @@ return [ 'sepa-cc' => 'Код очистки SEPA', 'sepa-ep' => 'Внешняя цель SEPA', 'sepa-ci' => 'Идентификатор кредитора SEPA', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'Внешний ID', 'account_at_bunq' => 'Счёт с bunq', 'file_name' => 'Имя файла', diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php index e3fd87a974..88fce4d5ff 100644 --- a/resources/lang/ru_RU/validation.php +++ b/resources/lang/ru_RU/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'This is not valid base64 encoded data.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute должен быть больше нуля.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute не является допустимым URL-адресом.', 'after' => ':attribute должна быть позже :date.', 'alpha' => ':attribute может содержать только буквы.', diff --git a/resources/lang/tr_TR/firefly.php b/resources/lang/tr_TR/firefly.php index eff00bba00..95757768cf 100644 --- a/resources/lang/tr_TR/firefly.php +++ b/resources/lang/tr_TR/firefly.php @@ -523,8 +523,8 @@ işlemlerin kontrol edildiğini lütfen unutmayın.', 'secure_pw_history' => 'Ağustos 2017\'de ünlü güvenlik araştırmacısı Troy Hunt, 306 milyon çalınan parolanın bir listesini yayınladı. Bu şifreler, LinkedIn, Adobe ve NeoPets gibi şirketlerde (ve daha pek çok yerde) sistem çökmesi sırasında çalındı.', 'secure_pw_check_box' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', 'secure_pw_sha1' => 'SHA1\'in çözüdüğünü sanıyordum', - 'secure_pw_hash_speed' => 'Doğru, ama bu bağlamda değil. SHA1\'in nasıl çözüleceğini anlatan web sitesinde de okuyabileceğin gibi artık bir "kesişim(aynı SHA1 hash\'i ile sonuçlanan başka bir dizin)" bulmak daha kolay. Şimdilik tek GPU\'lu bir makine ile sadece 10,000 yıl sürmektedir.', - 'secure_pw_hash_security' => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this hash are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', + 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', 'secure_pw_should' => 'Kutuyu kontrol etmeli miyim?', 'secure_pw_long_password' => 'Firefly III için bir çeşit şifre üreticisi kullanarak uzun, tek kullanımlık bir şifre oluşturduysanız: hayır.', 'secure_pw_short' => 'Her zaman kullandığınız şifreyi kullandıysanız: Evet lütfen.', diff --git a/resources/lang/tr_TR/import.php b/resources/lang/tr_TR/import.php index d5b413b0c1..e590a661ba 100644 --- a/resources/lang/tr_TR/import.php +++ b/resources/lang/tr_TR/import.php @@ -219,6 +219,7 @@ return [ 'column_account-iban' => 'Öğe hesabı (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', 'column_account-name' => 'Varlık hesabı (isim)', + 'column_account-bic' => 'Asset account (BIC)', 'column_amount' => 'Tutar', 'column_amount_foreign' => 'Amount (in foreign currency)', 'column_amount_debit' => 'Miktar (borç sütunu)', diff --git a/resources/lang/tr_TR/list.php b/resources/lang/tr_TR/list.php index 100e0aa33a..b30665dc0e 100644 --- a/resources/lang/tr_TR/list.php +++ b/resources/lang/tr_TR/list.php @@ -113,6 +113,7 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'sepa-batch-id' => 'SEPA Batch ID', 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'Dosya adı', diff --git a/resources/lang/tr_TR/validation.php b/resources/lang/tr_TR/validation.php index 9fa4b2ad3b..37d900f4a7 100644 --- a/resources/lang/tr_TR/validation.php +++ b/resources/lang/tr_TR/validation.php @@ -50,7 +50,8 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'Bu geçerli Base64 olarak kodlanmış veri değildir.', 'model_id_invalid' => 'Verilen kimlik bu model için geçersiz görünüyor.', - 'more' => ':attribute sıfırdan büyük olmak zorundadır.', + 'more' => ':attribute must be larger than :value.', + 'less' => ':attribute must be less than 10,000,000', 'active_url' => ':attribute geçerli bir URL değil.', 'after' => ':attribute :date tarihinden sonrası için tarihlendirilmelidir.', 'alpha' => ':attribute sadece harf içerebilir.', From e8c9554dd6193e07b7cef1c683295cfac8575a43 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Jul 2018 19:43:02 +0200 Subject: [PATCH 72/86] Remove TODO's, add some suppressors for code quality. --- .../V1/Requests/AvailableBudgetRequest.php | 1 - app/Api/V1/Requests/JournalLinkRequest.php | 2 - app/Helpers/Collector/JournalCollector.php | 1 - .../Collector/JournalCollectorInterface.php | 1 - .../Controllers/Budget/IndexController.php | 2 - .../Controllers/Chart/BudgetController.php | 2 - app/Http/Controllers/Controller.php | 11 -- app/Http/Controllers/CurrencyController.php | 2 - app/Http/Controllers/HelpController.php | 2 - .../Controllers/Recurring/EditController.php | 3 - .../Controllers/Recurring/IndexController.php | 2 - .../Controllers/Report/BudgetController.php | 2 - .../Controllers/Rule/CreateController.php | 2 - app/Http/Controllers/TagController.php | 2 - app/Http/Requests/BillFormRequest.php | 1 - app/Providers/EventServiceProvider.php | 1 - .../Account/AccountRepository.php | 2 +- app/Repositories/Bill/BillRepository.php | 1 + app/Repositories/Budget/BudgetRepository.php | 103 +++++++++++------- .../Category/CategoryRepository.php | 7 ++ .../ImportJob/ImportJobRepository.php | 15 +-- .../Journal/JournalRepository.php | 7 ++ .../LinkType/LinkTypeRepository.php | 74 ++++++------- .../LinkType/LinkTypeRepositoryInterface.php | 8 +- .../PiggyBank/PiggyBankRepository.php | 7 +- .../Recurring/RecurringRepository.php | 89 ++++++++------- .../RecurringRepositoryInterface.php | 9 +- app/Repositories/Rule/RuleRepository.php | 6 +- app/Repositories/Tag/TagRepository.php | 26 ++--- app/Repositories/User/UserRepository.php | 2 + .../Information/GetSpectreCustomerTrait.php | 1 - .../File/ConfigureRolesHandler.php | 1 - .../Spectre/ChooseAccountsHandler.php | 1 - app/Support/Twig/Extension/Transaction.php | 2 - app/Validation/FireflyValidator.php | 25 ----- 35 files changed, 196 insertions(+), 227 deletions(-) diff --git a/app/Api/V1/Requests/AvailableBudgetRequest.php b/app/Api/V1/Requests/AvailableBudgetRequest.php index 9ded5fdefa..dd6daf4e65 100644 --- a/app/Api/V1/Requests/AvailableBudgetRequest.php +++ b/app/Api/V1/Requests/AvailableBudgetRequest.php @@ -55,7 +55,6 @@ class AvailableBudgetRequest extends Request } /** - * TODO must also accept currency code. * The rules that the incoming request must be matched against. * * @return array diff --git a/app/Api/V1/Requests/JournalLinkRequest.php b/app/Api/V1/Requests/JournalLinkRequest.php index b6a9d9b9af..19e5f8f430 100644 --- a/app/Api/V1/Requests/JournalLinkRequest.php +++ b/app/Api/V1/Requests/JournalLinkRequest.php @@ -57,8 +57,6 @@ class JournalLinkRequest extends Request } /** - * TODO include link-type name as optional parameter. - * TODO be consistent and remove notes from this object. * * The rules that the incoming request must be matched against. * diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 2d07df89c2..26f481bdce 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -51,7 +51,6 @@ use Illuminate\Support\Collection; use Log; /** - * TODO rename references to journals to transactions * Maybe this is a good idea after all... * * Class JournalCollector diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index bb42ea69de..f3d3dbbb7b 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -82,7 +82,6 @@ interface JournalCollectorInterface /** * Get all journals. - * TODO rename me. * * @return Collection */ diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 15b9f9bba2..e79ea0b59a 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -68,8 +68,6 @@ class IndexController extends Controller /** * Show all budgets. * - * TODO remove moment routine. - * * @param Request $request * @param string|null $moment * diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 8ca96aa5d9..801be0814c 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -518,8 +518,6 @@ class BudgetController extends Controller /** * Small helper function for some of the charts. Extracts category names from a bunch of ID's. * - * TODO this method is duplicated and should be in a trait. - * * @param array $categoryIds * * @return array diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b3730d5de9..a90a31dc8f 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -121,8 +121,6 @@ class Controller extends BaseController /** * Is transaction opening balance? * - * TODO move to trait. - * * @param TransactionJournal $journal * * @return bool @@ -136,8 +134,6 @@ class Controller extends BaseController /** * Redirect to asset account that transaction belongs to. * - * TODO move to trait. - * * @param TransactionJournal $journal * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -172,9 +168,6 @@ class Controller extends BaseController /** * Get user's language. - * - * TODO pretty sure nobody uses this. - * * @return string */ private function getLanguage(): string @@ -196,8 +189,6 @@ class Controller extends BaseController /** * Get the specific name of a page for intro. * - * TODO move to trait. - * * @return string */ private function getSpecificPageName(): string @@ -208,8 +199,6 @@ class Controller extends BaseController /** * Returns if user has seen demo. * - * TODO move to trait. - * * @return bool */ private function hasSeenDemo(): bool diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index b2b7ae7fb2..927bc5880c 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -107,8 +107,6 @@ class CurrencyController extends Controller app('preferences')->mark(); $request->session()->flash('success', (string)trans('firefly.new_default_currency', ['name' => $currency->name])); - Cache::forget('FFCURRENCYSYMBOL'); // todo are these even used? - Cache::forget('FFCURRENCYCODE'); return redirect(route('currencies.index')); } diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 35555c2318..92323afb4c 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -68,8 +68,6 @@ class HelpController extends Controller /** * Gets the help text. * - * TODO move to repos or trait. - * * @param string $route * @param string $language * diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index b5f88eb645..400bd07a5b 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -70,9 +70,6 @@ class EditController extends Controller /** * Edit a recurring transaction. * - * todo move to repository - * todo handle old repetition type as well. - * * @param Request $request * @param Recurrence $recurrence * diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index 0321dd34e3..dd29bb353e 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -65,8 +65,6 @@ class IndexController extends Controller /** * Show all recurring transactions. * - * TODO: split collection into pages - * * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 494759beea..420fd485c7 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -38,8 +38,6 @@ class BudgetController extends Controller /** * Show partial overview of budgets. * - * TODO replace all \Throwable by catch/error and return simple string. - * * @param Collection $accounts * @param Carbon $start * @param Carbon $end diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index ce11445340..e35b243640 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -71,8 +71,6 @@ class CreateController extends Controller /** * Create a new rule. It will be stored under the given $ruleGroup. * - * TODO remove bill from this method, move to separate routine. - * * @param Request $request * @param RuleGroup $ruleGroup * diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 3183ee4228..102f1d7bff 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -172,8 +172,6 @@ class TagController extends Controller * @param Tag $tag * @param string|null $moment * - * TODO will be cleaned up and separated - * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php index db13b29bb8..59d7eaae1a 100644 --- a/app/Http/Requests/BillFormRequest.php +++ b/app/Http/Requests/BillFormRequest.php @@ -67,7 +67,6 @@ class BillFormRequest extends Request { $nameRule = 'required|between:1,255|uniqueObjectForUser:bills,name'; if ($this->integer('id') > 0) { - // todo is a fix to do this better. $nameRule .= ',' . $this->integer('id'); } // is OK diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 06207a3106..fd80ce452f 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -117,7 +117,6 @@ class EventServiceProvider extends ServiceProvider */ protected function registerCreateEvents(): void { - // todo move this routine to a filter // in case of repeated piggy banks and/or other problems. PiggyBank::created( function (PiggyBank $piggyBank) { diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 705f32f7a2..e865b10dbc 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -38,6 +38,7 @@ use Log; /** * Class AccountRepository. + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class AccountRepository implements AccountRepositoryInterface { @@ -392,7 +393,6 @@ class AccountRepository implements AccountRepositoryInterface /** * Returns the date of the very first transaction in this account. - * TODO refactor to nullable. * * @param Account $account * diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index a855d305ab..81c08e85e2 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -41,6 +41,7 @@ use Log; /** * Class BillRepository. + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class BillRepository implements BillRepositoryInterface { diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 6556b7a24e..2bbb0fd169 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -34,7 +34,6 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; @@ -42,10 +41,13 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; use Log; use Navigation; -use stdClass; /** * Class BudgetRepository. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class BudgetRepository implements BudgetRepositoryInterface { @@ -139,8 +141,8 @@ class BudgetRepository implements BudgetRepositoryInterface foreach ($budgets as $budget) { $budgetId = $budget->id; $return[$budgetId] = [ - 'spent' => $this->spentInPeriod(new Collection([$budget]), $accounts, $start, $end), - 'budgeted' => '0', + 'spent' => $this->spentInPeriod(new Collection([$budget]), $accounts, $start, $end), + 'budgeted' => '0', ]; $budgetLimits = $this->getBudgetLimits($budget, $start, $end); $otherLimits = new Collection; @@ -246,7 +248,10 @@ class BudgetRepository implements BudgetRepositoryInterface * Will cache result. * * @param Budget $budget + * * @return Carbon + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function firstUseDate(Budget $budget): ?Carbon { @@ -290,6 +295,8 @@ class BudgetRepository implements BudgetRepositoryInterface * @param Carbon $end * * @return Collection + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection { @@ -421,6 +428,8 @@ class BudgetRepository implements BudgetRepositoryInterface * @param Carbon $end * * @return Collection + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection { @@ -763,47 +772,12 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function update(Budget $budget, array $data): Budget { - $oldName = $budget->name; - // update the budget: + $oldName = $budget->name; $budget->name = $data['name']; $budget->active = $data['active']; $budget->save(); - - // find any rule triggers related to budgets, with this budget name, and update them accordingly. - $types = [ - 'budget_is', - ]; - $triggers = RuleTrigger::leftJoin('rules', 'rules.id', '=', 'rule_triggers.rule_id') - ->where('rules.user_id', $this->user->id) - ->whereIn('rule_triggers.trigger_type', $types) - ->where('rule_triggers.trigger_value', $oldName) - ->get(['rule_triggers.*']); - Log::debug(sprintf('Found %d triggers to update.', $triggers->count())); - /** @var RuleTrigger $trigger */ - foreach ($triggers as $trigger) { - $trigger->trigger_value = $data['name']; - $trigger->save(); - Log::debug(sprintf('Updated trigger %d: %s', $trigger->id, $trigger->trigger_value)); - } - - - // find any rule actions related to budgets, with this budget name, and update them accordingly. - $types = [ - 'set_budget', - ]; - $actions = RuleAction::leftJoin('rules', 'rules.id', '=', 'rule_actions.rule_id') - ->where('rules.user_id', $this->user->id) - ->whereIn('rule_actions.action_type', $types) - ->where('rule_actions.action_value', $oldName) - ->get(['rule_actions.*']); - Log::debug(sprintf('Found %d actions to update.', $actions->count())); - /** @var RuleAction $action */ - foreach ($actions as $action) { - $action->action_value = $data['name']; - $action->save(); - Log::debug(sprintf('Updated action %d: %s', $action->id, $action->action_value)); - } - + $this->updateRuleTriggers($oldName, $data['name']); + $this->updateRuleActions($oldName, $data['name']); app('preferences')->mark(); return $budget; @@ -869,6 +843,8 @@ class BudgetRepository implements BudgetRepositoryInterface * @param string $amount * * @return BudgetLimit|null + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit { @@ -879,6 +855,7 @@ class BudgetRepository implements BudgetRepositoryInterface ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00')) ->get(['budget_limits.*'])->count(); Log::debug(sprintf('Found %d budget limits.', $limits)); + // there might be a budget limit for these dates: /** @var BudgetLimit $limit */ $limit = $budget->budgetlimits() @@ -929,4 +906,46 @@ class BudgetRepository implements BudgetRepositoryInterface return $limit; } + + /** + * @param string $oldName + * @param string $newName + */ + private function updateRuleActions(string $oldName, string $newName): void + { + $types = ['set_budget',]; + $actions = RuleAction::leftJoin('rules', 'rules.id', '=', 'rule_actions.rule_id') + ->where('rules.user_id', $this->user->id) + ->whereIn('rule_actions.action_type', $types) + ->where('rule_actions.action_value', $oldName) + ->get(['rule_actions.*']); + Log::debug(sprintf('Found %d actions to update.', $actions->count())); + /** @var RuleAction $action */ + foreach ($actions as $action) { + $action->action_value = $newName; + $action->save(); + Log::debug(sprintf('Updated action %d: %s', $action->id, $action->action_value)); + } + } + + /** + * @param string $oldName + * @param string $newName + */ + private function updateRuleTriggers(string $oldName, string $newName): void + { + $types = ['budget_is',]; + $triggers = RuleTrigger::leftJoin('rules', 'rules.id', '=', 'rule_triggers.rule_id') + ->where('rules.user_id', $this->user->id) + ->whereIn('rule_triggers.trigger_type', $types) + ->where('rule_triggers.trigger_value', $oldName) + ->get(['rule_triggers.*']); + Log::debug(sprintf('Found %d triggers to update.', $triggers->count())); + /** @var RuleTrigger $trigger */ + foreach ($triggers as $trigger) { + $trigger->trigger_value = $newName; + $trigger->save(); + Log::debug(sprintf('Updated trigger %d: %s', $trigger->id, $trigger->trigger_value)); + } + } } diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index b134f74fef..f35b77f0e4 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -37,6 +37,10 @@ use Navigation; /** * Class CategoryRepository. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class CategoryRepository implements CategoryRepositoryInterface { @@ -114,6 +118,7 @@ class CategoryRepository implements CategoryRepositoryInterface * @param Category $category * * @return Carbon|null + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function firstUseDate(Category $category): ?Carbon { @@ -172,6 +177,8 @@ class CategoryRepository implements CategoryRepositoryInterface * @param Collection $accounts * * @return Carbon|null + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function lastUseDate(Category $category, Collection $accounts): ?Carbon { diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 24b74bdb9e..ba6626e271 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -37,6 +37,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; /** * Class ImportJobRepository. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ImportJobRepository implements ImportJobRepositoryInterface { @@ -270,7 +272,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface public function storeCLIUpload(ImportJob $job, string $name, string $fileName): MessageBag { $messages = new MessageBag; - if (!file_exists($fileName)) { $messages->add('notfound', sprintf('File not found: %s', $fileName)); @@ -283,8 +284,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface } )->count(); - if ($count > 0) { - // don't upload, but also don't complain about it. + if ($count > 0) {// don't upload, but also don't complain about it. Log::error(sprintf('Detected duplicate upload. Will ignore second "%s" file.', $name)); return new MessageBag; @@ -301,12 +301,10 @@ class ImportJobRepository implements ImportJobRepositoryInterface $attachment->save(); $encrypted = Crypt::encrypt($content); - // store it: $this->uploadDisk->put($attachment->fileName(), $encrypted); $attachment->uploaded = true; // update attachment $attachment->save(); - // return it. return new MessageBag; } @@ -333,9 +331,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $att->filename === $name; } )->count(); - - if ($count > 0) { - // don't upload, but also don't complain about it. + if ($count > 0) { // don't upload, but also don't complain about it. Log::error(sprintf('Detected duplicate upload. Will ignore second "%s" file.', $name)); return new MessageBag; @@ -354,13 +350,10 @@ class ImportJobRepository implements ImportJobRepositoryInterface $fileObject->rewind(); $content = $fileObject->fread($file->getSize()); $encrypted = Crypt::encrypt($content); - - // store it: $this->uploadDisk->put($attachment->fileName(), $encrypted); $attachment->uploaded = true; // update attachment $attachment->save(); - // return it. return new MessageBag; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 657b5faf61..68ca7ca9b4 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -44,6 +44,10 @@ use Log; /** * Class JournalRepository. + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class JournalRepository implements JournalRepositoryInterface { @@ -310,6 +314,8 @@ class JournalRepository implements JournalRepositoryInterface * @param null|string $field * * @return string + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function getJournalDate(TransactionJournal $journal, ?string $field): string { @@ -451,6 +457,7 @@ class JournalRepository implements JournalRepositoryInterface * @param string $field * * @return null|string + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getMetaField(TransactionJournal $journal, string $field): ?string { diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index 5fe1ad3db1..10d53f37af 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\LinkType; -use Exception; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\LinkType; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournal; @@ -34,6 +32,8 @@ use Log; /** * Class LinkTypeRepository. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class LinkTypeRepository implements LinkTypeRepositoryInterface { @@ -111,13 +111,13 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface } /** - * @param int $id + * @param int $linkTypeId * * @return LinkType|null */ - public function findNull(int $id): ?LinkType + public function findNull(int $linkTypeId): ?LinkType { - return LinkType::find($id); + return LinkType::find($linkTypeId); } /** @@ -224,14 +224,14 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface * @param TransactionJournal $inward * @param TransactionJournal $outward * - * @return mixed - * @throws FireflyException + * @return TransactionJournalLink|null + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function storeLink(array $information, TransactionJournal $inward, TransactionJournal $outward): TransactionJournalLink + public function storeLink(array $information, TransactionJournal $inward, TransactionJournal $outward): ?TransactionJournalLink { $linkType = $this->findNull((int)($information['link_type_id'] ?? 0)); if (null === $linkType) { - throw new FireflyException(sprintf('Link type #%d cannot be resolved to an actual link type', $information['link_type_id'] ?? 0)); + return null; } // might exist already: @@ -256,15 +256,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface $link->save(); // make note in noteable: - if (\strlen((string)$information['notes']) > 0) { - $dbNote = $link->notes()->first(); - if (null === $dbNote) { - $dbNote = new Note(); - $dbNote->noteable()->associate($link); - } - $dbNote->text = trim($information['notes']); - $dbNote->save(); - } + $this->setNoteText($link, (string)$information['notes']); return $link; } @@ -314,27 +306,33 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface $journalLink->destination_id = $data['outward']->id; $journalLink->link_type_id = $data['link_type_id']; $journalLink->save(); - /** @var Note $note */ - $note = $journalLink->notes()->first(); - // delete note: - if (null !== $note && '' === $data['notes']) { - try { - $note->delete(); - } catch (Exception $e) { - Log::debug(sprintf('Could not delete note for journal link: %s', $e->getMessage())); - } - } - // create note: - if (null === $note && '' !== $data['notes']) { - $note = new Note; - $note->noteable()->associate($journalLink); - } - // update note - if ('' !== $data['notes']) { - $note->text = $data['notes']; - $note->save(); - } + $this->setNoteText($journalLink, $data['notes']); return $journalLink; } + + /** + * @param TransactionJournalLink $link + * @param string $text + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function setNoteText(TransactionJournalLink $link, string $text): void + { + $dbNote = $link->notes()->first(); + if ('' !== $text) { + if (null === $dbNote) { + $dbNote = new Note(); + $dbNote->noteable()->associate($link); + } + $dbNote->text = trim($text); + $dbNote->save(); + + return; + } + if (null !== $dbNote && '' === $text) { + $dbNote->delete(); + } + + } } diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index 5d4a250614..02080dcc0e 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -75,11 +75,11 @@ interface LinkTypeRepositoryInterface public function findLink(TransactionJournal $one, TransactionJournal $two): bool; /** - * @param int $id + * @param int $linkTypeId * * @return LinkType|null */ - public function findNull(int $id): ?LinkType; + public function findNull(int $linkTypeId): ?LinkType; /** * See if such a link already exists (and get it). @@ -134,9 +134,9 @@ interface LinkTypeRepositoryInterface * @param TransactionJournal $inward * @param TransactionJournal $outward * - * @return mixed + * @return TransactionJournalLink|null */ - public function storeLink(array $information, TransactionJournal $inward, TransactionJournal $outward): TransactionJournalLink; + public function storeLink(array $information, TransactionJournal $inward, TransactionJournal $outward): ?TransactionJournalLink; /** * @param TransactionJournalLink $link diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 377b9d6331..ad4c3b51a0 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -35,6 +35,9 @@ use Log; /** * Class PiggyBankRepository. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class PiggyBankRepository implements PiggyBankRepositoryInterface { @@ -245,6 +248,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface * @param TransactionJournal $journal * * @return string + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getExactAmount(PiggyBank $piggyBank, PiggyBankRepetition $repetition, TransactionJournal $journal): string { @@ -256,7 +260,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $sources = $repos->getJournalSourceAccounts($journal)->pluck('id')->toArray(); $room = bcsub((string)$piggyBank->targetamount, (string)$repetition->currentamount); $compare = bcmul($repetition->currentamount, '-1'); - Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name)); // if piggy account matches source account, the amount is positive @@ -448,7 +451,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface /** @var PiggyBank $piggyBank */ $piggyBank = PiggyBank::create($data); - $this->updateNote($piggyBank, $data['note']); // todo rename to 'notes' + $this->updateNote($piggyBank, $data['note']); // repetition is auto created. $repetition = $this->getRepetition($piggyBank); diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index c67f1cc36b..38df49b788 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -47,6 +47,9 @@ use Log; /** * * Class RecurringRepository + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class RecurringRepository implements RecurringRepositoryInterface { @@ -98,15 +101,15 @@ class RecurringRepository implements RecurringRepositoryInterface /** * Get the budget ID from a recurring transaction transaction. * - * @param RecurrenceTransaction $recurrenceTransaction + * @param RecurrenceTransaction $recTransaction * * @return null|int */ - public function getBudget(RecurrenceTransaction $recurrenceTransaction): ?int + public function getBudget(RecurrenceTransaction $recTransaction): ?int { $return = 0; /** @var RecurrenceTransactionMeta $meta */ - foreach ($recurrenceTransaction->recurrenceTransactionMeta as $meta) { + foreach ($recTransaction->recurrenceTransactionMeta as $meta) { if ('budget_id' === $meta->name) { $return = (int)$meta->value; } @@ -118,15 +121,15 @@ class RecurringRepository implements RecurringRepositoryInterface /** * Get the category from a recurring transaction transaction. * - * @param RecurrenceTransaction $recurrenceTransaction + * @param RecurrenceTransaction $recTransaction * * @return null|string */ - public function getCategory(RecurrenceTransaction $recurrenceTransaction): ?string + public function getCategory(RecurrenceTransaction $recTransaction): ?string { $return = ''; /** @var RecurrenceTransactionMeta $meta */ - foreach ($recurrenceTransaction->recurrenceTransactionMeta as $meta) { + foreach ($recTransaction->recurrenceTransactionMeta as $meta) { if ('category_name' === $meta->name) { $return = (string)$meta->value; } @@ -189,6 +192,7 @@ class RecurringRepository implements RecurringRepositoryInterface * * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getOccurrencesInRange(RecurrenceRepetition $repetition, Carbon $start, Carbon $end): array { @@ -310,6 +314,7 @@ class RecurringRepository implements RecurringRepositoryInterface * @param int $count * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getXOccurrences(RecurrenceRepetition $repetition, Carbon $date, int $count): array { @@ -343,48 +348,43 @@ class RecurringRepository implements RecurringRepositoryInterface * @param RecurrenceRepetition $repetition * * @return string - * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function repetitionDescription(RecurrenceRepetition $repetition): string { /** @var Preference $pref */ $pref = app('preferences')->getForUser($this->user, 'language', config('firefly.default_language', 'en_US')); $language = $pref->data; - switch ($repetition->repetition_type) { - default: - throw new FireflyException(sprintf('Cannot translate recurring transaction repetition type "%s"', $repetition->repetition_type)); - break; - case 'daily': - return (string)trans('firefly.recurring_daily', [], $language); - break; - case 'weekly': - $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $language); - - return (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language); - break; - case 'monthly': - // format a date: - return (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $repetition->repetition_moment], $language); - break; - case 'ndom': - $parts = explode(',', $repetition->repetition_moment); - // first part is number of week, second is weekday. - $dayOfWeek = trans(sprintf('config.dow_%s', $parts[1]), [], $language); - - return (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language); - break; - case 'yearly': - // - $today = Carbon::create()->endOfYear(); - $repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment); - $diffInYears = $today->diffInYears($repDate); - $repDate->addYears($diffInYears); // technically not necessary. - $string = $repDate->formatLocalized(trans('config.month_and_day_no_year')); - - return (string)trans('firefly.recurring_yearly', ['date' => $string], $language); - break; - + if ('daily' === $repetition->repetition_type) { + return (string)trans('firefly.recurring_daily', [], $language); } + if ('weekly' === $repetition->repetition_type) { + $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $language); + + return (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language); + } + if ('monthly' === $repetition->repetition_type) { + return (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $repetition->repetition_moment], $language); + } + if ('ndom' === $repetition->repetition_type) { + $parts = explode(',', $repetition->repetition_moment); + // first part is number of week, second is weekday. + $dayOfWeek = trans(sprintf('config.dow_%s', $parts[1]), [], $language); + + return (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language); + } + if ('yearly' === $repetition->repetition_type) { + // + $today = Carbon::create()->endOfYear(); + $repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment); + $diffInYears = $today->diffInYears($repDate); + $repDate->addYears($diffInYears); // technically not necessary. + $string = $repDate->formatLocalized(trans('config.month_and_day_no_year')); + + return (string)trans('firefly.recurring_yearly', ['date' => $string], $language); + } + + return ''; } @@ -435,8 +435,10 @@ class RecurringRepository implements RecurringRepositoryInterface * @param array $dates * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - protected function filterWeekends(RecurrenceRepetition $repetition, array $dates): array + private function filterWeekends(RecurrenceRepetition $repetition, array $dates): array { if ((int)$repetition->weekend === RecurrenceRepetition::WEEKEND_DO_NOTHING) { Log::debug('Repetition will not be filtered on weekend days.'); @@ -525,6 +527,7 @@ class RecurringRepository implements RecurringRepositoryInterface * @param string $moment * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getMonthlyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array { @@ -604,6 +607,7 @@ class RecurringRepository implements RecurringRepositoryInterface * @param string $moment * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getWeeklyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array { @@ -834,6 +838,7 @@ class RecurringRepository implements RecurringRepositoryInterface * @param string $moment * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getYearlyInRange(Carbon $start, Carbon $end, int $skipMod, string $moment): array { diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index d34d8ed8ab..73e3e28d0c 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -63,24 +63,23 @@ interface RecurringRepositoryInterface /** * Get the budget ID from a recurring transaction transaction. * - * @param RecurrenceTransaction $recurrenceTransaction + * @param RecurrenceTransaction $recTransaction * * @return null|int */ - public function getBudget(RecurrenceTransaction $recurrenceTransaction): ?int; + public function getBudget(RecurrenceTransaction $recTransaction): ?int; /** * Get the category from a recurring transaction transaction. * - * @param RecurrenceTransaction $recurrenceTransaction + * @param RecurrenceTransaction $recTransaction * * @return null|string */ - public function getCategory(RecurrenceTransaction $recurrenceTransaction): ?string; + public function getCategory(RecurrenceTransaction $recTransaction): ?string; /** * Returns the journals created for this recurrence, possibly limited by time. - * TODO make consistent with getTransactions * * @param Recurrence $recurrence * @param Carbon|null $start diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index c143a2e2ce..a0b4ae4b3b 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -32,6 +32,8 @@ use Illuminate\Support\Collection; /** * Class RuleRepository. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class RuleRepository implements RuleRepositoryInterface { @@ -386,7 +388,7 @@ class RuleRepository implements RuleRepositoryInterface private function storeActions(Rule $rule, array $data): bool { $order = 1; - foreach ($data['rule-actions'] as $index => $action) { + foreach ($data['rule-actions'] as $action) { $value = $action['value'] ?? ''; $stopProcessing = $action['stop-processing'] ?? false; @@ -422,7 +424,7 @@ class RuleRepository implements RuleRepositoryInterface ]; $this->storeTrigger($rule, $triggerValues); - foreach ($data['rule-triggers'] as $index => $trigger) { + foreach ($data['rule-triggers'] as $trigger) { $value = $trigger['value'] ?? ''; $stopProcessing = $trigger['stop-processing'] ?? false; diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index fc5526f74f..60b2989fcd 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -35,6 +35,8 @@ use Log; /** * Class TagRepository. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class TagRepository implements TagRepositoryInterface { @@ -225,6 +227,7 @@ class TagRepository implements TagRepositoryInterface * @param Carbon|null $end * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function sumsOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): array { @@ -267,26 +270,22 @@ class TagRepository implements TagRepositoryInterface public function tagCloud(?int $year): array { // Some vars - $tags = $this->getTagsInYear($year); - $max = $this->getMaxAmount($tags); - $min = $this->getMinAmount($tags); - $diff = bcsub($max, $min); - $return = []; - Log::debug(sprintf('Minimum is %s, maximum is %s, difference is %s', $min, $max, $diff)); - - // default scale is from 12 to 24, so 12 points. - $minimumFont = '12'; + $tags = $this->getTagsInYear($year); + $max = $this->getMaxAmount($tags); + $min = $this->getMinAmount($tags); + $diff = bcsub($max, $min); + $return = []; + $minimumFont = '12'; // default scale is from 12 to 24, so 12 points. $maxPoints = '12'; $pointsPerCoin = '0'; - // for each full coin in tag, add so many points: - if (0 !== bccomp($diff, '0')) { + Log::debug(sprintf('Minimum is %s, maximum is %s, difference is %s', $min, $max, $diff)); + + if (0 !== bccomp($diff, '0')) {// for each full coin in tag, add so many points $pointsPerCoin = bcdiv($maxPoints, $diff); } - Log::debug(sprintf('Each coin in a tag earns it %s points', $pointsPerCoin)); - /** @var Tag $tag */ foreach ($tags as $tag) { $amount = (string)$tag->amount_sum; @@ -349,6 +348,7 @@ class TagRepository implements TagRepositoryInterface * @param Collection $tags * * @return string + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function getMinAmount(Collection $tags): string { diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 39508717cd..c9d3ef52ff 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -31,6 +31,8 @@ use Log; /** * Class UserRepository. + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class UserRepository implements UserRepositoryInterface { diff --git a/app/Support/Import/Information/GetSpectreCustomerTrait.php b/app/Support/Import/Information/GetSpectreCustomerTrait.php index cc0664a7d9..e638d7ce53 100644 --- a/app/Support/Import/Information/GetSpectreCustomerTrait.php +++ b/app/Support/Import/Information/GetSpectreCustomerTrait.php @@ -53,7 +53,6 @@ trait GetSpectreCustomerTrait $request->setUser($importJob->user); $request->call(); - // todo what if customer is still null? $customer = $request->getCustomer(); } diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php index 0c73e691df..fd633abd55 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php @@ -386,7 +386,6 @@ class ConfigureRolesHandler implements FileConfigurationInterface /** * Save the column count in the job. It's used in a later stage. - * TODO move config out of this method (make it a parameter). * * @return void */ diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php index 478041a396..f1ccd1b25b 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php @@ -65,7 +65,6 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface $importAccounts = $config['account_mapping'] ?? []; $complete = \count($importAccounts) > 0 && $importAccounts !== [0 => 0]; if ($complete) { - // todo also actually validate content. Log::debug('Looks like user has mapped import accounts to Firefly III accounts', $importAccounts); $this->repository->setStage($this->importJob, 'go-for-import'); } diff --git a/app/Support/Twig/Extension/Transaction.php b/app/Support/Twig/Extension/Transaction.php index cd5b488956..2eda973b52 100644 --- a/app/Support/Twig/Extension/Transaction.php +++ b/app/Support/Twig/Extension/Transaction.php @@ -214,8 +214,6 @@ class Transaction extends Twig_Extension } /** - * TODO improve code - * * @param TransactionModel $transaction * * @return string diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index db51337bd4..1034b1ef63 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -242,8 +242,6 @@ class FireflyValidator extends Validator } /** - * TODO lots of if-else because of API calls. - * * @param $attribute * * @return bool @@ -305,8 +303,6 @@ class FireflyValidator extends Validator } /** - * TODO This method uses a lot of if-then to handle the API calls as well. Fix. - * * @param $attribute * * @return bool @@ -449,19 +445,6 @@ class FireflyValidator extends Validator return false; } - /** - * TODO fill me. - * - * @param $attribute - * @param $value - * @param $parameters - * - * @return bool - */ - public function validateRepetitionMoment($attribute, $value, $parameters): bool { - - } - /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @@ -578,8 +561,6 @@ class FireflyValidator extends Validator } /** - * TODO this method needs a lot of logic to be able to handle API calls. Fix that. - * * @param int $index * * @return string @@ -595,8 +576,6 @@ class FireflyValidator extends Validator } /** - * TODO this method needs a lot of logic to be able to handle API calls. Fix that. - * * @param int $index * * @return string @@ -612,8 +591,6 @@ class FireflyValidator extends Validator } /** - * TODO this method needs a lot of logic to be able to handle API calls. Fix that. - * * @param int $index * * @return string @@ -629,8 +606,6 @@ class FireflyValidator extends Validator } /** - * TODO this method needs a lot of logic to be able to handle API calls. Fix that. - * * @param int $index * * @return string From 6bcfea1de40fc806abb2c6b6a2ed2d678ac183e9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 26 Jul 2018 06:10:17 +0200 Subject: [PATCH 73/86] Various code cleanup. --- .../V1/Controllers/BudgetLimitController.php | 6 +- app/Console/Commands/CreateImport.php | 4 +- app/Console/Commands/DecryptAttachment.php | 4 +- app/Console/Commands/Import.php | 2 +- .../Commands/UpgradeFireflyInstructions.php | 4 +- app/Factory/AccountFactory.php | 2 +- .../Events/VersionCheckEventHandler.php | 9 +- .../Account/ReconcileController.php | 2 +- app/Http/Controllers/AttachmentController.php | 5 +- .../Category/NoCategoryController.php | 2 +- app/Http/Controllers/CurrencyController.php | 2 +- app/Http/Controllers/HelpController.php | 4 +- .../Import/JobStatusController.php | 4 +- app/Import/Storage/ImportArrayStorage.php | 1 + app/Models/Account.php | 3 +- app/Models/Attachment.php | 3 +- app/Models/Bill.php | 3 +- app/Models/Note.php | 3 +- app/Models/PiggyBank.php | 3 +- app/Models/Recurrence.php | 3 +- app/Models/TransactionJournal.php | 5 +- app/Models/TransactionJournalLink.php | 3 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/SessionServiceProvider.php | 2 +- .../Account/AccountRepositoryInterface.php | 4 +- .../Attachment/AttachmentRepository.php | 11 +- .../ExportJob/ExportJobRepository.php | 15 +- .../Journal/JournalRepositoryInterface.php | 2 +- app/Rules/BelongsUser.php | 167 +++++++++++++----- app/Rules/IsAssetAccountId.php | 2 + app/Rules/IsValidAttachmentModel.php | 25 ++- app/Rules/UniqueIban.php | 106 ++++++----- app/Rules/ValidRecurrenceRepetitionType.php | 4 +- app/Rules/ValidRecurrenceRepetitionValue.php | 101 ++++++++--- app/Rules/ValidTransactions.php | 7 +- .../Update/TransactionUpdateService.php | 7 +- app/Transformers/PiggyBankTransformer.php | 4 +- 37 files changed, 351 insertions(+), 185 deletions(-) diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php index e875a475f5..16cf1d095a 100644 --- a/app/Api/V1/Controllers/BudgetLimitController.php +++ b/app/Api/V1/Controllers/BudgetLimitController.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; -use Carbon\Carbon; + use FireflyIII\Api\V1\Requests\BudgetLimitRequest; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\BudgetLimit; @@ -34,13 +34,13 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; -use InvalidArgumentException; + use League\Fractal\Manager; use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Item; use League\Fractal\Serializer\JsonApiSerializer; -use Log; + /** * Class BudgetLimitController. diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index 8831fa56b9..74910381e2 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -265,8 +265,8 @@ class CreateImport extends Command */ private function validArguments(): bool { - $file = $this->argument('file'); - $configuration = $this->argument('configuration'); + $file = (string)$this->argument('file'); + $configuration = (string)$this->argument('configuration'); $cwd = getcwd(); $validTypes = config('import.options.file.import_formats'); $type = strtolower($this->option('type')); diff --git a/app/Console/Commands/DecryptAttachment.php b/app/Console/Commands/DecryptAttachment.php index 75cfaf6329..dfa57386e5 100644 --- a/app/Console/Commands/DecryptAttachment.php +++ b/app/Console/Commands/DecryptAttachment.php @@ -63,8 +63,8 @@ class DecryptAttachment extends Command $repository = app(AttachmentRepositoryInterface::class); $attachmentId = (int)$this->argument('id'); $attachment = $repository->findWithoutUser($attachmentId); - $attachmentName = trim($this->argument('name')); - $storagePath = realpath(trim($this->argument('directory'))); + $attachmentName = trim((string)$this->argument('name')); + $storagePath = realpath(trim((string)$this->argument('directory'))); if (null === $attachment) { $this->error(sprintf('No attachment with id #%d', $attachmentId)); Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId)); diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 5d6d853f59..7fad01c15e 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -62,7 +62,7 @@ class Import extends Command public function handle(): int { Log::debug('Start start-import command'); - $jobKey = $this->argument('key'); + $jobKey = (string)$this->argument('key'); $job = ImportJob::where('key', $jobKey)->first(); if (null === $job) { $this->errorLine(sprintf('No job found with key "%s"', $jobKey)); diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index 54695221c4..d2e4730204 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -48,10 +48,10 @@ class UpgradeFireflyInstructions extends Command */ public function handle(): int { - if ('update' === $this->argument('task')) { + if ('update' === (string)$this->argument('task')) { $this->updateInstructions(); } - if ('install' === $this->argument('task')) { + if ('install' === (string)$this->argument('task')) { $this->installInstructions(); } return 0; diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php index a3e7f3d4a3..aeb9b62b3b 100644 --- a/app/Factory/AccountFactory.php +++ b/app/Factory/AccountFactory.php @@ -189,7 +189,7 @@ class AccountFactory } if (null === $result) { /** @var string $type */ - $type = (string)config('firefly.accountTypeByIdentifier.' . (string)$accountType); + $type = (string)config('firefly.accountTypeByIdentifier.' . $accountType); $result = AccountType::whereType($type)->first(); if (null === $result && null !== $accountType) { // try as full name: diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php index 3955de9098..072983d8c4 100644 --- a/app/Handlers/Events/VersionCheckEventHandler.php +++ b/app/Handlers/Events/VersionCheckEventHandler.php @@ -24,14 +24,14 @@ declare(strict_types=1); namespace FireflyIII\Handlers\Events; -use Carbon\Carbon; + use FireflyConfig; use FireflyIII\Events\RequestedVersionCheckStatus; -use FireflyIII\Exceptions\FireflyException; + use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Services\Github\Object\Release; -use FireflyIII\Services\Github\Request\UpdateRequest; + + use FireflyIII\User; use Log; @@ -66,7 +66,6 @@ class VersionCheckEventHandler return; } - $permission = FireflyConfig::get('permission_update_check', -1); $lastCheckTime = FireflyConfig::get('last_update_check', time()); $now = time(); $diff = $now - $lastCheckTime->data; diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 9e16cb589a..e43276c4dd 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -185,7 +185,7 @@ class ReconcileController extends Controller if (TransactionType::RECONCILIATION !== $journal->transactionType->type) { return redirect(route('transactions.show', [$journal->id])); } - $subTitle = (string)trans('firefly.reconciliation') . ' "' . $journal->description . '"'; + $subTitle = trans('firefly.reconciliation') . ' "' . $journal->description . '"'; // get main transaction: $transaction = $this->repository->getAssetTransaction($journal); diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 272b7a3f3b..443ad3e62a 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -146,8 +146,9 @@ class AttachmentController extends Controller $this->rememberPreviousUri('attachments.edit.uri'); } $request->session()->forget('attachments.edit.fromUpdate'); - - $preFilled['notes'] = $this->repository->getNoteText($attachment); + $preFilled = [ + 'notes' => $this->repository->getNoteText($attachment), + ]; $request->session()->flash('preFilled', $preFilled); return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle')); diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index d50c88190b..59b03f4a1f 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -29,7 +29,7 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Category\CategoryRepositoryInterface; + use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 927bc5880c..311f7a6681 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; -use Cache; + use FireflyIII\Http\Requests\CurrencyFormRequest; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 92323afb4c..91033e1eb2 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -78,7 +78,7 @@ class HelpController extends Controller private function getHelpText(string $route, string $language): string { // get language and default variables. - $content = '

                                                                          ' . (string)trans('firefly.route_has_no_help') . '

                                                                          '; + $content = '

                                                                          ' . trans('firefly.route_has_no_help') . '

                                                                          '; // if no such route, log error and return default text. if (!$this->help->hasRoute($route)) { @@ -120,6 +120,6 @@ class HelpController extends Controller return $content; } - return '

                                                                          ' . (string)trans('firefly.route_has_no_help') . '

                                                                          '; + return '

                                                                          ' . trans('firefly.route_has_no_help') . '

                                                                          '; } } diff --git a/app/Http/Controllers/Import/JobStatusController.php b/app/Http/Controllers/Import/JobStatusController.php index 57e96cee6e..62adfeb7eb 100644 --- a/app/Http/Controllers/Import/JobStatusController.php +++ b/app/Http/Controllers/Import/JobStatusController.php @@ -97,8 +97,8 @@ class JobStatusController extends Controller if ('file' === $importJob->provider) { $json['download_config'] = true; $json['download_config_text'] - = (string)trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' - . (string)trans('import.share_config_file'); + = trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' + . trans('import.share_config_file'); } // if count is zero: diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 666593e238..1b04ca8f12 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -463,6 +463,7 @@ class ImportArrayStorage foreach ($transaction['transactions'] as $current) { // get the amount: + /** @noinspection UnnecessaryCastingInspection */ $amount = (string)($current['amount'] ?? '0'); if (bccomp($amount, '0') === -1) { $amount = bcmul($amount, '-1'); // @codeCoverageIgnore diff --git a/app/Models/Account.php b/app/Models/Account.php index 00be2897de..ba5aef5da0 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -31,6 +31,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Log; @@ -200,7 +201,7 @@ class Account extends Model * @codeCoverageIgnore * Get all of the notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 43d12b7f15..591f2dfa71 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -27,6 +27,7 @@ use Crypt; use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -180,7 +181,7 @@ class Attachment extends Model * @codeCoverageIgnore * Get all of the notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 99a30828e5..f0b0ce6711 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -28,6 +28,7 @@ use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -155,7 +156,7 @@ class Bill extends Model * @codeCoverageIgnore * Get all of the notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Models/Note.php b/app/Models/Note.php index 1e37ef8cc0..ee4accbce0 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -24,6 +24,7 @@ namespace FireflyIII\Models; use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; /** @@ -58,7 +59,7 @@ class Note extends Model * * Get all of the owning noteable models. */ - public function noteable() + public function noteable(): MorphTo { return $this->morphTo(); } diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index d6779aef84..7436b5c35c 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -26,6 +26,7 @@ use Carbon\Carbon; use Crypt; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -123,7 +124,7 @@ class PiggyBank extends Model * @codeCoverageIgnore * Get all of the piggy bank's notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 7b6743019e..243eece7b6 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -28,6 +28,7 @@ use FireflyIII\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -112,7 +113,7 @@ class Recurrence extends Model * @codeCoverageIgnore * Get all of the notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index eba8e70d3d..77478c8be1 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -30,6 +30,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -59,6 +60,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string period_marker * @property Carbon $date * @property string $transaction_type_type + * @property int $id + * @property TransactionType $transactionType * * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -248,7 +251,7 @@ class TransactionJournal extends Model * @codeCoverageIgnore * Get all of the notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index dad69ba82f..38de517ea4 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -26,6 +26,7 @@ use Carbon\Carbon; use Crypt; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\MorphMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -111,7 +112,7 @@ class TransactionJournalLink extends Model * @codeCoverageIgnore * Get all of the notes. */ - public function notes() + public function notes(): MorphMany { return $this->morphMany(Note::class, 'noteable'); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index fd80ce452f..c775be7825 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -106,7 +106,7 @@ class EventServiceProvider extends ServiceProvider * @codeCoverageIgnore * Register any events for your application. */ - public function boot() + public function boot(): void { parent::boot(); $this->registerCreateEvents(); diff --git a/app/Providers/SessionServiceProvider.php b/app/Providers/SessionServiceProvider.php index 2f936a0747..9ccdc0c769 100644 --- a/app/Providers/SessionServiceProvider.php +++ b/app/Providers/SessionServiceProvider.php @@ -34,7 +34,7 @@ class SessionServiceProvider extends BaseSessionServiceProvider /** * Register the service provider. */ - public function register() + public function register(): void { $this->registerSessionManager(); diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 59e67acfc8..09a0981209 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -24,8 +24,8 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\Note; + + use FireflyIII\Models\TransactionJournal; use FireflyIII\User; use Illuminate\Support\Collection; diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index caad252875..1d5d55d7bc 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -31,6 +31,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; use FireflyIII\User; +use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Support\Collection; use Log; use Storage; @@ -81,6 +82,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface /** * @param int $attachmentId + * * @return Attachment|null */ public function findWithoutUser(int $attachmentId): ?Attachment @@ -119,8 +121,6 @@ class AttachmentRepository implements AttachmentRepositoryInterface * @param Attachment $attachment * * @return string - * - * @throws \Illuminate\Contracts\Encryption\DecryptException */ public function getContent(Attachment $attachment): string { @@ -130,7 +130,12 @@ class AttachmentRepository implements AttachmentRepositoryInterface $content = ''; if ($disk->exists($file)) { - $content = Crypt::decrypt($disk->get($file)); + try { + $content = Crypt::decrypt($disk->get($file)); + } catch (FileNotFoundException $e) { + Log::debug(sprintf('File not found: %e', $e->getMessage())); + $content = false; + } } if (\is_bool($content)) { Log::error(sprintf('Attachment #%d may be corrupted: the content could not be decrypted.', $attachment->id)); diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index ec2e0c61a7..49c12086ff 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\ExportJob; use Carbon\Carbon; use FireflyIII\Models\ExportJob; use FireflyIII\User; +use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Support\Str; use Log; use Storage; @@ -120,6 +121,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * @param string $key + * * @return ExportJob|null */ public function findByKey(string $key): ?ExportJob @@ -137,14 +139,19 @@ class ExportJobRepository implements ExportJobRepositoryInterface * @param ExportJob $job * * @return string - * */ public function getContent(ExportJob $job): string { - $disk = Storage::disk('export'); - $file = $job->key . '.zip'; + $disk = Storage::disk('export'); + $file = $job->key . '.zip'; + $content = ''; + try { + $content = $disk->get($file); + } catch (FileNotFoundException $e) { + Log::warning(sprintf('File not found: %s', $e->getMessage())); + } - return $disk->get($file); + return $content; } /** diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 4f2eccf58b..6b26aaa30a 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -25,7 +25,7 @@ namespace FireflyIII\Repositories\Journal; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; -use FireflyIII\Models\Note; + use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalMeta; diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index b873b18fe2..6dc8113d4d 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -65,8 +65,11 @@ class BelongsUser implements Rule * * @return bool * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function passes($attribute, $value) + public function passes($attribute, $value): bool { $attribute = $this->parseAttribute($attribute); if (!auth()->check()) { @@ -75,48 +78,22 @@ class BelongsUser implements Rule $attribute = (string)$attribute; switch ($attribute) { case 'piggy_bank_id': - $count = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') - ->where('piggy_banks.id', '=', (int)$value) - ->where('accounts.user_id', '=', auth()->user()->id)->count(); - - return $count === 1; - break; + return $this->validatePiggyBankId((int)$value); case 'piggy_bank_name': - $count = $this->countField(PiggyBank::class, 'name', $value); - - return $count === 1; - break; + return $this->validatePiggyBankName($value); case 'bill_id': - $count = Bill::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count(); - - return $count === 1; + return $this->validateBillId((int)$value); case 'bill_name': - $count = $this->countField(Bill::class, 'name', $value); - - return $count === 1; - break; + return $this->validateBillName($value); case 'budget_id': - $count = Budget::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count(); - - return $count === 1; - break; + return $this->validateBudgetId((int)$value); case 'category_id': - $count = Category::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count(); - - return $count === 1; - break; + return $this->validateCategoryId((int)$value); case 'budget_name': - $count = $this->countField(Budget::class, 'name', $value); - - return $count === 1; - break; + return $this->validateBudgetName($value); case 'source_id': case 'destination_id': - $count = Account::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count(); - - return $count === 1; - break; - + return $this->validateAccountId((int)$value); default: throw new FireflyException(sprintf('Rule BelongUser cannot handle "%s"', $attribute)); // @codeCoverageIgnore } @@ -128,18 +105,20 @@ class BelongsUser implements Rule * @param string $value * * @return int + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ protected function countField(string $class, string $field, string $value): int { + $objects = []; // get all objects belonging to user: - switch ($class) { - case PiggyBank::class: - $objects = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') - ->where('accounts.user_id', '=', auth()->user()->id)->get(['piggy_banks.*']); - break; - default: - $objects = $class::where('user_id', '=', auth()->user()->id)->get(); - break; + if (PiggyBank::class === $class) { + $objects = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') + ->where('accounts.user_id', '=', auth()->user()->id)->get(['piggy_banks.*']); + + } + if (PiggyBank::class !== $class) { + $objects = $class::where('user_id', '=', auth()->user()->id)->get(); } $count = 0; foreach ($objects as $object) { @@ -159,13 +138,111 @@ class BelongsUser implements Rule private function parseAttribute(string $attribute): string { $parts = explode('.', $attribute); - if (\count($parts) === 1) { + if (1 === \count($parts)) { return $attribute; } - if (\count($parts) === 3) { + if (3 === \count($parts)) { return $parts[2]; } return $attribute; // @codeCoverageIgnore } + + /** + * @param int $value + * + * @return bool + */ + private function validateAccountId(int $value): bool + { + $count = Account::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count(); + + return 1 === $count; + } + + /** + * @param int $value + * + * @return bool + */ + private function validateBillId(int $value): bool + { + $count = Bill::where('id', '=', $value)->where('user_id', '=', auth()->user()->id)->count(); + + return 1 === $count; + } + + /** + * @param string $value + * + * @return bool + */ + private function validateBillName(string $value): bool + { + $count = $this->countField(Bill::class, 'name', $value); + + return 1 === $count; + } + + /** + * @param int $value + * + * @return bool + */ + private function validateBudgetId(int $value): bool + { + $count = Budget::where('id', '=', $value)->where('user_id', '=', auth()->user()->id)->count(); + + return 1 === $count; + } + + /** + * @param string $value + * + * @return bool + */ + private function validateBudgetName(string $value): bool + { + $count = $this->countField(Budget::class, 'name', $value); + + return 1 === $count; + } + + /** + * @param int $value + * + * @return bool + */ + private function validateCategoryId(int $value): bool + { + $count = Category::where('id', '=', $value)->where('user_id', '=', auth()->user()->id)->count(); + + return 1 === $count; + } + + /** + * @param int $value + * + * @return bool + */ + private function validatePiggyBankId(int $value): bool + { + $count = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') + ->where('piggy_banks.id', '=', $value) + ->where('accounts.user_id', '=', auth()->user()->id)->count(); + + return 1 === $count; + } + + /** + * @param string $value + * + * @return bool + */ + private function validatePiggyBankName(string $value): bool + { + $count = $this->countField(PiggyBank::class, 'name', $value); + + return 1 === $count; + } } diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index 14f2defc0b..9a59f823ee 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -49,6 +49,8 @@ class IsAssetAccountId implements Rule * @param mixed $value * * @return bool + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function passes($attribute, $value): bool { diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.php index 99ceb61f78..f34da76724 100644 --- a/app/Rules/IsValidAttachmentModel.php +++ b/app/Rules/IsValidAttachmentModel.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Rules; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Contracts\Validation\Rule; @@ -64,25 +63,25 @@ class IsValidAttachmentModel implements Rule * @param mixed $value * * @return bool - * @throws FireflyException + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function passes($attribute, $value): bool { if (!auth()->check()) { return false; } - $user = auth()->user(); - switch ($this->model) { - default: - throw new FireflyException(sprintf('Model "%s" cannot be validated.', $this->model)); - case TransactionJournal::class: - /** @var JournalRepositoryInterface $repository */ - $repository = app(JournalRepositoryInterface::class); - $repository->setUser($user); - $result = $repository->findNull((int)$value); - return null !== $result; - break; + + if (TransactionJournal::class === $this->model) { + $repository = app(JournalRepositoryInterface::class); + $user = auth()->user(); + $repository->setUser($user); + $result = $repository->findNull((int)$value); + + return null !== $result; } + + return false; } } diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.php index a710ae78ad..292746f40d 100644 --- a/app/Rules/UniqueIban.php +++ b/app/Rules/UniqueIban.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Rules; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use Illuminate\Contracts\Validation\Rule; @@ -57,7 +56,7 @@ class UniqueIban implements Rule * * @return string */ - public function message() + public function message(): string { return (string)trans('validation.unique_iban_for_user'); } @@ -69,9 +68,10 @@ class UniqueIban implements Rule * @param mixed $value * * @return bool - * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function passes($attribute, $value) + public function passes($attribute, $value): bool { if (!auth()->check()) { return true; // @codeCoverageIgnore @@ -79,50 +79,11 @@ class UniqueIban implements Rule if (null === $this->expectedType) { return true; } - $maxCounts = [ - AccountType::ASSET => 0, - AccountType::EXPENSE => 0, - AccountType::REVENUE => 0, - ]; - switch ($this->expectedType) { - case 'asset': - case AccountType::ASSET: - // iban should be unique amongst asset accounts - // should not be in use with expense or revenue accounts. - // ie: must be totally unique. - break; - case 'expense': - case AccountType::EXPENSE: - // should be unique amongst expense and asset accounts. - // may appear once in revenue accounts - $maxCounts[AccountType::REVENUE] = 1; - break; - case 'revenue': - case AccountType::REVENUE: - // should be unique amongst revenue and asset accounts. - // may appear once in expense accounts - $maxCounts[AccountType::EXPENSE] = 1; - break; - default: - - throw new FireflyException(sprintf('UniqueIban cannot handle type "%s"', $this->expectedType)); - } + $maxCounts = $this->getMaxOccurrences(); foreach ($maxCounts as $type => $max) { - $count = 0; - $query = auth()->user() - ->accounts() - ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') - ->where('account_types.type', $type); - if (null !== $this->account) { - $query->where('accounts.id', '!=', $this->account->id); - } - $result = $query->get(['accounts.*']); - foreach ($result as $account) { - if ($account->iban === $value) { - $count++; - } - } + $count = $this->countHits($type, $value); + if ($count > $max) { Log::debug( sprintf( @@ -137,4 +98,57 @@ class UniqueIban implements Rule return true; } + + /** + * @param string $type + * @param string $iban + * + * @return int + */ + private function countHits(string $type, string $iban): int + { + $count = 0; + /** @noinspection NullPointerExceptionInspection */ + $query = auth()->user() + ->accounts() + ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') + ->where('account_types.type', $type); + if (null !== $this->account) { + $query->where('accounts.id', '!=', $this->account->id); + } + $result = $query->get(['accounts.*']); + foreach ($result as $account) { + if ($account->iban === $iban) { + $count++; + } + } + + return $count; + } + + /** + * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function getMaxOccurrences(): array + { + $maxCounts = [ + AccountType::ASSET => 0, + AccountType::EXPENSE => 0, + AccountType::REVENUE => 0, + ]; + + if ('expense' === $this->expectedType || AccountType::EXPENSE === $this->expectedType) { + // IBAN should be unique amongst expense and asset accounts. + // may appear once in revenue accounts + $maxCounts[AccountType::REVENUE] = 1; + } + if ('revenue' === $this->expectedType || AccountType::EXPENSE === $this->expectedType) { + // IBAN should be unique amongst revenue and asset accounts. + // may appear once in expense accounts + $maxCounts[AccountType::EXPENSE] = 1; + } + + return $maxCounts; + } } diff --git a/app/Rules/ValidRecurrenceRepetitionType.php b/app/Rules/ValidRecurrenceRepetitionType.php index 10affa68c6..403fc9223a 100644 --- a/app/Rules/ValidRecurrenceRepetitionType.php +++ b/app/Rules/ValidRecurrenceRepetitionType.php @@ -48,11 +48,13 @@ class ValidRecurrenceRepetitionType implements Rule * @param mixed $value * * @return bool + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function passes($attribute, $value): bool { $value = (string)$value; - if ($value === 'daily') { + if ('daily' === $value) { return true; } //monthly,17 diff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.php index b2177c9606..825321ae75 100644 --- a/app/Rules/ValidRecurrenceRepetitionValue.php +++ b/app/Rules/ValidRecurrenceRepetitionValue.php @@ -27,6 +27,7 @@ namespace FireflyIII\Rules; use Carbon\Carbon; use Illuminate\Contracts\Validation\Rule; use InvalidArgumentException; +use Log; /** * Class ValidRecurrenceRepetitionValue @@ -51,57 +52,103 @@ class ValidRecurrenceRepetitionValue implements Rule * @param mixed $value * * @return bool + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function passes($attribute, $value): bool { $value = (string)$value; - if ($value === 'daily') { + if ('daily' === $value) { return true; } if (0 === strpos($value, 'monthly')) { - $dayOfMonth = (int)substr($value, 8); - - return $dayOfMonth > 0 && $dayOfMonth < 32; + return $this->validateMonthly($value); } //ndom,3,7 // nth x-day of the month. if (0 === strpos($value, 'ndom')) { - $parameters = explode(',', substr($value, 5)); - if (\count($parameters) !== 2) { - return false; - } - $nthDay = (int)($parameters[0] ?? 0.0); - $dayOfWeek = (int)($parameters[1] ?? 0.0); - if ($nthDay < 1 || $nthDay > 5) { - return false; - } - - return $dayOfWeek > 0 && $dayOfWeek < 8; + return $this->validateNdom($value); } //weekly,7 if (0 === strpos($value, 'weekly')) { - $dayOfWeek = (int)substr($value, 7); - - return $dayOfWeek > 0 && $dayOfWeek < 8; + return $this->validateWeekly($value); } //yearly,2018-01-01 if (0 === strpos($value, 'yearly')) { - // rest of the string must be valid date: - $dateString = substr($value, 7); - try { - $date = Carbon::createFromFormat('Y-m-d', $dateString); - } catch (InvalidArgumentException $e) { - return false; - } - - return true; + return $this->validateYearly($value); } return false; } + + /** + * @param string $value + * + * @return bool + */ + private function validateMonthly(string $value): bool + { + $dayOfMonth = (int)substr($value, 8); + + return $dayOfMonth > 0 && $dayOfMonth < 32; + } + + /** + * @param string $value + * + * @return bool + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function validateNdom(string $value): bool + { + $parameters = explode(',', substr($value, 5)); + if (2 !== \count($parameters)) { + return false; + } + $nthDay = (int)($parameters[0] ?? 0.0); + $dayOfWeek = (int)($parameters[1] ?? 0.0); + if ($nthDay < 1 || $nthDay > 5) { + return false; + } + + return $dayOfWeek > 0 && $dayOfWeek < 8; + } + + /** + * @param string $value + * + * @return bool + */ + private function validateWeekly(string $value): bool + { + $dayOfWeek = (int)substr($value, 7); + + return $dayOfWeek > 0 && $dayOfWeek < 8; + } + + /** + * @param string $value + * + * @return bool + */ + private function validateYearly(string $value): bool + { + // rest of the string must be valid date: + $dateString = substr($value, 7); + try { + Carbon::createFromFormat('Y-m-d', $dateString); + } catch (InvalidArgumentException $e) { + Log::debug(sprintf('Could not parse date %s: %s', $dateString, $e->getMessage())); + + return false; + } + + return true; + } } diff --git a/app/Rules/ValidTransactions.php b/app/Rules/ValidTransactions.php index 17a8e714ee..29fd7baaef 100644 --- a/app/Rules/ValidTransactions.php +++ b/app/Rules/ValidTransactions.php @@ -49,7 +49,7 @@ class ValidTransactions implements Rule * * @return string */ - public function message() + public function message(): string { return (string)trans('validation.invalid_selection'); } @@ -61,8 +61,9 @@ class ValidTransactions implements Rule * @param mixed $value * * @return bool + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function passes($attribute, $value) + public function passes($attribute, $value): bool { Log::debug('In ValidTransactions::passes'); if (!\is_array($value)) { @@ -73,7 +74,7 @@ class ValidTransactions implements Rule $count = Transaction::where('transactions.id', $transactionId) ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->where('accounts.user_id', $userId)->count(); - if ($count === 0) { + if (0 === $count) { Log::debug(sprintf('Count for transaction #%d and user #%d is zero! Return FALSE', $transactionId, $userId)); return false; diff --git a/app/Services/Internal/Update/TransactionUpdateService.php b/app/Services/Internal/Update/TransactionUpdateService.php index c2f94d08e3..32c86d8548 100644 --- a/app/Services/Internal/Update/TransactionUpdateService.php +++ b/app/Services/Internal/Update/TransactionUpdateService.php @@ -75,7 +75,8 @@ class TransactionUpdateService $currency = $this->findCurrency($data['currency_id'], $data['currency_code']); $journal = $transaction->transactionJournal; $description = $journal->description === $data['description'] ? null : $data['description']; - + $amount = (string)$data['amount']; + $account = null; // update description: $transaction->description = $description; $foreignAmount = null; @@ -83,7 +84,7 @@ class TransactionUpdateService // this is the source transaction. $type = $this->accountType($journal, 'source'); $account = $this->findAccount($type, $data['source_id'], $data['source_name']); - $amount = app('steam')->negative((string)$data['amount']); + $amount = app('steam')->negative($amount); $foreignAmount = app('steam')->negative((string)$data['foreign_amount']); } @@ -91,7 +92,7 @@ class TransactionUpdateService // this is the destination transaction. $type = $this->accountType($journal, 'destination'); $account = $this->findAccount($type, $data['destination_id'], $data['destination_name']); - $amount = app('steam')->positive((string)$data['amount']); + $amount = app('steam')->positive($amount); $foreignAmount = app('steam')->positive((string)$data['foreign_amount']); } diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.php index 0816fb0f63..897e969b7e 100644 --- a/app/Transformers/PiggyBankTransformer.php +++ b/app/Transformers/PiggyBankTransformer.php @@ -124,8 +124,8 @@ class PiggyBankTransformer extends TransformerAbstract $accountRepos = app(AccountRepositoryInterface::class); $accountRepos->setUser($account->user); $currencyId = (int)$accountRepos->getMetaValue($account, 'currency_id'); - - if ($currencyId === 0) { + $currency = null; + if (0 === $currencyId) { $currency = app('amount')->getDefaultCurrencyByUser($account->user); } From 89be30c4b94d9603f99987e3cfbafb7a36c82802 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 26 Jul 2018 06:27:52 +0200 Subject: [PATCH 74/86] Catch various errors. --- .../Controllers/Auth/RegisterController.php | 5 ++-- app/Rules/IsAssetAccountId.php | 2 +- app/Services/Bunq/ApiContext.php | 9 +++---- app/Services/Bunq/MonetaryAccount.php | 4 +-- app/Services/Bunq/Payment.php | 4 +-- app/Services/Currency/FixerIOv2.php | 12 +++++---- .../Destroy/RecurrenceDestroyService.php | 25 ++++++++++++------- .../Internal/Support/AccountServiceTrait.php | 23 +++++++++++------ .../Internal/Support/BillServiceTrait.php | 2 +- .../Internal/Support/JournalServiceTrait.php | 6 +++-- .../Support/RecurringTransactionTrait.php | 2 +- .../Support/TransactionServiceTrait.php | 1 + .../Internal/Update/AccountUpdateService.php | 5 ++-- .../Internal/Update/JournalUpdateService.php | 1 + .../Update/RecurrenceUpdateService.php | 2 +- .../Update/TransactionUpdateService.php | 7 +++--- app/Services/Password/PwndVerifierV2.php | 4 ++- app/Services/Spectre/Object/Attempt.php | 10 ++++---- app/Support/Amount.php | 2 +- 19 files changed, 76 insertions(+), 50 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index ea5d8f025e..273cc4c18e 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -88,8 +88,9 @@ class RegisterController extends Controller session()->flash('success', (string)trans('firefly.registered')); - return $this->registered($request, $user) - ?: redirect($this->redirectPath()); + $this->registered($request, $user); + + return redirect($this->redirectPath()); } /** diff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.php index 9a59f823ee..c50e897ca1 100644 --- a/app/Rules/IsAssetAccountId.php +++ b/app/Rules/IsAssetAccountId.php @@ -65,4 +65,4 @@ class IsAssetAccountId implements Rule return true; } -} +} \ No newline at end of file diff --git a/app/Services/Bunq/ApiContext.php b/app/Services/Bunq/ApiContext.php index 5b0670e72a..43cd2a8b7a 100644 --- a/app/Services/Bunq/ApiContext.php +++ b/app/Services/Bunq/ApiContext.php @@ -25,8 +25,6 @@ namespace FireflyIII\Services\Bunq; use bunq\Context\ApiContext as BunqApiContext; use bunq\Context\BunqContext; -use bunq\Exception\BadRequestException; -use bunq\Exception\BunqException; use bunq\Util\BunqEnumApiEnvironmentType; use Exception; use FireflyIII\Exceptions\FireflyException; @@ -39,6 +37,7 @@ use Log; */ class ApiContext { + /** @noinspection MoreThanThreeArgumentsInspection */ /** * @param BunqEnumApiEnvironmentType $environmentType * @param string $apiKey @@ -50,11 +49,11 @@ class ApiContext * @return BunqApiContext */ public function create(BunqEnumApiEnvironmentType $environmentType, string $apiKey, string $description, array $permittedIps, string $proxyUrl = null - ) { + ): BunqApiContext { $permittedIps = $permittedIps ?? []; try { $context = BunqApiContext::create($environmentType, $apiKey, $description, $permittedIps, $proxyUrl); - } catch (BunqException|BadRequestException|Exception $e) { + } catch (Exception $e) { $message = $e->getMessage(); Log::error($message); Log::error($e->getTraceAsString()); @@ -78,7 +77,7 @@ class ApiContext try { $apiContext = BunqApiContext::fromJson($jsonString); BunqContext::loadApiContext($apiContext); - } catch (BadRequestException|BunqException|Exception $e) { + } catch (Exception $e) { $message = $e->getMessage(); Log::error($message); Log::error($e->getTraceAsString()); diff --git a/app/Services/Bunq/MonetaryAccount.php b/app/Services/Bunq/MonetaryAccount.php index 803a125cae..be13f57759 100644 --- a/app/Services/Bunq/MonetaryAccount.php +++ b/app/Services/Bunq/MonetaryAccount.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Bunq; -use bunq\Exception\BunqException; + use bunq\Model\Generated\Endpoint\BunqResponseMonetaryAccountList; use bunq\Model\Generated\Endpoint\MonetaryAccount as BunqMonetaryAccount; use Exception; @@ -47,7 +47,7 @@ class MonetaryAccount $customHeaders = $customHeaders ?? []; try { $result = BunqMonetaryAccount::listing($params, $customHeaders); - } catch (BunqException|Exception $e) { + } catch (Exception $e) { throw new FireflyException($e->getMessage()); } diff --git a/app/Services/Bunq/Payment.php b/app/Services/Bunq/Payment.php index cf7f996c76..3ce3447b66 100644 --- a/app/Services/Bunq/Payment.php +++ b/app/Services/Bunq/Payment.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Bunq; -use bunq\Exception\BunqException; + use bunq\Model\Generated\Endpoint\BunqResponsePaymentList; use bunq\Model\Generated\Endpoint\Payment as BunqPayment; use Exception; @@ -49,7 +49,7 @@ class Payment $customHeaders = $customHeaders ?? []; try { $result = BunqPayment::listing($monetaryAccountId, $params, $customHeaders); - } catch (BunqException|Exception $e) { + } catch (Exception $e) { throw new FireflyException($e->getMessage()); } diff --git a/app/Services/Currency/FixerIOv2.php b/app/Services/Currency/FixerIOv2.php index b224e65de4..5e296f5de4 100644 --- a/app/Services/Currency/FixerIOv2.php +++ b/app/Services/Currency/FixerIOv2.php @@ -74,17 +74,19 @@ class FixerIOv2 implements ExchangeRateInterface ); $statusCode = -1; Log::debug(sprintf('Going to request exchange rate using URI %s', str_replace($apiKey, 'xxxx', $uri))); + $client = new Client; try { - $client = new Client; + $res = $client->request('GET', $uri); $statusCode = $res->getStatusCode(); $body = $res->getBody()->getContents(); - Log::debug(sprintf('Result status code is %d', $statusCode)); - Log::debug(sprintf('Result body is: %s', $body)); } catch (GuzzleException|Exception $e) { // don't care about error - $body = sprintf('Guzzle exception: %s', $e->getMessage()); + $body = sprintf('Guzzle exception: %s', $e->getMessage()); + $statusCode = 500; } + Log::debug(sprintf('Result status code is %d', $statusCode)); + Log::debug(sprintf('Result body is: %s', $body)); $content = null; if (200 !== $statusCode) { @@ -103,7 +105,7 @@ class FixerIOv2 implements ExchangeRateInterface } $exchangeRate->rate = $rate; - if ($rate !== 0.0) { + if (0.0 !== $rate) { Log::debug('Rate is not zero, save it!'); $exchangeRate->save(); } diff --git a/app/Services/Internal/Destroy/RecurrenceDestroyService.php b/app/Services/Internal/Destroy/RecurrenceDestroyService.php index 6f59892f4f..6ad484738e 100644 --- a/app/Services/Internal/Destroy/RecurrenceDestroyService.php +++ b/app/Services/Internal/Destroy/RecurrenceDestroyService.php @@ -42,20 +42,27 @@ class RecurrenceDestroyService try { // delete all meta data $recurrence->recurrenceMeta()->delete(); - - // delete all transactions. - /** @var RecurrenceTransaction $transaction */ - foreach($recurrence->recurrenceTransactions as $transaction) { - $transaction->recurrenceTransactionMeta()->delete(); + } catch (Exception $e) { // @codeCoverageIgnore + Log::info(sprintf('Could not delete recurrence meta: %s', $e->getMessage())); // @codeCoverageIgnore + } + // delete all transactions. + /** @var RecurrenceTransaction $transaction */ + foreach ($recurrence->recurrenceTransactions as $transaction) { + $transaction->recurrenceTransactionMeta()->delete(); + try { $transaction->delete(); + } catch (Exception $e) { // @codeCoverageIgnore + Log::info(sprintf('Could not delete recurrence transaction: %s', $e->getMessage())); // @codeCoverageIgnore } - // delete all repetitions - $recurrence->recurrenceRepetitions()->delete(); + } + // delete all repetitions + $recurrence->recurrenceRepetitions()->delete(); - // delete recurrence + // delete recurrence + try { $recurrence->delete(); } catch (Exception $e) { // @codeCoverageIgnore - Log::error(sprintf('Could not delete recurrence: %s', $e->getMessage())); // @codeCoverageIgnore + Log::info(sprintf('Could not delete recurrence: %s', $e->getMessage())); // @codeCoverageIgnore } } diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index a32fb802f9..bef8eb4a43 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Support; +use Exception; use FireflyIII\Factory\AccountFactory; use FireflyIII\Factory\AccountMetaFactory; use FireflyIII\Factory\TransactionFactory; @@ -80,7 +81,7 @@ trait AccountServiceTrait * * @return null|string */ - public function filterIban(?string $iban) + public function filterIban(?string $iban): ?string { if (null === $iban) { return null; @@ -204,7 +205,9 @@ trait AccountServiceTrait 'reconciled' => false, ] ); - Log::notice(sprintf('Stored two transactions for new account, #%d and #%d', $one->id, $two->id)); + if (null !== $one && null !== $two) { + Log::notice(sprintf('Stored two transactions for new account, #%d and #%d', $one->id, $two->id)); + } return $journal; } @@ -214,6 +217,7 @@ trait AccountServiceTrait * @param string $name * * @return Account + * @throws \FireflyIII\Exceptions\FireflyException */ public function storeOpposingAccount(User $user, string $name): Account { @@ -231,6 +235,7 @@ trait AccountServiceTrait * @param array $data * * @return bool + * @throws \FireflyIII\Exceptions\FireflyException */ public function updateIB(Account $account, array $data): bool { @@ -313,14 +318,14 @@ trait AccountServiceTrait * @param Account $account * @param array $data */ - public function updateMetaData(Account $account, array $data) + public function updateMetaData(Account $account, array $data): void { $fields = $this->validFields; if ($account->accountType->type === AccountType::ASSET) { $fields = $this->validAssetFields; } - if ($account->accountType->type === AccountType::ASSET && $data['accountRole'] === 'ccAsset') { + if ($account->accountType->type === AccountType::ASSET && 'ccAsset' === $data['accountRole']) { $fields = $this->validCCFields; } /** @var AccountMetaFactory $factory */ @@ -346,8 +351,12 @@ trait AccountServiceTrait Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $data[$field], $account->id, $account->name)); } } - if (null !== $entry && isset($data[$field]) && \strlen((string)$data[$field]) === 0) { - $entry->delete(); + if (null !== $entry && isset($data[$field]) && '' === (string)$data[$field]) { + try { + $entry->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete entry: %s', $e->getMessage())); + } } } } @@ -360,7 +369,7 @@ trait AccountServiceTrait */ public function updateNote(Account $account, string $note): bool { - if (0 === \strlen($note)) { + if ('' === $note) { $dbNote = $account->notes()->first(); if (null !== $dbNote) { $dbNote->delete(); diff --git a/app/Services/Internal/Support/BillServiceTrait.php b/app/Services/Internal/Support/BillServiceTrait.php index 4c34e7c7d0..35cef980cd 100644 --- a/app/Services/Internal/Support/BillServiceTrait.php +++ b/app/Services/Internal/Support/BillServiceTrait.php @@ -67,7 +67,7 @@ trait BillServiceTrait */ public function updateNote(Bill $bill, string $note): bool { - if (0 === \strlen($note)) { + if ('' === $note) { $dbNote = $bill->notes()->first(); if (null !== $dbNote) { $dbNote->delete(); // @codeCoverageIgnore diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index e6ab014cab..b46d8a74c0 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -52,8 +52,10 @@ trait JournalServiceTrait } foreach ($data['tags'] as $string) { if (\strlen($string) > 0) { - $tag = $factory->findOrCreate($string); - $set[] = $tag->id; + $tag = $factory->findOrCreate($string); + if (null !== $tag) { + $set[] = $tag->id; + } } } $journal->tags()->sync($set); diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index fa51f957e5..8844d64db0 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -205,7 +205,7 @@ trait RecurringTransactionTrait $entry->value = implode(',', $tags); $entry->save(); } - if (\count($tags) === 0) { + if (0 === \count($tags)) { // delete if present $recurrence->recurrenceMeta()->where('name', 'tags')->delete(); } diff --git a/app/Services/Internal/Support/TransactionServiceTrait.php b/app/Services/Internal/Support/TransactionServiceTrait.php index d0cb0a3f8f..a784dd240a 100644 --- a/app/Services/Internal/Support/TransactionServiceTrait.php +++ b/app/Services/Internal/Support/TransactionServiceTrait.php @@ -100,6 +100,7 @@ trait TransactionServiceTrait * @param string|null $accountName * * @return Account|null + * @throws \FireflyIII\Exceptions\FireflyException */ public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): ?Account { diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.php index 8c3875c138..0e79a40a2d 100644 --- a/app/Services/Internal/Update/AccountUpdateService.php +++ b/app/Services/Internal/Update/AccountUpdateService.php @@ -41,17 +41,18 @@ class AccountUpdateService * @param array $data * * @return Account + * @throws \FireflyIII\Exceptions\FireflyException */ public function update(Account $account, array $data): Account { // update the account itself: $account->name = $data['name']; $account->active = $data['active']; - $account->virtual_balance = trim($data['virtualBalance']) === '' ? '0' : $data['virtualBalance']; + $account->virtual_balance = '' === trim($data['virtualBalance']) ? '0' : $data['virtualBalance']; $account->iban = $data['iban']; $account->save(); - if (isset($data['currency_id']) && $data['currency_id'] === 0) { + if (isset($data['currency_id']) && 0 === $data['currency_id']) { unset($data['currency_id']); } diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 8dde0112c2..caba75d2e2 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -44,6 +44,7 @@ class JournalUpdateService * @param array $data * * @return TransactionJournal + * @throws \FireflyIII\Exceptions\FireflyException */ public function update(TransactionJournal $journal, array $data): TransactionJournal { diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index 0bce14ab27..b33a8b2297 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -25,7 +25,7 @@ namespace FireflyIII\Services\Internal\Update; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Recurrence; -use FireflyIII\Models\RecurrenceMeta; + use FireflyIII\Services\Internal\Support\RecurringTransactionTrait; use FireflyIII\Services\Internal\Support\TransactionServiceTrait; use FireflyIII\Services\Internal\Support\TransactionTypeTrait; diff --git a/app/Services/Internal/Update/TransactionUpdateService.php b/app/Services/Internal/Update/TransactionUpdateService.php index 32c86d8548..b497e41749 100644 --- a/app/Services/Internal/Update/TransactionUpdateService.php +++ b/app/Services/Internal/Update/TransactionUpdateService.php @@ -69,6 +69,7 @@ class TransactionUpdateService * @param array $data * * @return Transaction + * @throws \FireflyIII\Exceptions\FireflyException */ public function update(Transaction $transaction, array $data): Transaction { @@ -100,7 +101,7 @@ class TransactionUpdateService $transaction->description = $description; $transaction->amount = $amount; $transaction->foreign_amount = null; - $transaction->transaction_currency_id = $currency->id; + $transaction->transaction_currency_id = null === $currency ? $transaction->transaction_currency_id : $currency->id; $transaction->account_id = $account->id; $transaction->reconciled = $data['reconciled']; $transaction->save(); @@ -108,11 +109,11 @@ class TransactionUpdateService // set foreign currency $foreign = $this->findCurrency($data['foreign_currency_id'], $data['foreign_currency_code']); // set foreign amount: - if (null !== $data['foreign_amount'] && null !== $foreign) { + if (null !== $foreign && null !== $data['foreign_amount']) { $this->setForeignCurrency($transaction, $foreign); $this->setForeignAmount($transaction, $foreignAmount); } - if (null === $data['foreign_amount'] || null === $foreign) { + if (null === $foreign && null === $data['foreign_amount']) { $this->setForeignCurrency($transaction, null); $this->setForeignAmount($transaction, null); } diff --git a/app/Services/Password/PwndVerifierV2.php b/app/Services/Password/PwndVerifierV2.php index 014fbbcbe6..de2180c784 100644 --- a/app/Services/Password/PwndVerifierV2.php +++ b/app/Services/Password/PwndVerifierV2.php @@ -56,6 +56,8 @@ class PwndVerifierV2 implements Verifier $client = new Client(); $res = $client->request('GET', $uri, $opt); } catch (GuzzleException|Exception $e) { + Log::error(sprintf('Could not verify password security: %s', $e->getMessage())); + return true; } Log::debug(sprintf('Status code returned is %d', $res->getStatusCode())); @@ -63,7 +65,7 @@ class PwndVerifierV2 implements Verifier return true; } $strpos = stripos($res->getBody()->getContents(), $rest); - if ($strpos === false) { + if (false === $strpos) { Log::debug(sprintf('%s was not found in result body. Return true.', $rest)); return true; diff --git a/app/Services/Spectre/Object/Attempt.php b/app/Services/Spectre/Object/Attempt.php index 495fa9566e..ce0a912225 100644 --- a/app/Services/Spectre/Object/Attempt.php +++ b/app/Services/Spectre/Object/Attempt.php @@ -42,17 +42,17 @@ class Attempt extends SpectreObject /** @var Carbon */ private $consentGivenAt; /** @var array */ - private $consentTypes = []; + private $consentTypes; /** @var Carbon */ private $createdAt; /** @var array */ - private $customFields = []; + private $customFields; /** @var bool */ private $dailyRefresh; /** @var string */ private $deviceType; /** @var array */ - private $excludeAccounts = []; + private $excludeAccounts; /** @var Carbon */ private $failAt; /** @var string */ @@ -60,7 +60,7 @@ class Attempt extends SpectreObject /** @var string */ private $failMessage; /** @var array */ - private $fetchScopes = []; + private $fetchScopes; /** @var bool */ private $finished; /** @var bool */ @@ -80,7 +80,7 @@ class Attempt extends SpectreObject /** @var bool */ private $showConsentInformation; /** @var array */ - private $stages = []; + private $stages; /** @var bool */ private $storeCredentials; /** @var Carbon */ diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 01973c203d..58650c4cd5 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -121,7 +121,7 @@ class Amount $locale = explode(',', (string)trans('config.locale')); $locale = array_map('trim', $locale); setlocale(LC_MONETARY, $locale); - $float = round($amount, 12); + $float = round($amount, $format->decimal_places); $info = localeconv(); $formatted = number_format($float, (int)$format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep']); From d6298d9f0574ff234111f150f5e1205c83d8447c Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 26 Jul 2018 06:28:49 +0200 Subject: [PATCH 75/86] Add extra logging for common error on demo site [skip ci] --- app/Factory/TransactionFactory.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 7f328ac270..0c3c3c7e3f 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -113,7 +113,8 @@ class TransactionFactory $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']); if (null === $sourceAccount || null === $destinationAccount) { - throw new FireflyException('Could not determine source or destination account.', $data); + Log::error('Info about source/dest:', $data); + throw new FireflyException('Could not determine source or destination account.'); } Log::debug(sprintf('Source type is "%s", destination type is "%s"', $sourceAccount->accountType->type, $destinationAccount->accountType->type)); From 2ad8e7f343d77f65112d64a7591a8bd8b17642e8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Jul 2018 03:09:35 +0200 Subject: [PATCH 76/86] Fix some errors found in debug logs. --- app/Helpers/Chart/MetaPieChart.php | 2 +- app/Http/Controllers/Chart/CategoryController.php | 4 ++-- app/Http/Controllers/Json/AutoCompleteController.php | 6 +++--- app/Http/Controllers/Report/ExpenseController.php | 6 +++--- app/Support/Amount.php | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index c9fd1e2e9a..f1082cda43 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -359,7 +359,7 @@ class MetaPieChart implements MetaPieChartInterface $repository->setUser($this->user); foreach ($array as $objectId => $amount) { if (!isset($names[$objectId])) { - $object = $repository->find((int)$objectId); + $object = $repository->findNull((int)$objectId); $names[$objectId] = $object->name ?? $object->tag; } $amount = app('steam')->positive($amount); diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index eb3f9559e7..458e0fb014 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -176,7 +176,7 @@ class CategoryController extends Controller $cache->addProperty($accounts->pluck('id')->toArray()); $cache->addProperty($category); if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore + return response()->json($cache->get());// @codeCoverageIgnore } $repository = app(CategoryRepositoryInterface::class); $expenses = $repository->periodExpenses(new Collection([$category]), $accounts, $start, $end); @@ -237,7 +237,7 @@ class CategoryController extends Controller $cache->addProperty('chart.category.period.no-cat'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore + return response()->json($cache->get()); // @codeCoverageIgnore } $repository = app(CategoryRepositoryInterface::class); $expenses = $repository->periodExpensesNoCategory($accounts, $start, $end); diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index 8e89ac4dd7..a2b1aba242 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -176,15 +176,15 @@ class AutoCompleteController extends Controller * @param JournalCollectorInterface $collector * @param TransactionJournal $except * - * @return JsonResponse|mixed + * @return JsonResponse */ - public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except) + public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except): JsonResponse { $cache = new CacheProperties; $cache->addProperty('recent-journals-id'); if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore + return response()->json($cache->get()); // @codeCoverageIgnore } $collector->setLimit(400)->setPage(1); diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 892575dd3f..7749607f7f 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -107,7 +107,7 @@ class ExpenseController extends Controller try { $result = view('reports.partials.exp-budgets', compact('together'))->render(); } catch (Throwable $e) { - Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + Log::error(sprintf('Could not render category::budget: %s', $e->getMessage())); $result = 'An error prevented Firefly III from rendering. Apologies.'; } $cache->store($result); @@ -271,7 +271,7 @@ class ExpenseController extends Controller try { $result = view('reports.partials.top-transactions', compact('sorted'))->render(); } catch (Throwable $e) { - Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + Log::error(sprintf('Could not render category::topExpense: %s', $e->getMessage())); $result = 'An error prevented Firefly III from rendering. Apologies.'; } $cache->store($result); @@ -320,7 +320,7 @@ class ExpenseController extends Controller try { $result = view('reports.partials.top-transactions', compact('sorted'))->render(); } catch (Throwable $e) { - Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); + Log::error(sprintf('Could not render category::topIncome: %s', $e->getMessage())); $result = 'An error prevented Firefly III from rendering. Apologies.'; } $cache->store($result); diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 58650c4cd5..01973c203d 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -121,7 +121,7 @@ class Amount $locale = explode(',', (string)trans('config.locale')); $locale = array_map('trim', $locale); setlocale(LC_MONETARY, $locale); - $float = round($amount, $format->decimal_places); + $float = round($amount, 12); $info = localeconv(); $formatted = number_format($float, (int)$format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep']); From 0312ba8ad7eecf45a4e80af0bd9a4e6fc35f5b3a Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Jul 2018 04:46:21 +0200 Subject: [PATCH 77/86] Various bugfixes and code clean up. --- app/Console/Commands/Import.php | 1 + app/Export/ExpandedProcessor.php | 2 + app/Factory/TransactionCurrencyFactory.php | 2 +- .../Events/VersionCheckEventHandler.php | 2 +- app/Helpers/Attachments/AttachmentHelper.php | 3 +- app/Helpers/Help/Help.php | 3 +- app/Helpers/Update/UpdateTrait.php | 4 +- .../Account/ReconcileController.php | 3 + .../Controllers/Account/ShowController.php | 2 + .../Controllers/Admin/UpdateController.php | 2 +- app/Http/Controllers/BillController.php | 3 + .../Controllers/Budget/IndexController.php | 1 + .../Controllers/Budget/ShowController.php | 1 + .../Controllers/Chart/AccountController.php | 2 + app/Http/Controllers/DebugController.php | 2 +- app/Http/Controllers/HelpController.php | 1 + app/Http/Controllers/JavascriptController.php | 3 + app/Http/Controllers/Json/BoxController.php | 6 ++ .../Controllers/Json/ReconcileController.php | 2 +- .../Controllers/Json/RecurrenceController.php | 4 +- .../Controllers/Recurring/IndexController.php | 7 +- app/Http/Middleware/Installer.php | 2 - app/Http/Requests/ExportFormRequest.php | 1 + app/Http/Requests/RecurrenceFormRequest.php | 2 +- app/Http/Requests/Request.php | 10 ++- .../Requests/SelectTransactionsRequest.php | 1 + .../JobConfiguration/BunqJobConfiguration.php | 2 +- .../JobConfiguration/FileJobConfiguration.php | 3 - app/Import/Storage/ImportArrayStorage.php | 4 +- app/Repositories/Bill/BillRepository.php | 2 +- .../ExportJob/ExportJobRepository.php | 3 +- .../ImportJob/ImportJobRepository.php | 7 +- .../Journal/JournalRepository.php | 1 - .../Recurring/RecurringRepository.php | 2 +- app/Rules/ValidRecurrenceRepetitionValue.php | 6 +- app/Services/Bunq/ApiContext.php | 5 +- app/Services/IP/IpifyOrg.php | 1 - .../Support/RecurringTransactionTrait.php | 10 +++ .../Support/TransactionServiceTrait.php | 2 - .../Spectre/Request/SpectreRequest.php | 2 +- app/Support/Binder/ImportProvider.php | 4 - app/Support/Facades/FireflyConfig.php | 5 +- app/Support/Facades/Preferences.php | 2 +- app/Support/FireflyConfig.php | 2 +- .../File/ConfigureRolesHandler.php | 1 - .../Popup/ReportControllerTest.php | 2 +- .../Transaction/MassControllerTest.php | 2 + .../Transaction/SingleControllerTest.php | 5 ++ .../Controllers/TransactionControllerTest.php | 3 + .../Events/VersionCheckEventHandlerTest.php | 4 - tests/Unit/Helpers/MetaPieChartTest.php | 16 ++-- .../Specifics/RabobankDescriptionTest.php | 75 ------------------- .../Triggers/FromAccountContainsTest.php | 33 ++++---- .../Triggers/FromAccountEndsTest.php | 33 ++++---- .../Triggers/FromAccountIsTest.php | 26 +++---- .../Triggers/FromAccountStartsTest.php | 56 +++++--------- .../Triggers/ToAccountContainsTest.php | 28 +++---- .../Triggers/ToAccountEndsTest.php | 71 ++++-------------- .../Triggers/ToAccountIsTest.php | 37 +++------ .../Triggers/ToAccountStartsTest.php | 49 +++++------- 60 files changed, 223 insertions(+), 353 deletions(-) delete mode 100644 tests/Unit/Import/Specifics/RabobankDescriptionTest.php diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 7fad01c15e..0f952e6af3 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -63,6 +63,7 @@ class Import extends Command { Log::debug('Start start-import command'); $jobKey = (string)$this->argument('key'); + /** @var ImportJob $job */ $job = ImportJob::where('key', $jobKey)->first(); if (null === $job) { $this->errorLine(sprintf('No job found with key "%s"', $jobKey)); diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php index f20c25e0a7..27fdc83822 100644 --- a/app/Export/ExpandedProcessor.php +++ b/app/Export/ExpandedProcessor.php @@ -31,6 +31,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Export\Collector\AttachmentCollector; use FireflyIII\Export\Collector\UploadCollector; use FireflyIII\Export\Entry\Entry; +use FireflyIII\Export\Exporter\ExporterInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\AccountMeta; @@ -220,6 +221,7 @@ class ExpandedProcessor implements ProcessorInterface public function exportJournals(): bool { $exporterClass = config('firefly.export_formats.' . $this->exportFormat); + /** @var ExporterInterface $exporter */ $exporter = app($exporterClass); $exporter->setJob($this->job); $exporter->setEntries($this->exportEntries); diff --git a/app/Factory/TransactionCurrencyFactory.php b/app/Factory/TransactionCurrencyFactory.php index b2d75737c2..7f7b4548af 100644 --- a/app/Factory/TransactionCurrencyFactory.php +++ b/app/Factory/TransactionCurrencyFactory.php @@ -43,7 +43,6 @@ class TransactionCurrencyFactory */ public function create(array $data): ?TransactionCurrency { - $result = null; try { /** @var TransactionCurrency $currency */ $result = TransactionCurrency::create( @@ -55,6 +54,7 @@ class TransactionCurrencyFactory ] ); } catch (QueryException $e) { + $result = null; Log::error(sprintf('Could not create new currency: %s', $e->getMessage())); } diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php index 072983d8c4..46b371772e 100644 --- a/app/Handlers/Events/VersionCheckEventHandler.php +++ b/app/Handlers/Events/VersionCheckEventHandler.php @@ -81,7 +81,7 @@ class VersionCheckEventHandler $latestRelease = $this->getLatestRelease(); $versionCheck = $this->versionCheck($latestRelease); - $resultString = $this->parseResult($latestRelease, $versionCheck); + $resultString = $this->parseResult($versionCheck, $latestRelease); if (0 !== $versionCheck && '' !== $resultString) { // flash info session()->flash('info', $resultString); diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index e68300bedb..d840a2a812 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -77,11 +77,12 @@ class AttachmentHelper implements AttachmentHelperInterface */ public function getAttachmentContent(Attachment $attachment): string { - $content = ''; + try { $content = Crypt::decrypt($this->uploadDisk->get(sprintf('at-%d.data', $attachment->id))); } catch (DecryptException|FileNotFoundException $e) { Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage())); + $content = ''; } return $content; diff --git a/app/Helpers/Help/Help.php b/app/Helpers/Help/Help.php index 818517d6f3..787d4710fe 100644 --- a/app/Helpers/Help/Help.php +++ b/app/Helpers/Help/Help.php @@ -76,7 +76,8 @@ class Help implements HelpInterface $statusCode = $res->getStatusCode(); $content = trim($res->getBody()->getContents()); } catch (GuzzleException|Exception $e) { - Log::error($e); + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); } Log::debug(sprintf('Status code is %d', $statusCode)); diff --git a/app/Helpers/Update/UpdateTrait.php b/app/Helpers/Update/UpdateTrait.php index e7fe2d936e..775c44e186 100644 --- a/app/Helpers/Update/UpdateTrait.php +++ b/app/Helpers/Update/UpdateTrait.php @@ -66,12 +66,12 @@ trait UpdateTrait /** * Parses the version check result in a human readable sentence. * - * @param Release|null $release * @param int $versionCheck + * @param Release|null $release * * @return string */ - public function parseResult(Release $release = null, int $versionCheck): string + public function parseResult(int $versionCheck, Release $release = null): string { $current = (string)config('firefly.version'); $return = ''; diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index e43276c4dd..99c3ab623c 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -144,10 +144,13 @@ class ReconcileController extends Controller // get start and end if (null === $start && null === $end) { + /** @var Carbon $start */ $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); + /** @var Carbon $end */ $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); } if (null === $end) { + /** @var Carbon $end */ $end = app('navigation')->endOfPeriod($start, $range); } diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 13eedc3304..a5273323c4 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -90,7 +90,9 @@ class ShowController extends Controller if (AccountType::INITIAL_BALANCE === $account->accountType->type) { return $this->redirectToOriginalAccount($account); } + /** @var Carbon $start */ $start = $start ?? session('start'); + /** @var Carbon $end */ $end = $end ?? session('end'); if ($end < $start) { throw new FireflyException('End is after start!'); // @codeCoverageIgnore diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 3c672fd9aa..18aa985518 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -101,7 +101,7 @@ class UpdateController extends Controller { $latestRelease = $this->getLatestRelease(); $versionCheck = $this->versionCheck($latestRelease); - $resultString = $this->parseResult($latestRelease, $versionCheck); + $resultString = $this->parseResult($versionCheck, $latestRelease); if (0 !== $versionCheck && '' !== $resultString) { // flash info diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 0bee14bc8b..5e3e12f362 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use Carbon\Carbon; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Requests\BillFormRequest; @@ -277,7 +278,9 @@ class BillController extends Controller // add info about rules: $rules = $this->billRepository->getRulesForBill($bill); $subTitle = $bill->name; + /** @var Carbon $start */ $start = session('start'); + /** @var Carbon $end */ $end = session('end'); $year = $start->year; $page = (int)$request->get('page'); diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index e79ea0b59a..f23cd4f159 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -77,6 +77,7 @@ class IndexController extends Controller */ public function index(Request $request, string $moment = null) { + /** @var string $range */ $range = app('preferences')->get('viewRange', '1M')->data; /** @var Carbon $start */ $start = session('start', new Carbon); diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index bf19fbac6d..0b48280422 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -195,6 +195,7 @@ class ShowController extends Controller ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); $transactions = $collector->getPaginatedJournals(); $transactions->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); + /** @var Carbon $start */ $start = session('first', Carbon::create()->startOfYear()); $end = new Carbon; $limits = $this->getLimits($budget, $start, $end); diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 10923b03a5..124cc00da6 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -74,7 +74,9 @@ class AccountController extends Controller */ public function expenseAccounts(AccountRepositoryInterface $repository): JsonResponse { + /** @var Carbon $start */ $start = clone session('start', Carbon::now()->startOfMonth()); + /** @var Carbon $end */ $end = clone session('end', Carbon::now()->endOfMonth()); $cache = new CacheProperties; $cache->addProperty($start); diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index af596ecd2e..958c51f017 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -276,7 +276,7 @@ class DebugController extends Controller { $packages = []; $file = \dirname(__DIR__, 3) . '/vendor/composer/installed.json'; - if (!(false === $file) && file_exists($file)) { + if (file_exists($file)) { // file exists! $content = file_get_contents($file); $json = json_decode($content, true); diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 91033e1eb2..830d63ab31 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -59,6 +59,7 @@ class HelpController extends Controller */ public function show(string $route): JsonResponse { + /** @var string $language */ $language = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; $html = $this->getHelpText($route, $language); diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index fc054d5590..d9432135bf 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -149,8 +149,11 @@ class JavascriptController extends Controller private function getDateRangeConfig(): array { $viewRange = app('preferences')->get('viewRange', '1M')->data; + /** @var Carbon $start */ $start = session('start'); + /** @var Carbon $end */ $end = session('end'); + /** @var Carbon $first */ $first = session('first'); $title = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat)); $isCustom = true === session('is_custom_range', false); diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index c8947f213e..f059036100 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -54,7 +54,9 @@ class BoxController extends Controller */ public function available(BudgetRepositoryInterface $repository): JsonResponse { + /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); + /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); $today = new Carbon; $cache = new CacheProperties; @@ -111,7 +113,9 @@ class BoxController extends Controller public function balance(CurrencyRepositoryInterface $repository): JsonResponse { // Cache result, return cache if present. + /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); + /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); $cache = new CacheProperties; $cache->addProperty($start); @@ -195,7 +199,9 @@ class BoxController extends Controller */ public function bills(BillRepositoryInterface $repository): JsonResponse { + /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); + /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); $cache = new CacheProperties; diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index dc5878c97a..dc36328675 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -161,7 +161,7 @@ class ReconcileController extends Controller $currencyId = (int)$this->accountRepos->getMetaValue($account, 'currency_id'); $currency = $this->currencyRepos->findNull($currencyId); - if (0 === $currency) { + if (0 === $currencyId) { $currency = app('amount')->getDefaultCurrency(); // @codeCoverageIgnore } diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index e5cd05697e..b983022876 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -156,10 +156,10 @@ class RecurrenceController extends Controller if ($date > $today || 'true' === (string)$request->get('past')) { $weekly = sprintf('weekly,%s', $date->dayOfWeekIso); $monthly = sprintf('monthly,%s', $date->day); - $dayOfWeek = trans(sprintf('config.dow_%s', $date->dayOfWeekIso)); + $dayOfWeek = (string)trans(sprintf('config.dow_%s', $date->dayOfWeekIso)); $ndom = sprintf('ndom,%s,%s', $date->weekOfMonth, $date->dayOfWeekIso); $yearly = sprintf('yearly,%s', $date->format('Y-m-d')); - $yearlyDate = $date->formatLocalized(trans('config.month_and_day_no_year')); + $yearlyDate = $date->formatLocalized((string)trans('config.month_and_day_no_year')); $result = [ 'daily' => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index dd29bb353e..4aceec0e57 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -95,19 +95,16 @@ class IndexController extends Controller /** * Show a single recurring transaction. * - * @param Request $request * @param Recurrence $recurrence * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws FireflyException */ - public function show(Request $request, Recurrence $recurrence) + public function show(Recurrence $recurrence) { $transformer = new RecurrenceTransformer(new ParameterBag); $array = $transformer->transform($recurrence); - $page = (int)$request->get('page'); - $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; - $transactions = $this->recurring->getTransactions($recurrence, $page, $pageSize); + $transactions = $this->recurring->getTransactions($recurrence); // transform dates back to Carbon objects: foreach ($array['recurrence_repetitions'] as $index => $repetition) { diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index ccb574c8df..d246c1b02d 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -61,8 +61,6 @@ class Installer return $next($request); } - // Log::debug(sprintf('URL is %s, will run installer middleware', $url)); - // no tables present? try { DB::table('users')->count(); diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php index 2a12faac28..942aca6870 100644 --- a/app/Http/Requests/ExportFormRequest.php +++ b/app/Http/Requests/ExportFormRequest.php @@ -47,6 +47,7 @@ class ExportFormRequest extends Request */ public function rules(): array { + /** @var Carbon $sessionFirst */ $sessionFirst = clone session('first'); $first = $sessionFirst->subDay()->format('Y-m-d'); $today = Carbon::create()->addDay()->format('Y-m-d'); diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 0ddd7bb8c2..47c389922e 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -190,7 +190,7 @@ class RecurrenceFormRequest extends Request $rules['repetitions'] = 'required|numeric|between:0,254'; } // if foreign amount, currency must be different. - if (0.0 !== $this->float('foreign_amount')) { + if (null !== $this->float('foreign_amount')) { $rules['foreign_currency_id'] = 'exists:transaction_currencies,id|different:transaction_currency_id'; } diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 488d1ab2ed..f03a05093d 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -56,11 +56,15 @@ class Request extends FormRequest * * @param string $field * - * @return float + * @return float|null */ - public function float(string $field): float + public function float(string $field): ?float { - return (float)$this->get($field); + $res = $this->get($field); + if(null === $res) { + return null; + } + return (float)$res; } /** diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index 311efa751b..9207a51159 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -50,6 +50,7 @@ class SelectTransactionsRequest extends Request public function rules(): array { // fixed + /** @var Carbon $sessionFirst */ $sessionFirst = clone session('first'); $first = $sessionFirst->subDay()->format('Y-m-d'); $today = Carbon::create()->addDay()->format('Y-m-d'); diff --git a/app/Import/JobConfiguration/BunqJobConfiguration.php b/app/Import/JobConfiguration/BunqJobConfiguration.php index 31ec787ba5..6f3b4a85cb 100644 --- a/app/Import/JobConfiguration/BunqJobConfiguration.php +++ b/app/Import/JobConfiguration/BunqJobConfiguration.php @@ -113,7 +113,7 @@ class BunqJobConfiguration implements JobConfigurationInterface Log::debug(sprintf('Now in BunqJobConfiguration::getHandler() with stage "%s"', $this->importJob->stage)); $handler = null; switch ($this->importJob->stage) { - case 'new'; + case 'new': $handler = app(NewBunqJobHandler::class); $handler->setImportJob($this->importJob); break; diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php index e240dd974e..b41e8e3156 100644 --- a/app/Import/JobConfiguration/FileJobConfiguration.php +++ b/app/Import/JobConfiguration/FileJobConfiguration.php @@ -101,13 +101,10 @@ class FileJobConfiguration implements JobConfigurationInterface return 'import.file.new'; case 'configure-upload': return 'import.file.configure-upload'; - break; case 'roles': return 'import.file.roles'; - break; case 'map': return 'import.file.map'; - break; default: // @codeCoverageIgnoreStart throw new FireflyException( diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 1b04ca8f12..19868ec17e 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -185,7 +185,9 @@ class ImportArrayStorage unset($transaction['importHashV2']); $json = json_encode($transaction); if (false === $json) { - throw new FireflyException('Could not encode import array. Please see the logs.', $transaction); // @codeCoverageIgnore + /** @noinspection ForgottenDebugOutputInspection */ + Log::error('Could not encode import array.', print_r($transaction, true)); + throw new FireflyException('Could not encode import array. Please see the logs.'); // @codeCoverageIgnore } $hash = hash('sha256', $json, false); Log::debug(sprintf('The hash is: %s', $hash)); diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 81c08e85e2..390916ce24 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -161,7 +161,7 @@ class BillRepository implements BillRepositoryInterface $set = $set->sortBy( function (Bill $bill) { - $int = 1 === $bill->active ? 0 : 1; + $int = $bill->active ? 0 : 1; return $int . strtolower($bill->name); } diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index 49c12086ff..c8d50516a5 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -144,11 +144,12 @@ class ExportJobRepository implements ExportJobRepositoryInterface { $disk = Storage::disk('export'); $file = $job->key . '.zip'; - $content = ''; + try { $content = $disk->get($file); } catch (FileNotFoundException $e) { Log::warning(sprintf('File not found: %s', $e->getMessage())); + $content = ''; } return $content; diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index ba6626e271..120e612f40 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -150,12 +150,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface */ public function getConfiguration(ImportJob $job): array { - $config = $job->configuration; - if (\is_array($config)) { - return $config; - } - - return []; + return $job->configuration; } /** diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 68ca7ca9b4..64715c42af 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -477,7 +477,6 @@ class JournalRepository implements JournalRepositoryInterface $value = $entry->data; - // return when array: if (\is_array($value)) { $return = implode(',', $value); $cache->store($return); diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 38df49b788..61ccbd4a79 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -379,7 +379,7 @@ class RecurringRepository implements RecurringRepositoryInterface $repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment); $diffInYears = $today->diffInYears($repDate); $repDate->addYears($diffInYears); // technically not necessary. - $string = $repDate->formatLocalized(trans('config.month_and_day_no_year')); + $string = $repDate->formatLocalized((string)trans('config.month_and_day_no_year')); return (string)trans('firefly.recurring_yearly', ['date' => $string], $language); } diff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.php index 825321ae75..da24867046 100644 --- a/app/Rules/ValidRecurrenceRepetitionValue.php +++ b/app/Rules/ValidRecurrenceRepetitionValue.php @@ -67,18 +67,18 @@ class ValidRecurrenceRepetitionValue implements Rule return $this->validateMonthly($value); } - //ndom,3,7 + // Value is like: ndom,3,7 // nth x-day of the month. if (0 === strpos($value, 'ndom')) { return $this->validateNdom($value); } - //weekly,7 + // Value is like: weekly,7 if (0 === strpos($value, 'weekly')) { return $this->validateWeekly($value); } - //yearly,2018-01-01 + // Value is like: yearly,2018-01-01 if (0 === strpos($value, 'yearly')) { return $this->validateYearly($value); } diff --git a/app/Services/Bunq/ApiContext.php b/app/Services/Bunq/ApiContext.php index 43cd2a8b7a..b09aa1ea80 100644 --- a/app/Services/Bunq/ApiContext.php +++ b/app/Services/Bunq/ApiContext.php @@ -29,6 +29,7 @@ use bunq\Util\BunqEnumApiEnvironmentType; use Exception; use FireflyIII\Exceptions\FireflyException; use Log; +use Tests\Object\FakeApiContext; /** * Special class to hide away bunq's static initialisation methods. @@ -46,10 +47,10 @@ class ApiContext * @param string|null $proxyUrl * * @throws FireflyException - * @return BunqApiContext + * @return BunqApiContext|FakeApiContext */ public function create(BunqEnumApiEnvironmentType $environmentType, string $apiKey, string $description, array $permittedIps, string $proxyUrl = null - ): BunqApiContext { + ) { $permittedIps = $permittedIps ?? []; try { $context = BunqApiContext::create($environmentType, $apiKey, $description, $permittedIps, $proxyUrl); diff --git a/app/Services/IP/IpifyOrg.php b/app/Services/IP/IpifyOrg.php index 0c0f8a3404..2349f65dce 100644 --- a/app/Services/IP/IpifyOrg.php +++ b/app/Services/IP/IpifyOrg.php @@ -41,7 +41,6 @@ class IpifyOrg implements IPRetrievalInterface */ public function getIP(): ?string { - $result = null; try { $client = new Client; $res = $client->request('GET', 'https://api.ipify.org'); diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 8844d64db0..46c91191a9 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -28,6 +28,7 @@ use FireflyIII\Factory\BudgetFactory; use FireflyIII\Factory\CategoryFactory; use FireflyIII\Factory\PiggyBankFactory; use FireflyIII\Factory\TransactionCurrencyFactory; +use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceMeta; @@ -44,6 +45,15 @@ use Log; */ trait RecurringTransactionTrait { + /** + * @param null|string $expectedType + * @param int|null $accountId + * @param null|string $accountName + * + * @return Account|null + */ + abstract public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): ?Account; + /** * @param Recurrence $recurrence * @param array $repetitions diff --git a/app/Services/Internal/Support/TransactionServiceTrait.php b/app/Services/Internal/Support/TransactionServiceTrait.php index a784dd240a..7be855dbbf 100644 --- a/app/Services/Internal/Support/TransactionServiceTrait.php +++ b/app/Services/Internal/Support/TransactionServiceTrait.php @@ -124,7 +124,6 @@ trait TransactionServiceTrait // alternatively, return by name. Validator should catch invalid names. return $repository->findByName($accountName, [AccountType::ASSET]); - break; case AccountType::EXPENSE: if ($accountId > 0) { // must be able to find it based on ID. Validator should catch invalid ID's. @@ -140,7 +139,6 @@ trait TransactionServiceTrait // return cash account: return $repository->getCashAccount(); - break; case AccountType::REVENUE: if ($accountId > 0) { // must be able to find it based on ID. Validator should catch invalid ID's. diff --git a/app/Services/Spectre/Request/SpectreRequest.php b/app/Services/Spectre/Request/SpectreRequest.php index 1fafadf23c..a215373a91 100644 --- a/app/Services/Spectre/Request/SpectreRequest.php +++ b/app/Services/Spectre/Request/SpectreRequest.php @@ -250,7 +250,7 @@ abstract class SpectreRequest $client = new Client; $res = $client->request('POST', $fullUri, ['headers' => $headers, 'body' => $body]); } catch (GuzzleException|Exception $e) { - throw new FireflyException(sprintf('Request Exception: %s', $e->getMessage())); + throw new FireflyException(sprintf('Guzzle Exception: %s', $e->getMessage())); } $body = $res->getBody()->getContents(); $statusCode = $res->getStatusCode(); diff --git a/app/Support/Binder/ImportProvider.php b/app/Support/Binder/ImportProvider.php index 1d3df1bf8e..149e38cb84 100644 --- a/app/Support/Binder/ImportProvider.php +++ b/app/Support/Binder/ImportProvider.php @@ -66,22 +66,18 @@ class ImportProvider implements BinderInterface $isDemoUser = $repository->hasRole($user, 'demo'); $isDebug = (bool)config('app.debug'); foreach ($providerNames as $providerName) { - //Log::debug(sprintf('Now with provider %s', $providerName)); // only consider enabled providers $enabled = (bool)config(sprintf('import.enabled.%s', $providerName)); $allowedForDemo = (bool)config(sprintf('import.allowed_for_demo.%s', $providerName)); $allowedForUser = (bool)config(sprintf('import.allowed_for_user.%s', $providerName)); if (false === $enabled) { - //Log::debug('Provider is not enabled. NEXT!'); continue; } if (true === $isDemoUser && false === $allowedForDemo) { - //Log::debug('User is demo and this provider is not allowed for demo user. NEXT!'); continue; } if (false === $isDemoUser && false === $allowedForUser && false === $isDebug) { - //Log::debug('User is not demo and this provider is not allowed for such users. NEXT!'); continue; // @codeCoverageIgnore } diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index 01aade0d24..92c941e4eb 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -28,8 +28,11 @@ use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class FireflyConfig. - * @method ?Configuration get($name, $default = null) + * @method null|Configuration get($name, $default = null) * @method Configuration set(string $name, $value) + * @method delete(string $name) + * @method Configuration|null getFresh(string $name, $default = null) + * @method Configuration put(string $name, $value) */ class FireflyConfig extends Facade { diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index b5d6eacafb..3686144b5f 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -34,7 +34,7 @@ use Illuminate\Support\Facades\Facade; * @method Collection beginsWith(User $user, string $search) * @method bool delete(string $name) * @method Collection findByName(string $name) - * @method Preference get(string $name, $value) + * @method Preference get(string $name, $value = null) * @method array getArrayForUser(User $user, array $list) * @method Preference|null getForUser(User $user, string $name, $default = null) * @method string lastActivity() diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index 17a0fe41a5..9e7ecf23fd 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -55,7 +55,7 @@ class FireflyConfig * * @return \FireflyIII\Models\Configuration|null */ - public function get(string $name, $default = null): ?Configuration + public function get(string $name, $default = null): ?Configuration { $fullName = 'ff-config-' . $name; if (Cache::has($fullName)) { diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php index fd633abd55..e93af258cf 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php @@ -63,7 +63,6 @@ class ConfigureRolesHandler implements FileConfigurationInterface { /** @var array $roles */ $roles = $config['column-roles']; - $count = $config['column-count']; $assigned = 0; // check if data actually contains amount column (foreign amount does not count) diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php index d981b23dc8..ccbde5228c 100644 --- a/tests/Feature/Controllers/Popup/ReportControllerTest.php +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -74,7 +74,7 @@ class ReportControllerTest extends TestCase ]; $uri = route('popup.general') . '?' . http_build_query($arguments); $response = $this->get($uri); - $response->assertStatus(500); + $response->assertStatus(200); } /** diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index 202be2a26e..f722727516 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -58,6 +58,8 @@ class MassControllerTest extends TestCase { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection)->once(); + $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection)->once(); $withdrawals = TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index 2fc9ef1c1f..d785a5a5a2 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -845,6 +845,11 @@ class SingleControllerTest extends TestCase $journalRepos->shouldReceive('getPiggyBankEvents')->andReturn(new Collection); $journalRepos->shouldReceive('getMetaField')->andReturn(''); + $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection); + $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection); + + + $linkRepos->shouldReceive('get')->andReturn(new Collection); $linkRepos->shouldReceive('getLinks')->andReturn(new Collection); $attRepos->shouldReceive('saveAttachmentsForModel'); diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index a9dedac278..73cb4f7d6b 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -351,6 +351,9 @@ class TransactionControllerTest extends TestCase $journalRepos->shouldReceive('getPiggyBankEvents')->andReturn(new Collection); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); $journalRepos->shouldReceive('getMetaField')->andReturn(''); + $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection); + $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection); + $this->be($this->user()); $response = $this->get(route('transactions.show', [1])); diff --git a/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php b/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php index 1f4399ba6f..528b5bbc2d 100644 --- a/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php +++ b/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php @@ -57,7 +57,6 @@ class VersionCheckEventHandlerTest extends TestCase $repos->shouldReceive('hasRole')->andReturn(true)->once(); // report on config variables: - FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($updateConfig); FireflyConfig::shouldReceive('get')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); @@ -91,7 +90,6 @@ class VersionCheckEventHandlerTest extends TestCase $version = config('firefly.version'); $first = new Release(['id' => '1', 'title' => $version . '.1', 'updated' => '2017-05-01', 'content' => '']); // report on config variables: - FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($updateConfig); FireflyConfig::shouldReceive('get')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); @@ -139,7 +137,6 @@ class VersionCheckEventHandlerTest extends TestCase $repos->shouldReceive('hasRole')->andReturn(true)->once(); // report on config variables: - FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($updateConfig); FireflyConfig::shouldReceive('get')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); @@ -164,7 +161,6 @@ class VersionCheckEventHandlerTest extends TestCase // report on config variables: - FireflyConfig::shouldReceive('get')->withArgs(['permission_update_check', -1])->once()->andReturn($updateConfig); FireflyConfig::shouldReceive('get')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); FireflyConfig::shouldReceive('set')->withArgs(['last_update_check', Mockery::any()])->once()->andReturn($checkConfig); diff --git a/tests/Unit/Helpers/MetaPieChartTest.php b/tests/Unit/Helpers/MetaPieChartTest.php index 791e12406d..527ed3ee3b 100644 --- a/tests/Unit/Helpers/MetaPieChartTest.php +++ b/tests/Unit/Helpers/MetaPieChartTest.php @@ -79,8 +79,8 @@ class MetaPieChartTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); - $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]); - $accountRepos->shouldReceive('find')->withArgs([2])->andReturn($accounts[2]); + $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($accounts[1]); + $accountRepos->shouldReceive('findNull')->withArgs([2])->andReturn($accounts[2]); $helper = new MetaPieChart(); $helper->setUser($this->user()); @@ -135,8 +135,8 @@ class MetaPieChartTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); - $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]); - $accountRepos->shouldReceive('find')->withArgs([2])->andReturn($accounts[2]); + $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($accounts[1]); + $accountRepos->shouldReceive('findNull')->withArgs([2])->andReturn($accounts[2]); $helper = new MetaPieChart(); $helper->setCollectOtherObjects(true); @@ -190,8 +190,8 @@ class MetaPieChartTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); - $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]); - $accountRepos->shouldReceive('find')->withArgs([2])->andReturn($accounts[2]); + $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($accounts[1]); + $accountRepos->shouldReceive('findNull')->withArgs([2])->andReturn($accounts[2]); $helper = new MetaPieChart(); $helper->setUser($this->user()); @@ -245,8 +245,8 @@ class MetaPieChartTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); - $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]); - $accountRepos->shouldReceive('find')->withArgs([2])->andReturn($accounts[2]); + $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($accounts[1]); + $accountRepos->shouldReceive('findNull')->withArgs([2])->andReturn($accounts[2]); $helper = new MetaPieChart(); $helper->setCollectOtherObjects(true); diff --git a/tests/Unit/Import/Specifics/RabobankDescriptionTest.php b/tests/Unit/Import/Specifics/RabobankDescriptionTest.php deleted file mode 100644 index f969cd5f66..0000000000 --- a/tests/Unit/Import/Specifics/RabobankDescriptionTest.php +++ /dev/null @@ -1,75 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace Tests\Unit\Import\Specifics; - - -use FireflyIII\Import\Specifics\RabobankDescription; -use Tests\TestCase; - -/** - * Class RabobankDescriptionTest - */ -class RabobankDescriptionTest extends TestCase -{ - /** - * Default behaviour - * @covers \FireflyIII\Import\Specifics\RabobankDescription - */ - public function testRunBasic(): void - { - $row = ['','','','','','','','','','','']; - - $parser = new RabobankDescription; - $result = $parser->run($row); - $this->assertEquals($row, $result); - } - - /** - * No opposite name or iban - * @covers \FireflyIII\Import\Specifics\RabobankDescription - */ - public function testRunUseDescription(): void - { - $row = ['','','','','','','','','','','Hello']; - - $parser = new RabobankDescription; - $result = $parser->run($row); - $this->assertEquals('Hello', $result[6]); - $this->assertEquals('', $result[10]); - } - - /** - * Has opposite name or iban - * @covers \FireflyIII\Import\Specifics\RabobankDescription - */ - public function testRunUseFilledIn(): void - { - $row = ['','','','','','ABC','','','','','']; - - $parser = new RabobankDescription; - $result = $parser->run($row); - $this->assertEquals($row, $result); - } - -} diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php index e96de4909b..ad52b8cbe5 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountContains; +use Illuminate\Support\Collection; use Tests\TestCase; /** @@ -38,13 +39,12 @@ class FromAccountContainsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $count = 0; - while ($count === 0) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '<', 0)->count(); - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - } - $account = $transaction->account; + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountContains::makeFromStrings($account->name, false); $result = $trigger->triggered($journal); @@ -57,7 +57,12 @@ class FromAccountContainsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountContains::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); @@ -70,8 +75,8 @@ class FromAccountContainsTest extends TestCase public function testWillMatchEverythingEmpty(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $value = ''; - $result = FromAccountContains::willMatchEverything($value); + $value = ''; + $result = FromAccountContains::willMatchEverything($value); $this->assertTrue($result); } @@ -81,8 +86,8 @@ class FromAccountContainsTest extends TestCase public function testWillMatchEverythingNotNull(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $value = 'x'; - $result = FromAccountContains::willMatchEverything($value); + $value = 'x'; + $result = FromAccountContains::willMatchEverything($value); $this->assertFalse($result); } @@ -92,8 +97,8 @@ class FromAccountContainsTest extends TestCase public function testWillMatchEverythingNull(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $value = null; - $result = FromAccountContains::willMatchEverything($value); + $value = null; + $result = FromAccountContains::willMatchEverything($value); $this->assertTrue($result); } } diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php index 5fb022732f..e945255556 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountEnds; +use Illuminate\Support\Collection; use Tests\TestCase; /** @@ -38,13 +39,11 @@ class FromAccountEndsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $count = 0; - while ($count === 0) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '<', 0)->count(); - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - } - $account = $transaction->account; + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountEnds::makeFromStrings(substr($account->name, -3), false); $result = $trigger->triggered($journal); @@ -57,13 +56,12 @@ class FromAccountEndsTest extends TestCase public function testTriggeredLonger(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $count = 0; - while ($count === 0) { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $count = $journal->transactions()->where('amount', '<', 0)->count(); - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - } - $account = $transaction->account; + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountEnds::makeFromStrings('bla-bla-bla' . $account->name, false); $result = $trigger->triggered($journal); @@ -76,7 +74,12 @@ class FromAccountEndsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountEnds::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php index c746a39b85..280c3459df 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountIs; +use Illuminate\Support\Collection; use Tests\TestCase; use Log; /** @@ -38,20 +39,12 @@ class FromAccountIsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); - - $loops++; - - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountIs::makeFromStrings($account->name, false); @@ -65,7 +58,12 @@ class FromAccountIsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountIs::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index 467f57c438..3527b1547d 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\FromAccountStarts; +use Illuminate\Support\Collection; use Log; use Tests\TestCase; @@ -48,26 +49,12 @@ class FromAccountStartsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - Log::debug('In testTriggered()'); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - $name = $account->name ?? ''; - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); - - $loops++; - - // do this while the following is untrue: - // 1) account is not null, - // 2) journal has two transactions - // 3) loops is less than 30 - // 4) $name is longer than 3 - } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountStarts::makeFromStrings(substr($account->name, 0, -3), false); $result = $trigger->triggered($journal); @@ -80,26 +67,12 @@ class FromAccountStartsTest extends TestCase public function testTriggeredLonger(): void { $repository = $this->mock(JournalRepositoryInterface::class); - Log::debug('In testTriggeredLonger()'); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - $name = $account->name ?? ''; - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); - - $loops++; - - // do this while the following is untrue: - // 1) account is not null, - // 2) journal has two transactions - // 3) loops is less than 30 - // 4) $name is longer than 3 - } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false); $result = $trigger->triggered($journal); @@ -112,7 +85,12 @@ class FromAccountStartsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalSourceAccounts')->once()->andReturn($collection); $trigger = FromAccountStarts::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php index a441ac7b20..9974e65e03 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountContains; +use Illuminate\Support\Collection; use Tests\TestCase; /** @@ -39,14 +40,11 @@ class ToAccountContainsTest extends TestCase { $repository = $this->mock(JournalRepositoryInterface::class); - $count = 0; - do { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $transactionCount = $journal->transactions()->count(); - $account = null === $transaction ? null : $transaction->account; - $count++; - } while ($account === null && $count < 30 && $transactionCount !== 2); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountContains::makeFromStrings($account->name, false); @@ -60,14 +58,12 @@ class ToAccountContainsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $count = 0; - do { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $transactionCount = $journal->transactions()->count(); - $account = null === $transaction ? null : $transaction->account; - $count++; - } while ($account === null && $count < 30 && $transactionCount !== 2); + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountContains::makeFromStrings('some name' . random_int(1, 234), false); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php index 91d46c04a9..bf78a467ed 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountEnds; +use Illuminate\Support\Collection; use Log; use Tests\TestCase; @@ -39,26 +40,12 @@ class ToAccountEndsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - $name = $account->name ?? ''; - - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); - - $loops++; - - // do this while the following is untrue: - // 1) account is not null, - // 2) journal has two transactions - // 3) loops is less than 30 - // 4) $name is longer than 3 - } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountEnds::makeFromStrings(substr($account->name, -3), false); $result = $trigger->triggered($journal); @@ -71,25 +58,12 @@ class ToAccountEndsTest extends TestCase public function testTriggeredLonger(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - $name = $account->name ?? ''; - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); - - $loops++; - - // do this while the following is untrue: - // 1) account is not null, - // 2) journal has two transactions - // 3) loops is less than 30 - // 4) $name is longer than 3 - } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountEnds::makeFromStrings('bla-bla-bla' . $account->name, false); $result = $trigger->triggered($journal); @@ -102,25 +76,12 @@ class ToAccountEndsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - $name = $account->name ?? ''; - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d, name = "%s"', $loops, $count, (int)null === $account, $name)); - - $loops++; - - // do this while the following is untrue: - // 1) account is not null, - // 2) journal has two transactions - // 3) loops is less than 30 - // 4) $name is longer than 3 - } while (!(null !== $account && 2 === $count && $loops < 30 && \strlen($name) > 3)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountEnds::makeFromStrings((string)random_int(1, 1234), false); $result = $trigger->triggered($journal); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php index a2ac324a0e..4a8ff271d1 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountIs; +use Illuminate\Support\Collection; use Tests\TestCase; use Log; @@ -39,20 +40,12 @@ class ToAccountIsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); - - $loops++; - - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); @@ -67,20 +60,12 @@ class ToAccountIsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); - - $loops++; - - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountIs::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php index 2eeb5b1fc7..9ed3017438 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php @@ -25,6 +25,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\TransactionRules\Triggers\ToAccountStarts; +use Illuminate\Support\Collection; use Log; use Tests\TestCase; @@ -39,22 +40,12 @@ class ToAccountStartsTest extends TestCase public function testTriggered(): void { $repository = $this->mock(JournalRepositoryInterface::class); - Log::debug('Now in testTriggered'); - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account)); - - $loops++; - - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false); @@ -68,23 +59,12 @@ class ToAccountStartsTest extends TestCase public function testTriggeredLonger(): void { $repository = $this->mock(JournalRepositoryInterface::class); - Log::debug('Now in testTriggeredLonger'); - - $loops = 0; // FINAL LOOP METHOD. - do { - /** @var TransactionJournal $journal */ - $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = null === $transaction ? null : $transaction->account; - $count = $journal->transactions()->count(); - - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account)); - - $loops++; - - // do this until: account is not null, journal has two transactions, loops is below 30 - } while (!(null !== $account && 2 === $count && $loops < 30)); + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false); $result = $trigger->triggered($journal); @@ -97,7 +77,12 @@ class ToAccountStartsTest extends TestCase public function testTriggeredNot(): void { $repository = $this->mock(JournalRepositoryInterface::class); - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + + /** @var TransactionJournal $journal */ + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $account = $this->user()->accounts()->inRandomOrder()->first(); + $collection = new Collection([$account]); + $repository->shouldReceive('getJournalDestinationAccounts')->once()->andReturn($collection); $trigger = ToAccountStarts::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal); From e3e0e12fef14464bbbda855c7360960eb9a5093e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Jul 2018 05:03:37 +0200 Subject: [PATCH 78/86] Various code cleanup. --- app/Models/Transaction.php | 6 ++++ app/Models/TransactionJournal.php | 23 +++++++------ app/Rules/BelongsUser.php | 2 +- app/Services/Currency/FixerIOv2.php | 1 - app/Support/Amount.php | 9 +++-- app/Support/Binder/AccountList.php | 6 ++-- app/Support/Binder/BudgetList.php | 4 +-- app/Support/Binder/CategoryList.php | 4 +-- app/Support/Binder/Date.php | 2 +- app/Support/Binder/ImportProvider.php | 34 +++++++++---------- app/Support/Binder/JournalList.php | 2 +- app/Support/Binder/SimpleJournalList.php | 2 +- app/Support/Binder/TagList.php | 4 +-- app/Support/CacheProperties.php | 6 ++-- app/Support/ExpandedForm.php | 16 +++++---- app/Support/FireflyConfig.php | 6 ++-- .../Bunq/ChooseAccountsHandler.php | 10 +++--- .../File/ConfigureMappingHandler.php | 10 +++--- .../File/ConfigureRolesHandler.php | 14 ++++---- .../File/ConfigureUploadHandler.php | 4 +-- .../File/NewFileJobHandler.php | 9 +++-- .../Spectre/ChooseAccountsHandler.php | 10 +++--- .../Spectre/ChooseLoginHandler.php | 2 +- .../Import/Placeholder/ImportTransaction.php | 5 ++- .../Routine/Bunq/StageImportDataHandler.php | 9 ++--- .../Import/Routine/Fake/StageAhoyHandler.php | 2 -- .../Import/Routine/Fake/StageNewHandler.php | 2 -- .../Routine/File/ImportableConverter.php | 6 ++-- .../Import/Routine/File/LineReader.php | 4 +-- .../Import/Routine/File/MappingConverger.php | 2 +- .../Routine/File/OpposingAccountMapper.php | 2 +- .../Spectre/StageAuthenticatedHandler.php | 2 +- .../Spectre/StageImportDataHandler.php | 6 ++-- app/Support/Navigation.php | 6 ++-- app/Support/Preferences.php | 5 +-- app/Support/Search/Modifier.php | 6 ++++ app/Support/Search/Search.php | 18 +++++----- app/Support/Steam.php | 4 ++- app/Support/Twig/AmountFormat.php | 11 ++++-- app/Support/Twig/Extension/Transaction.php | 26 +++++++------- .../Twig/Extension/TransactionJournal.php | 2 +- app/Support/Twig/General.php | 4 +-- app/Support/Twig/Rule.php | 4 +-- 43 files changed, 167 insertions(+), 145 deletions(-) diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index b3c1c33320..2098c6788b 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -90,6 +90,12 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int $opposing_id // ID of the opposing transaction, used in collector * @property bool $encrypted // is the journal encrypted * @property bool reconciled + * @property string transaction_category_encrypted + * @property string transaction_journal_category_encrypted + * @property string transaction_budget_encrypted + * @property string transaction_journal_budget_encrypted + * @property string type + * @property string name * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class Transaction extends Model diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 77478c8be1..8e5b29f661 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -50,18 +50,19 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property Collection $tags * @property mixed user_id * @property mixed transactions - * @property int transaction_count - * @property Carbon interest_date - * @property Carbon book_date - * @property Carbon process_date - * @property bool encrypted - * @property int order - * @property int budget_id - * @property string period_marker - * @property Carbon $date - * @property string $transaction_type_type - * @property int $id + * @property int transaction_count + * @property Carbon interest_date + * @property Carbon book_date + * @property Carbon process_date + * @property bool encrypted + * @property int order + * @property int budget_id + * @property string period_marker + * @property Carbon $date + * @property string $transaction_type_type + * @property int $id * @property TransactionType $transactionType + * @property Collection budgets * * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index 6dc8113d4d..d33e0ef412 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -155,7 +155,7 @@ class BelongsUser implements Rule */ private function validateAccountId(int $value): bool { - $count = Account::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count(); + $count = Account::where('id', '=', $value)->where('user_id', '=', auth()->user()->id)->count(); return 1 === $count; } diff --git a/app/Services/Currency/FixerIOv2.php b/app/Services/Currency/FixerIOv2.php index 5e296f5de4..2d5f250f8a 100644 --- a/app/Services/Currency/FixerIOv2.php +++ b/app/Services/Currency/FixerIOv2.php @@ -72,7 +72,6 @@ class FixerIOv2 implements ExchangeRateInterface 'http://data.fixer.io/api/%s?access_key=%s&base=%s&symbols=%s', $date->format('Y-m-d'), $apiKey, $fromCurrency->code, $toCurrency->code ); - $statusCode = -1; Log::debug(sprintf('Going to request exchange rate using URI %s', str_replace($apiKey, 'xxxx', $uri))); $client = new Client; try { diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 01973c203d..17dff88a69 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -33,6 +33,7 @@ use Preferences as Prefs; */ class Amount { + /** @noinspection MoreThanThreeArgumentsInspection */ /** * bool $sepBySpace is $localeconv['n_sep_by_space'] * int $signPosn = $localeconv['n_sign_posn'] @@ -116,10 +117,11 @@ class Amount * * @return string */ - public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string + public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = null): string { - $locale = explode(',', (string)trans('config.locale')); - $locale = array_map('trim', $locale); + $coloured = $coloured ?? true; + $locale = explode(',', (string)trans('config.locale')); + $locale = array_map('trim', $locale); setlocale(LC_MONETARY, $locale); $float = round($amount, 12); $info = localeconv(); @@ -205,6 +207,7 @@ class Amount */ public function getDefaultCurrency(): TransactionCurrency { + /** @var User $user */ $user = auth()->user(); return $this->getDefaultCurrencyByUser($user); diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index 2c1baab334..b63b8f2c5d 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -47,14 +47,14 @@ class AccountList implements BinderInterface if (auth()->check()) { $collection = new Collection; - if ($value === 'allAssetAccounts') { + if ('allAssetAccounts' === $value) { /** @var \Illuminate\Support\Collection $collection */ $collection = auth()->user()->accounts() ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->where('account_types.type', AccountType::ASSET) ->get(['accounts.*']); } - if ($value !== 'allAssetAccounts') { + if ('allAssetAccounts' !== $value) { $list = []; $incoming = explode(',', $value); @@ -62,7 +62,7 @@ class AccountList implements BinderInterface $list[] = (int)$entry; } $list = array_unique($list); - if (\count($list) === 0) { + if (0 === \count($list)) { Log::error('Account list is empty.'); throw new NotFoundHttpException; // @codeCoverageIgnore } diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php index 374640b127..3c6da0ce92 100644 --- a/app/Support/Binder/BudgetList.php +++ b/app/Support/Binder/BudgetList.php @@ -48,7 +48,7 @@ class BudgetList implements BinderInterface $list[] = (int)$entry; } $list = array_unique($list); - if (\count($list) === 0) { + if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } @@ -59,7 +59,7 @@ class BudgetList implements BinderInterface ->get(); // add empty budget if applicable. - if (\in_array(0, $list)) { + if (\in_array(0, $list, true)) { $collection->push(new Budget); } diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php index 90bb36dfff..bd6997423d 100644 --- a/app/Support/Binder/CategoryList.php +++ b/app/Support/Binder/CategoryList.php @@ -48,7 +48,7 @@ class CategoryList implements BinderInterface $list[] = (int)$entry; } $list = array_unique($list); - if (\count($list) === 0) { + if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } @@ -58,7 +58,7 @@ class CategoryList implements BinderInterface ->get(); // add empty category if applicable. - if (\in_array(0, $list)) { + if (\in_array(0, $list, true)) { $collection->push(new Category); } diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php index 39ee1a704f..e075179b61 100644 --- a/app/Support/Binder/Date.php +++ b/app/Support/Binder/Date.php @@ -51,7 +51,7 @@ class Date implements BinderInterface try { $date = new Carbon($value); } catch (Exception $e) { - Log::error('Could not parse date "' . $value . '" for user #' . auth()->user()->id); + Log::error(sprintf('Could not parse date "%s" for user #%d: %s', $value, auth()->user()->id, $e->getMessage())); throw new NotFoundHttpException; } diff --git a/app/Support/Binder/ImportProvider.php b/app/Support/Binder/ImportProvider.php index 149e38cb84..7e5917f50c 100644 --- a/app/Support/Binder/ImportProvider.php +++ b/app/Support/Binder/ImportProvider.php @@ -27,30 +27,14 @@ use FireflyIII\Import\Prerequisites\PrerequisitesInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Routing\Route; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Log; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class ImportProvider. */ class ImportProvider implements BinderInterface { - /** - * @param string $value - * @param Route $route - * - * @return Carbon - * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException - */ - public static function routeBinder(string $value, Route $route): string - { - $providers = array_keys(self::getProviders()); - if (\in_array($value, $providers, true)) { - return $value; - } - throw new NotFoundHttpException; - } - /** * @return array */ @@ -99,4 +83,20 @@ class ImportProvider implements BinderInterface return $providers; } + + /** + * @param string $value + * @param Route $route + * + * @return Carbon + * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + */ + public static function routeBinder(string $value, Route $route): string + { + $providers = array_keys(self::getProviders()); + if (\in_array($value, $providers, true)) { + return $value; + } + throw new NotFoundHttpException; + } } diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php index e86774d871..5c034c242c 100644 --- a/app/Support/Binder/JournalList.php +++ b/app/Support/Binder/JournalList.php @@ -47,7 +47,7 @@ class JournalList implements BinderInterface $list[] = (int)$entry; } $list = array_unique($list); - if (\count($list) === 0) { + if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } diff --git a/app/Support/Binder/SimpleJournalList.php b/app/Support/Binder/SimpleJournalList.php index 6375208c1c..b33ac2fc9a 100644 --- a/app/Support/Binder/SimpleJournalList.php +++ b/app/Support/Binder/SimpleJournalList.php @@ -51,7 +51,7 @@ class SimpleJournalList implements BinderInterface $list[] = (int)$entry; } $list = array_unique($list); - if (\count($list) === 0) { + if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php index 1b9eb74aa6..b4131e0eea 100644 --- a/app/Support/Binder/TagList.php +++ b/app/Support/Binder/TagList.php @@ -50,7 +50,7 @@ class TagList implements BinderInterface $list[] = strtolower(trim($entry)); } $list = array_unique($list); - if (\count($list) === 0) { + if (0 === \count($list)) { Log::error('Tag list is empty.'); throw new NotFoundHttpException; // @codeCoverageIgnore } @@ -61,7 +61,7 @@ class TagList implements BinderInterface $collection = $allTags->filter( function (Tag $tag) use ($list) { - return \in_array(strtolower($tag->tag), $list); + return \in_array(strtolower($tag->tag), $list, true); } ); diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index d6d34aa8ed..52d7e7d22f 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -50,7 +50,7 @@ class CacheProperties /** * @param $property */ - public function addProperty($property) + public function addProperty($property): void { $this->properties->push($property); } @@ -87,14 +87,14 @@ class CacheProperties /** * @param $data */ - public function store($data) + public function store($data): void { Cache::forever($this->hash, $data); } /** */ - private function hash() + private function hash(): void { $content = ''; foreach ($this->properties as $property) { diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index ea4747bc96..e7edc728f2 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -36,6 +36,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Form; use Illuminate\Support\Collection; +use Illuminate\Support\HtmlString; use Illuminate\Support\MessageBag; use Log; use RuntimeException; @@ -251,7 +252,7 @@ class ExpandedForm { $options = $options ?? []; $value = $value ?? 1; - $options['checked'] = true === $checked ? true : false; + $options['checked'] = true === $checked; if (Session::has('preFilled')) { $preFilled = session('preFilled'); @@ -688,13 +689,13 @@ class ExpandedForm } /** - * @param string $name - * @param mixed $value - * @param array $options + * @param string $name + * @param null $value + * @param array|null $options * - * @return \Illuminate\Support\HtmlString + * @return HtmlString */ - public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null) + public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null): HtmlString { $options = $options ?? []; $options['class'] = 'form-control'; @@ -877,6 +878,7 @@ class ExpandedForm } } catch (RuntimeException $e) { // don't care about session errors. + Log::debug(sprintf('Run time: %s', $e->getMessage())); } if ($value instanceof Carbon) { $value = $value->format('Y-m-d'); @@ -929,6 +931,8 @@ class ExpandedForm * @param array $options * * @return string + * @throws \FireflyIII\Exceptions\FireflyException + * @throws \FireflyIII\Exceptions\FireflyException */ private function currencyField(string $name, string $view, $value = null, array $options = null): string { diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index 9e7ecf23fd..1c9a1c9d3c 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -51,11 +51,11 @@ class FireflyConfig /** * @param string $name - * @param mixed $default + * @param mixed $default * * @return \FireflyIII\Models\Configuration|null */ - public function get(string $name, $default = null): ?Configuration + public function get(string $name, $default = null): ?Configuration { $fullName = 'ff-config-' . $name; if (Cache::has($fullName)) { @@ -79,7 +79,7 @@ class FireflyConfig /** * @param string $name - * @param mixed $default + * @param mixed $default * * @return \FireflyIII\Models\Configuration|null */ diff --git a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php index 22d1cd7983..6a801deccc 100644 --- a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php @@ -58,7 +58,7 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface $config = $this->repository->getConfiguration($this->importJob); $mapping = $config['mapping'] ?? []; $complete = \count($mapping) > 0; - if ($complete === true) { + if (true === $complete) { // move job to correct stage to download transactions $this->repository->setStage($this->importJob, 'go-for-import'); } @@ -79,12 +79,12 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface $config = $this->repository->getConfiguration($this->importJob); $accounts = $config['accounts'] ?? []; $mapping = $data['account_mapping'] ?? []; - $applyRules = (int)$data['apply_rules'] === 1; + $applyRules = 1 === (int)$data['apply_rules']; $final = []; - if (\count($accounts) === 0) { + if (0 === \count($accounts)) { throw new FireflyException('No bunq accounts found. Import cannot continue.'); // @codeCoverageIgnore } - if (\count($mapping) === 0) { + if (0 === \count($mapping)) { $messages = new MessageBag; $messages->add('nomap', (string)trans('import.bunq_no_mapping')); @@ -116,7 +116,7 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface { $config = $this->repository->getConfiguration($this->importJob); $accounts = $config['accounts'] ?? []; - if (\count($accounts) === 0) { + if (0 === \count($accounts)) { throw new FireflyException('No bunq accounts found. Import cannot continue.'); // @codeCoverageIgnore } // list the users accounts: diff --git a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php index 5e4c6df1f2..4d16537a19 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php @@ -183,7 +183,7 @@ class ConfigureMappingHandler implements FileConfigurationInterface { $canBeMapped = config('csv.import_roles.' . $name . '.mappable'); - return $canBeMapped === true && $requested === true; + return true === $canBeMapped && true === $requested; } /** @@ -247,7 +247,7 @@ class ConfigureMappingHandler implements FileConfigurationInterface $collection = $this->repository->getAttachments($this->importJob); /** @var Attachment $attachment */ foreach ($collection as $attachment) { - if ($attachment->filename === 'import_file') { + if ('import_file' === $attachment->filename) { $content = $this->attachments->getAttachmentContent($attachment); break; } @@ -274,7 +274,7 @@ class ConfigureMappingHandler implements FileConfigurationInterface */ public function getValuesForMapping(Reader $reader, array $config, array $columnConfig): array { - $offset = isset($config['has-headers']) && $config['has-headers'] === true ? 1 : 0; + $offset = isset($config['has-headers']) && true === $config['has-headers'] ? 1 : 0; try { $stmt = (new Statement)->offset($offset); // @codeCoverageIgnoreStart @@ -295,7 +295,7 @@ class ConfigureMappingHandler implements FileConfigurationInterface continue; } $value = trim($line[$columnIndex]); - if (\strlen($value) === 0) { + if ('' === $value) { // value is empty, ignore it. continue; } @@ -309,7 +309,7 @@ class ConfigureMappingHandler implements FileConfigurationInterface $columnConfig[$columnIndex]['values'] = array_unique($columnConfig[$columnIndex]['values']); asort($columnConfig[$columnIndex]['values']); // if the count of this array is zero, there is nothing to map. - if (\count($columnConfig[$columnIndex]['values']) === 0) { + if (0 === \count($columnConfig[$columnIndex]['values'])) { unset($columnConfig[$columnIndex]); } } diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php index e93af258cf..16a45137f9 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php @@ -76,10 +76,10 @@ class ConfigureRolesHandler implements FileConfigurationInterface if (\in_array($role, ['amount', 'amount_credit', 'amount_debit'])) { $hasAmount = true; } - if ($role === 'foreign-currency-code') { + if ('foreign-currency-code' === $role) { $hasForeignCode = true; } - if ($role === 'amount_foreign') { + if ('amount_foreign' === $role) { $hasForeignAmount = true; } } @@ -122,7 +122,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface $count = $config['column-count']; for ($i = 0; $i < $count; ++$i) { $role = $data['role'][$i] ?? '_ignore'; - $mapping = (isset($data['map'][$i]) && $data['map'][$i] === '1'); + $mapping = (isset($data['map'][$i]) && '1' === $data['map'][$i]); $config['column-roles'][$i] = $role; $config['column-do-mapping'][$i] = $mapping; Log::debug(sprintf('Column %d has been given role %s (mapping: %s)', $i, $role, var_export($mapping, true))); @@ -130,7 +130,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface $config = $this->ignoreUnmappableColumns($config); $messages = $this->configurationComplete($config); - if ($messages->count() === 0) { + if (0 === $messages->count()) { $this->repository->setStage($this->importJob, 'ready_to_run'); if ($this->isMappingNecessary($config)) { $this->repository->setStage($this->importJob, 'map'); @@ -175,7 +175,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface public function getExamplesFromFile(Reader $reader, array $config): void { $limit = (int)config('csv.example_rows', 5); - $offset = isset($config['has-headers']) && $config['has-headers'] === true ? 1 : 0; + $offset = isset($config['has-headers']) && true === $config['has-headers'] ? 1 : 0; // make statement. try { @@ -214,7 +214,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface public function getHeaders(Reader $reader, array $config): array { $headers = []; - if (isset($config['has-headers']) && $config['has-headers'] === true) { + if (isset($config['has-headers']) && true === $config['has-headers']) { try { $stmt = (new Statement)->limit(1)->offset(0); $records = $stmt->process($reader); @@ -273,7 +273,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface $collection = $this->repository->getAttachments($this->importJob); /** @var Attachment $attachment */ foreach ($collection as $attachment) { - if ($attachment->filename === 'import_file') { + if ('import_file' === $attachment->filename) { $content = $this->attachments->getAttachmentContent($attachment); break; } diff --git a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php index 7e521e527c..0c205ca4a2 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php @@ -57,10 +57,10 @@ class ConfigureUploadHandler implements FileConfigurationInterface // collect values: $importId = isset($data['csv_import_account']) ? (int)$data['csv_import_account'] : 0; $delimiter = (string)$data['csv_delimiter']; - $config['has-headers'] = (int)($data['has_headers'] ?? 0.0) === 1; + $config['has-headers'] = 1 === (int)($data['has_headers'] ?? 0.0); $config['date-format'] = (string)$data['date_format']; $config['delimiter'] = 'tab' === $delimiter ? "\t" : $delimiter; - $config['apply-rules'] = (int)($data['apply_rules'] ?? 0.0) === 1; + $config['apply-rules'] = 1 === (int)($data['apply_rules'] ?? 0.0); $config['specifics'] = $this->getSpecifics($data); // validate values: $account = $this->accountRepos->findNull($importId); diff --git a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php index 34f79e92c9..047f8c5d39 100644 --- a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php +++ b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php @@ -123,7 +123,7 @@ class NewFileJobHandler implements FileConfigurationInterface /** @var Attachment $attachment */ foreach ($attachments as $attachment) { // if file is configuration file, store it into the job. - if ($attachment->filename === 'configuration_file') { + if ('configuration_file' === $attachment->filename) { $this->storeConfig($attachment); } } @@ -162,7 +162,7 @@ class NewFileJobHandler implements FileConfigurationInterface } // if file is configuration file, store it into the job. - if ($attachment->filename === 'configuration_file') { + if ('configuration_file' === $attachment->filename) { $this->storeConfig($attachment); } } @@ -179,10 +179,10 @@ class NewFileJobHandler implements FileConfigurationInterface { $content = $this->attachments->getAttachmentContent($attachment); $result = mb_detect_encoding($content, 'UTF-8', true); - if ($result === false) { + if (false === $result) { return false; } - if ($result !== 'ASCII' && $result !== 'UTF-8') { + if ('ASCII' !== $result && 'UTF-8' !== $result) { return false; // @codeCoverageIgnore } @@ -194,7 +194,6 @@ class NewFileJobHandler implements FileConfigurationInterface * * @param Attachment $attachment * - * @throws FireflyException */ private function storeConfig(Attachment $attachment): void { diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php index f1ccd1b25b..8f42ac6ea0 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php @@ -98,7 +98,7 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface $config['account_mapping'] = $final; $config['apply-rules'] = $applyRules; $this->repository->setConfiguration($this->importJob, $config); - if ($final === [0 => 0] || \count($final) === 0) { + if ($final === [0 => 0] || 0 === \count($final)) { $messages->add('count', (string)trans('import.spectre_no_mapping')); } @@ -116,7 +116,7 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface Log::debug('Now in ChooseAccountsHandler::getnextData()'); $config = $this->importJob->configuration; $accounts = $config['accounts'] ?? []; - if (\count($accounts) === 0) { + if (0 === \count($accounts)) { throw new FireflyException('It seems you have no accounts with this bank. The import cannot continue.'); // @codeCoverageIgnore } $converted = []; @@ -128,15 +128,15 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface $login = null; $logins = $config['all-logins'] ?? []; $selected = $config['selected-login'] ?? 0; - if (\count($logins) === 0) { + if (0 === \count($logins)) { throw new FireflyException('It seems you have no configured logins in this import job. The import cannot continue.'); // @codeCoverageIgnore } Log::debug(sprintf('Selected login to use is %d', $selected)); - if ($selected === 0) { + if (0 === $selected) { $login = new Login($logins[0]); Log::debug(sprintf('Will use login %d (%s %s)', $login->getId(), $login->getProviderName(), $login->getCountryCode())); } - if ($selected !== 0) { + if (0 !== $selected) { foreach ($logins as $loginArray) { $loginId = $loginArray['id'] ?? -1; if ($loginId === $selected) { diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php index d2d2027538..39b6e5b565 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php @@ -82,7 +82,7 @@ class ChooseLoginHandler implements SpectreJobConfigurationInterface Log::debug(sprintf('The selected login by the user is #%d', $selectedLogin)); // if selected login is zero, create a new one. - if ($selectedLogin === 0) { + if (0 === $selectedLogin) { Log::debug('Login is zero, get Spectre customer + token and store it in config.'); $customer = $this->getCustomer($this->importJob); // get a token for the user and redirect to next stage diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index 6a2344fed9..c97f3f8f7e 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -226,7 +226,6 @@ class ImportTransaction * Calculate the amount of this transaction. * * @return string - * @throws FireflyException */ public function calculateAmount(): string { @@ -258,7 +257,7 @@ class ImportTransaction if ($conversion === -1) { $result = app('steam')->negative($result); } - if ($conversion === 1) { + if (1 === $conversion) { $result = app('steam')->positive($result); } Log::debug(sprintf('convertedAmount after conversion is %s', $result)); @@ -301,7 +300,7 @@ class ImportTransaction if ($conversion === -1) { $result = app('steam')->negative($result); } - if ($conversion === 1) { + if (1 === $conversion) { $result = app('steam')->positive($result); } Log::debug(sprintf('Foreign amount after conversion is %s', $result)); diff --git a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php index 102135f87f..f0067b57dd 100644 --- a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php +++ b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php @@ -80,7 +80,7 @@ class StageImportDataHandler $bunqAccountId = $bunqAccount['id'] ?? 0; $localId = $mapping[$bunqAccountId] ?? 0; Log::debug(sprintf('Looping accounts, now at bunq account #%d and local account #%d', $bunqAccountId, $localId)); - if ($localId !== 0 && $bunqAccountId !== 0) { + if (0 !== $localId && 0 !== $bunqAccountId) { $localAccount = $this->getLocalAccount((int)$localId); $collection[] = $this->getTransactionsFromBunq($bunqAccountId, $localAccount); } @@ -122,7 +122,7 @@ class StageImportDataHandler Log::debug(sprintf('Amount is %s %s', $amount->getCurrency(), $amount->getValue())); $expected = AccountType::EXPENSE; - if (bccomp($amount->getValue(), '0') === 1) { + if (1 === bccomp($amount->getValue(), '0')) { // amount + means that its a deposit. $expected = AccountType::REVENUE; $type = TransactionType::DEPOSIT; @@ -131,7 +131,7 @@ class StageImportDataHandler $destination = $this->convertToAccount($counterParty, $expected); // switch source and destination if necessary. - if (bccomp($amount->getValue(), '0') === 1) { + if (1 === bccomp($amount->getValue(), '0')) { Log::debug('Will make it a deposit.'); [$source, $destination] = [$destination, $source]; } @@ -187,11 +187,12 @@ class StageImportDataHandler * @param string $expectedType * * @return LocalAccount + * @throws FireflyException */ private function convertToAccount(LabelMonetaryAccount $party, string $expectedType): LocalAccount { Log::debug('in convertToAccount()'); - if ($party->getIban() !== null) { + if (null !== $party->getIban()) { // find opposing party by IBAN first. $result = $this->accountRepository->findByIbanNull($party->getIban(), [$expectedType]); if (null !== $result) { diff --git a/app/Support/Import/Routine/Fake/StageAhoyHandler.php b/app/Support/Import/Routine/Fake/StageAhoyHandler.php index 8c4bb211c0..b7084e0423 100644 --- a/app/Support/Import/Routine/Fake/StageAhoyHandler.php +++ b/app/Support/Import/Routine/Fake/StageAhoyHandler.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Import\Routine\Fake; -use FireflyIII\Exceptions\FireflyException; use Log; /** @@ -33,7 +32,6 @@ use Log; class StageAhoyHandler { /** - * @throws FireflyException */ public function run(): void { diff --git a/app/Support/Import/Routine/Fake/StageNewHandler.php b/app/Support/Import/Routine/Fake/StageNewHandler.php index 2c0f7cdd3c..111378042a 100644 --- a/app/Support/Import/Routine/Fake/StageNewHandler.php +++ b/app/Support/Import/Routine/Fake/StageNewHandler.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Import\Routine\Fake; -use FireflyIII\Exceptions\FireflyException; use Log; /** @@ -33,7 +32,6 @@ use Log; class StageNewHandler { /** - * @throws FireflyException */ public function run(): void { diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php index e0ec2ba022..17fcfe2b46 100644 --- a/app/Support/Import/Routine/File/ImportableConverter.php +++ b/app/Support/Import/Routine/File/ImportableConverter.php @@ -205,7 +205,7 @@ class ImportableConverter $transactionType = $this->getTransactionType($source->accountType->type, $destination->accountType->type); $currency = $currency ?? $this->getCurrency($source, $destination); - if ($transactionType === 'unknown') { + if ('unknown' === $transactionType) { $message = sprintf( 'Cannot determine transaction type. Source account is a %s, destination is a %s', $source->accountType->type, $destination->accountType->type ); @@ -282,14 +282,14 @@ class ImportableConverter if ($destination->accountType->type === AccountType::ASSET) { // destination is asset, might have currency preference: $destinationCurrencyId = (int)$this->accountRepository->getMetaValue($destination, 'currency_id'); - $currency = $destinationCurrencyId === 0 ? $this->defaultCurrency : $this->currencyMapper->map($destinationCurrencyId, []); + $currency = 0 === $destinationCurrencyId ? $this->defaultCurrency : $this->currencyMapper->map($destinationCurrencyId, []); Log::debug(sprintf('Destination is an asset account, and has currency preference %s', $currency->code)); } if ($source->accountType->type === AccountType::ASSET) { // source is asset, might have currency preference: $sourceCurrencyId = (int)$this->accountRepository->getMetaValue($source, 'currency_id'); - $currency = $sourceCurrencyId === 0 ? $this->defaultCurrency : $this->currencyMapper->map($sourceCurrencyId, []); + $currency = 0 === $sourceCurrencyId ? $this->defaultCurrency : $this->currencyMapper->map($sourceCurrencyId, []); Log::debug(sprintf('Source is an asset account, and has currency preference %s', $currency->code)); } if (null === $currency) { diff --git a/app/Support/Import/Routine/File/LineReader.php b/app/Support/Import/Routine/File/LineReader.php index 2391ff8af0..0953ec1ad8 100644 --- a/app/Support/Import/Routine/File/LineReader.php +++ b/app/Support/Import/Routine/File/LineReader.php @@ -123,7 +123,7 @@ class LineReader /** @var array $config */ $config = $this->importJob->configuration; Log::debug('now in getLines()'); - $offset = isset($config['has-headers']) && $config['has-headers'] === true ? 1 : 0; + $offset = isset($config['has-headers']) && true === $config['has-headers'] ? 1 : 0; try { $stmt = (new Statement)->offset($offset); // @codeCoverageIgnoreStart @@ -151,7 +151,7 @@ class LineReader $collection = $this->repository->getAttachments($this->importJob); /** @var Attachment $attachment */ foreach ($collection as $attachment) { - if ($attachment->filename === 'import_file') { + if ('import_file' === $attachment->filename) { $content = $this->attachments->getAttachmentContent($attachment); break; } diff --git a/app/Support/Import/Routine/File/MappingConverger.php b/app/Support/Import/Routine/File/MappingConverger.php index e2768ae8f2..57d70522ad 100644 --- a/app/Support/Import/Routine/File/MappingConverger.php +++ b/app/Support/Import/Routine/File/MappingConverger.php @@ -195,7 +195,7 @@ class MappingConverger $value = trim($value); $originalRole = $this->roles[$columnIndex] ?? '_ignore'; Log::debug(sprintf('Now at column #%d (%s), value "%s"', $columnIndex, $originalRole, $value)); - if ($originalRole !== '_ignore' && \strlen($value) > 0) { + if ('_ignore' !== $originalRole && \strlen($value) > 0) { // is a mapped value present? $mapped = $this->mapping[$columnIndex][$value] ?? 0; diff --git a/app/Support/Import/Routine/File/OpposingAccountMapper.php b/app/Support/Import/Routine/File/OpposingAccountMapper.php index da1b6b9fa0..5f67428d7e 100644 --- a/app/Support/Import/Routine/File/OpposingAccountMapper.php +++ b/app/Support/Import/Routine/File/OpposingAccountMapper.php @@ -53,7 +53,7 @@ class OpposingAccountMapper $expectedType = AccountType::EXPENSE; $result = null; Log::debug(sprintf('Going to search for accounts of type %s', $expectedType)); - if (bccomp($amount, '0') === 1) { + if (1 === bccomp($amount, '0')) { // more than zero. $expectedType = AccountType::REVENUE; Log::debug(sprintf('Because amount is %s, will instead search for accounts of type %s', $amount, $expectedType)); diff --git a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php index b247a230e0..c4b08e7af1 100644 --- a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php +++ b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php @@ -57,7 +57,7 @@ class StageAuthenticatedHandler $config = $this->importJob->configuration; $logins = $config['all-logins'] ?? []; Log::debug(sprintf('%d logins in config', \count($logins))); - if (\count($logins) === 0) { + if (0 === \count($logins)) { // get logins from Spectre. $logins = $this->getLogins(); $config['all-logins'] = $logins; diff --git a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php index 4f2eff2872..789aa6c664 100644 --- a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php +++ b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php @@ -60,7 +60,7 @@ class StageImportDataHandler $config = $this->importJob->configuration; $accounts = $config['accounts'] ?? []; Log::debug(sprintf('Count of accounts in array is %d', \count($accounts))); - if (\count($accounts) === 0) { + if (0 === \count($accounts)) { throw new FireflyException('There are no accounts in this import job. Cannot continue.'); // @codeCoverageIgnore } $toImport = $config['account_mapping'] ?? []; @@ -124,14 +124,14 @@ class StageImportDataHandler $amount = $transaction->getAmount(); $source = $originalSource; $destination = $this->mapper->map(null, $amount, $destinationData); - $notes = (string)trans('import.imported_from_account', ['account' => $spectreAccount->getName()]) . ' ' . "\n"; + $notes = trans('import.imported_from_account', ['account' => $spectreAccount->getName()]) . ' ' . "\n"; $foreignAmount = null; $foreignCurrencyCode = null; $currencyCode = $transaction->getCurrencyCode(); $type = 'withdrawal'; // switch source and destination if amount is greater than zero. - if (bccomp($amount, '0') === 1) { + if (1 === bccomp($amount, '0')) { [$source, $destination] = [$destination, $source]; $type = 'deposit'; } diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 3e1fc6b818..a539793d17 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -73,7 +73,7 @@ class Navigation // if period is 1M and diff in month is 2 and new DOM = 1, sub a day: $months = ['1M', 'month', 'monthly']; $difference = $date->month - $theDate->month; - if (\in_array($repeatFreq, $months) && 2 === $difference && 1 === $date->day) { + if (2 === $difference && 1 === $date->day && \in_array($repeatFreq, $months, true)) { $date->subDay(); } @@ -199,14 +199,14 @@ class Navigation if (isset($modifierMap[$repeatFreq])) { $currentEnd->$function($modifierMap[$repeatFreq]); - if (\in_array($repeatFreq, $subDay)) { + if (\in_array($repeatFreq, $subDay, true)) { $currentEnd->subDay(); } return $currentEnd; } $currentEnd->$function(); - if (\in_array($repeatFreq, $subDay)) { + if (\in_array($repeatFreq, $subDay, true)) { $currentEnd->subDay(); } diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 69a4a41e8a..a27ab81001 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -62,6 +62,7 @@ class Preferences try { Preference::where('user_id', auth()->user()->id)->where('name', $name)->delete(); } catch (Exception $e) { + Log::debug(sprintf('Not interesting: %s', $e->getMessage())); // don't care. } @@ -80,7 +81,7 @@ class Preferences /** * @param string $name - * @param mixed $default + * @param mixed $default * * @return \FireflyIII\Models\Preference|null */ @@ -137,7 +138,7 @@ class Preferences try { $preference->delete(); } catch (Exception $e) { - Log::debug(sprintf('Could not delete preference #%d', $preference->id)); + Log::debug(sprintf('Could not delete preference #%d: %s', $preference->id, $e->getMessage())); } $preference = null; } diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index 56a3a13755..5b6972c46b 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -101,6 +101,8 @@ class Modifier try { $compareDate = new Carbon($compare); } catch (Exception $e) { + Log::debug(sprintf('Not interesting: %s', $e->getMessage())); + return false; } @@ -118,6 +120,8 @@ class Modifier try { $compareDate = new Carbon($compare); } catch (Exception $e) { + Log::debug(sprintf('Not interesting: %s', $e->getMessage())); + return false; } @@ -135,6 +139,8 @@ class Modifier try { $compareDate = new Carbon($compare); } catch (Exception $e) { + Log::debug(sprintf('Not interesting: %s', $e->getMessage())); + return false; } diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index d8e6b72c0c..ff47407573 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -63,7 +63,7 @@ class Search implements SearchInterface public function getWordsAsString(): string { $string = implode(' ', $this->words); - if (0 === \strlen($string)) { + if ('' === $string) { return \is_string($this->originalQuery) ? $this->originalQuery : ''; } @@ -81,7 +81,7 @@ class Search implements SearchInterface /** * @param string $query */ - public function parseQuery(string $query) + public function parseQuery(string $query): void { $filteredQuery = $query; $this->originalQuery = $query; @@ -171,7 +171,7 @@ class Search implements SearchInterface /** * @param int $limit */ - public function setLimit(int $limit) + public function setLimit(int $limit): void { $this->limit = $limit; } @@ -179,7 +179,7 @@ class Search implements SearchInterface /** * @param User $user */ - public function setUser(User $user) + public function setUser(User $user): void { $this->user = $user; } @@ -242,13 +242,13 @@ class Search implements SearchInterface /** * @param string $string */ - private function extractModifier(string $string) + private function extractModifier(string $string): void { $parts = explode(':', $string); - if (2 === \count($parts) && \strlen(trim((string)$parts[0])) > 0 && \strlen(trim((string)$parts[1]))) { + if (2 === \count($parts) && \strlen(trim((string)$parts[0])) > 0 && '' !== trim((string)$parts[1])) { $type = trim((string)$parts[0]); $value = trim((string)$parts[1]); - if (\in_array($type, $this->validModifiers)) { + if (\in_array($type, $this->validModifiers, true)) { // filter for valid type $this->modifiers->push(['type' => $type, 'value' => $value]); } @@ -292,9 +292,9 @@ class Search implements SearchInterface * * @return bool */ - private function strposArray(string $haystack, array $needle) + private function strposArray(string $haystack, array $needle): bool { - if (0 === \strlen($haystack)) { + if ('' === $haystack) { return false; } foreach ($needle as $what) { diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 42df4918af..3256f37f0a 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Collection; +use Log; /** * Class Steam. @@ -249,7 +250,7 @@ class Steam * @return string * @throws \Illuminate\Contracts\Encryption\DecryptException */ - public function decrypt(int $isEncrypted, string $value) + public function decrypt(int $isEncrypted, string $value): string { if (1 === $isEncrypted) { return Crypt::decrypt($value); @@ -366,6 +367,7 @@ class Steam $value = Crypt::decrypt($value); } catch (DecryptException $e) { // do not care. + Log::debug(sprintf('Not interesting: %s', $e->getMessage())); } return $value; diff --git a/app/Support/Twig/AmountFormat.php b/app/Support/Twig/AmountFormat.php index 7cc70d7dd4..52a7554885 100644 --- a/app/Support/Twig/AmountFormat.php +++ b/app/Support/Twig/AmountFormat.php @@ -83,7 +83,8 @@ class AmountFormat extends Twig_Extension { return new Twig_SimpleFunction( 'formatAmountByAccount', - function (AccountModel $account, string $amount, bool $coloured = true): string { + function (AccountModel $account, string $amount, bool $coloured = null): string { + $coloured = $coloured ?? true; /** @var AccountRepositoryInterface $accountRepos */ $accountRepos = app(AccountRepositoryInterface::class); /** @var CurrencyRepositoryInterface $currencyRepos */ @@ -113,7 +114,9 @@ class AmountFormat extends Twig_Extension { return new Twig_SimpleFunction( 'formatAmountByCurrency', - function (TransactionCurrency $currency, string $amount, bool $coloured = true): string { + function (TransactionCurrency $currency, string $amount, bool $coloured = null): string { + $coloured = $coloured ?? true; + return app('amount')->formatAnything($currency, $amount, $coloured); }, ['is_safe' => ['html']] @@ -129,7 +132,9 @@ class AmountFormat extends Twig_Extension { return new Twig_SimpleFunction( 'formatAmountBySymbol', - function (string $amount, string $symbol, int $decimalPlaces = 2, bool $coloured = true): string { + function (string $amount, string $symbol, int $decimalPlaces = null, bool $coloured = null): string { + $decimalPlaces = $decimalPlaces ?? 2; + $coloured = $coloured ?? true; $currency = new TransactionCurrency; $currency->symbol = $symbol; $currency->decimal_places = $decimalPlaces; diff --git a/app/Support/Twig/Extension/Transaction.php b/app/Support/Twig/Extension/Transaction.php index 2eda973b52..327c7af1d6 100644 --- a/app/Support/Twig/Extension/Transaction.php +++ b/app/Support/Twig/Extension/Transaction.php @@ -136,12 +136,12 @@ class Transaction extends Twig_Extension } // transaction has a budget - if (null !== $transaction->transaction_budget_id && $txt === '') { + if (null !== $transaction->transaction_budget_id && '' === $txt) { $name = app('steam')->tryDecrypt($transaction->transaction_budget_name); $txt = sprintf('%s', route('budgets.show', [$transaction->transaction_budget_id]), $name, $name); } - if ($txt === '') { + if ('' === $txt) { // see if the transaction has a budget: $budgets = $transaction->budgets()->get(); if (0 === $budgets->count()) { @@ -174,12 +174,12 @@ class Transaction extends Twig_Extension } // transaction has a category: - if (null !== $transaction->transaction_category_id && $txt === '') { + if (null !== $transaction->transaction_category_id && '' === $txt) { $name = app('steam')->tryDecrypt($transaction->transaction_category_name); $txt = sprintf('%s', route('categories.show', [$transaction->transaction_category_id]), $name, $name); } - if ($txt === '') { + if ('' === $txt) { // see if the transaction has a category: $categories = $transaction->categories()->get(); if (0 === $categories->count()) { @@ -229,14 +229,14 @@ class Transaction extends Twig_Extension $type = $transaction->account_type; // name is present in object, use that one: - if (bccomp($transaction->transaction_amount, '0') === -1 && null !== $transaction->opposing_account_id) { + if (null !== $transaction->opposing_account_id && bccomp($transaction->transaction_amount, '0') === -1) { $name = $transaction->opposing_account_name; $transactionId = (int)$transaction->opposing_account_id; $type = $transaction->opposing_account_type; } // Find the opposing account and use that one: - if (bccomp($transaction->transaction_amount, '0') === -1 && null === $transaction->opposing_account_id) { + if (null === $transaction->opposing_account_id && bccomp($transaction->transaction_amount, '0') === -1) { // if the amount is negative, find the opposing account and use that one: $journalId = $transaction->journal_id; /** @var TransactionModel $other */ @@ -259,7 +259,7 @@ class Transaction extends Twig_Extension } if (AccountType::CASH === $type) { - $txt = '(' . (string)trans('firefly.cash') . ')'; + $txt = '(' . trans('firefly.cash') . ')'; return $txt; } @@ -285,7 +285,7 @@ class Transaction extends Twig_Extension ) ); } - if ($transaction->attachmentCount === null) { + if (null === $transaction->attachmentCount) { $journalId = (int)$transaction->journal_id; $count = Attachment::whereNull('deleted_at') ->where('attachable_type', TransactionJournal::class) @@ -355,11 +355,11 @@ class Transaction extends Twig_Extension public function isSplit(TransactionModel $transaction): string { $res = ''; - if ($transaction->is_split === true) { + if (true === $transaction->is_split) { $res = ''; } - if ($transaction->is_split === null) { + if (null === $transaction->is_split) { $journalId = (int)$transaction->journal_id; $count = TransactionModel::where('transaction_journal_id', $journalId)->whereNull('deleted_at')->count(); if ($count > 2) { @@ -387,13 +387,13 @@ class Transaction extends Twig_Extension $type = $transaction->account_type; // name is present in object, use that one: - if (1 === bccomp($transaction->transaction_amount, '0') && null !== $transaction->opposing_account_id) { + if (null !== $transaction->opposing_account_id && 1 === bccomp($transaction->transaction_amount, '0')) { $name = $transaction->opposing_account_name; $transactionId = (int)$transaction->opposing_account_id; $type = $transaction->opposing_account_type; } // Find the opposing account and use that one: - if (1 === bccomp($transaction->transaction_amount, '0') && null === $transaction->opposing_account_id) { + if (null === $transaction->opposing_account_id && 1 === bccomp($transaction->transaction_amount, '0')) { $journalId = $transaction->journal_id; /** @var TransactionModel $other */ $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id) @@ -410,7 +410,7 @@ class Transaction extends Twig_Extension } if (AccountType::CASH === $type) { - $txt = '(' . (string)trans('firefly.cash') . ')'; + $txt = '(' . trans('firefly.cash') . ')'; return $txt; } diff --git a/app/Support/Twig/Extension/TransactionJournal.php b/app/Support/Twig/Extension/TransactionJournal.php index 5e4ec2b1a2..32bfa25f3a 100644 --- a/app/Support/Twig/Extension/TransactionJournal.php +++ b/app/Support/Twig/Extension/TransactionJournal.php @@ -83,7 +83,7 @@ class TransactionJournal extends Twig_Extension if (null === $result) { return false; } - if (\strlen((string)$result) === 0) { + if ('' === (string)$result) { return false; } diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index d7e3d16355..633de8f1c3 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -174,7 +174,7 @@ class General extends Twig_Extension /** * @return Twig_SimpleFunction */ - protected function formatDate() + protected function formatDate(): Twig_SimpleFunction { return new Twig_SimpleFunction( 'formatDate', @@ -330,7 +330,7 @@ class General extends Twig_Extension /** * @return Twig_SimpleFunction */ - protected function phpdate() + protected function phpdate(): Twig_SimpleFunction { return new Twig_SimpleFunction( 'phpdate', diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php index 72d531796c..83a403bc0f 100644 --- a/app/Support/Twig/Rule.php +++ b/app/Support/Twig/Rule.php @@ -45,7 +45,7 @@ class Rule extends Twig_Extension foreach ($ruleActions as $key) { $possibleActions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice'); } - unset($key, $ruleActions); + unset($ruleActions); asort($possibleActions); return $possibleActions; @@ -84,7 +84,7 @@ class Rule extends Twig_Extension $possibleTriggers[$key] = (string)trans('firefly.rule_trigger_' . $key . '_choice'); } } - unset($key, $ruleTriggers); + unset($ruleTriggers); asort($possibleTriggers); return $possibleTriggers; From 6f64c19c32b0c6fc4805c815f34c988085e804f4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Jul 2018 05:03:50 +0200 Subject: [PATCH 79/86] Update changelog for next release. --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index 945a303282..2428f80323 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +Many updated French translations thanks to https://crowdin.com/profile/bubka + + ## [4.7.5.1] - 2018-07-14 ### Fixed From 26fa2b0b740f2a38acc8133d31dcdff4554b59a8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Jul 2018 06:02:34 +0200 Subject: [PATCH 80/86] Speed up category test. --- app/Http/Controllers/Category/ShowController.php | 9 ++++++--- .../Controllers/Category/ShowControllerTest.php | 13 ++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 4dc431ccfb..eb0e54edfd 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -36,7 +36,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; - +use Log; /** * @@ -88,10 +88,11 @@ class ShowController extends Controller */ public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) { + Log::debug('Now in show()'); /** @var Carbon $start */ - $start = $start ?? session('start'); + $start = $start ?? session('start', Carbon::create()->startOfMonth()); /** @var Carbon $end */ - $end = $end ?? session('end'); + $end = $end ?? session('end', Carbon::create()->startOfMonth()); $subTitleIcon = 'fa-bar-chart'; $moment = ''; $page = (int)$request->get('page'); @@ -112,6 +113,8 @@ class ShowController extends Controller $transactions = $collector->getPaginatedJournals(); $transactions->setPath($path); + Log::debug('End of show()'); + return view('categories.show', compact('category', 'transactions', 'moment', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); } diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php index b678a30176..f6a4eacf11 100644 --- a/tests/Feature/Controllers/Category/ShowControllerTest.php +++ b/tests/Feature/Controllers/Category/ShowControllerTest.php @@ -63,7 +63,7 @@ class ShowControllerTest extends TestCase */ public function testShow(string $range): void { - Log::debug('Test show()'); + Log::debug(sprintf('Test show(%s)', $range)); $transaction = factory(Transaction::class)->make(); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -113,7 +113,7 @@ class ShowControllerTest extends TestCase */ public function testShowAll(string $range): void { - Log::debug('Test showAll()'); + Log::debug(sprintf('Test showAll(%s)', $range)); // mock stuff $transaction = factory(Transaction::class)->make(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -151,7 +151,7 @@ class ShowControllerTest extends TestCase */ public function testShowByDate(string $range): void { - Log::debug('Test showbydate()'); + Log::debug(sprintf('Test testShowByDate(%s)', $range)); // mock stuff $transaction = factory(Transaction::class)->make(); $repository = $this->mock(CategoryRepositoryInterface::class); @@ -199,9 +199,12 @@ class ShowControllerTest extends TestCase */ public function testShowEmpty(string $range): void { - Log::debug('Test showempty()'); + $latestJournal = $this->user()->transactionJournals() + ->orderBy('date','DESC')->first(); + + Log::debug(sprintf('Test testShowEmpty(%s)', $range)); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn($latestJournal); // mock stuff $repository = $this->mock(CategoryRepositoryInterface::class); From 0ccc1271a6ec52d97c3acb11851168f0cc23c9ff Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Jul 2018 06:06:29 +0200 Subject: [PATCH 81/86] Update tests. --- tests/Unit/TransactionRules/Actions/AddTagTest.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/Unit/TransactionRules/Actions/AddTagTest.php b/tests/Unit/TransactionRules/Actions/AddTagTest.php index a164ba954c..98c0d7c2f4 100644 --- a/tests/Unit/TransactionRules/Actions/AddTagTest.php +++ b/tests/Unit/TransactionRules/Actions/AddTagTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Actions; +use FireflyIII\Factory\TagFactory; use FireflyIII\Models\RuleAction; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; @@ -39,7 +40,13 @@ class AddTagTest extends TestCase */ public function testActExistingTag(): void { - $tag = $this->user()->tags()->inRandomOrder()->whereNull('deleted_at')->first(); + $tag = $this->user()->tags()->inRandomOrder()->whereNull('deleted_at')->first(); + + $tagFactory = $this->mock(TagFactory::class); + $tagFactory->shouldReceive('setUser')->once(); + $tagFactory->shouldReceive('findOrCreate')->once()->withArgs([$tag->tag])->andReturn($tag); + + /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $journal->tags()->sync([]); @@ -59,9 +66,10 @@ class AddTagTest extends TestCase */ public function testActNoTag(): void { + $newTagName = 'TestTag-' . random_int(1, 10000); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $ruleAction = new RuleAction; - $ruleAction->action_value = 'TestTag-' . random_int(1, 10000); + $ruleAction->action_value = $newTagName; $action = new AddTag($ruleAction); $result = $action->act($journal); $this->assertTrue($result); From 07ae64693e840fba6faf04878530bd98aaea6687 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 06:27:30 +0200 Subject: [PATCH 82/86] new language strings and updated code --- app/Factory/AccountMetaFactory.php | 45 +++++++ app/Factory/TransactionFactory.php | 5 +- app/Models/PiggyBankEvent.php | 3 +- app/Models/TransactionJournal.php | 30 ++--- app/Services/Bunq/ApiContext.php | 1 + app/Services/Github/Object/Release.php | 6 +- .../Destroy/AccountDestroyService.php | 4 +- .../Destroy/RecurrenceDestroyService.php | 3 + .../Internal/Support/AccountServiceTrait.php | 46 +------ .../Internal/Support/JournalServiceTrait.php | 3 + .../Support/RecurringTransactionTrait.php | 52 ++++++-- .../Support/TransactionServiceTrait.php | 114 +++++------------- .../Internal/Update/AccountUpdateService.php | 2 + .../Internal/Update/JournalUpdateService.php | 2 + .../Update/TransactionUpdateService.php | 6 +- app/Services/Spectre/Object/Account.php | 4 +- app/Services/Spectre/Object/Attempt.php | 5 +- app/Services/Spectre/Object/Customer.php | 4 +- app/Services/Spectre/Object/Holder.php | 4 +- app/Services/Spectre/Object/Login.php | 4 +- app/Services/Spectre/Object/Transaction.php | 7 +- .../Spectre/Object/TransactionExtra.php | 5 +- .../Spectre/Request/ListAccountsRequest.php | 3 +- .../Spectre/Request/ListCustomersRequest.php | 3 +- .../Spectre/Request/ListLoginsRequest.php | 3 +- .../Request/ListTransactionsRequest.php | 3 +- app/User.php | 2 +- resources/lang/de_DE/firefly.php | 4 +- resources/lang/de_DE/import.php | 2 +- resources/lang/de_DE/list.php | 2 +- resources/lang/de_DE/validation.php | 4 +- resources/lang/es_ES/breadcrumbs.php | 8 +- resources/lang/es_ES/demo.php | 20 +-- resources/lang/es_ES/firefly.php | 36 +++--- resources/lang/fr_FR/config.php | 2 +- resources/lang/fr_FR/firefly.php | 84 ++++++------- resources/lang/fr_FR/import.php | 2 +- resources/lang/fr_FR/list.php | 2 +- resources/lang/fr_FR/validation.php | 4 +- resources/lang/it_IT/config.php | 2 +- resources/lang/it_IT/firefly.php | 4 +- resources/lang/it_IT/import.php | 2 +- resources/lang/it_IT/list.php | 2 +- resources/lang/it_IT/validation.php | 4 +- resources/lang/nl_NL/config.php | 2 +- resources/lang/nl_NL/firefly.php | 4 +- resources/lang/nl_NL/import.php | 2 +- resources/lang/nl_NL/list.php | 2 +- resources/lang/nl_NL/validation.php | 4 +- 49 files changed, 298 insertions(+), 269 deletions(-) diff --git a/app/Factory/AccountMetaFactory.php b/app/Factory/AccountMetaFactory.php index ba2172a30d..67ec707046 100644 --- a/app/Factory/AccountMetaFactory.php +++ b/app/Factory/AccountMetaFactory.php @@ -24,13 +24,17 @@ declare(strict_types=1); namespace FireflyIII\Factory; +use Exception; +use FireflyIII\Models\Account; use FireflyIII\Models\AccountMeta; +use Log; /** * Class AccountMetaFactory */ class AccountMetaFactory { + /** * @param array $data * @@ -41,4 +45,45 @@ class AccountMetaFactory return AccountMeta::create($data); } + /** + * Create update or delete meta data. + * + * @param Account $account + * @param string $field + * @param string $value + * + * @return AccountMeta|null + */ + public function crud(Account $account, string $field, string $value): ?AccountMeta + { + /** @var AccountMeta $entry */ + $entry = $account->accountMeta()->where('name', $field)->first(); + + // must not be an empty string: + if ('' !== $value) { + + // if $data has field and $entry is null, create new one: + if (null === $entry) { + Log::debug(sprintf('Created meta-field "%s":"%s" for account #%d ("%s") ', $field, $value, $account->id, $account->name)); + $this->create(['account_id' => $account->id, 'name' => $field, 'data' => $value]); + } + + // if $data has field and $entry is not null, update $entry: + if (null !== $entry) { + $entry->data = $value; + $entry->save(); + Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $value, $account->id, $account->name)); + } + } + if ('' === $value && null !== $entry && isset($data[$field])) { + try { + $entry->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete entry: %s', $e->getMessage())); + } + } + + return $entry; + } + } diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 0c3c3c7e3f..39d483b46a 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -113,7 +113,10 @@ class TransactionFactory $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']); if (null === $sourceAccount || null === $destinationAccount) { - Log::error('Info about source/dest:', $data); + $debugData = $data; + $debugData['source_type'] = $sourceType; + $debugData['dest_type'] = $destinationType; + Log::error('Info about source/dest:', $debugData); throw new FireflyException('Could not determine source or destination account.'); } diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 48668c220e..e01ed0a677 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Models; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; /** @@ -31,7 +32,7 @@ use Illuminate\Database\Eloquent\Model; * @property int $transaction_journal_id * @property int $piggy_bank_id * @property int $id - * @property mixed date + * @property Carbon date */ class PiggyBankEvent extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 8e5b29f661..7eae36c4d3 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -48,21 +48,21 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property int transaction_currency_id * @property TransactionCurrency $transactionCurrency * @property Collection $tags - * @property mixed user_id - * @property mixed transactions - * @property int transaction_count - * @property Carbon interest_date - * @property Carbon book_date - * @property Carbon process_date - * @property bool encrypted - * @property int order - * @property int budget_id - * @property string period_marker - * @property Carbon $date - * @property string $transaction_type_type - * @property int $id - * @property TransactionType $transactionType - * @property Collection budgets + * @property int user_id + * @property Collection transactions + * @property int transaction_count + * @property Carbon interest_date + * @property Carbon book_date + * @property Carbon process_date + * @property bool encrypted + * @property int order + * @property int budget_id + * @property string period_marker + * @property Carbon $date + * @property string $transaction_type_type + * @property int $id + * @property TransactionType $transactionType + * @property Collection budgets * * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/Services/Bunq/ApiContext.php b/app/Services/Bunq/ApiContext.php index b09aa1ea80..4e68bef43f 100644 --- a/app/Services/Bunq/ApiContext.php +++ b/app/Services/Bunq/ApiContext.php @@ -48,6 +48,7 @@ class ApiContext * * @throws FireflyException * @return BunqApiContext|FakeApiContext + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function create(BunqEnumApiEnvironmentType $environmentType, string $apiKey, string $description, array $permittedIps, string $proxyUrl = null ) { diff --git a/app/Services/Github/Object/Release.php b/app/Services/Github/Object/Release.php index d9bf4ed408..7a9ab20e94 100644 --- a/app/Services/Github/Object/Release.php +++ b/app/Services/Github/Object/Release.php @@ -27,8 +27,12 @@ use Carbon\Carbon; /** - * @codeCoverageIgnore + * * Class Release + * + * @SuppressWarnings(PHPMD.ShortVariable) + * + * @codeCoverageIgnore */ class Release extends GithubObject { diff --git a/app/Services/Internal/Destroy/AccountDestroyService.php b/app/Services/Internal/Destroy/AccountDestroyService.php index d04c319515..352b5cb48b 100644 --- a/app/Services/Internal/Destroy/AccountDestroyService.php +++ b/app/Services/Internal/Destroy/AccountDestroyService.php @@ -40,12 +40,14 @@ class AccountDestroyService * @param Account|null $moveTo * * @return void + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function destroy(Account $account, ?Account $moveTo): void { if (null !== $moveTo) { DB::table('transactions')->where('account_id', $account->id)->update(['account_id' => $moveTo->id]); } + $service = app(JournalDestroyService::class); Log::debug('Now trigger account delete response #' . $account->id); /** @var Transaction $transaction */ @@ -56,7 +58,7 @@ class AccountDestroyService if (null !== $journal) { Log::debug('Call for deletion of journal #' . $journal->id); /** @var JournalDestroyService $service */ - $service = app(JournalDestroyService::class); + $service->destroy($journal); } } diff --git a/app/Services/Internal/Destroy/RecurrenceDestroyService.php b/app/Services/Internal/Destroy/RecurrenceDestroyService.php index 6ad484738e..6dd1bb9ab2 100644 --- a/app/Services/Internal/Destroy/RecurrenceDestroyService.php +++ b/app/Services/Internal/Destroy/RecurrenceDestroyService.php @@ -35,7 +35,10 @@ use Log; class RecurrenceDestroyService { /** + * Delete recurrence. + * * @param Recurrence $recurrence + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function destroy(Recurrence $recurrence): void { diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index bef8eb4a43..10c4019fda 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -23,13 +23,11 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Support; -use Exception; use FireflyIII\Factory\AccountFactory; use FireflyIII\Factory\AccountMetaFactory; use FireflyIII\Factory\TransactionFactory; use FireflyIII\Factory\TransactionJournalFactory; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountMeta; use FireflyIII\Models\AccountType; use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; @@ -128,6 +126,7 @@ trait AccountServiceTrait * * @return TransactionJournal|null * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function storeIBJournal(Account $account, array $data): ?TransactionJournal { @@ -181,7 +180,7 @@ trait AccountServiceTrait /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($account->user); - $one = $factory->create( + $factory->create( [ 'account' => $firstAccount, 'transaction_journal' => $journal, @@ -193,7 +192,7 @@ trait AccountServiceTrait 'reconciled' => false, ] ); - $two = $factory->create( + $factory->create( [ 'account' => $secondAccount, 'transaction_journal' => $journal, @@ -205,9 +204,6 @@ trait AccountServiceTrait 'reconciled' => false, ] ); - if (null !== $one && null !== $two) { - Log::notice(sprintf('Stored two transactions for new account, #%d and #%d', $one->id, $two->id)); - } return $journal; } @@ -267,6 +263,7 @@ trait AccountServiceTrait * @param array $data * * @return bool + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function updateIBJournal(Account $account, TransactionJournal $journal, array $data): bool { @@ -274,7 +271,6 @@ trait AccountServiceTrait $amount = (string)$data['openingBalance']; $negativeAmount = bcmul($amount, '-1'); $currencyId = (int)$data['currency_id']; - Log::debug(sprintf('Submitted amount for opening balance to update is "%s"', $amount)); if (0 === bccomp($amount, '0')) { Log::notice(sprintf('Amount "%s" is zero, delete opening balance.', $amount)); @@ -282,16 +278,11 @@ trait AccountServiceTrait $service = app(JournalDestroyService::class); $service->destroy($journal); - return true; } - - // update date: $journal->date = $date; $journal->transaction_currency_id = $currencyId; $journal->save(); - - // update transactions: /** @var Transaction $transaction */ foreach ($journal->transactions()->get() as $transaction) { if ((int)$account->id === (int)$transaction->account_id) { @@ -317,6 +308,7 @@ trait AccountServiceTrait * * @param Account $account * @param array $data + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function updateMetaData(Account $account, array $data): void { @@ -331,33 +323,7 @@ trait AccountServiceTrait /** @var AccountMetaFactory $factory */ $factory = app(AccountMetaFactory::class); foreach ($fields as $field) { - /** @var AccountMeta $entry */ - $entry = $account->accountMeta()->where('name', $field)->first(); - - // must not be an empty string: - if (isset($data[$field]) && \strlen((string)$data[$field]) > 0) { - - // if $data has field and $entry is null, create new one: - if (null === $entry) { - Log::debug(sprintf('Created meta-field "%s":"%s" for account #%d ("%s") ', $field, $data[$field], $account->id, $account->name)); - $factory->create(['account_id' => $account->id, 'name' => $field, 'data' => $data[$field],]); - } - - // if $data has field and $entry is not null, update $entry: - // let's not bother with a service. - if (null !== $entry) { - $entry->data = $data[$field]; - $entry->save(); - Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $data[$field], $account->id, $account->name)); - } - } - if (null !== $entry && isset($data[$field]) && '' === (string)$data[$field]) { - try { - $entry->delete(); - } catch (Exception $e) { - Log::debug(sprintf('Could not delete entry: %s', $e->getMessage())); - } - } + $factory->crud($account, $field, $data[$field] ?? ''); } } diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index b46d8a74c0..3b97e9d375 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -38,8 +38,11 @@ trait JournalServiceTrait { /** + * Link tags to journal. + * * @param TransactionJournal $journal * @param array $data + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function connectTags(TransactionJournal $journal, array $data): void { diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 46c91191a9..b9c03074d9 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -45,15 +45,6 @@ use Log; */ trait RecurringTransactionTrait { - /** - * @param null|string $expectedType - * @param int|null $accountId - * @param null|string $accountName - * - * @return Account|null - */ - abstract public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): ?Account; - /** * @param Recurrence $recurrence * @param array $repetitions @@ -76,8 +67,12 @@ trait RecurringTransactionTrait } /** + * Store transactions of a recurring transactions. It's complex but readable. + * * @param Recurrence $recurrence * @param array $transactions + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function createTransactions(Recurrence $recurrence, array $transactions): void { @@ -103,9 +98,8 @@ trait RecurringTransactionTrait $factory = app(TransactionCurrencyFactory::class); $currency = $factory->find($array['currency_id'], $array['currency_code']); $foreignCurrency = $factory->find($array['foreign_currency_id'], $array['foreign_currency_code']); - $defaultCurrency = app('amount')->getDefaultCurrencyByUser($recurrence->user); if (null === $currency) { - $currency = $defaultCurrency; + $currency = app('amount')->getDefaultCurrencyByUser($recurrence->user); } $transaction = new RecurrenceTransaction( [ @@ -178,6 +172,17 @@ trait RecurringTransactionTrait } /** + * @param null|string $expectedType + * @param int|null $accountId + * @param null|string $accountName + * + * @return Account|null + */ + abstract public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): ?Account; + + /** + * Update meta data for recurring transaction. + * * @param Recurrence $recurrence * @param array $data */ @@ -186,6 +191,22 @@ trait RecurringTransactionTrait // only two special meta fields right now. Let's just hard code them. $piggyId = (int)($data['meta']['piggy_bank_id'] ?? 0.0); $piggyName = $data['meta']['piggy_bank_name'] ?? ''; + $this->updatePiggyBank($recurrence, $piggyId, $piggyName); + + + $tags = $data['meta']['tags'] ?? []; + $this->updateTags($recurrence, $tags); + + } + + /** + * @param Recurrence $recurrence + * @param int $piggyId + * @param string $piggyName + */ + protected function updatePiggyBank(Recurrence $recurrence, int $piggyId, string $piggyName): void + { + /** @var PiggyBankFactory $factory */ $factory = app(PiggyBankFactory::class); $factory->setUser($recurrence->user); @@ -203,9 +224,14 @@ trait RecurringTransactionTrait // delete if present $recurrence->recurrenceMeta()->where('name', 'piggy_bank_id')->delete(); } + } - - $tags = $data['meta']['tags'] ?? []; + /** + * @param Recurrence $recurrence + * @param array $tagst + */ + protected function updateTags(Recurrence $recurrence, array $tags): void + { if (\count($tags) > 0) { /** @var RecurrenceMeta $entry */ $entry = $recurrence->recurrenceMeta()->where('name', 'tags')->first(); diff --git a/app/Services/Internal/Support/TransactionServiceTrait.php b/app/Services/Internal/Support/TransactionServiceTrait.php index 7be855dbbf..207ef8da81 100644 --- a/app/Services/Internal/Support/TransactionServiceTrait.php +++ b/app/Services/Internal/Support/TransactionServiceTrait.php @@ -51,47 +51,30 @@ trait TransactionServiceTrait * @param string $direction * * @return string|null + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function accountType(TransactionJournal $journal, string $direction): ?string { $types = []; $type = $journal->transactionType->type; - switch ($type) { - default: - // @codeCoverageIgnoreStart - Log::error(sprintf('Cannot handle type "%s" in accountType()', $type)); - - return null; - // @codeCoverageIgnoreEnd - case TransactionType::WITHDRAWAL: - $types['source'] = AccountType::ASSET; - $types['destination'] = AccountType::EXPENSE; - break; - case TransactionType::DEPOSIT: - $types['source'] = AccountType::REVENUE; - $types['destination'] = AccountType::ASSET; - break; - case TransactionType::TRANSFER: - $types['source'] = AccountType::ASSET; - $types['destination'] = AccountType::ASSET; - break; - case TransactionType::RECONCILIATION: - // always NULL, since this is handled by the reconciliation. - $types['source'] = null; - $types['destination'] = null; - - // return here: - return $types[$direction]; + if (TransactionType::WITHDRAWAL === $type) { + $types['source'] = AccountType::ASSET; + $types['destination'] = AccountType::EXPENSE; } - if (!isset($types[$direction])) { - // @codeCoverageIgnoreStart - Log::error(sprintf('No type set for direction "%s" and type "%s"', $type, $direction)); - - return null; - // @codeCoverageIgnoreEnd + if (TransactionType::DEPOSIT === $type) { + $types['source'] = AccountType::REVENUE; + $types['destination'] = AccountType::ASSET; + } + if (TransactionType::TRANSFER === $type) { + $types['source'] = AccountType::ASSET; + $types['destination'] = AccountType::ASSET; + } + if (TransactionType::RECONCILIATION === $type) { + $types['source'] = null; + $types['destination'] = null; } - return $types[$direction]; + return $types[$direction] ?? null; } /** @@ -101,6 +84,7 @@ trait TransactionServiceTrait * * @return Account|null * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): ?Account { @@ -115,55 +99,23 @@ trait TransactionServiceTrait return $repository->findNull($accountId); } - switch ($expectedType) { - case AccountType::ASSET: - if ($accountId > 0) { - // must be able to find it based on ID. Validator should catch invalid ID's. - return $repository->findNull($accountId); - } - - // alternatively, return by name. Validator should catch invalid names. - return $repository->findByName($accountName, [AccountType::ASSET]); - case AccountType::EXPENSE: - if ($accountId > 0) { - // must be able to find it based on ID. Validator should catch invalid ID's. - return $repository->findNull($accountId); - } - if (\strlen($accountName) > 0) { - /** @var AccountFactory $factory */ - $factory = app(AccountFactory::class); - $factory->setUser($this->user); - - return $factory->findOrCreate($accountName, AccountType::EXPENSE); - } - - // return cash account: - return $repository->getCashAccount(); - case AccountType::REVENUE: - if ($accountId > 0) { - // must be able to find it based on ID. Validator should catch invalid ID's. - return $repository->findNull($accountId); - } - if (\strlen($accountName) > 0) { - // alternatively, return by name. - /** @var AccountFactory $factory */ - $factory = app(AccountFactory::class); - $factory->setUser($this->user); - - return $factory->findOrCreate($accountName, AccountType::REVENUE); - } - - // return cash account: - return $repository->getCashAccount(); - - default: - // @codeCoverageIgnoreStart - Log::error(sprintf('Cannot find account of type "%s".', $expectedType)); - - return null; - // @codeCoverageIgnoreEnd - + if ($accountId > 0) { + // must be able to find it based on ID. Validator should catch invalid ID's. + return $repository->findNull($accountId); } + if (AccountType::ASSET === $expectedType) { + return $repository->findByName($accountName, [AccountType::ASSET]); + } + // for revenue and expense: + if (\strlen($accountName) > 0) { + /** @var AccountFactory $factory */ + $factory = app(AccountFactory::class); + $factory->setUser($this->user); + + return $factory->findOrCreate($accountName, $expectedType); + } + + return $repository->getCashAccount(); } /** diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.php index 0e79a40a2d..59f8222cda 100644 --- a/app/Services/Internal/Update/AccountUpdateService.php +++ b/app/Services/Internal/Update/AccountUpdateService.php @@ -42,6 +42,8 @@ class AccountUpdateService * * @return Account * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function update(Account $account, array $data): Account { diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index caba75d2e2..df2162636f 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -45,6 +45,8 @@ class JournalUpdateService * * @return TransactionJournal * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function update(TransactionJournal $journal, array $data): TransactionJournal { diff --git a/app/Services/Internal/Update/TransactionUpdateService.php b/app/Services/Internal/Update/TransactionUpdateService.php index b497e41749..88a4b05f5a 100644 --- a/app/Services/Internal/Update/TransactionUpdateService.php +++ b/app/Services/Internal/Update/TransactionUpdateService.php @@ -70,6 +70,10 @@ class TransactionUpdateService * * @return Transaction * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.NPathComplexity) + * */ public function update(Transaction $transaction, array $data): Transaction { @@ -113,7 +117,7 @@ class TransactionUpdateService $this->setForeignCurrency($transaction, $foreign); $this->setForeignAmount($transaction, $foreignAmount); } - if (null === $foreign && null === $data['foreign_amount']) { + if (null === $foreign || null === $data['foreign_amount']) { $this->setForeignCurrency($transaction, null); $this->setForeignAmount($transaction, null); } diff --git a/app/Services/Spectre/Object/Account.php b/app/Services/Spectre/Object/Account.php index fa7367b770..d3cfceb689 100644 --- a/app/Services/Spectre/Object/Account.php +++ b/app/Services/Spectre/Object/Account.php @@ -26,8 +26,10 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** - * @codeCoverageIgnore * Class Account + * + * @codeCoverageIgnore + * @SuppressWarnings(PHPMD.ShortVariable) */ class Account extends SpectreObject { diff --git a/app/Services/Spectre/Object/Attempt.php b/app/Services/Spectre/Object/Attempt.php index ce0a912225..53aff5124a 100644 --- a/app/Services/Spectre/Object/Attempt.php +++ b/app/Services/Spectre/Object/Attempt.php @@ -26,8 +26,11 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** - * @codeCoverageIgnore + * * Class Attempt + * @codeCoverageIgnore + * @SuppressWarnings(PHPMD.ShortVariable) + * @SuppressWarnings(PHPMD.TooManyFields) */ class Attempt extends SpectreObject { diff --git a/app/Services/Spectre/Object/Customer.php b/app/Services/Spectre/Object/Customer.php index 10b76424ca..3376db8daf 100644 --- a/app/Services/Spectre/Object/Customer.php +++ b/app/Services/Spectre/Object/Customer.php @@ -23,8 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Object; /** - * @codeCoverageIgnore * Class Customer + * + * @codeCoverageIgnore + * @SuppressWarnings(PHPMD.ShortVariable) */ class Customer extends SpectreObject { diff --git a/app/Services/Spectre/Object/Holder.php b/app/Services/Spectre/Object/Holder.php index ac07e953c0..791abb5b7f 100644 --- a/app/Services/Spectre/Object/Holder.php +++ b/app/Services/Spectre/Object/Holder.php @@ -24,8 +24,9 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Object; /** - * @codeCoverageIgnore * Class Holder + * + * @codeCoverageIgnore */ class Holder extends SpectreObject { @@ -33,6 +34,7 @@ class Holder extends SpectreObject * Holder constructor. * * @param array $data + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct(array $data) { diff --git a/app/Services/Spectre/Object/Login.php b/app/Services/Spectre/Object/Login.php index 6a8fad38e7..6d536ac7ce 100644 --- a/app/Services/Spectre/Object/Login.php +++ b/app/Services/Spectre/Object/Login.php @@ -27,8 +27,10 @@ use Carbon\Carbon; /** - * @codeCoverageIgnore * Class Login + * @codeCoverageIgnore + * @SuppressWarnings(PHPMD.ShortVariable) + * @SuppressWarnings(PHPMD.TooManyFields) */ class Login extends SpectreObject { diff --git a/app/Services/Spectre/Object/Transaction.php b/app/Services/Spectre/Object/Transaction.php index 0ebd50cd2e..866ffddbb2 100644 --- a/app/Services/Spectre/Object/Transaction.php +++ b/app/Services/Spectre/Object/Transaction.php @@ -26,8 +26,10 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** - * @codeCoverageIgnore * Class Transaction + * @codeCoverageIgnore + * + * @SuppressWarnings(PHPMD.ShortVariable) */ class Transaction extends SpectreObject { @@ -169,7 +171,10 @@ class Transaction extends SpectreObject } /** + * Get opposing account data. + * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getOpposingAccountData(): array { diff --git a/app/Services/Spectre/Object/TransactionExtra.php b/app/Services/Spectre/Object/TransactionExtra.php index 28ca9da498..652bd9025c 100644 --- a/app/Services/Spectre/Object/TransactionExtra.php +++ b/app/Services/Spectre/Object/TransactionExtra.php @@ -26,8 +26,11 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** - * @codeCoverageIgnore * Class TransactionExtra + * + * @SuppressWarnings(PHPMD.TooManyFields) + * @SuppressWarnings(PHPMD.ShortVariable) + * @codeCoverageIgnore */ class TransactionExtra extends SpectreObject { diff --git a/app/Services/Spectre/Request/ListAccountsRequest.php b/app/Services/Spectre/Request/ListAccountsRequest.php index eedb0d2382..a641819202 100644 --- a/app/Services/Spectre/Request/ListAccountsRequest.php +++ b/app/Services/Spectre/Request/ListAccountsRequest.php @@ -40,6 +40,7 @@ class ListAccountsRequest extends SpectreRequest /** * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function call(): void { @@ -60,8 +61,6 @@ class ListAccountsRequest extends SpectreRequest $hasNextPage = true; $nextId = $response['meta']['next_id']; Log::debug(sprintf('Next ID is now %d.', $nextId)); - } else { - Log::debug('No next page.'); } // store customers: diff --git a/app/Services/Spectre/Request/ListCustomersRequest.php b/app/Services/Spectre/Request/ListCustomersRequest.php index def720dc9a..5b92b00ec2 100644 --- a/app/Services/Spectre/Request/ListCustomersRequest.php +++ b/app/Services/Spectre/Request/ListCustomersRequest.php @@ -38,6 +38,7 @@ class ListCustomersRequest extends SpectreRequest /** * * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function call(): void { @@ -58,8 +59,6 @@ class ListCustomersRequest extends SpectreRequest $hasNextPage = true; $nextId = $response['meta']['next_id']; Log::debug(sprintf('Next ID is now %d.', $nextId)); - } else { - Log::debug('No next page.'); } // store customers: diff --git a/app/Services/Spectre/Request/ListLoginsRequest.php b/app/Services/Spectre/Request/ListLoginsRequest.php index 49379bd96e..f5cda26a3b 100644 --- a/app/Services/Spectre/Request/ListLoginsRequest.php +++ b/app/Services/Spectre/Request/ListLoginsRequest.php @@ -42,6 +42,7 @@ class ListLoginsRequest extends SpectreRequest /** * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function call(): void { @@ -62,8 +63,6 @@ class ListLoginsRequest extends SpectreRequest $hasNextPage = true; $nextId = $response['meta']['next_id']; Log::debug(sprintf('Next ID is now %d.', $nextId)); - } else { - Log::debug('No next page.'); } $collection = new Collection; // store logins: diff --git a/app/Services/Spectre/Request/ListTransactionsRequest.php b/app/Services/Spectre/Request/ListTransactionsRequest.php index 1a9b419a0f..642562a067 100644 --- a/app/Services/Spectre/Request/ListTransactionsRequest.php +++ b/app/Services/Spectre/Request/ListTransactionsRequest.php @@ -40,6 +40,7 @@ class ListTransactionsRequest extends SpectreRequest /** * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function call(): void { @@ -60,8 +61,6 @@ class ListTransactionsRequest extends SpectreRequest $hasNextPage = true; $nextId = $response['meta']['next_id']; Log::debug(sprintf('Next ID is now %d.', $nextId)); - } else { - Log::debug('No next page, done with ListTransactionsRequest.'); } // store customers: diff --git a/app/User.php b/app/User.php index 2fbca22b1d..c8ff6c43c6 100644 --- a/app/User.php +++ b/app/User.php @@ -61,7 +61,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property bool $isAdmin used in admin user controller. * @property bool $has2FA used in admin user controller. * @property array $prefs used in admin user controller. - * @property mixed password + * @property string password * @property Collection roles * @property string blocked_code * @property bool blocked diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 87d666267a..8ef2322118 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -521,8 +521,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'secure_pw_history' => 'Im August 2017 veröffentlichte die bekannte Sicherheitsforscherin Troy Hunt eine Liste von 306 Millionen gestohlenen Passwörtern. Diese Passwörter wurden während der Einbrüche bei Firmen wie LinkedIn, Adobe und NeoPets (und vielen mehr) gestohlen.', 'secure_pw_check_box' => 'Durch Ankreuzen des Kästchens sendet Firefly III die ersten fünf Zeichen des SHA1-Hash Ihres Passworts an die Website von Troy Hunt, um festzustellen, ob es auf der Liste enthalten ist. Dies wird Sie davon abhalten, unsichere Passwörter zu verwenden, wie es in der neuesten NIST Sonderveröffentlichung zu diesem Thema empfohlen wird.', 'secure_pw_sha1' => 'Aber ich dachte, dass SHA1 schon geknackt wurde?', - 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', - 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Ja, aber nicht in diesem Zusammenhang. Wie Sie auf auf der Website, die erklärt, wie SHA1 gebrochen wurde, lesen können, ist es jetzt etwas leichter, eine "Kollision" zu finden: eine andere Zeichenfolge, die zu demselben SHA1-Hash führt. Es dauert nur mehr 10.000 Jahre mit einer einzigen GPU-Maschine.', + 'secure_pw_hash_security' => 'Dieser Auszug wäre weder mit Ihrem Passwort gleichzusetzen, noch wäre sie auf einer Seite wie Firefly III nützlich. Diese Anwendung verwendet SHA1 nicht zur Passwortverifizierung. Es ist also sicher, dieses Kontrollkästchen zu aktivieren. Ihr Passwort wird verschlüsselt und nur die ersten fünf Zeichen dieses Auszuges werden über HTTPS gesendet.', 'secure_pw_should' => 'Soll ich die Box ankreuzen?', 'secure_pw_long_password' => 'Wenn Sie gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert haben: Nein.', 'secure_pw_short' => 'Wenn Sie gerade das Passwort eingegeben haben, welches Sie immer verwenden: Bitte ja.', diff --git a/resources/lang/de_DE/import.php b/resources/lang/de_DE/import.php index e5c50db546..13bf4e3781 100644 --- a/resources/lang/de_DE/import.php +++ b/resources/lang/de_DE/import.php @@ -219,7 +219,7 @@ return [ 'column_account-iban' => 'Bestandskonto (IBAN)', 'column_account-id' => 'Kennung des Bestandkontos (passend zu FF3)', 'column_account-name' => 'Bestandskonto (Name)', - 'column_account-bic' => 'Asset account (BIC)', + 'column_account-bic' => 'Bestandskonto (BIC)', 'column_amount' => 'Betrag', 'column_amount_foreign' => 'Betrag (in Fremdwährung)', 'column_amount_debit' => 'Betrag (Debitoren-Spalte)', diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index 74cfa4d88e..f3143b9d65 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -112,7 +112,7 @@ return [ 'sepa-cc' => 'SEPA • Verrechnungsschlüssel', 'sepa-ep' => 'SEPA • Externer Verwendungszweck', 'sepa-ci' => 'SEPA • Identifikationsnummer des Zahlungsempfängers', - 'sepa-batch-id' => 'SEPA Batch ID', + 'sepa-batch-id' => 'SEPA Batch-Kennung', 'external_id' => 'Externe Kennung', 'account_at_bunq' => 'Konto bei „bunq”', 'file_name' => 'Dateiname', diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php index 1541442491..1f1499f1b1 100644 --- a/resources/lang/de_DE/validation.php +++ b/resources/lang/de_DE/validation.php @@ -50,8 +50,8 @@ return [ 'at_least_one_action' => 'Regel muss mindestens eine Aktion enthalten', 'base64' => 'Dies sind keine gültigen base64-kodierten Daten.', 'model_id_invalid' => 'Die angegebene ID scheint für dieses Modell ungültig zu sein.', - 'more' => ':attribute must be larger than :value.', - 'less' => ':attribute must be less than 10,000,000', + 'more' => ':attribute muss größer als :value sein.', + 'less' => ':attribute muss kleiner als 10.000.000 sein', 'active_url' => ':attribute ist keine gültige URL.', 'after' => ':attribute muss ein Datum nach :date sein.', 'alpha' => ':attribute darf nur Buchstaben enthalten.', diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php index f1b9067035..76198fddd0 100644 --- a/resources/lang/es_ES/breadcrumbs.php +++ b/resources/lang/es_ES/breadcrumbs.php @@ -26,8 +26,8 @@ return [ 'home' => 'Inicio', 'edit_currency' => 'Editar moneda ":name"', 'delete_currency' => 'Eliminar moneda ":name"', - 'newPiggyBank' => 'Crear nueva alcancía', - 'edit_piggyBank' => 'Editar alcancía ":name"', + 'newPiggyBank' => 'Crear nueva hucha', + 'edit_piggyBank' => 'Editar hucha ":name"', 'preferences' => 'Preferencias', 'profile' => 'Perfil', 'changePassword' => 'Cambiar contraseña', @@ -36,14 +36,14 @@ return [ 'newBill' => 'Nueva factura', 'edit_bill' => 'Editar factura ":name"', 'delete_bill' => 'Eliminar factura ":name"', - 'reports' => 'Reportes', + 'reports' => 'Informes', 'search_result' => 'Resultados de la búsqueda para ":query"', 'withdrawal_list' => 'Gastos', 'deposit_list' => 'Ganancia, ingresos y depósitos', 'transfer_list' => 'Transferencias', 'transfers_list' => 'Transferencias', 'reconciliation_list' => 'Reconciliaciones', - 'create_withdrawal' => 'Crear nuevo retiro', + 'create_withdrawal' => 'Crear nueva retirada', 'create_deposit' => 'Crear nuevo depósito', 'create_transfer' => 'Crear nueva transferencia', 'edit_journal' => 'Editar transacción ":description"', diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php index 4588444cea..ba0a5dde41 100644 --- a/resources/lang/es_ES/demo.php +++ b/resources/lang/es_ES/demo.php @@ -24,16 +24,16 @@ declare(strict_types=1); return [ 'no_demo_text' => 'Lamentablemente no hay textos de ayuda para esta página.', - 'see_help_icon' => 'Sin embargo, el ícono en la esquina superior-derecha puede tener más información.', - 'index' => '¡Bienvenido a Firefly III! En esta página tendrá una vista rápida de sus finanzas. Para más información, mire sus cuentas rarr; Asset Accounts y, claro, las páginas de presupuestos y reportes. O simplemente investigue la aplicación por su cuenta.', - 'accounts-index' => 'Las cajas de ahorro son sus cuentas de banco personales. Las cuentas de gastos contienen sus gastos habituales como compras y salidas con amigos. Las cuentas de ingresos repesentan ingresos de su trabajo u otras fuentes. En esta página puede editarlas o eliminarlas.', - 'budgets-index' => 'Esta página le muestra una visión general de sus presupuestos. La barra superior muestra la cantidad que está disponible para ser presupuestado. Esto se puede personalizar para cualquier período haciendo clic en la cantidad a la derecha. La cantidad que has gastado hasta ahora se muestra en la barra de abajo. Debajo están los gastos por presupuesto y lo que ha presupuestado para ellos.', - 'reports-index-start' => 'Firefly III da soporte a un buen numero de tipos de reportes. Lea sobre ellos haciendo clic en el icono en el tope de la esquina derecha.', + 'see_help_icon' => 'Sin embargo, el icono en la esquina superior derecha puede tener más información.', + 'index' => '¡Bienvenido a Firefly III! En esta página tendrá una vista rápida de sus finanzas. Para más información, mire sus cuentas → Cuentas de activos y, por supuesto, las páginas de presupuestos e Informes. O simplemente investigue la aplicación por su cuenta.', + 'accounts-index' => 'Las cajas de activos son sus cuentas de banco personales. Las cuentas de gastos contienen sus gastos habituales como compras y salidas con amigos. Las cuentas de ingresos repesentan diner que recibe de su trabajo, gobierno u otras fuentes de ingresos. En esta página puede editarlas o eliminarlas.', + 'budgets-index' => 'Esta página le muestra una visión general de sus presupuestos. La barra superior muestra la cantidad que está disponible para ser presupuestada. Esto se puede personalizar para cualquier período haciendo clic en la cantidad a la derecha. La cantidad que ha gastado hasta ahora se muestra en la barra de abajo. Debajo están los gastos por presupuesto y lo que ha presupuestado para ellos.', + 'reports-index-start' => 'Firefly III da soporte a un buen numero de tipos de informes. Lea sobre ellos haciendo clic en el icono en la esquina superior derecha.', 'reports-index-examples' => 'Asegúrese de revisar estos ejemplos: un resumen financiero mensual, un resumen financiero anual y una vista general del presupuesto.', - 'currencies-index' => 'Firefly III admite múltiples monedas. A pesar de que la moneda por defecto es el Euro, se puede seleccionar el Dólar de EE.UU, y muchas otras monedas. Como se puede ver se ha incluido una pequeña selección de monedas, pero puedes agregar tu propia moneda si lo deseas. Sin embargo, cambiar la moneda predeterminada no cambiará la moneda de las transacciones existentes: Firefly III admite el uso de varias monedas al mismo tiempo.', + 'currencies-index' => 'Firefly III admite múltiples monedas. A pesar de que la moneda por defecto es el Euro, se puede seleccionar el Dólar de EE. UU, y muchas otras monedas. Como se puede ver se ha incluido una pequeña selección de monedas, pero puede agregar su propia moneda si lo desea. Sin embargo, cambiar la moneda predeterminada no cambiará la moneda de las transacciones existentes: Firefly III admite el uso de varias monedas al mismo tiempo.', 'transactions-index' => 'Estos gastos, depósitos y transferencias no son particularmente imaginativos. Se han generado automáticamente.', - 'piggy-banks-index' => 'Como puede ver, hay tres alcancías. Utilice los botones más y menos para influir en la cantidad de dinero en cada alcancía. Haga clic en el nombre de la alcancía para ver la administración de cada una.', - 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', - 'recurring-index' => 'Please note that this feature is under active development and may not work as expected.', - 'recurring-create' => 'Please note that this feature is under active development and may not work as expected.', + 'piggy-banks-index' => 'Como puede ver, hay tres huchas. Utilice los botones más y menos para influir en la cantidad de dinero en cada hucha. Haga clic en el nombre de la hucha para ver la administración de cada una.', + 'import-index' => 'Cualquier archivo CSV se puede importar en Firefly III. También soporta la importación de datos desde bunq y Spectre. Otros bancos y agregadores financieros se implementarán en el futuro. Sin embargo, como usuario de la demo, solo puede ver el "falso"-proveedor en acción. Generará algunas transacciones aleatorias para mostrarle cómo funciona el proceso.', + 'recurring-index' => 'Por favor, tenga en cuenta que esta característica está bajo desarrollo activo y puede no funcionar como se espera.', + 'recurring-create' => 'Por favor, tenga en cuenta que esta característica está bajo desarrollo activo y puede no funcionar como se espera.', ]; diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 8c1bb6bf30..86d0b21cfb 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -172,15 +172,15 @@ return [ 'want_to_login' => 'Yo quiero entrar al sistema', 'button_register' => 'Registrar', 'authorization' => 'Autorización', - 'active_bills_only' => 'active bills only', - 'average_per_bill' => 'average per bill', - 'expected_total' => 'expected total', + 'active_bills_only' => 'solo facturas activas', + 'average_per_bill' => 'media por factura', + 'expected_total' => 'total esperado', // API access 'authorization_request' => 'Firefly III v:version Solicitud de autorización', 'authorization_request_intro' => 'El :client está solicitando permiso para acceder a su administración financiera. ¿Desea autorizar :client para acceder a estos registros?', 'scopes_will_be_able' => 'Esta aplicación podrá:', 'button_authorize' => 'Autorizar', - 'none_in_select_list' => '(none)', + 'none_in_select_list' => '(ninguno)', // check for updates: 'update_check_title' => 'Ver actualizaciones', @@ -269,10 +269,10 @@ return [ 'move_rule_group_down' => 'Mover el grupo de reglas hacia abajo', 'save_rules_by_moving' => 'Guardar esta(s) regla(s) moviéndola(s) a otro grupo:', 'make_new_rule' => 'Hacer nueva regla en grupo de regla ":title"', - 'rule_is_strict' => 'strict rule', - 'rule_is_not_strict' => 'non-strict rule', + 'rule_is_strict' => 'regla estricta', + 'rule_is_not_strict' => 'regla no estricta', 'rule_help_stop_processing' => 'Al marcar esta casilla, las reglas posteriores de este grupo no se ejecutarán.', - 'rule_help_strict' => 'In strict rules ALL triggers must fire for the action(s) to be executed. In non-strict rules, ANY trigger is enough for the action(s) to be executed.', + 'rule_help_strict' => 'En las reglas estrictas TODOS los desencadenadores deben actuar para acción(es) que será(n) ejecutada(s). En las reglas no estrictas, CUALQUIER desencadenador es suficiente para que la(s) acción(es) se ejecute(n).', 'rule_help_active' => 'Las reglas inactivas nunca se ejecutan.', 'stored_new_rule' => 'Guardar la nueva regla con titulo ":title"', 'deleted_rule' => 'Regla eliminada con titulo ":title"', @@ -350,8 +350,8 @@ return [ 'rule_trigger_budget_is' => 'Presupuesto es ":trigger_value"', 'rule_trigger_tag_is_choice' => '(una) etiqueta es..', 'rule_trigger_tag_is' => 'Una etiqueta es ":trigger_value"', - 'rule_trigger_currency_is_choice' => 'Transaction currency is..', - 'rule_trigger_currency_is' => 'Transaction currency is ":trigger_value"', + 'rule_trigger_currency_is_choice' => 'La moneda de la transacción es..', + 'rule_trigger_currency_is' => 'La moneda de la transacción es ":trigger_value"', 'rule_trigger_has_attachments_choice' => 'Tiene al menos tantos archivos adjuntos', 'rule_trigger_has_attachments' => 'Tiene al menos :trigger_value anexo (s)', 'rule_trigger_store_journal' => 'Cuando la transacción es creada', @@ -411,19 +411,19 @@ return [ 'rule_action_clear_notes_choice' => 'Eliminar cualquier nota', 'rule_action_clear_notes' => 'Eliminar cualquier nota', 'rule_action_set_notes_choice' => 'Establecer notas para..', - 'rule_action_link_to_bill_choice' => 'Link to a bill..', - 'rule_action_link_to_bill' => 'Link to bill ":action_value"', + 'rule_action_link_to_bill_choice' => 'Enlace a una factura..', + 'rule_action_link_to_bill' => 'Enlace a una factura ":action_value"', 'rule_action_set_notes' => 'Establecer notas para:action_value', 'rules_have_read_warning' => '¿Has leído la advertencia?', 'apply_rule_warning' => 'Advertencia: Ejecutando una regla (grupo) en una gran selección de transacciones podría tomar años, y podría exceder el tiempo de espera. Si lo hace, la regla (grupo) solo se aplicara a un subconjunto desconocido de sus transacciones. Esto podría dejar a su administración financiera en ruinas. por favor tenga cuidado.', - 'rulegroup_for_bills_title' => 'Rule group for bills', - 'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills.', - 'rule_for_bill_title' => 'Auto-generated rule for bill ":name"', - 'rule_for_bill_description' => 'This rule is auto-generated to try to match bill ":name".', - 'create_rule_for_bill' => 'Create a new rule for bill ":name"', - 'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations! Firefly III can automagically match new withdrawals to this bill. For example, whenever you pay your rent, the bill "rent" will be linked to the expense. This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.', - 'new_rule_for_bill_title' => 'Rule for bill ":name"', + 'rulegroup_for_bills_title' => 'Regla de grupo para facturas', + 'rulegroup_for_bills_description' => 'Regla de grupo especial para todas las reglas que impliquen facturas.', + 'rule_for_bill_title' => 'Regla autogenerada para factura ":name"', + 'rule_for_bill_description' => 'Esta regla es autogenerada para intentar emparejar la factura ":name".', + 'create_rule_for_bill' => 'Crear una nueva regla para la factura ":name"', + 'create_rule_for_bill_txt' => 'Acaba de crear una nueva factura llamada ":name", ¡enhorabuena! Firefly III puede asociar de manera automágica nuevas retiradas con esta factura. Por ejemplo, siempre que pague su alquiler, la factura "alquiler" será enlazada a ese gasto. De esta manera, Firefly III puede mostrarle de forma precisa qué facturas han vencido y cuáles no. Para ello, una nueva regla debe ser creada. Si estos valores son correctos, Firefly III enlazará automáticamente el retiro correspondiente con la factura correcta. Por favor, revise los desencadenadores para ver si son correctos, y añada algunos si son incorrectos.', + 'new_rule_for_bill_title' => 'Regla para la factura ":name"', 'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".', // tags diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index 17cd33ed32..621da47c93 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -24,7 +24,7 @@ declare(strict_types=1); return [ 'html_language' => 'fr', - 'locale' => 'fr, French, fr_FR, fr_FR.utf8, fr_FR.UTF-8', + 'locale' => 'fr, French, fr_FR.utf8, fr_FR.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'month_and_date_day' => '%A %e %B %Y', diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index c8b87448d1..c48142c504 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -481,7 +481,7 @@ return [ 'list_page_size_label' => 'Nombre d\'élément par page', 'between_dates' => '(:start et :end)', 'pref_optional_fields_transaction' => 'Champs optionnels pour les transactions', - 'pref_optional_fields_transaction_help' => 'Par défaut, tous les champs ne sont pas activés lors de la création d\'une nouvelle transaction (en raison de possibles problèmes d', + 'pref_optional_fields_transaction_help' => 'Par défaut, tous les champs ne sont pas disponibles lors de la création d\'une nouvelle transaction (pour éviter de surcharger la page). Vous pouvez activer les champs suivants si vous pensez qu\'ils peuvent vous être utiles. Bien sûr, tout champ désactivé mais précédemment rempli restera visible quel que soit son paramétrage.', 'optional_tj_date_fields' => 'Champ date', 'optional_tj_business_fields' => 'Champs professionnels', 'optional_tj_attachment_fields' => 'Champs de pièces jointes', @@ -509,24 +509,24 @@ return [ 'delete_your_account_help' => 'La suppression de votre compte supprimera également les comptes, les opérations, tout ce que vous pourriez avoir enregistré dans Firefly III. Tout sera SUPPRIME.', 'delete_your_account_password' => 'Entrez votre mot de passe pour continuer.', 'password' => 'Mot de passe', - 'are_you_sure' => 'Etes-vous sûr ? Vous ne pourrez pas annuler cette action.', + 'are_you_sure' => 'Êtes-vous sûr ? Vous ne pourrez pas annuler cette action.', 'delete_account_button' => 'SUPPRIMER votre compte', - 'invalid_current_password' => 'Mot de passe actuel non valide!', - 'password_changed' => 'Mot de passe modifié!', + 'invalid_current_password' => 'Mot de passe actuel non valide !', + 'password_changed' => 'Mot de passe modifié !', 'should_change' => 'L’idée est de changer votre mot de passe.', - 'invalid_password' => 'Mot de passe incorrect!', + 'invalid_password' => 'Mot de passe incorrect !', 'what_is_pw_security' => 'Qu\'est-ce que "vérifier la sécurité du mot de passe" ?', 'secure_pw_title' => 'Comment choisir un mot de passe sécurisé', 'secure_pw_history' => 'En août 2017, le réputé chercheur en sécurité Troy Hunt a publié une liste de 306 millions de mots de passe volés. Ces mots de passe ont été volés lors de cambriolages d\'entreprises comme LinkedIn, Adobe ou NeoPets (et bien d’autres).', 'secure_pw_check_box' => 'En cochant la case, Firefly III enverra l\'empreinte SHA1 de votre mot de passe au site Web de Troy Hunt pour voir si c’est sur la liste. Cela vous empêchera d\'utiliser des mots de passe non sûr comme cela est recommandé dans les dernières Publication Special NIST à ce sujet.', 'secure_pw_sha1' => 'Mais je pensais que SHA1 était cassé ?', - 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', - 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Oui, mais pas dans ce contexte. Comme vous pouvez le lire sur le site web détaillant comment SHA1 a été cassé, c’est maintenant légèrement plus facile de trouver une « collision » : une autre chaîne qui aboutit à la même empreinte SHA1. Maintenant, cela prend seulement 10 000 ans, à l’aide d’une machine mono-GPU.', + 'secure_pw_hash_security' => 'L\'empreinte ne sera pas identique à votre mot de passe et ne sera d\'aucune utilité pour Firefly III. Cette application n’utilise pas SHA1 pour la vérification des mots de passe. Il n\'y a donc aucun risque à cocher cette case. Votre mot de passer est haché et seuls les cinq premiers caractères de son empreinte sont envoyés via HTTPS.', 'secure_pw_should' => 'Dois-je cocher la case ?', - 'secure_pw_long_password' => 'Si vous venez de générer un long mot de passe unique pour Firefly III à l\'aide d\'un type de générateur de mot de passe : non.', + 'secure_pw_long_password' => 'Si vous venez de générer un long mot de passe unique pour Firefly III à l\'aide d\'un générateur de mot de passe : non.', 'secure_pw_short' => 'Si vous venez d\'entrer le mot de passe que vous utilisez toujours : oui.', 'command_line_token' => 'Jeton de ligne de commande', - 'explain_command_line_token' => 'Vous avez besoin de ce jeton pour exécuter des opérations optionnelles en ligne de commandes telles qu\'importer et exporter des données. Sans celui-ci, de telles commandes sensibles ne fonctionneront pas. Personne ne vous le demandera, pas même moi. Si vous craignez de le perdre, ou si vous êtes parano, régénérez ce jeton à l\'aide du bouton.', + 'explain_command_line_token' => 'Vous avez besoin de ce jeton pour exécuter des opérations optionnelles en ligne de commandes telles qu\'importer et exporter des données. Sans celui-ci, de telles commandes sensibles ne fonctionneront pas. Ne partagez jamais votre jeton. Personne ne vous le demandera, pas même moi. Si vous craignez de le perdre, ou si vous êtes parano, régénérez ce jeton à l\'aide du bouton.', 'regenerate_command_line_token' => 'Régénérer le jeton de ligne de commande', 'token_regenerated' => 'Un nouveau jeton en ligne de commande a été généré', 'change_your_email' => 'Changer votre adresse e-mail', @@ -558,9 +558,9 @@ return [ 'convert_is_already_type_Withdrawal' => 'Cette transaction est déjà un retrait', 'convert_is_already_type_Deposit' => 'Cette transaction est déjà un dépôt', 'convert_is_already_type_Transfer' => 'Cette transaction est déjà un transfert', - 'convert_to_Withdrawal' => 'Convertir ":description" vers un retrait', - 'convert_to_Deposit' => 'Convertir ":description" vers un dépôt', - 'convert_to_Transfer' => 'Convertir ":description" vers un transfert', + 'convert_to_Withdrawal' => 'Convertir ":description" en retrait', + 'convert_to_Deposit' => 'Convertir ":description" en dépôt', + 'convert_to_Transfer' => 'Convertir ":description" en transfert', 'convert_options_WithdrawalDeposit' => 'Convertir un retrait en dépôt', 'convert_options_WithdrawalTransfer' => 'Convertir un retrait en transfert', 'convert_options_DepositTransfer' => 'Convertir un dépôt en transfert', @@ -579,7 +579,7 @@ return [ 'convert_please_set_asset_source' => 'Veuillez choisir le compte d’actifs d\'où proviendra l’argent.', 'convert_explanation_withdrawal_deposit' => 'Si vous convertissez ce retrait en dépôt, :amount sera déposé dans :sourceName au lieu de le retirer.', 'convert_explanation_withdrawal_transfer' => 'Si vous convertissez cette dépense en transfert, :amount sera transféré de :sourceName vers un nouveau compte d\'actif, au lieu d\'être payé à :destinationName.', - 'convert_explanation_deposit_withdrawal' => 'Si vous convertissez ce dépôt dans un retrait :amount sera supprimé de :destinationName au lieu d\'y être ajouté.', + 'convert_explanation_deposit_withdrawal' => 'Si vous convertissez ce dépôt en retrait :amount sera supprimé de :destinationName au lieu d\'y être ajouté.', 'convert_explanation_deposit_transfer' => 'Si vous convertissez ce dépôt en transfert, :amount sera transféré d\'un compte d\'actif de votre choix en :destinationName.', 'convert_explanation_transfer_withdrawal' => 'Si vous convertissez ce transfert en retrait, le montant passera de :sourceName à une nouvelle destination comme une dépense, au lieu de :destinationName en tant que transfert.', 'convert_explanation_transfer_deposit' => 'Si vous convertissez ce transfert en dépôt, :amount sera déposé dans le compte :destinationName au lieu d\'y être transféré.', @@ -592,7 +592,7 @@ return [ // create new stuff: 'create_new_withdrawal' => 'Créer une nouvelle dépense', 'create_new_deposit' => 'Créer un nouveau dépôt', - 'create_new_transfer' => 'Creer un nouveau transfert', + 'create_new_transfer' => 'Créer un nouveau transfert', 'create_new_asset' => 'Créer un nouveau compte d’actif', 'create_new_expense' => 'Créer nouveau compte de dépenses', 'create_new_revenue' => 'Créer nouveau compte de recettes', @@ -602,7 +602,7 @@ return [ // currencies: 'create_currency' => 'Créer une nouvelle devise', 'store_currency' => 'Créer une nouvelle devise', - 'update_currency' => 'Mise à jour de la balance', + 'update_currency' => 'Mise à jour de la devise', 'new_default_currency' => ':name est maintenant la devise par défaut.', 'cannot_delete_currency' => 'Impossible de supprimer :name car il est encore utilisé.', 'deleted_currency' => 'Devise ":name" supprimée', @@ -625,15 +625,15 @@ return [ 'stored_new_budget' => 'Nouveau budget ":name" créé', 'available_between' => 'Disponible entre le :start et le :end', 'transactionsWithoutBudget' => 'Dépenses non budgétisées', - 'transactions_no_budget' => 'Dépenses non budgetisées entre le :start et le :end', + 'transactions_no_budget' => 'Dépenses non budgétisées entre le :start et le :end', 'spent_between' => 'Dépensé entre le :start et le :end', 'createBudget' => 'Nouveau budget', 'inactiveBudgets' => 'Budgets inactifs', - 'without_budget_between' => 'Opérations non budgetisées entre le :start et le :end', + 'without_budget_between' => 'Opérations non budgétisées entre le :start et le :end', 'delete_budget' => 'Supprimer le budget ":name"', 'deleted_budget' => 'Budget ":name" supprimé', 'edit_budget' => 'Modifier le budget ":name"', - 'updated_budget' => 'Mettre à jour le budget ":name"', + 'updated_budget' => 'Budget ":name" mis à jour', 'update_amount' => 'Mettre à jour le montant', 'update_budget' => 'Mettre à jour le budget', 'update_budget_amount_range' => 'Mettre à jour le montant disponible (prévu) entre le :start et le :end', @@ -664,7 +664,7 @@ return [ 'cannot_scan_inactive_bill' => 'Les factures inactives ne peuvent pas être analysées.', 'rescanned_bill' => 'Tout a été réexaminé, :total transaction(s) a/ont été liée(s) à la facture.', 'average_bill_amount_year' => 'Montant moyen des factures ( :year)', - 'average_bill_amount_overall' => 'Montant moyen de la facture (global)', + 'average_bill_amount_overall' => 'Montant moyen des factures (global)', 'bill_is_active' => 'Facture en cours', 'bill_expected_between' => 'Attendu entre le :start et le :end', 'bill_will_automatch' => 'La facture sera automatiquement liée aux transactions correspondantes', @@ -724,9 +724,9 @@ return [ 'account_type' => 'Type de compte', 'save_transactions_by_moving' => 'Enregistrer ces opération(s) en les déplaçant vers un autre compte :', 'stored_new_account' => 'Nouveau compte ":name" créé !', - 'updated_account' => 'Nom du compte ":name"', + 'updated_account' => 'Compte ":name" mis à jour', 'credit_card_options' => 'Cartes de crédit', - 'no_transactions_account' => 'Il n\'y a pas de transaction (dans cette période) pour le compte d\'actif ":name".', + 'no_transactions_account' => 'Il n\'y a pas de transaction (sur cette période) pour le compte d\'actif ":name".', 'no_data_for_chart' => 'Il n\'y a pas assez d\'informations (pour le moment) pour générer ce graphique.', 'select_more_than_one_account' => 'Veuillez sélectionner plus d\'un compte', 'select_more_than_one_category' => 'Veuillez sélectionner plus d\'une catégorie', @@ -763,7 +763,7 @@ return [ 'category' => 'Catégorie', 'delete_category' => 'Supprimer la catégorie ":name"', 'deleted_category' => 'Catégorie ":name" supprimée', - 'store_category' => 'Créer une nouvelle catgorie', + 'store_category' => 'Créer une nouvelle catégorie', 'stored_category' => 'Nouvelle catégorie stockée ":name"', 'without_category_between' => 'Sans catégorie entre :start et :end', @@ -778,14 +778,14 @@ return [ 'delete_deposit' => 'Supprimer le dépôt ":description"', 'delete_transfer' => 'Supprimer le transfert ":description"', 'deleted_withdrawal' => 'Retrait ":name" correctement supprimé', - 'deleted_deposit' => 'Dépot ":name" correctement supprimé', + 'deleted_deposit' => 'Dépôt ":name" correctement supprimé', 'deleted_transfer' => 'Opération ":name" correctement supprimée', 'stored_journal' => 'Opération ":description" créée avec succès', 'select_transactions' => 'Sélectionner des opérations', 'rule_group_select_transactions' => 'Appliquer le groupe de règles ":title" sur les transactions', 'rule_select_transactions' => 'Appliquer la règle ":title" sur les transactions', 'stop_selection' => 'Arrêter de sélectionner les transactions', - 'reconcile_selected' => 'Rapproché', + 'reconcile_selected' => 'Rapprocher', 'mass_delete_journals' => 'Supprimer un certain nombre de transactions', 'mass_edit_journals' => 'Modifier un certain nombre d’opérations', 'mass_bulk_journals' => 'Modifier un certain nombre d’opérations en masse', @@ -795,7 +795,7 @@ return [ 'no_bulk_budget' => 'Ne pas mettre à jour le budget', 'no_bulk_tags' => 'Ne pas mettre à jour le·s tag·s', 'bulk_edit' => 'Modification en masse', - 'cannot_edit_other_fields' => 'Vous ne pouvez pas modifier en masse d\'autres champs que ceux-ci, car il n’y a pas de place pour tous les montrer. S’il vous plaît suivez le lien et modifiez les par un par un, si vous devez modifier ces champs.', + 'cannot_edit_other_fields' => 'Vous ne pouvez pas modifier en masse d\'autres champs que ceux-ci, car il n’y a pas de place pour tous les afficher. S’il vous plaît suivez le lien et modifiez les un par un si vous devez modifier ces champs.', 'no_budget' => '(pas de budget)', 'no_budget_squared' => '(pas de budget)', 'perm-delete-many' => 'Supprimer de nombreux éléments en une seule fois peut engendrer des erreurs. Soyez prudent.', @@ -815,7 +815,7 @@ return [ 'submit' => 'Soumettre', 'getting_started' => 'Mise en route', 'to_get_started' => 'Vous venez d\'installer Firefly III avec succès. Pour commencer avec cet outil, entrez le nom de votre banque et le solde de votre compte courant principal. Ne vous inquiétez pas si vous avez plusieurs comptes. Vous pourrez les ajouter plus tard. Firefly III a simplement besoin de quelque chose pour commencer.', - 'savings_balance_text' => 'Firefly III créera automatiquement un compte d\'épargne pour vous. Par défaut, il n\'y aura pas d\'argent dans votre compte d\'épargne, mais si vous le dites à Firefly III, le solde sera stocké en tant que tel.', + 'savings_balance_text' => 'Firefly III créera automatiquement un compte d\'épargne pour vous. Par défaut, il n\'y aura pas d\'argent sur ce compte d\'épargne, mais si vous indiquez un montant à Firefly III, il l\'enregistrera en tant que solde.', 'finish_up_new_user' => 'C\'est tout ! Vous pouvez continuer en appuyant sur Envoyer. Vous passerez à l\'index de Firefly III.', 'stored_new_accounts_new_user' => 'Super ! Vos nouveaux comptes ont été créés.', 'set_preferred_language' => 'Si vous préférez utiliser Firefly III dans une autre langue, veuillez l\'indiquer ici.', @@ -831,7 +831,7 @@ return [ 'newWithdrawal' => 'Nouvelle dépense', 'newDeposit' => 'Nouveau dépôt', 'newTransfer' => 'Nouveau transfert', - 'bills_to_pay' => 'Facture à payer', + 'bills_to_pay' => 'Factures à payer', 'per_day' => 'Par jour', 'left_to_spend_per_day' => 'Reste à dépenser par jour', 'bills_paid' => 'Factures payées', @@ -858,7 +858,7 @@ return [ 'expenses' => 'Dépenses', 'income' => 'Recette / revenu', 'transfers' => 'Transferts', - 'moneyManagement' => 'Gérer les comptes', + 'moneyManagement' => 'Gestion financière', 'piggyBanks' => 'Tirelires', 'bills' => 'Factures', 'withdrawal' => 'Dépense', @@ -897,16 +897,16 @@ return [ 'report_all_time_quick' => 'Tous les temps, tous les comptes', 'reports_can_bookmark' => 'N’oubliez pas que les rapports peuvent être mis en signet.', 'incomeVsExpenses' => 'Revenus vs dépenses', - 'accountBalances' => 'Solde du compte', + 'accountBalances' => 'Soldes du compte', 'balanceStart' => 'Solde au début de la période', 'balanceEnd' => 'Solde à la fin de la période', 'splitByAccount' => 'Divisé par compte', 'coveredWithTags' => 'Recouvert de tags', 'leftInBudget' => 'Budget restant', - 'sumOfSums' => 'Montant des sommes', + 'sumOfSums' => 'Somme des montants', 'noCategory' => '(aucune catégorie)', 'notCharged' => 'Pas encore chargé', - 'inactive' => 'Désactivé', + 'inactive' => 'Inactif', 'active' => 'Actif', 'difference' => 'Différence', 'money_flowing_in' => 'Rentrée', @@ -921,7 +921,7 @@ return [ 'report_type_budget' => 'Rapport du budget', 'report_type_tag' => 'Rapport de tag', 'report_type_account' => 'Rapport de compte de dépenses/recettes', - 'more_info_help' => 'Plus d’informations sur ces types de rapports se trouvent dans les pages d’aide. Appuyez sur l’icône (?) dans le coin supérieur droit.', + 'more_info_help' => 'Vous trouverez plus d’informations sur ces différents types de rapports dans les pages d’aide. Appuyez sur l’icône (?) dans le coin supérieur droit.', 'report_included_accounts' => 'Comptes inclus', 'report_date_range' => 'Intervalle de dates', 'report_preset_ranges' => 'Pré-configurer les étendues', @@ -948,8 +948,8 @@ return [ 'expense_per_account' => 'Dépenses par compte', 'expense_per_tag' => 'Dépenses par tag', 'income_per_tag' => 'Revenus par tag', - 'include_expense_not_in_budget' => 'Frais inclus non compris dans le(s) budget(s) sélectionné(s)', - 'include_expense_not_in_account' => 'Frais inclus non compris dans le(s) compte(s) sélectionné(s)', + 'include_expense_not_in_budget' => 'Les dépenses incluses ne sont pas dans le(s) budget(s) sélectionné(s)', + 'include_expense_not_in_account' => 'Les dépenses incluses ne sont pas dans le(s) compte(s) sélectionné(s)', 'include_expense_not_in_category' => 'Les dépenses incluses ne sont pas dans la(les) catégorie(s) sélectionnée(s)', 'include_income_not_in_category' => 'Les revenus inclus ne sont pas dans la(les) catégorie(s) sélectionnée(s)', 'include_income_not_in_account' => 'Revenus inclus non compris dans le(s) compte(s) sélectionné(s)', @@ -979,7 +979,7 @@ return [ 'select_expense_revenue' => 'Sélectionner le compte de dépenses / recettes', // charts: - 'chart' => 'Diagramme', + 'chart' => 'Graphique', 'month' => 'Mois', 'budget' => 'Budget', 'spent' => 'Dépensé', @@ -990,7 +990,7 @@ return [ 'left' => 'Reste', 'max-amount' => 'Montant maximum', 'min-amount' => 'Montant minimum', - 'journal-amount' => 'Entrée de facture courante', + 'journal-amount' => 'Entrée de la facture courante', 'name' => 'Nom', 'date' => 'Date', 'paid' => 'Payé', @@ -1001,7 +1001,7 @@ return [ 'balance' => 'Solde', 'sum' => 'Somme', 'average' => 'Moyenne', - 'balanceFor' => 'Balance pour :name', + 'balanceFor' => 'Solde pour :name', // piggy banks: 'add_money_to_piggy' => 'Ajouter de l’argent à la tirelire ":name"', @@ -1009,7 +1009,7 @@ return [ 'new_piggy_bank' => 'Nouvelle tirelire', 'store_piggy_bank' => 'Créer une nouvelle tirelire', 'stored_piggy_bank' => 'Créer une nouvelle tirelire ":name"', - 'account_status' => 'Statut du compte', + 'account_status' => 'État du compte', 'left_for_piggy_banks' => 'Reste pour les tirelires', 'sum_of_piggy_banks' => 'Somme des tirelires', 'saved_so_far' => 'Mis de côté jusqu\'à présent', @@ -1024,7 +1024,7 @@ return [ 'remove' => 'Enlever', 'max_amount_add' => 'Le montant maximum que vous pouvez ajouter est', 'max_amount_remove' => 'Le montant maximum que vous pouvez supprimer est', - 'update_piggy_button' => 'Mise à jour tirelire', + 'update_piggy_button' => 'Mise à jour de la tirelire', 'update_piggy_title' => 'Mise à jour de tirelire ":name"', 'updated_piggy_bank' => 'Mise à jour de la tirelire ":name"', 'details' => 'Détails', @@ -1082,7 +1082,7 @@ return [ 'block_code_expired' => 'Compte démo expiré', 'no_block_code' => 'Aucune raison pour le blocage ou utilisateur non bloqué', 'block_code_email_changed' => 'L\'utilisateur n\'a pas encore confirmé sa nouvelle adresse e-mail', - 'admin_update_email' => 'Contrairement à la page de profil, l\'utilisateur NE SERA PAS informé que son adresse email a changé!', + 'admin_update_email' => 'Contrairement à la page de profil, l\'utilisateur NE SERA PAS informé que son adresse email a changé !', 'update_user' => 'Utilisateur mis à jour', 'updated_user' => 'Les données utilisateur ont bien été modifiées.', 'delete_user' => 'Supprimer l\'utilisateur :email', @@ -1108,9 +1108,9 @@ return [ 'link_type_help_outward' => 'Par exemple "est dupliqué par"', 'save_connections_by_moving' => 'Enregistrez le lien entre ces transactions en les déplaçant vers un autre type de lien :', 'do_not_save_connection' => '(ne pas enregistrer la connexion)', - 'link_transaction' => 'Lien transaction', + 'link_transaction' => 'Lier la transaction', 'link_to_other_transaction' => 'Lier cette transaction à une autre transaction', - 'select_transaction_to_link' => 'Sélectionnez une transaction pour lier cette transaction à', + 'select_transaction_to_link' => 'Sélectionnez une transaction à laquelle lier cette transaction', 'this_transaction' => 'Cette transaction', 'transaction' => 'Transaction', 'comments' => 'Commentaires', diff --git a/resources/lang/fr_FR/import.php b/resources/lang/fr_FR/import.php index 458d4bba90..4c50f8363b 100644 --- a/resources/lang/fr_FR/import.php +++ b/resources/lang/fr_FR/import.php @@ -219,7 +219,7 @@ return [ 'column_account-iban' => 'Compte d’actif (IBAN)', 'column_account-id' => 'Compte d\'actif (ID correspondant à FF3)', 'column_account-name' => 'Compte d’actif (nom)', - 'column_account-bic' => 'Asset account (BIC)', + 'column_account-bic' => 'Compte d’actif (BIC)', 'column_amount' => 'Montant', 'column_amount_foreign' => 'Montant (en devise étrangère)', 'column_amount_debit' => 'Montant (colonne débit)', diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php index 24f87d378c..4c2827d1b2 100644 --- a/resources/lang/fr_FR/list.php +++ b/resources/lang/fr_FR/list.php @@ -112,7 +112,7 @@ return [ 'sepa-cc' => 'Code de compensation SEPA', 'sepa-ep' => 'Objectif externe SEPA', 'sepa-ci' => 'Identifiant Créancier SEPA', - 'sepa-batch-id' => 'SEPA Batch ID', + 'sepa-batch-id' => 'ID de lot SEPA', 'external_id' => 'ID externe', 'account_at_bunq' => 'Compte avec bunq', 'file_name' => 'Nom du fichier', diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php index e8d28df7a6..a0d1f92e4e 100644 --- a/resources/lang/fr_FR/validation.php +++ b/resources/lang/fr_FR/validation.php @@ -50,8 +50,8 @@ return [ 'at_least_one_action' => 'Une règle doit avoir au moins une action.', 'base64' => 'Il ne s\'agit pas de données base64 valides.', 'model_id_invalid' => 'L’ID fournit ne semble pas valide pour ce modèle.', - 'more' => ':attribute must be larger than :value.', - 'less' => ':attribute must be less than 10,000,000', + 'more' => ':attribute doit être supérieur à :value.', + 'less' => ':attribute doit être inférieur à 10 000 000', 'active_url' => 'Le champ :attribute n\'est pas une URL valide.', 'after' => 'Le champ :attribute doit être une date postérieure à :date.', 'alpha' => 'Le champ :attribute doit seulement contenir des lettres.', diff --git a/resources/lang/it_IT/config.php b/resources/lang/it_IT/config.php index 8ba46bb310..e8eba2d877 100644 --- a/resources/lang/it_IT/config.php +++ b/resources/lang/it_IT/config.php @@ -24,7 +24,7 @@ declare(strict_types=1); return [ 'html_language' => 'it', - 'locale' => 'it, Italiano, it_IT, it_IT.utf8, it_IT.UTF-8', + 'locale' => 'it, Italiano, it_IT.utf8, it_IT.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'month_and_date_day' => '%A %B %e %Y', diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 11ed5e9acf..34320af6a0 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'Nell\'agosto 2017 il noto ricercatore di sicurezza Troy Hunt ha pubblicato una lista di 306 milioni di password rubate. Queste password sono state rubate durante incursioni in aziende come LinkedIn, Adobe e NeoPets (e molte altre).', 'secure_pw_check_box' => 'Selezionando la casella, Firefly III invierà l\'hash SHA1 della tua password a il sito web di Troy Hunt per vedere se è presente nell\'elenco. Questo ti impedirà di usare password non sicure come raccomandato nell\'ultima Pubblicazione speciale NIST su questo argomento.', 'secure_pw_sha1' => 'Ma pensavo che SHA1 fosse rotto?', - 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', - 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Sì, ma non in questo contesto. Come puoi leggere sul sito che descrive in dettaglio come è stato sconfitto SHA1, ora è leggermente più facile trovare una "collisione", ovvero un altro digest che abbia lo stesso hash in SHA1. Ora sono richiesti solamente 10.000 anni usando una macchina con una singola GPU.', + 'secure_pw_hash_security' => 'Questo digest non sarebbe uguale alla tua password né sarebbe utile su (un sito come) Firefly III. Questa applicazione non usa SHA1 per la verifica della password. Della tua password ne viene fatto l\'hash e solo i primi cinque caratteri di questo digest vengono inviati via HTTPS.', 'secure_pw_should' => 'Devo controllare la scatola?', 'secure_pw_long_password' => 'Se hai appena generato una password lunga e monouso per Firefly III utilizzando un qualche tipo di generatore di password: no.', 'secure_pw_short' => 'Se hai appena inserito la password, usi sempre: Si prega di.', diff --git a/resources/lang/it_IT/import.php b/resources/lang/it_IT/import.php index 0a410bf86e..c78c15921d 100644 --- a/resources/lang/it_IT/import.php +++ b/resources/lang/it_IT/import.php @@ -219,7 +219,7 @@ return [ 'column_account-iban' => 'Conto attività (IBAN)', 'column_account-id' => 'ID conto attività (mappa FF3)', 'column_account-name' => 'Conto attività (nome)', - 'column_account-bic' => 'Asset account (BIC)', + 'column_account-bic' => 'Conto attività (BIC)', 'column_amount' => 'Importo', 'column_amount_foreign' => 'Importo (in altra valuta)', 'column_amount_debit' => 'Importo (colonna debito)', diff --git a/resources/lang/it_IT/list.php b/resources/lang/it_IT/list.php index 6c3fa9e8e8..1fab9f426d 100644 --- a/resources/lang/it_IT/list.php +++ b/resources/lang/it_IT/list.php @@ -112,7 +112,7 @@ return [ 'sepa-cc' => 'Codice Compensazione SEPA', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'Identificativo Creditore SEPA', - 'sepa-batch-id' => 'SEPA Batch ID', + 'sepa-batch-id' => 'ID Batch SEPA', 'external_id' => 'ID esterno', 'account_at_bunq' => 'Conto con Bunq', 'file_name' => 'Nome del file', diff --git a/resources/lang/it_IT/validation.php b/resources/lang/it_IT/validation.php index d0daff498d..a5ddcfa8dd 100644 --- a/resources/lang/it_IT/validation.php +++ b/resources/lang/it_IT/validation.php @@ -50,8 +50,8 @@ return [ 'at_least_one_action' => 'Una regola deve avere almeno una azione.', 'base64' => 'Questi non sono dati codificati in base64 validi.', 'model_id_invalid' => 'L\'ID fornito sembra non essere valido per questo modello.', - 'more' => ':attribute must be larger than :value.', - 'less' => ':attribute must be less than 10,000,000', + 'more' => ':attribute deve essere più grande di :value.', + 'less' => ':attribute deve essere minore di 10.000.000', 'active_url' => ':attribute non è un URL valido.', 'after' => ':attribute deve essere una data dopo :date.', 'alpha' => ':attribute può contenere solo lettere.', diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php index aab20ae1cb..148e4299da 100644 --- a/resources/lang/nl_NL/config.php +++ b/resources/lang/nl_NL/config.php @@ -24,7 +24,7 @@ declare(strict_types=1); return [ 'html_language' => 'nl', - 'locale' => 'nl, Dutch, nl_NL, nl_NL.utf8, nl_NL.UTF-8', + 'locale' => 'nl, Dutch, nl_NL.utf8, nl_NL.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'month_and_date_day' => '%A %e %B %Y', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index cef0735c87..a00e4be5e2 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -520,8 +520,8 @@ return [ 'secure_pw_history' => 'De bekende security onderzoeker Troy Hunt gaf in augustus 2017 een lijst vrij van 306 miljoen gestolen wachtwoorden. Deze wachtwoorden waren gestolen tijdens hacks van bekende bedrijven zoals LinkedIn, Adobe en NeoPets (en vele anderen).', 'secure_pw_check_box' => 'Zet het vinkje, en Firefly III stuurt de eerste vijf karakters van de SHA1-hash van je wachtwoord naar de website van Troy Hunt om te zien of-ie op de lijst staat. Dit voorkomt dat je een onveilig wachtwoord gebruikt, zoals is voorgeschreven in een speciale publicatie van het NIST over dit onderwerp.', 'secure_pw_sha1' => 'Maar SHA1 is toch gebroken?', - 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', - 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', + 'secure_pw_hash_speed' => 'Ja, maar niet in deze context. Zoals je kan lezen op de website over SHA1 is het nu makkelijker geworden om een "collision" te vinden: twee stukken tekst die dezelfde SHA1-hash opleveren. Dit kan nu in 10.000 jaar op een machine met één grafische kaart.', + 'secure_pw_hash_security' => 'Deze hash is niet gelijk aan jouw wachtwoord, noch is deze te gebruiken op een site (zoals) Firefly III. Deze app gebruikt geen SHA1 voor wachtwoordverificatie. Dat maakt het veilig om de checkbox aan te vinken. Je wachtwoord wordt gehasht en alleen de eerste vijf karakters van die hash worden verstuurt over HTTPS.', 'secure_pw_should' => 'Vinkje zetten of niet?', 'secure_pw_long_password' => 'Als je net een lang wachtwoord hebt gegenereerd met een password generator tool: nee.', 'secure_pw_short' => 'Gebruik je het wachtwoord dat je altijd gebruikt? Ja, doen!', diff --git a/resources/lang/nl_NL/import.php b/resources/lang/nl_NL/import.php index 1f8d4b461b..d68ff96f74 100644 --- a/resources/lang/nl_NL/import.php +++ b/resources/lang/nl_NL/import.php @@ -219,7 +219,7 @@ return [ 'column_account-iban' => 'Betaalrekening (IBAN)', 'column_account-id' => 'Betaalrekening (ID gelijk aan FF3)', 'column_account-name' => 'Betaalrekeningnaam', - 'column_account-bic' => 'Asset account (BIC)', + 'column_account-bic' => 'Betaalrekening (BIC)', 'column_amount' => 'Bedrag', 'column_amount_foreign' => 'Bedrag (in vreemde valuta)', 'column_amount_debit' => 'Bedrag (debetkolom)', diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index b52c48113a..2e258977ad 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -112,7 +112,7 @@ return [ 'sepa-cc' => 'SEPA vrijwaringscode', 'sepa-ep' => 'SEPA transactiedoeleinde', 'sepa-ci' => 'SEPA crediteuridentificatie', - 'sepa-batch-id' => 'SEPA Batch ID', + 'sepa-batch-id' => 'SEPA batchnummer', 'external_id' => 'Externe ID', 'account_at_bunq' => 'Bunq-account', 'file_name' => 'Bestandsnaam', diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php index 06eeccb120..d1b75de2a3 100644 --- a/resources/lang/nl_NL/validation.php +++ b/resources/lang/nl_NL/validation.php @@ -50,8 +50,8 @@ return [ 'at_least_one_action' => 'De regel moet minstens één actie hebben.', 'base64' => 'Dit is geen geldige base64 gecodeerde data.', 'model_id_invalid' => 'Dit ID past niet bij dit object.', - 'more' => ':attribute must be larger than :value.', - 'less' => ':attribute must be less than 10,000,000', + 'more' => ':attribute moet groter zijn dan :value.', + 'less' => ':attribute moet minder zijn dan 10.000.000', 'active_url' => ':attribute is geen geldige URL.', 'after' => ':attribute moet een datum na :date zijn.', 'alpha' => ':attribute mag alleen letters bevatten.', From 719d610be31e0f867b8172c62827568815b67a87 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 07:26:33 +0200 Subject: [PATCH 83/86] Fix issue with new crud() method. --- app/Services/Internal/Support/AccountServiceTrait.php | 2 +- config/firefly.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 10c4019fda..a5bf55b646 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -323,7 +323,7 @@ trait AccountServiceTrait /** @var AccountMetaFactory $factory */ $factory = app(AccountMetaFactory::class); foreach ($fields as $field) { - $factory->crud($account, $field, $data[$field] ?? ''); + $factory->crud($account, $field, (string)($data[$field] ?? '')); } } diff --git a/config/firefly.php b/config/firefly.php index 288f8bcf62..d4b52be4a5 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -225,8 +225,10 @@ return [ 'languages' => [ // completed languages 'en_US' => ['name_locale' => 'English', 'name_english' => 'English'], + 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'], 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'], 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'], + 'id_ID' => ['name_locale' => 'Bahasa Indonesia', 'name_english' => 'Indonesian'], 'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'], 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'], 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '], From d35470a79ef1038aeab677afbd7ea415caf48f15 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 10:03:47 +0200 Subject: [PATCH 84/86] Found and fixed #1571 --- public/css/app.css | 2 +- public/js/app.js | 2 +- resources/assets/js/components/passport/Clients.vue | 4 ++-- .../assets/js/components/passport/PersonalAccessTokens.vue | 2 +- resources/views/layout/default.twig | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 9fbbfd93bb..99c3d14a5b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -6,7 +6,7 @@ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} -/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{background:transparent!important;color:#000!important;-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:Glyphicons Halflings;src:url(/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.eot?f4769f9bdb7466be65088239c12046d1);src:url(/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.eot?f4769f9bdb7466be65088239c12046d1?#iefix) format("embedded-opentype"),url(/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.woff2?448c34a56d699c29117adc64c43affeb) format("woff2"),url(/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.woff?fa2772327f55d8198301fdb8bcfc8158) format("woff"),url(/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.ttf?e18bbf611f2a2e43afc071aa2f4e1512) format("truetype"),url(/fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.svg?89889688147bd7575d6327160d64e760#glyphicons_halflingsregular) format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:Glyphicons Halflings;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"*"}.glyphicon-plus:before{content:"+"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20AC"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270F"}.glyphicon-glass:before{content:"\E001"}.glyphicon-music:before{content:"\E002"}.glyphicon-search:before{content:"\E003"}.glyphicon-heart:before{content:"\E005"}.glyphicon-star:before{content:"\E006"}.glyphicon-star-empty:before{content:"\E007"}.glyphicon-user:before{content:"\E008"}.glyphicon-film:before{content:"\E009"}.glyphicon-th-large:before{content:"\E010"}.glyphicon-th:before{content:"\E011"}.glyphicon-th-list:before{content:"\E012"}.glyphicon-ok:before{content:"\E013"}.glyphicon-remove:before{content:"\E014"}.glyphicon-zoom-in:before{content:"\E015"}.glyphicon-zoom-out:before{content:"\E016"}.glyphicon-off:before{content:"\E017"}.glyphicon-signal:before{content:"\E018"}.glyphicon-cog:before{content:"\E019"}.glyphicon-trash:before{content:"\E020"}.glyphicon-home:before{content:"\E021"}.glyphicon-file:before{content:"\E022"}.glyphicon-time:before{content:"\E023"}.glyphicon-road:before{content:"\E024"}.glyphicon-download-alt:before{content:"\E025"}.glyphicon-download:before{content:"\E026"}.glyphicon-upload:before{content:"\E027"}.glyphicon-inbox:before{content:"\E028"}.glyphicon-play-circle:before{content:"\E029"}.glyphicon-repeat:before{content:"\E030"}.glyphicon-refresh:before{content:"\E031"}.glyphicon-list-alt:before{content:"\E032"}.glyphicon-lock:before{content:"\E033"}.glyphicon-flag:before{content:"\E034"}.glyphicon-headphones:before{content:"\E035"}.glyphicon-volume-off:before{content:"\E036"}.glyphicon-volume-down:before{content:"\E037"}.glyphicon-volume-up:before{content:"\E038"}.glyphicon-qrcode:before{content:"\E039"}.glyphicon-barcode:before{content:"\E040"}.glyphicon-tag:before{content:"\E041"}.glyphicon-tags:before{content:"\E042"}.glyphicon-book:before{content:"\E043"}.glyphicon-bookmark:before{content:"\E044"}.glyphicon-print:before{content:"\E045"}.glyphicon-camera:before{content:"\E046"}.glyphicon-font:before{content:"\E047"}.glyphicon-bold:before{content:"\E048"}.glyphicon-italic:before{content:"\E049"}.glyphicon-text-height:before{content:"\E050"}.glyphicon-text-width:before{content:"\E051"}.glyphicon-align-left:before{content:"\E052"}.glyphicon-align-center:before{content:"\E053"}.glyphicon-align-right:before{content:"\E054"}.glyphicon-align-justify:before{content:"\E055"}.glyphicon-list:before{content:"\E056"}.glyphicon-indent-left:before{content:"\E057"}.glyphicon-indent-right:before{content:"\E058"}.glyphicon-facetime-video:before{content:"\E059"}.glyphicon-picture:before{content:"\E060"}.glyphicon-map-marker:before{content:"\E062"}.glyphicon-adjust:before{content:"\E063"}.glyphicon-tint:before{content:"\E064"}.glyphicon-edit:before{content:"\E065"}.glyphicon-share:before{content:"\E066"}.glyphicon-check:before{content:"\E067"}.glyphicon-move:before{content:"\E068"}.glyphicon-step-backward:before{content:"\E069"}.glyphicon-fast-backward:before{content:"\E070"}.glyphicon-backward:before{content:"\E071"}.glyphicon-play:before{content:"\E072"}.glyphicon-pause:before{content:"\E073"}.glyphicon-stop:before{content:"\E074"}.glyphicon-forward:before{content:"\E075"}.glyphicon-fast-forward:before{content:"\E076"}.glyphicon-step-forward:before{content:"\E077"}.glyphicon-eject:before{content:"\E078"}.glyphicon-chevron-left:before{content:"\E079"}.glyphicon-chevron-right:before{content:"\E080"}.glyphicon-plus-sign:before{content:"\E081"}.glyphicon-minus-sign:before{content:"\E082"}.glyphicon-remove-sign:before{content:"\E083"}.glyphicon-ok-sign:before{content:"\E084"}.glyphicon-question-sign:before{content:"\E085"}.glyphicon-info-sign:before{content:"\E086"}.glyphicon-screenshot:before{content:"\E087"}.glyphicon-remove-circle:before{content:"\E088"}.glyphicon-ok-circle:before{content:"\E089"}.glyphicon-ban-circle:before{content:"\E090"}.glyphicon-arrow-left:before{content:"\E091"}.glyphicon-arrow-right:before{content:"\E092"}.glyphicon-arrow-up:before{content:"\E093"}.glyphicon-arrow-down:before{content:"\E094"}.glyphicon-share-alt:before{content:"\E095"}.glyphicon-resize-full:before{content:"\E096"}.glyphicon-resize-small:before{content:"\E097"}.glyphicon-exclamation-sign:before{content:"\E101"}.glyphicon-gift:before{content:"\E102"}.glyphicon-leaf:before{content:"\E103"}.glyphicon-fire:before{content:"\E104"}.glyphicon-eye-open:before{content:"\E105"}.glyphicon-eye-close:before{content:"\E106"}.glyphicon-warning-sign:before{content:"\E107"}.glyphicon-plane:before{content:"\E108"}.glyphicon-calendar:before{content:"\E109"}.glyphicon-random:before{content:"\E110"}.glyphicon-comment:before{content:"\E111"}.glyphicon-magnet:before{content:"\E112"}.glyphicon-chevron-up:before{content:"\E113"}.glyphicon-chevron-down:before{content:"\E114"}.glyphicon-retweet:before{content:"\E115"}.glyphicon-shopping-cart:before{content:"\E116"}.glyphicon-folder-close:before{content:"\E117"}.glyphicon-folder-open:before{content:"\E118"}.glyphicon-resize-vertical:before{content:"\E119"}.glyphicon-resize-horizontal:before{content:"\E120"}.glyphicon-hdd:before{content:"\E121"}.glyphicon-bullhorn:before{content:"\E122"}.glyphicon-bell:before{content:"\E123"}.glyphicon-certificate:before{content:"\E124"}.glyphicon-thumbs-up:before{content:"\E125"}.glyphicon-thumbs-down:before{content:"\E126"}.glyphicon-hand-right:before{content:"\E127"}.glyphicon-hand-left:before{content:"\E128"}.glyphicon-hand-up:before{content:"\E129"}.glyphicon-hand-down:before{content:"\E130"}.glyphicon-circle-arrow-right:before{content:"\E131"}.glyphicon-circle-arrow-left:before{content:"\E132"}.glyphicon-circle-arrow-up:before{content:"\E133"}.glyphicon-circle-arrow-down:before{content:"\E134"}.glyphicon-globe:before{content:"\E135"}.glyphicon-wrench:before{content:"\E136"}.glyphicon-tasks:before{content:"\E137"}.glyphicon-filter:before{content:"\E138"}.glyphicon-briefcase:before{content:"\E139"}.glyphicon-fullscreen:before{content:"\E140"}.glyphicon-dashboard:before{content:"\E141"}.glyphicon-paperclip:before{content:"\E142"}.glyphicon-heart-empty:before{content:"\E143"}.glyphicon-link:before{content:"\E144"}.glyphicon-phone:before{content:"\E145"}.glyphicon-pushpin:before{content:"\E146"}.glyphicon-usd:before{content:"\E148"}.glyphicon-gbp:before{content:"\E149"}.glyphicon-sort:before{content:"\E150"}.glyphicon-sort-by-alphabet:before{content:"\E151"}.glyphicon-sort-by-alphabet-alt:before{content:"\E152"}.glyphicon-sort-by-order:before{content:"\E153"}.glyphicon-sort-by-order-alt:before{content:"\E154"}.glyphicon-sort-by-attributes:before{content:"\E155"}.glyphicon-sort-by-attributes-alt:before{content:"\E156"}.glyphicon-unchecked:before{content:"\E157"}.glyphicon-expand:before{content:"\E158"}.glyphicon-collapse-down:before{content:"\E159"}.glyphicon-collapse-up:before{content:"\E160"}.glyphicon-log-in:before{content:"\E161"}.glyphicon-flash:before{content:"\E162"}.glyphicon-log-out:before{content:"\E163"}.glyphicon-new-window:before{content:"\E164"}.glyphicon-record:before{content:"\E165"}.glyphicon-save:before{content:"\E166"}.glyphicon-open:before{content:"\E167"}.glyphicon-saved:before{content:"\E168"}.glyphicon-import:before{content:"\E169"}.glyphicon-export:before{content:"\E170"}.glyphicon-send:before{content:"\E171"}.glyphicon-floppy-disk:before{content:"\E172"}.glyphicon-floppy-saved:before{content:"\E173"}.glyphicon-floppy-remove:before{content:"\E174"}.glyphicon-floppy-save:before{content:"\E175"}.glyphicon-floppy-open:before{content:"\E176"}.glyphicon-credit-card:before{content:"\E177"}.glyphicon-transfer:before{content:"\E178"}.glyphicon-cutlery:before{content:"\E179"}.glyphicon-header:before{content:"\E180"}.glyphicon-compressed:before{content:"\E181"}.glyphicon-earphone:before{content:"\E182"}.glyphicon-phone-alt:before{content:"\E183"}.glyphicon-tower:before{content:"\E184"}.glyphicon-stats:before{content:"\E185"}.glyphicon-sd-video:before{content:"\E186"}.glyphicon-hd-video:before{content:"\E187"}.glyphicon-subtitles:before{content:"\E188"}.glyphicon-sound-stereo:before{content:"\E189"}.glyphicon-sound-dolby:before{content:"\E190"}.glyphicon-sound-5-1:before{content:"\E191"}.glyphicon-sound-6-1:before{content:"\E192"}.glyphicon-sound-7-1:before{content:"\E193"}.glyphicon-copyright-mark:before{content:"\E194"}.glyphicon-registration-mark:before{content:"\E195"}.glyphicon-cloud-download:before{content:"\E197"}.glyphicon-cloud-upload:before{content:"\E198"}.glyphicon-tree-conifer:before{content:"\E199"}.glyphicon-tree-deciduous:before{content:"\E200"}.glyphicon-cd:before{content:"\E201"}.glyphicon-save-file:before{content:"\E202"}.glyphicon-open-file:before{content:"\E203"}.glyphicon-level-up:before{content:"\E204"}.glyphicon-copy:before{content:"\E205"}.glyphicon-paste:before{content:"\E206"}.glyphicon-alert:before{content:"\E209"}.glyphicon-equalizer:before{content:"\E210"}.glyphicon-king:before{content:"\E211"}.glyphicon-queen:before{content:"\E212"}.glyphicon-pawn:before{content:"\E213"}.glyphicon-bishop:before{content:"\E214"}.glyphicon-knight:before{content:"\E215"}.glyphicon-baby-formula:before{content:"\E216"}.glyphicon-tent:before{content:"\26FA"}.glyphicon-blackboard:before{content:"\E218"}.glyphicon-bed:before{content:"\E219"}.glyphicon-apple:before{content:"\F8FF"}.glyphicon-erase:before{content:"\E221"}.glyphicon-hourglass:before{content:"\231B"}.glyphicon-lamp:before{content:"\E223"}.glyphicon-duplicate:before{content:"\E224"}.glyphicon-piggy-bank:before{content:"\E225"}.glyphicon-scissors:before{content:"\E226"}.glyphicon-bitcoin:before,.glyphicon-btc:before,.glyphicon-xbt:before{content:"\E227"}.glyphicon-jpy:before,.glyphicon-yen:before{content:"\A5"}.glyphicon-rub:before,.glyphicon-ruble:before{content:"\20BD"}.glyphicon-scale:before{content:"\E230"}.glyphicon-ice-lolly:before{content:"\E231"}.glyphicon-ice-lolly-tasted:before{content:"\E232"}.glyphicon-education:before{content:"\E233"}.glyphicon-option-horizontal:before{content:"\E234"}.glyphicon-option-vertical:before{content:"\E235"}.glyphicon-menu-hamburger:before{content:"\E236"}.glyphicon-modal-window:before{content:"\E237"}.glyphicon-oil:before{content:"\E238"}.glyphicon-grain:before{content:"\E239"}.glyphicon-sunglasses:before{content:"\E240"}.glyphicon-text-size:before{content:"\E241"}.glyphicon-text-color:before{content:"\E242"}.glyphicon-text-background:before{content:"\E243"}.glyphicon-object-align-top:before{content:"\E244"}.glyphicon-object-align-bottom:before{content:"\E245"}.glyphicon-object-align-horizontal:before{content:"\E246"}.glyphicon-object-align-left:before{content:"\E247"}.glyphicon-object-align-vertical:before{content:"\E248"}.glyphicon-object-align-right:before{content:"\E249"}.glyphicon-triangle-right:before{content:"\E250"}.glyphicon-triangle-left:before{content:"\E251"}.glyphicon-triangle-bottom:before{content:"\E252"}.glyphicon-triangle-top:before{content:"\E253"}.glyphicon-console:before{content:"\E254"}.glyphicon-superscript:before{content:"\E255"}.glyphicon-subscript:before{content:"\E256"}.glyphicon-menu-left:before{content:"\E257"}.glyphicon-menu-right:before{content:"\E258"}.glyphicon-menu-down:before{content:"\E259"}.glyphicon-menu-up:before{content:"\E260"}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:transparent}body{font-family:Raleway,sans-serif;font-size:14px;line-height:1.6;color:#636b6f;background-color:#f5f8fa}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#3097d1;text-decoration:none}a:focus,a:hover{color:#216a94;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.6;background-color:#f5f8fa;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:22px;margin-bottom:22px;border:0;border-top:1px solid #eee}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:22px;margin-bottom:11px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:11px;margin-bottom:11px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 11px}.lead{margin-bottom:22px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.initialism,.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#3097d1}a.text-primary:focus,a.text-primary:hover{color:#2579a9}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#3097d1}a.bg-primary:focus,a.bg-primary:hover{background-color:#2579a9}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:10px;margin:44px 0 22px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:11px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline{margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:22px}dd,dt{line-height:1.6}dt{font-weight:700}dd{margin-left:0}.dl-horizontal dd:after,.dl-horizontal dd:before{content:" ";display:table}.dl-horizontal dd:after{clear:both}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%}blockquote{padding:11px 22px;margin:0 0 22px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.6;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:"\2014 \A0"}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:""}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:"\A0 \2014"}address{margin-bottom:22px;font-style:normal;line-height:1.6}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Courier New,monospace}code{color:#c7254e;background-color:#f9f2f4;border-radius:4px}code,kbd{padding:2px 4px;font-size:90%}kbd{color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:10.5px;margin:0 0 11px;font-size:13px;line-height:1.6;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container:after,.container:before{content:" ";display:table}.container:after{clear:both}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container-fluid:after,.container-fluid:before{content:" ";display:table}.container-fluid:after{clear:both}.row{margin-left:-15px;margin-right:-15px}.row:after,.row:before{content:" ";display:table}.row:after{clear:both}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-1{width:8.33333333%}.col-xs-2{width:16.66666667%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333%}.col-xs-5{width:41.66666667%}.col-xs-6{width:50%}.col-xs-7{width:58.33333333%}.col-xs-8{width:66.66666667%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333%}.col-xs-11{width:91.66666667%}.col-xs-12{width:100%}.col-xs-pull-0{right:auto}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-3{right:25%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-6{right:50%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-9{right:75%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-12{right:100%}.col-xs-push-0{left:auto}.col-xs-push-1{left:8.33333333%}.col-xs-push-2{left:16.66666667%}.col-xs-push-3{left:25%}.col-xs-push-4{left:33.33333333%}.col-xs-push-5{left:41.66666667%}.col-xs-push-6{left:50%}.col-xs-push-7{left:58.33333333%}.col-xs-push-8{left:66.66666667%}.col-xs-push-9{left:75%}.col-xs-push-10{left:83.33333333%}.col-xs-push-11{left:91.66666667%}.col-xs-push-12{left:100%}.col-xs-offset-0{margin-left:0}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-12{margin-left:100%}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-1{width:8.33333333%}.col-sm-2{width:16.66666667%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333%}.col-sm-5{width:41.66666667%}.col-sm-6{width:50%}.col-sm-7{width:58.33333333%}.col-sm-8{width:66.66666667%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333%}.col-sm-11{width:91.66666667%}.col-sm-12{width:100%}.col-sm-pull-0{right:auto}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-12{right:100%}.col-sm-push-0{left:auto}.col-sm-push-1{left:8.33333333%}.col-sm-push-2{left:16.66666667%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333%}.col-sm-push-5{left:41.66666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.33333333%}.col-sm-push-8{left:66.66666667%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333%}.col-sm-push-11{left:91.66666667%}.col-sm-push-12{left:100%}.col-sm-offset-0{margin-left:0}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-12{margin-left:100%}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-1{width:8.33333333%}.col-md-2{width:16.66666667%}.col-md-3{width:25%}.col-md-4{width:33.33333333%}.col-md-5{width:41.66666667%}.col-md-6{width:50%}.col-md-7{width:58.33333333%}.col-md-8{width:66.66666667%}.col-md-9{width:75%}.col-md-10{width:83.33333333%}.col-md-11{width:91.66666667%}.col-md-12{width:100%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.33333333%}.col-md-pull-2{right:16.66666667%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333%}.col-md-pull-5{right:41.66666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.33333333%}.col-md-pull-8{right:66.66666667%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333%}.col-md-pull-11{right:91.66666667%}.col-md-pull-12{right:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.33333333%}.col-md-push-2{left:16.66666667%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333%}.col-md-push-5{left:41.66666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.33333333%}.col-md-push-8{left:66.66666667%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333%}.col-md-push-11{left:91.66666667%}.col-md-push-12{left:100%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-12{margin-left:100%}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-1{width:8.33333333%}.col-lg-2{width:16.66666667%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333%}.col-lg-5{width:41.66666667%}.col-lg-6{width:50%}.col-lg-7{width:58.33333333%}.col-lg-8{width:66.66666667%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333%}.col-lg-11{width:91.66666667%}.col-lg-12{width:100%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-12{right:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.33333333%}.col-lg-push-2{left:16.66666667%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333%}.col-lg-push-5{left:41.66666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.33333333%}.col-lg-push-8{left:66.66666667%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333%}.col-lg-push-11{left:91.66666667%}.col-lg-push-12{left:100%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-12{margin-left:100%}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777}caption,th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:22px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.6;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#f5f8fa}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;float:none;display:table-column}table td[class*=col-],table th[class*=col-]{position:static;float:none;display:table-cell}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{overflow-x:auto;min-height:.01%}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:16.5px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{margin:0;min-width:0}fieldset,legend{padding:0;border:0}legend{display:block;width:100%;margin-bottom:22px;font-size:21px;line-height:inherit;color:#333;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{padding-top:7px}.form-control,output{display:block;font-size:14px;line-height:1.6;color:#555}.form-control{width:100%;height:36px;padding:6px 12px;background-color:#fff;background-image:none;border:1px solid #ccd0d2;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.form-control:focus{border-color:#98cbe8;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(152,203,232,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(152,203,232,.6)}.form-control::-moz-placeholder{color:#b1b7ba;opacity:1}.form-control:-ms-input-placeholder{color:#b1b7ba}.form-control::-webkit-input-placeholder{color:#b1b7ba}.form-control::-ms-expand{border:0;background-color:transparent}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{line-height:36px}.input-group-sm>.input-group-btn>input[type=date].btn,.input-group-sm>.input-group-btn>input[type=datetime-local].btn,.input-group-sm>.input-group-btn>input[type=month].btn,.input-group-sm>.input-group-btn>input[type=time].btn,.input-group-sm>input[type=date].form-control,.input-group-sm>input[type=date].input-group-addon,.input-group-sm>input[type=datetime-local].form-control,.input-group-sm>input[type=datetime-local].input-group-addon,.input-group-sm>input[type=month].form-control,.input-group-sm>input[type=month].input-group-addon,.input-group-sm>input[type=time].form-control,.input-group-sm>input[type=time].input-group-addon,.input-group-sm input[type=date],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],.input-group-sm input[type=time],input[type=date].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm,input[type=time].input-sm{line-height:30px}.input-group-lg>.input-group-btn>input[type=date].btn,.input-group-lg>.input-group-btn>input[type=datetime-local].btn,.input-group-lg>.input-group-btn>input[type=month].btn,.input-group-lg>.input-group-btn>input[type=time].btn,.input-group-lg>input[type=date].form-control,.input-group-lg>input[type=date].input-group-addon,.input-group-lg>input[type=datetime-local].form-control,.input-group-lg>input[type=datetime-local].input-group-addon,.input-group-lg>input[type=month].form-control,.input-group-lg>input[type=month].input-group-addon,.input-group-lg>input[type=time].form-control,.input-group-lg>input[type=time].input-group-addon,.input-group-lg input[type=date],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],.input-group-lg input[type=time],input[type=date].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg,input[type=time].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:22px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox-inline input[type=checkbox],.checkbox input[type=checkbox],.radio-inline input[type=radio],.radio input[type=radio]{position:absolute;margin-left:-20px;margin-top:4px\9}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.checkbox-inline.disabled,.checkbox.disabled label,.radio-inline.disabled,.radio.disabled label,fieldset[disabled] .checkbox-inline,fieldset[disabled] .checkbox label,fieldset[disabled] .radio-inline,fieldset[disabled] .radio label,fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0;min-height:36px}.form-control-static.input-lg,.form-control-static.input-sm,.input-group-lg>.form-control-static.form-control,.input-group-lg>.form-control-static.input-group-addon,.input-group-lg>.input-group-btn>.form-control-static.btn,.input-group-sm>.form-control-static.form-control,.input-group-sm>.form-control-static.input-group-addon,.input-group-sm>.input-group-btn>.form-control-static.btn{padding-left:0;padding-right:0}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn,.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.input-group-sm>.input-group-btn>select.btn,.input-group-sm>select.form-control,.input-group-sm>select.input-group-addon,select.input-sm{height:30px;line-height:30px}.input-group-sm>.input-group-btn>select[multiple].btn,.input-group-sm>.input-group-btn>textarea.btn,.input-group-sm>select[multiple].form-control,.input-group-sm>select[multiple].input-group-addon,.input-group-sm>textarea.form-control,.input-group-sm>textarea.input-group-addon,select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:34px;padding:6px 10px;font-size:12px;line-height:1.5}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn,.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.input-group-lg>.input-group-btn>select.btn,.input-group-lg>select.form-control,.input-group-lg>select.input-group-addon,select.input-lg{height:46px;line-height:46px}.input-group-lg>.input-group-btn>select[multiple].btn,.input-group-lg>.input-group-btn>textarea.btn,.input-group-lg>select[multiple].form-control,.input-group-lg>select[multiple].input-group-addon,.input-group-lg>textarea.form-control,.input-group-lg>textarea.input-group-addon,select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:40px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:45px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:36px;height:36px;line-height:36px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-group-lg>.form-control+.form-control-feedback,.input-group-lg>.input-group-addon+.form-control-feedback,.input-group-lg>.input-group-btn>.btn+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-group-sm>.form-control+.form-control-feedback,.input-group-sm>.input-group-addon+.form-control-feedback,.input-group-sm>.input-group-btn>.btn+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success.checkbox-inline label,.has-success.checkbox label,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.radio-inline label,.has-success.radio label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning.checkbox-inline label,.has-warning.checkbox label,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.radio-inline label,.has-warning.radio label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error.checkbox-inline label,.has-error.checkbox label,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.radio-inline label,.has-error.radio label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:27px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#a4aaae}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .checkbox,.form-horizontal .radio{min-height:29px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-group:after,.form-horizontal .form-group:before{content:" ";display:table}.form-horizontal .form-group:after{clear:both}@media (min-width:768px){.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.6;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#636b6f;text-decoration:none}.btn.active,.btn:active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#636b6f;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#636b6f;background-color:#e6e5e5;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.btn-default:hover,.open>.btn-default.dropdown-toggle{color:#636b6f;background-color:#e6e5e5;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.btn-default.dropdown-toggle.focus,.open>.btn-default.dropdown-toggle:focus,.open>.btn-default.dropdown-toggle:hover{color:#636b6f;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.btn-default.dropdown-toggle{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#636b6f}.btn-primary{color:#fff;background-color:#3097d1;border-color:#2a88bd}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#2579a9;border-color:#133d55}.btn-primary.active,.btn-primary:active,.btn-primary:hover,.open>.btn-primary.dropdown-toggle{color:#fff;background-color:#2579a9;border-color:#1f648b}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.btn-primary.dropdown-toggle.focus,.open>.btn-primary.dropdown-toggle:focus,.open>.btn-primary.dropdown-toggle:hover{color:#fff;background-color:#1f648b;border-color:#133d55}.btn-primary.active,.btn-primary:active,.open>.btn-primary.dropdown-toggle{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#3097d1;border-color:#2a88bd}.btn-primary .badge{color:#3097d1;background-color:#fff}.btn-success{color:#fff;background-color:#2ab27b;border-color:#259d6d}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#20895e;border-color:#0d3625}.btn-success.active,.btn-success:active,.btn-success:hover,.open>.btn-success.dropdown-toggle{color:#fff;background-color:#20895e;border-color:#196c4b}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.btn-success.dropdown-toggle.focus,.open>.btn-success.dropdown-toggle:focus,.open>.btn-success.dropdown-toggle:hover{color:#fff;background-color:#196c4b;border-color:#0d3625}.btn-success.active,.btn-success:active,.open>.btn-success.dropdown-toggle{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#2ab27b;border-color:#259d6d}.btn-success .badge{color:#2ab27b;background-color:#fff}.btn-info{color:#fff;background-color:#8eb4cb;border-color:#7da8c3}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#6b9dbb;border-color:#3d6983}.btn-info.active,.btn-info:active,.btn-info:hover,.open>.btn-info.dropdown-toggle{color:#fff;background-color:#6b9dbb;border-color:#538db0}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.btn-info.dropdown-toggle.focus,.open>.btn-info.dropdown-toggle:focus,.open>.btn-info.dropdown-toggle:hover{color:#fff;background-color:#538db0;border-color:#3d6983}.btn-info.active,.btn-info:active,.open>.btn-info.dropdown-toggle{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#8eb4cb;border-color:#7da8c3}.btn-info .badge{color:#8eb4cb;background-color:#fff}.btn-warning{color:#fff;background-color:#cbb956;border-color:#c5b143}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#b6a338;border-color:#685d20}.btn-warning.active,.btn-warning:active,.btn-warning:hover,.open>.btn-warning.dropdown-toggle{color:#fff;background-color:#b6a338;border-color:#9b8a30}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.btn-warning.dropdown-toggle.focus,.open>.btn-warning.dropdown-toggle:focus,.open>.btn-warning.dropdown-toggle:hover{color:#fff;background-color:#9b8a30;border-color:#685d20}.btn-warning.active,.btn-warning:active,.open>.btn-warning.dropdown-toggle{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#cbb956;border-color:#c5b143}.btn-warning .badge{color:#cbb956;background-color:#fff}.btn-danger{color:#fff;background-color:#bf5329;border-color:#aa4a24}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#954120;border-color:#411c0e}.btn-danger.active,.btn-danger:active,.btn-danger:hover,.open>.btn-danger.dropdown-toggle{color:#fff;background-color:#954120;border-color:#78341a}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.btn-danger.dropdown-toggle.focus,.open>.btn-danger.dropdown-toggle:focus,.open>.btn-danger.dropdown-toggle:hover{color:#fff;background-color:#78341a;border-color:#411c0e}.btn-danger.active,.btn-danger:active,.open>.btn-danger.dropdown-toggle{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#bf5329;border-color:#aa4a24}.btn-danger .badge{color:#bf5329;background-color:#fff}.btn-link{color:#3097d1;font-weight:400;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#216a94;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:10px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.6;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:#3097d1}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.6;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar:after,.btn-toolbar:before{content:" ";display:table}.btn-toolbar:after{clear:both}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group-lg.btn-group>.btn+.dropdown-toggle,.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-group-lg>.btn .caret,.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-group-lg>.btn .caret,.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before{content:" ";display:table}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-top-left-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio],[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccd0d2;border-radius:4px}.input-group-addon.input-sm,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.input-group-addon.btn{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.input-group-addon.btn{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group .form-control:last-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{font-size:0;white-space:nowrap}.input-group-btn,.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav:after,.nav:before{content:" ";display:table}.nav:after{clear:both}.nav>li,.nav>li>a{position:relative;display:block}.nav>li>a{padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#3097d1}.nav .nav-divider{height:1px;margin:10px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.6;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;background-color:#f5f8fa;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#3097d1}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified,.nav-tabs.nav-justified{width:100%}.nav-justified>li,.nav-tabs.nav-justified>li{float:none}.nav-justified>li>a,.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li,.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a,.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified,.nav-tabs.nav-justified{border-bottom:0}.nav-tabs-justified>li>a,.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a,.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#f5f8fa}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:22px;border:1px solid transparent}.navbar:after,.navbar:before{content:" ";display:table}.navbar:after{clear:both}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-header:after,.navbar-header:before{content:" ";display:table}.navbar-header:after{clear:both}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1);-webkit-overflow-scrolling:touch}.navbar-collapse:after,.navbar-collapse:before{content:" ";display:table}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:0;padding-right:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:14px 15px;font-size:18px;line-height:22px;height:50px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container-fluid .navbar-brand,.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:22px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:22px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:14px;padding-bottom:14px}}.navbar-form{margin:7px -15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1),0 1px 0 hsla(0,0%,100%,.1);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1),0 1px 0 hsla(0,0%,100%,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:7px;margin-bottom:7px}.btn-group-sm>.navbar-btn.btn,.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.btn-group-xs>.navbar-btn.btn,.navbar-btn.btn-xs,.navbar-text{margin-top:14px;margin-bottom:14px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#fff;border-color:#d3e0e9}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5d5d;background-color:transparent}.navbar-default .navbar-nav>li>a,.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#eee}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#d3e0e9}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{background-color:#eee;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#eee}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#090909}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>li>a,.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#090909}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#090909;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#090909}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#090909}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#090909}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:22px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{content:"/\A0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:22px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.6;text-decoration:none;color:#3097d1;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#216a94;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;background-color:#3097d1;border-color:#3097d1;cursor:default}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:22px 0;list-style:none;text-align:center}.pager:after,.pager:before{content:" ";display:table}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label:empty{display:none}.btn .label{position:relative;top:-1px}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#3097d1}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#2579a9}.label-success{background-color:#2ab27b}.label-success[href]:focus,.label-success[href]:hover{background-color:#20895e}.label-info{background-color:#8eb4cb}.label-info[href]:focus,.label-info[href]:hover{background-color:#6b9dbb}.label-warning{background-color:#cbb956}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#b6a338}.label-danger{background-color:#bf5329}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#954120}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;color:#fff;line-height:1;vertical-align:middle;white-space:nowrap;text-align:center;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#3097d1;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;background-color:#eee}.jumbotron,.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container-fluid .jumbotron,.container .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container-fluid .jumbotron,.container .jumbotron{padding-left:60px;padding-right:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:22px;line-height:1.6;background-color:#f5f8fa;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail>img,.thumbnail a>img{display:block;max-width:100%;height:auto;margin-left:auto;margin-right:auto}.thumbnail .caption{padding:9px;color:#636b6f}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#3097d1}.alert{padding:15px;margin-bottom:22px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{0%{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:22px;margin-bottom:22px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:22px;color:#fff;text-align:center;background-color:#3097d1;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#2ab27b}.progress-striped .progress-bar-success{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.progress-bar-info{background-color:#8eb4cb}.progress-striped .progress-bar-info{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.progress-bar-warning{background-color:#cbb956}.progress-striped .progress-bar-warning{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.progress-bar-danger{background-color:#bf5329}.progress-striped .progress-bar-danger{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{zoom:1;overflow:hidden}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #d3e0e9}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{text-decoration:none;color:#555;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{background-color:#eee;color:#777;cursor:not-allowed}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#3097d1;border-color:#3097d1}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#d7ebf6}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:22px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-body:after,.panel-body:before{content:" ";display:table}.panel-body:after{clear:both}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle,.panel-title{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #d3e0e9;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.list-group+.panel-footer,.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table-responsive>.table caption,.panel>.table caption{padding-left:15px;padding-right:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:22px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #d3e0e9}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #d3e0e9}.panel-default{border-color:#d3e0e9}.panel-default>.panel-heading{color:#333;background-color:#fff;border-color:#d3e0e9}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d3e0e9}.panel-default>.panel-heading .badge{color:#fff;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d3e0e9}.panel-primary{border-color:#3097d1}.panel-primary>.panel-heading{color:#fff;background-color:#3097d1;border-color:#3097d1}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#3097d1}.panel-primary>.panel-heading .badge{color:#3097d1;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#3097d1}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;left:0;bottom:0;height:100%;width:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal,.modal-open{overflow:hidden}.modal{display:none;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translateY(-25%);transform:translateY(-25%);-webkit-transition:-webkit-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0);transform:translate(0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);background-clip:padding-box;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header:after,.modal-header:before{content:" ";display:table}.modal-header:after{clear:both}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.6}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:after,.modal-footer:before{content:" ";display:table}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;letter-spacing:normal;line-break:auto;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:12px;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px}.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow{bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{left:5px}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;letter-spacing:normal;line-break:auto;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:14px;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{border-width:10px;content:""}.popover.top>.arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,.25);bottom:-11px}.popover.top>.arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,.25)}.popover.right>.arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom>.arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25);top:-11px}.popover.bottom>.arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.carousel,.carousel-inner{position:relative}.carousel-inner{overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:left .6s ease-in-out;transition:left .6s ease-in-out}.carousel-inner>.item>a>img,.carousel-inner>.item>img{display:block;max-width:100%;height:auto;line-height:1}@media (-webkit-transform-3d),(transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;transition:transform .6s ease-in-out,-webkit-transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);left:0}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);left:0}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{-webkit-transform:translateZ(0);transform:translateZ(0);left:0}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:transparent}.carousel-control.left{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(90deg,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000",endColorstr="#00000000",GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(90deg,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000",endColorstr="#80000000",GradientType=1)}.carousel-control:focus,.carousel-control:hover{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;margin-top:-10px;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;line-height:1;font-family:serif}.carousel-control .icon-prev:before{content:"\2039"}.carousel-control .icon-next:before{content:"\203A"}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;cursor:pointer;background-color:#000\9;background-color:transparent}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:after,.clearfix:before{content:" ";display:table}.clearfix:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} +/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{background:transparent!important;color:#000!important;-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:Glyphicons Halflings;src:url(../fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.eot?f4769f9bdb7466be65088239c12046d1);src:url(../fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.eot?f4769f9bdb7466be65088239c12046d1?#iefix) format("embedded-opentype"),url(../fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.woff2?448c34a56d699c29117adc64c43affeb) format("woff2"),url(../fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.woff?fa2772327f55d8198301fdb8bcfc8158) format("woff"),url(../fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.ttf?e18bbf611f2a2e43afc071aa2f4e1512) format("truetype"),url(../fonts/vendor/bootstrap-sass/bootstrap/glyphicons-halflings-regular.svg?89889688147bd7575d6327160d64e760#glyphicons_halflingsregular) format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:Glyphicons Halflings;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"*"}.glyphicon-plus:before{content:"+"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20AC"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270F"}.glyphicon-glass:before{content:"\E001"}.glyphicon-music:before{content:"\E002"}.glyphicon-search:before{content:"\E003"}.glyphicon-heart:before{content:"\E005"}.glyphicon-star:before{content:"\E006"}.glyphicon-star-empty:before{content:"\E007"}.glyphicon-user:before{content:"\E008"}.glyphicon-film:before{content:"\E009"}.glyphicon-th-large:before{content:"\E010"}.glyphicon-th:before{content:"\E011"}.glyphicon-th-list:before{content:"\E012"}.glyphicon-ok:before{content:"\E013"}.glyphicon-remove:before{content:"\E014"}.glyphicon-zoom-in:before{content:"\E015"}.glyphicon-zoom-out:before{content:"\E016"}.glyphicon-off:before{content:"\E017"}.glyphicon-signal:before{content:"\E018"}.glyphicon-cog:before{content:"\E019"}.glyphicon-trash:before{content:"\E020"}.glyphicon-home:before{content:"\E021"}.glyphicon-file:before{content:"\E022"}.glyphicon-time:before{content:"\E023"}.glyphicon-road:before{content:"\E024"}.glyphicon-download-alt:before{content:"\E025"}.glyphicon-download:before{content:"\E026"}.glyphicon-upload:before{content:"\E027"}.glyphicon-inbox:before{content:"\E028"}.glyphicon-play-circle:before{content:"\E029"}.glyphicon-repeat:before{content:"\E030"}.glyphicon-refresh:before{content:"\E031"}.glyphicon-list-alt:before{content:"\E032"}.glyphicon-lock:before{content:"\E033"}.glyphicon-flag:before{content:"\E034"}.glyphicon-headphones:before{content:"\E035"}.glyphicon-volume-off:before{content:"\E036"}.glyphicon-volume-down:before{content:"\E037"}.glyphicon-volume-up:before{content:"\E038"}.glyphicon-qrcode:before{content:"\E039"}.glyphicon-barcode:before{content:"\E040"}.glyphicon-tag:before{content:"\E041"}.glyphicon-tags:before{content:"\E042"}.glyphicon-book:before{content:"\E043"}.glyphicon-bookmark:before{content:"\E044"}.glyphicon-print:before{content:"\E045"}.glyphicon-camera:before{content:"\E046"}.glyphicon-font:before{content:"\E047"}.glyphicon-bold:before{content:"\E048"}.glyphicon-italic:before{content:"\E049"}.glyphicon-text-height:before{content:"\E050"}.glyphicon-text-width:before{content:"\E051"}.glyphicon-align-left:before{content:"\E052"}.glyphicon-align-center:before{content:"\E053"}.glyphicon-align-right:before{content:"\E054"}.glyphicon-align-justify:before{content:"\E055"}.glyphicon-list:before{content:"\E056"}.glyphicon-indent-left:before{content:"\E057"}.glyphicon-indent-right:before{content:"\E058"}.glyphicon-facetime-video:before{content:"\E059"}.glyphicon-picture:before{content:"\E060"}.glyphicon-map-marker:before{content:"\E062"}.glyphicon-adjust:before{content:"\E063"}.glyphicon-tint:before{content:"\E064"}.glyphicon-edit:before{content:"\E065"}.glyphicon-share:before{content:"\E066"}.glyphicon-check:before{content:"\E067"}.glyphicon-move:before{content:"\E068"}.glyphicon-step-backward:before{content:"\E069"}.glyphicon-fast-backward:before{content:"\E070"}.glyphicon-backward:before{content:"\E071"}.glyphicon-play:before{content:"\E072"}.glyphicon-pause:before{content:"\E073"}.glyphicon-stop:before{content:"\E074"}.glyphicon-forward:before{content:"\E075"}.glyphicon-fast-forward:before{content:"\E076"}.glyphicon-step-forward:before{content:"\E077"}.glyphicon-eject:before{content:"\E078"}.glyphicon-chevron-left:before{content:"\E079"}.glyphicon-chevron-right:before{content:"\E080"}.glyphicon-plus-sign:before{content:"\E081"}.glyphicon-minus-sign:before{content:"\E082"}.glyphicon-remove-sign:before{content:"\E083"}.glyphicon-ok-sign:before{content:"\E084"}.glyphicon-question-sign:before{content:"\E085"}.glyphicon-info-sign:before{content:"\E086"}.glyphicon-screenshot:before{content:"\E087"}.glyphicon-remove-circle:before{content:"\E088"}.glyphicon-ok-circle:before{content:"\E089"}.glyphicon-ban-circle:before{content:"\E090"}.glyphicon-arrow-left:before{content:"\E091"}.glyphicon-arrow-right:before{content:"\E092"}.glyphicon-arrow-up:before{content:"\E093"}.glyphicon-arrow-down:before{content:"\E094"}.glyphicon-share-alt:before{content:"\E095"}.glyphicon-resize-full:before{content:"\E096"}.glyphicon-resize-small:before{content:"\E097"}.glyphicon-exclamation-sign:before{content:"\E101"}.glyphicon-gift:before{content:"\E102"}.glyphicon-leaf:before{content:"\E103"}.glyphicon-fire:before{content:"\E104"}.glyphicon-eye-open:before{content:"\E105"}.glyphicon-eye-close:before{content:"\E106"}.glyphicon-warning-sign:before{content:"\E107"}.glyphicon-plane:before{content:"\E108"}.glyphicon-calendar:before{content:"\E109"}.glyphicon-random:before{content:"\E110"}.glyphicon-comment:before{content:"\E111"}.glyphicon-magnet:before{content:"\E112"}.glyphicon-chevron-up:before{content:"\E113"}.glyphicon-chevron-down:before{content:"\E114"}.glyphicon-retweet:before{content:"\E115"}.glyphicon-shopping-cart:before{content:"\E116"}.glyphicon-folder-close:before{content:"\E117"}.glyphicon-folder-open:before{content:"\E118"}.glyphicon-resize-vertical:before{content:"\E119"}.glyphicon-resize-horizontal:before{content:"\E120"}.glyphicon-hdd:before{content:"\E121"}.glyphicon-bullhorn:before{content:"\E122"}.glyphicon-bell:before{content:"\E123"}.glyphicon-certificate:before{content:"\E124"}.glyphicon-thumbs-up:before{content:"\E125"}.glyphicon-thumbs-down:before{content:"\E126"}.glyphicon-hand-right:before{content:"\E127"}.glyphicon-hand-left:before{content:"\E128"}.glyphicon-hand-up:before{content:"\E129"}.glyphicon-hand-down:before{content:"\E130"}.glyphicon-circle-arrow-right:before{content:"\E131"}.glyphicon-circle-arrow-left:before{content:"\E132"}.glyphicon-circle-arrow-up:before{content:"\E133"}.glyphicon-circle-arrow-down:before{content:"\E134"}.glyphicon-globe:before{content:"\E135"}.glyphicon-wrench:before{content:"\E136"}.glyphicon-tasks:before{content:"\E137"}.glyphicon-filter:before{content:"\E138"}.glyphicon-briefcase:before{content:"\E139"}.glyphicon-fullscreen:before{content:"\E140"}.glyphicon-dashboard:before{content:"\E141"}.glyphicon-paperclip:before{content:"\E142"}.glyphicon-heart-empty:before{content:"\E143"}.glyphicon-link:before{content:"\E144"}.glyphicon-phone:before{content:"\E145"}.glyphicon-pushpin:before{content:"\E146"}.glyphicon-usd:before{content:"\E148"}.glyphicon-gbp:before{content:"\E149"}.glyphicon-sort:before{content:"\E150"}.glyphicon-sort-by-alphabet:before{content:"\E151"}.glyphicon-sort-by-alphabet-alt:before{content:"\E152"}.glyphicon-sort-by-order:before{content:"\E153"}.glyphicon-sort-by-order-alt:before{content:"\E154"}.glyphicon-sort-by-attributes:before{content:"\E155"}.glyphicon-sort-by-attributes-alt:before{content:"\E156"}.glyphicon-unchecked:before{content:"\E157"}.glyphicon-expand:before{content:"\E158"}.glyphicon-collapse-down:before{content:"\E159"}.glyphicon-collapse-up:before{content:"\E160"}.glyphicon-log-in:before{content:"\E161"}.glyphicon-flash:before{content:"\E162"}.glyphicon-log-out:before{content:"\E163"}.glyphicon-new-window:before{content:"\E164"}.glyphicon-record:before{content:"\E165"}.glyphicon-save:before{content:"\E166"}.glyphicon-open:before{content:"\E167"}.glyphicon-saved:before{content:"\E168"}.glyphicon-import:before{content:"\E169"}.glyphicon-export:before{content:"\E170"}.glyphicon-send:before{content:"\E171"}.glyphicon-floppy-disk:before{content:"\E172"}.glyphicon-floppy-saved:before{content:"\E173"}.glyphicon-floppy-remove:before{content:"\E174"}.glyphicon-floppy-save:before{content:"\E175"}.glyphicon-floppy-open:before{content:"\E176"}.glyphicon-credit-card:before{content:"\E177"}.glyphicon-transfer:before{content:"\E178"}.glyphicon-cutlery:before{content:"\E179"}.glyphicon-header:before{content:"\E180"}.glyphicon-compressed:before{content:"\E181"}.glyphicon-earphone:before{content:"\E182"}.glyphicon-phone-alt:before{content:"\E183"}.glyphicon-tower:before{content:"\E184"}.glyphicon-stats:before{content:"\E185"}.glyphicon-sd-video:before{content:"\E186"}.glyphicon-hd-video:before{content:"\E187"}.glyphicon-subtitles:before{content:"\E188"}.glyphicon-sound-stereo:before{content:"\E189"}.glyphicon-sound-dolby:before{content:"\E190"}.glyphicon-sound-5-1:before{content:"\E191"}.glyphicon-sound-6-1:before{content:"\E192"}.glyphicon-sound-7-1:before{content:"\E193"}.glyphicon-copyright-mark:before{content:"\E194"}.glyphicon-registration-mark:before{content:"\E195"}.glyphicon-cloud-download:before{content:"\E197"}.glyphicon-cloud-upload:before{content:"\E198"}.glyphicon-tree-conifer:before{content:"\E199"}.glyphicon-tree-deciduous:before{content:"\E200"}.glyphicon-cd:before{content:"\E201"}.glyphicon-save-file:before{content:"\E202"}.glyphicon-open-file:before{content:"\E203"}.glyphicon-level-up:before{content:"\E204"}.glyphicon-copy:before{content:"\E205"}.glyphicon-paste:before{content:"\E206"}.glyphicon-alert:before{content:"\E209"}.glyphicon-equalizer:before{content:"\E210"}.glyphicon-king:before{content:"\E211"}.glyphicon-queen:before{content:"\E212"}.glyphicon-pawn:before{content:"\E213"}.glyphicon-bishop:before{content:"\E214"}.glyphicon-knight:before{content:"\E215"}.glyphicon-baby-formula:before{content:"\E216"}.glyphicon-tent:before{content:"\26FA"}.glyphicon-blackboard:before{content:"\E218"}.glyphicon-bed:before{content:"\E219"}.glyphicon-apple:before{content:"\F8FF"}.glyphicon-erase:before{content:"\E221"}.glyphicon-hourglass:before{content:"\231B"}.glyphicon-lamp:before{content:"\E223"}.glyphicon-duplicate:before{content:"\E224"}.glyphicon-piggy-bank:before{content:"\E225"}.glyphicon-scissors:before{content:"\E226"}.glyphicon-bitcoin:before,.glyphicon-btc:before,.glyphicon-xbt:before{content:"\E227"}.glyphicon-jpy:before,.glyphicon-yen:before{content:"\A5"}.glyphicon-rub:before,.glyphicon-ruble:before{content:"\20BD"}.glyphicon-scale:before{content:"\E230"}.glyphicon-ice-lolly:before{content:"\E231"}.glyphicon-ice-lolly-tasted:before{content:"\E232"}.glyphicon-education:before{content:"\E233"}.glyphicon-option-horizontal:before{content:"\E234"}.glyphicon-option-vertical:before{content:"\E235"}.glyphicon-menu-hamburger:before{content:"\E236"}.glyphicon-modal-window:before{content:"\E237"}.glyphicon-oil:before{content:"\E238"}.glyphicon-grain:before{content:"\E239"}.glyphicon-sunglasses:before{content:"\E240"}.glyphicon-text-size:before{content:"\E241"}.glyphicon-text-color:before{content:"\E242"}.glyphicon-text-background:before{content:"\E243"}.glyphicon-object-align-top:before{content:"\E244"}.glyphicon-object-align-bottom:before{content:"\E245"}.glyphicon-object-align-horizontal:before{content:"\E246"}.glyphicon-object-align-left:before{content:"\E247"}.glyphicon-object-align-vertical:before{content:"\E248"}.glyphicon-object-align-right:before{content:"\E249"}.glyphicon-triangle-right:before{content:"\E250"}.glyphicon-triangle-left:before{content:"\E251"}.glyphicon-triangle-bottom:before{content:"\E252"}.glyphicon-triangle-top:before{content:"\E253"}.glyphicon-console:before{content:"\E254"}.glyphicon-superscript:before{content:"\E255"}.glyphicon-subscript:before{content:"\E256"}.glyphicon-menu-left:before{content:"\E257"}.glyphicon-menu-right:before{content:"\E258"}.glyphicon-menu-down:before{content:"\E259"}.glyphicon-menu-up:before{content:"\E260"}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:transparent}body{font-family:Raleway,sans-serif;font-size:14px;line-height:1.6;color:#636b6f;background-color:#f5f8fa}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#3097d1;text-decoration:none}a:focus,a:hover{color:#216a94;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.6;background-color:#f5f8fa;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:22px;margin-bottom:22px;border:0;border-top:1px solid #eee}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:22px;margin-bottom:11px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:11px;margin-bottom:11px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 11px}.lead{margin-bottom:22px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.initialism,.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#3097d1}a.text-primary:focus,a.text-primary:hover{color:#2579a9}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#3097d1}a.bg-primary:focus,a.bg-primary:hover{background-color:#2579a9}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:10px;margin:44px 0 22px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:11px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline{margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:22px}dd,dt{line-height:1.6}dt{font-weight:700}dd{margin-left:0}.dl-horizontal dd:after,.dl-horizontal dd:before{content:" ";display:table}.dl-horizontal dd:after{clear:both}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%}blockquote{padding:11px 22px;margin:0 0 22px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.6;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:"\2014 \A0"}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:""}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:"\A0 \2014"}address{margin-bottom:22px;font-style:normal;line-height:1.6}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Courier New,monospace}code{color:#c7254e;background-color:#f9f2f4;border-radius:4px}code,kbd{padding:2px 4px;font-size:90%}kbd{color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:10.5px;margin:0 0 11px;font-size:13px;line-height:1.6;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container:after,.container:before{content:" ";display:table}.container:after{clear:both}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container-fluid:after,.container-fluid:before{content:" ";display:table}.container-fluid:after{clear:both}.row{margin-left:-15px;margin-right:-15px}.row:after,.row:before{content:" ";display:table}.row:after{clear:both}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-1{width:8.33333333%}.col-xs-2{width:16.66666667%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333%}.col-xs-5{width:41.66666667%}.col-xs-6{width:50%}.col-xs-7{width:58.33333333%}.col-xs-8{width:66.66666667%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333%}.col-xs-11{width:91.66666667%}.col-xs-12{width:100%}.col-xs-pull-0{right:auto}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-3{right:25%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-6{right:50%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-9{right:75%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-12{right:100%}.col-xs-push-0{left:auto}.col-xs-push-1{left:8.33333333%}.col-xs-push-2{left:16.66666667%}.col-xs-push-3{left:25%}.col-xs-push-4{left:33.33333333%}.col-xs-push-5{left:41.66666667%}.col-xs-push-6{left:50%}.col-xs-push-7{left:58.33333333%}.col-xs-push-8{left:66.66666667%}.col-xs-push-9{left:75%}.col-xs-push-10{left:83.33333333%}.col-xs-push-11{left:91.66666667%}.col-xs-push-12{left:100%}.col-xs-offset-0{margin-left:0}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-12{margin-left:100%}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-1{width:8.33333333%}.col-sm-2{width:16.66666667%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333%}.col-sm-5{width:41.66666667%}.col-sm-6{width:50%}.col-sm-7{width:58.33333333%}.col-sm-8{width:66.66666667%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333%}.col-sm-11{width:91.66666667%}.col-sm-12{width:100%}.col-sm-pull-0{right:auto}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-12{right:100%}.col-sm-push-0{left:auto}.col-sm-push-1{left:8.33333333%}.col-sm-push-2{left:16.66666667%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333%}.col-sm-push-5{left:41.66666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.33333333%}.col-sm-push-8{left:66.66666667%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333%}.col-sm-push-11{left:91.66666667%}.col-sm-push-12{left:100%}.col-sm-offset-0{margin-left:0}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-12{margin-left:100%}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-1{width:8.33333333%}.col-md-2{width:16.66666667%}.col-md-3{width:25%}.col-md-4{width:33.33333333%}.col-md-5{width:41.66666667%}.col-md-6{width:50%}.col-md-7{width:58.33333333%}.col-md-8{width:66.66666667%}.col-md-9{width:75%}.col-md-10{width:83.33333333%}.col-md-11{width:91.66666667%}.col-md-12{width:100%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.33333333%}.col-md-pull-2{right:16.66666667%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333%}.col-md-pull-5{right:41.66666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.33333333%}.col-md-pull-8{right:66.66666667%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333%}.col-md-pull-11{right:91.66666667%}.col-md-pull-12{right:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.33333333%}.col-md-push-2{left:16.66666667%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333%}.col-md-push-5{left:41.66666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.33333333%}.col-md-push-8{left:66.66666667%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333%}.col-md-push-11{left:91.66666667%}.col-md-push-12{left:100%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-12{margin-left:100%}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-1{width:8.33333333%}.col-lg-2{width:16.66666667%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333%}.col-lg-5{width:41.66666667%}.col-lg-6{width:50%}.col-lg-7{width:58.33333333%}.col-lg-8{width:66.66666667%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333%}.col-lg-11{width:91.66666667%}.col-lg-12{width:100%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-12{right:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.33333333%}.col-lg-push-2{left:16.66666667%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333%}.col-lg-push-5{left:41.66666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.33333333%}.col-lg-push-8{left:66.66666667%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333%}.col-lg-push-11{left:91.66666667%}.col-lg-push-12{left:100%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-12{margin-left:100%}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777}caption,th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:22px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.6;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#f5f8fa}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;float:none;display:table-column}table td[class*=col-],table th[class*=col-]{position:static;float:none;display:table-cell}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{overflow-x:auto;min-height:.01%}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:16.5px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{margin:0;min-width:0}fieldset,legend{padding:0;border:0}legend{display:block;width:100%;margin-bottom:22px;font-size:21px;line-height:inherit;color:#333;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{padding-top:7px}.form-control,output{display:block;font-size:14px;line-height:1.6;color:#555}.form-control{width:100%;height:36px;padding:6px 12px;background-color:#fff;background-image:none;border:1px solid #ccd0d2;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.form-control:focus{border-color:#98cbe8;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(152,203,232,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(152,203,232,.6)}.form-control::-moz-placeholder{color:#b1b7ba;opacity:1}.form-control:-ms-input-placeholder{color:#b1b7ba}.form-control::-webkit-input-placeholder{color:#b1b7ba}.form-control::-ms-expand{border:0;background-color:transparent}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{line-height:36px}.input-group-sm>.input-group-btn>input[type=date].btn,.input-group-sm>.input-group-btn>input[type=datetime-local].btn,.input-group-sm>.input-group-btn>input[type=month].btn,.input-group-sm>.input-group-btn>input[type=time].btn,.input-group-sm>input[type=date].form-control,.input-group-sm>input[type=date].input-group-addon,.input-group-sm>input[type=datetime-local].form-control,.input-group-sm>input[type=datetime-local].input-group-addon,.input-group-sm>input[type=month].form-control,.input-group-sm>input[type=month].input-group-addon,.input-group-sm>input[type=time].form-control,.input-group-sm>input[type=time].input-group-addon,.input-group-sm input[type=date],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],.input-group-sm input[type=time],input[type=date].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm,input[type=time].input-sm{line-height:30px}.input-group-lg>.input-group-btn>input[type=date].btn,.input-group-lg>.input-group-btn>input[type=datetime-local].btn,.input-group-lg>.input-group-btn>input[type=month].btn,.input-group-lg>.input-group-btn>input[type=time].btn,.input-group-lg>input[type=date].form-control,.input-group-lg>input[type=date].input-group-addon,.input-group-lg>input[type=datetime-local].form-control,.input-group-lg>input[type=datetime-local].input-group-addon,.input-group-lg>input[type=month].form-control,.input-group-lg>input[type=month].input-group-addon,.input-group-lg>input[type=time].form-control,.input-group-lg>input[type=time].input-group-addon,.input-group-lg input[type=date],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],.input-group-lg input[type=time],input[type=date].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg,input[type=time].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:22px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox-inline input[type=checkbox],.checkbox input[type=checkbox],.radio-inline input[type=radio],.radio input[type=radio]{position:absolute;margin-left:-20px;margin-top:4px\9}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.checkbox-inline.disabled,.checkbox.disabled label,.radio-inline.disabled,.radio.disabled label,fieldset[disabled] .checkbox-inline,fieldset[disabled] .checkbox label,fieldset[disabled] .radio-inline,fieldset[disabled] .radio label,fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0;min-height:36px}.form-control-static.input-lg,.form-control-static.input-sm,.input-group-lg>.form-control-static.form-control,.input-group-lg>.form-control-static.input-group-addon,.input-group-lg>.input-group-btn>.form-control-static.btn,.input-group-sm>.form-control-static.form-control,.input-group-sm>.form-control-static.input-group-addon,.input-group-sm>.input-group-btn>.form-control-static.btn{padding-left:0;padding-right:0}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn,.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.input-group-sm>.input-group-btn>select.btn,.input-group-sm>select.form-control,.input-group-sm>select.input-group-addon,select.input-sm{height:30px;line-height:30px}.input-group-sm>.input-group-btn>select[multiple].btn,.input-group-sm>.input-group-btn>textarea.btn,.input-group-sm>select[multiple].form-control,.input-group-sm>select[multiple].input-group-addon,.input-group-sm>textarea.form-control,.input-group-sm>textarea.input-group-addon,select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:34px;padding:6px 10px;font-size:12px;line-height:1.5}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn,.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.input-group-lg>.input-group-btn>select.btn,.input-group-lg>select.form-control,.input-group-lg>select.input-group-addon,select.input-lg{height:46px;line-height:46px}.input-group-lg>.input-group-btn>select[multiple].btn,.input-group-lg>.input-group-btn>textarea.btn,.input-group-lg>select[multiple].form-control,.input-group-lg>select[multiple].input-group-addon,.input-group-lg>textarea.form-control,.input-group-lg>textarea.input-group-addon,select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:40px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:45px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:36px;height:36px;line-height:36px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-group-lg>.form-control+.form-control-feedback,.input-group-lg>.input-group-addon+.form-control-feedback,.input-group-lg>.input-group-btn>.btn+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-group-sm>.form-control+.form-control-feedback,.input-group-sm>.input-group-addon+.form-control-feedback,.input-group-sm>.input-group-btn>.btn+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success.checkbox-inline label,.has-success.checkbox label,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.radio-inline label,.has-success.radio label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning.checkbox-inline label,.has-warning.checkbox label,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.radio-inline label,.has-warning.radio label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error.checkbox-inline label,.has-error.checkbox label,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.radio-inline label,.has-error.radio label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:27px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#a4aaae}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .checkbox,.form-horizontal .radio{min-height:29px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-group:after,.form-horizontal .form-group:before{content:" ";display:table}.form-horizontal .form-group:after{clear:both}@media (min-width:768px){.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.6;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#636b6f;text-decoration:none}.btn.active,.btn:active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#636b6f;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#636b6f;background-color:#e6e5e5;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.btn-default:hover,.open>.btn-default.dropdown-toggle{color:#636b6f;background-color:#e6e5e5;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.btn-default.dropdown-toggle.focus,.open>.btn-default.dropdown-toggle:focus,.open>.btn-default.dropdown-toggle:hover{color:#636b6f;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.btn-default.dropdown-toggle{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#636b6f}.btn-primary{color:#fff;background-color:#3097d1;border-color:#2a88bd}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#2579a9;border-color:#133d55}.btn-primary.active,.btn-primary:active,.btn-primary:hover,.open>.btn-primary.dropdown-toggle{color:#fff;background-color:#2579a9;border-color:#1f648b}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.btn-primary.dropdown-toggle.focus,.open>.btn-primary.dropdown-toggle:focus,.open>.btn-primary.dropdown-toggle:hover{color:#fff;background-color:#1f648b;border-color:#133d55}.btn-primary.active,.btn-primary:active,.open>.btn-primary.dropdown-toggle{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#3097d1;border-color:#2a88bd}.btn-primary .badge{color:#3097d1;background-color:#fff}.btn-success{color:#fff;background-color:#2ab27b;border-color:#259d6d}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#20895e;border-color:#0d3625}.btn-success.active,.btn-success:active,.btn-success:hover,.open>.btn-success.dropdown-toggle{color:#fff;background-color:#20895e;border-color:#196c4b}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.btn-success.dropdown-toggle.focus,.open>.btn-success.dropdown-toggle:focus,.open>.btn-success.dropdown-toggle:hover{color:#fff;background-color:#196c4b;border-color:#0d3625}.btn-success.active,.btn-success:active,.open>.btn-success.dropdown-toggle{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#2ab27b;border-color:#259d6d}.btn-success .badge{color:#2ab27b;background-color:#fff}.btn-info{color:#fff;background-color:#8eb4cb;border-color:#7da8c3}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#6b9dbb;border-color:#3d6983}.btn-info.active,.btn-info:active,.btn-info:hover,.open>.btn-info.dropdown-toggle{color:#fff;background-color:#6b9dbb;border-color:#538db0}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.btn-info.dropdown-toggle.focus,.open>.btn-info.dropdown-toggle:focus,.open>.btn-info.dropdown-toggle:hover{color:#fff;background-color:#538db0;border-color:#3d6983}.btn-info.active,.btn-info:active,.open>.btn-info.dropdown-toggle{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#8eb4cb;border-color:#7da8c3}.btn-info .badge{color:#8eb4cb;background-color:#fff}.btn-warning{color:#fff;background-color:#cbb956;border-color:#c5b143}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#b6a338;border-color:#685d20}.btn-warning.active,.btn-warning:active,.btn-warning:hover,.open>.btn-warning.dropdown-toggle{color:#fff;background-color:#b6a338;border-color:#9b8a30}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.btn-warning.dropdown-toggle.focus,.open>.btn-warning.dropdown-toggle:focus,.open>.btn-warning.dropdown-toggle:hover{color:#fff;background-color:#9b8a30;border-color:#685d20}.btn-warning.active,.btn-warning:active,.open>.btn-warning.dropdown-toggle{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#cbb956;border-color:#c5b143}.btn-warning .badge{color:#cbb956;background-color:#fff}.btn-danger{color:#fff;background-color:#bf5329;border-color:#aa4a24}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#954120;border-color:#411c0e}.btn-danger.active,.btn-danger:active,.btn-danger:hover,.open>.btn-danger.dropdown-toggle{color:#fff;background-color:#954120;border-color:#78341a}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.btn-danger.dropdown-toggle.focus,.open>.btn-danger.dropdown-toggle:focus,.open>.btn-danger.dropdown-toggle:hover{color:#fff;background-color:#78341a;border-color:#411c0e}.btn-danger.active,.btn-danger:active,.open>.btn-danger.dropdown-toggle{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#bf5329;border-color:#aa4a24}.btn-danger .badge{color:#bf5329;background-color:#fff}.btn-link{color:#3097d1;font-weight:400;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#216a94;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:10px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.6;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:#3097d1}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.6;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar:after,.btn-toolbar:before{content:" ";display:table}.btn-toolbar:after{clear:both}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group-lg.btn-group>.btn+.dropdown-toggle,.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-group-lg>.btn .caret,.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-group-lg>.btn .caret,.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before{content:" ";display:table}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-top-left-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio],[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccd0d2;border-radius:4px}.input-group-addon.input-sm,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.input-group-addon.btn{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.input-group-addon.btn{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group .form-control:last-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{font-size:0;white-space:nowrap}.input-group-btn,.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav:after,.nav:before{content:" ";display:table}.nav:after{clear:both}.nav>li,.nav>li>a{position:relative;display:block}.nav>li>a{padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#3097d1}.nav .nav-divider{height:1px;margin:10px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.6;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;background-color:#f5f8fa;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#3097d1}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified,.nav-tabs.nav-justified{width:100%}.nav-justified>li,.nav-tabs.nav-justified>li{float:none}.nav-justified>li>a,.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li,.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a,.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified,.nav-tabs.nav-justified{border-bottom:0}.nav-tabs-justified>li>a,.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a,.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#f5f8fa}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:22px;border:1px solid transparent}.navbar:after,.navbar:before{content:" ";display:table}.navbar:after{clear:both}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-header:after,.navbar-header:before{content:" ";display:table}.navbar-header:after{clear:both}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1);-webkit-overflow-scrolling:touch}.navbar-collapse:after,.navbar-collapse:before{content:" ";display:table}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:0;padding-right:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:14px 15px;font-size:18px;line-height:22px;height:50px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container-fluid .navbar-brand,.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:22px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:22px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:14px;padding-bottom:14px}}.navbar-form{margin:7px -15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1),0 1px 0 hsla(0,0%,100%,.1);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1),0 1px 0 hsla(0,0%,100%,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:7px;margin-bottom:7px}.btn-group-sm>.navbar-btn.btn,.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.btn-group-xs>.navbar-btn.btn,.navbar-btn.btn-xs,.navbar-text{margin-top:14px;margin-bottom:14px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#fff;border-color:#d3e0e9}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5d5d;background-color:transparent}.navbar-default .navbar-nav>li>a,.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#eee}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#d3e0e9}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{background-color:#eee;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#eee}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#090909}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>li>a,.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#090909}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#090909;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#090909}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#090909}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#090909}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:22px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{content:"/\A0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:22px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.6;text-decoration:none;color:#3097d1;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#216a94;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;background-color:#3097d1;border-color:#3097d1;cursor:default}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:22px 0;list-style:none;text-align:center}.pager:after,.pager:before{content:" ";display:table}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label:empty{display:none}.btn .label{position:relative;top:-1px}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#3097d1}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#2579a9}.label-success{background-color:#2ab27b}.label-success[href]:focus,.label-success[href]:hover{background-color:#20895e}.label-info{background-color:#8eb4cb}.label-info[href]:focus,.label-info[href]:hover{background-color:#6b9dbb}.label-warning{background-color:#cbb956}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#b6a338}.label-danger{background-color:#bf5329}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#954120}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;color:#fff;line-height:1;vertical-align:middle;white-space:nowrap;text-align:center;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#3097d1;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;background-color:#eee}.jumbotron,.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container-fluid .jumbotron,.container .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container-fluid .jumbotron,.container .jumbotron{padding-left:60px;padding-right:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:22px;line-height:1.6;background-color:#f5f8fa;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail>img,.thumbnail a>img{display:block;max-width:100%;height:auto;margin-left:auto;margin-right:auto}.thumbnail .caption{padding:9px;color:#636b6f}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#3097d1}.alert{padding:15px;margin-bottom:22px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{0%{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:22px;margin-bottom:22px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:22px;color:#fff;text-align:center;background-color:#3097d1;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#2ab27b}.progress-striped .progress-bar-success{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.progress-bar-info{background-color:#8eb4cb}.progress-striped .progress-bar-info{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.progress-bar-warning{background-color:#cbb956}.progress-striped .progress-bar-warning{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.progress-bar-danger{background-color:#bf5329}.progress-striped .progress-bar-danger{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{zoom:1;overflow:hidden}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #d3e0e9}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{text-decoration:none;color:#555;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{background-color:#eee;color:#777;cursor:not-allowed}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#3097d1;border-color:#3097d1}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#d7ebf6}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:22px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-body:after,.panel-body:before{content:" ";display:table}.panel-body:after{clear:both}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle,.panel-title{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #d3e0e9;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.list-group+.panel-footer,.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table-responsive>.table caption,.panel>.table caption{padding-left:15px;padding-right:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:22px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #d3e0e9}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #d3e0e9}.panel-default{border-color:#d3e0e9}.panel-default>.panel-heading{color:#333;background-color:#fff;border-color:#d3e0e9}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d3e0e9}.panel-default>.panel-heading .badge{color:#fff;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d3e0e9}.panel-primary{border-color:#3097d1}.panel-primary>.panel-heading{color:#fff;background-color:#3097d1;border-color:#3097d1}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#3097d1}.panel-primary>.panel-heading .badge{color:#3097d1;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#3097d1}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;left:0;bottom:0;height:100%;width:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal,.modal-open{overflow:hidden}.modal{display:none;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translateY(-25%);transform:translateY(-25%);-webkit-transition:-webkit-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0);transform:translate(0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);background-clip:padding-box;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header:after,.modal-header:before{content:" ";display:table}.modal-header:after{clear:both}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.6}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:after,.modal-footer:before{content:" ";display:table}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;letter-spacing:normal;line-break:auto;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:12px;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px}.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow{bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{left:5px}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;letter-spacing:normal;line-break:auto;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:14px;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{border-width:10px;content:""}.popover.top>.arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,.25);bottom:-11px}.popover.top>.arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,.25)}.popover.right>.arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom>.arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25);top:-11px}.popover.bottom>.arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.carousel,.carousel-inner{position:relative}.carousel-inner{overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:left .6s ease-in-out;transition:left .6s ease-in-out}.carousel-inner>.item>a>img,.carousel-inner>.item>img{display:block;max-width:100%;height:auto;line-height:1}@media (-webkit-transform-3d),(transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;transition:transform .6s ease-in-out,-webkit-transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);left:0}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);left:0}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{-webkit-transform:translateZ(0);transform:translateZ(0);left:0}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:transparent}.carousel-control.left{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(90deg,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000",endColorstr="#00000000",GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(90deg,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000",endColorstr="#80000000",GradientType=1)}.carousel-control:focus,.carousel-control:hover{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;margin-top:-10px;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;line-height:1;font-family:serif}.carousel-control .icon-prev:before{content:"\2039"}.carousel-control .icon-next:before{content:"\203A"}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;cursor:pointer;background-color:#000\9;background-color:transparent}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:after,.clearfix:before{content:" ";display:table}.clearfix:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} /*! * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome diff --git a/public/js/app.js b/public/js/app.js index c7157cdf46..3b1cd0f4ee 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -1 +1 @@ -!function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:r})},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=12)}([function(t,e,n){"use strict";var r=n(6),i=n(21),o=Object.prototype.toString;function a(t){return"[object Array]"===o.call(t)}function s(t){return null!==t&&"object"==typeof t}function u(t){return"[object Function]"===o.call(t)}function c(t,e){if(null!==t&&void 0!==t)if("object"!=typeof t&&(t=[t]),a(t))for(var n=0,r=t.length;n=200&&t<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],function(t){u.headers[t]={}}),r.forEach(["post","put","patch"],function(t){u.headers[t]=r.merge(o)}),t.exports=u}).call(e,n(7))},function(t,e){t.exports=function(t){var e=[];return e.toString=function(){return this.map(function(e){var n=function(t,e){var n=t[1]||"",r=t[3];if(!r)return n;if(e&&"function"==typeof btoa){var i=(a=r,"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(a))))+" */"),o=r.sources.map(function(t){return"/*# sourceURL="+r.sourceRoot+t+" */"});return[n].concat(o).concat([i]).join("\n")}var a;return[n].join("\n")}(e,t);return e[2]?"@media "+e[2]+"{"+n+"}":n}).join("")},e.i=function(t,n){"string"==typeof t&&(t=[[null,t,""]]);for(var r={},i=0;in.parts.length&&(r.parts.length=n.parts.length)}else{var a=[];for(i=0;i1)for(var n=1;n>>1,q=[["ary",T],["bind",g],["bindKey",y],["curry",_],["curryRight",w],["flip",$],["partial",x],["partialRight",C],["rearg",k]],B="[object Arguments]",H="[object Array]",U="[object AsyncFunction]",W="[object Boolean]",z="[object Date]",V="[object DOMException]",X="[object Error]",K="[object Function]",J="[object GeneratorFunction]",G="[object Map]",Q="[object Number]",Y="[object Null]",Z="[object Object]",tt="[object Proxy]",et="[object RegExp]",nt="[object Set]",rt="[object String]",it="[object Symbol]",ot="[object Undefined]",at="[object WeakMap]",st="[object WeakSet]",ut="[object ArrayBuffer]",ct="[object DataView]",lt="[object Float32Array]",ft="[object Float64Array]",pt="[object Int8Array]",dt="[object Int16Array]",ht="[object Int32Array]",vt="[object Uint8Array]",mt="[object Uint8ClampedArray]",gt="[object Uint16Array]",yt="[object Uint32Array]",bt=/\b__p \+= '';/g,_t=/\b(__p \+=) '' \+/g,wt=/(__e\(.*?\)|\b__t\)) \+\n'';/g,xt=/&(?:amp|lt|gt|quot|#39);/g,Ct=/[&<>"']/g,Tt=RegExp(xt.source),kt=RegExp(Ct.source),$t=/<%-([\s\S]+?)%>/g,At=/<%([\s\S]+?)%>/g,St=/<%=([\s\S]+?)%>/g,Et=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,Ot=/^\w*$/,jt=/^\./,Nt=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,Dt=/[\\^$.*+?()[\]{}|]/g,It=RegExp(Dt.source),Lt=/^\s+|\s+$/g,Rt=/^\s+/,Pt=/\s+$/,Ft=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,Mt=/\{\n\/\* \[wrapped with (.+)\] \*/,qt=/,? & /,Bt=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,Ht=/\\(\\)?/g,Ut=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,Wt=/\w*$/,zt=/^[-+]0x[0-9a-f]+$/i,Vt=/^0b[01]+$/i,Xt=/^\[object .+?Constructor\]$/,Kt=/^0o[0-7]+$/i,Jt=/^(?:0|[1-9]\d*)$/,Gt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Qt=/($^)/,Yt=/['\n\r\u2028\u2029\\]/g,Zt="\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff",te="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",ee="[\\ud800-\\udfff]",ne="["+te+"]",re="["+Zt+"]",ie="\\d+",oe="[\\u2700-\\u27bf]",ae="[a-z\\xdf-\\xf6\\xf8-\\xff]",se="[^\\ud800-\\udfff"+te+ie+"\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde]",ue="\\ud83c[\\udffb-\\udfff]",ce="[^\\ud800-\\udfff]",le="(?:\\ud83c[\\udde6-\\uddff]){2}",fe="[\\ud800-\\udbff][\\udc00-\\udfff]",pe="[A-Z\\xc0-\\xd6\\xd8-\\xde]",de="(?:"+ae+"|"+se+")",he="(?:"+pe+"|"+se+")",ve="(?:"+re+"|"+ue+")"+"?",me="[\\ufe0e\\ufe0f]?"+ve+("(?:\\u200d(?:"+[ce,le,fe].join("|")+")[\\ufe0e\\ufe0f]?"+ve+")*"),ge="(?:"+[oe,le,fe].join("|")+")"+me,ye="(?:"+[ce+re+"?",re,le,fe,ee].join("|")+")",be=RegExp("['’]","g"),_e=RegExp(re,"g"),we=RegExp(ue+"(?="+ue+")|"+ye+me,"g"),xe=RegExp([pe+"?"+ae+"+(?:['’](?:d|ll|m|re|s|t|ve))?(?="+[ne,pe,"$"].join("|")+")",he+"+(?:['’](?:D|LL|M|RE|S|T|VE))?(?="+[ne,pe+de,"$"].join("|")+")",pe+"?"+de+"+(?:['’](?:d|ll|m|re|s|t|ve))?",pe+"+(?:['’](?:D|LL|M|RE|S|T|VE))?","\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)","\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)",ie,ge].join("|"),"g"),Ce=RegExp("[\\u200d\\ud800-\\udfff"+Zt+"\\ufe0e\\ufe0f]"),Te=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,ke=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],$e=-1,Ae={};Ae[lt]=Ae[ft]=Ae[pt]=Ae[dt]=Ae[ht]=Ae[vt]=Ae[mt]=Ae[gt]=Ae[yt]=!0,Ae[B]=Ae[H]=Ae[ut]=Ae[W]=Ae[ct]=Ae[z]=Ae[X]=Ae[K]=Ae[G]=Ae[Q]=Ae[Z]=Ae[et]=Ae[nt]=Ae[rt]=Ae[at]=!1;var Se={};Se[B]=Se[H]=Se[ut]=Se[ct]=Se[W]=Se[z]=Se[lt]=Se[ft]=Se[pt]=Se[dt]=Se[ht]=Se[G]=Se[Q]=Se[Z]=Se[et]=Se[nt]=Se[rt]=Se[it]=Se[vt]=Se[mt]=Se[gt]=Se[yt]=!0,Se[X]=Se[K]=Se[at]=!1;var Ee={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Oe=parseFloat,je=parseInt,Ne="object"==typeof t&&t&&t.Object===Object&&t,De="object"==typeof self&&self&&self.Object===Object&&self,Ie=Ne||De||Function("return this")(),Le="object"==typeof e&&e&&!e.nodeType&&e,Re=Le&&"object"==typeof r&&r&&!r.nodeType&&r,Pe=Re&&Re.exports===Le,Fe=Pe&&Ne.process,Me=function(){try{return Fe&&Fe.binding&&Fe.binding("util")}catch(t){}}(),qe=Me&&Me.isArrayBuffer,Be=Me&&Me.isDate,He=Me&&Me.isMap,Ue=Me&&Me.isRegExp,We=Me&&Me.isSet,ze=Me&&Me.isTypedArray;function Ve(t,e){return t.set(e[0],e[1]),t}function Xe(t,e){return t.add(e),t}function Ke(t,e,n){switch(n.length){case 0:return t.call(e);case 1:return t.call(e,n[0]);case 2:return t.call(e,n[0],n[1]);case 3:return t.call(e,n[0],n[1],n[2])}return t.apply(e,n)}function Je(t,e,n,r){for(var i=-1,o=null==t?0:t.length;++i-1}function en(t,e,n){for(var r=-1,i=null==t?0:t.length;++r-1;);return n}function Tn(t,e){for(var n=t.length;n--&&fn(e,t[n],0)>-1;);return n}var kn=mn({"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"}),$n=mn({"&":"&","<":"<",">":">",'"':""","'":"'"});function An(t){return"\\"+Ee[t]}function Sn(t){return Ce.test(t)}function En(t){var e=-1,n=Array(t.size);return t.forEach(function(t,r){n[++e]=[r,t]}),n}function On(t,e){return function(n){return t(e(n))}}function jn(t,e){for(var n=-1,r=t.length,i=0,o=[];++n",""":'"',"'":"'"});var Pn=function t(e){var n,r=(e=null==e?Ie:Pn.defaults(Ie.Object(),e,Pn.pick(Ie,ke))).Array,i=e.Date,Zt=e.Error,te=e.Function,ee=e.Math,ne=e.Object,re=e.RegExp,ie=e.String,oe=e.TypeError,ae=r.prototype,se=te.prototype,ue=ne.prototype,ce=e["__core-js_shared__"],le=se.toString,fe=ue.hasOwnProperty,pe=0,de=(n=/[^.]+$/.exec(ce&&ce.keys&&ce.keys.IE_PROTO||""))?"Symbol(src)_1."+n:"",he=ue.toString,ve=le.call(ne),me=Ie._,ge=re("^"+le.call(fe).replace(Dt,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),ye=Pe?e.Buffer:o,we=e.Symbol,Ce=e.Uint8Array,Ee=ye?ye.allocUnsafe:o,Ne=On(ne.getPrototypeOf,ne),De=ne.create,Le=ue.propertyIsEnumerable,Re=ae.splice,Fe=we?we.isConcatSpreadable:o,Me=we?we.iterator:o,un=we?we.toStringTag:o,mn=function(){try{var t=Ho(ne,"defineProperty");return t({},"",{}),t}catch(t){}}(),Fn=e.clearTimeout!==Ie.clearTimeout&&e.clearTimeout,Mn=i&&i.now!==Ie.Date.now&&i.now,qn=e.setTimeout!==Ie.setTimeout&&e.setTimeout,Bn=ee.ceil,Hn=ee.floor,Un=ne.getOwnPropertySymbols,Wn=ye?ye.isBuffer:o,zn=e.isFinite,Vn=ae.join,Xn=On(ne.keys,ne),Kn=ee.max,Jn=ee.min,Gn=i.now,Qn=e.parseInt,Yn=ee.random,Zn=ae.reverse,tr=Ho(e,"DataView"),er=Ho(e,"Map"),nr=Ho(e,"Promise"),rr=Ho(e,"Set"),ir=Ho(e,"WeakMap"),or=Ho(ne,"create"),ar=ir&&new ir,sr={},ur=da(tr),cr=da(er),lr=da(nr),fr=da(rr),pr=da(ir),dr=we?we.prototype:o,hr=dr?dr.valueOf:o,vr=dr?dr.toString:o;function mr(t){if(Os(t)&&!bs(t)&&!(t instanceof _r)){if(t instanceof br)return t;if(fe.call(t,"__wrapped__"))return ha(t)}return new br(t)}var gr=function(){function t(){}return function(e){if(!Es(e))return{};if(De)return De(e);t.prototype=e;var n=new t;return t.prototype=o,n}}();function yr(){}function br(t,e){this.__wrapped__=t,this.__actions__=[],this.__chain__=!!e,this.__index__=0,this.__values__=o}function _r(t){this.__wrapped__=t,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=P,this.__views__=[]}function wr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e=e?t:e)),t}function Fr(t,e,n,r,i,a){var s,u=e&p,c=e&d,l=e&h;if(n&&(s=i?n(t,r,i,a):n(t)),s!==o)return s;if(!Es(t))return t;var f=bs(t);if(f){if(s=function(t){var e=t.length,n=t.constructor(e);return e&&"string"==typeof t[0]&&fe.call(t,"index")&&(n.index=t.index,n.input=t.input),n}(t),!u)return oo(t,s)}else{var v=zo(t),m=v==K||v==J;if(Cs(t))return Zi(t,u);if(v==Z||v==B||m&&!i){if(s=c||m?{}:Xo(t),!u)return c?function(t,e){return ao(t,Wo(t),e)}(t,function(t,e){return t&&ao(e,su(e),t)}(s,t)):function(t,e){return ao(t,Uo(t),e)}(t,Ir(s,t))}else{if(!Se[v])return i?t:{};s=function(t,e,n,r){var i,o,a,s=t.constructor;switch(e){case ut:return to(t);case W:case z:return new s(+t);case ct:return function(t,e){var n=e?to(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.byteLength)}(t,r);case lt:case ft:case pt:case dt:case ht:case vt:case mt:case gt:case yt:return eo(t,r);case G:return function(t,e,n){return on(e?n(En(t),p):En(t),Ve,new t.constructor)}(t,r,n);case Q:case rt:return new s(t);case et:return(a=new(o=t).constructor(o.source,Wt.exec(o))).lastIndex=o.lastIndex,a;case nt:return function(t,e,n){return on(e?n(Nn(t),p):Nn(t),Xe,new t.constructor)}(t,r,n);case it:return i=t,hr?ne(hr.call(i)):{}}}(t,v,Fr,u)}}a||(a=new kr);var g=a.get(t);if(g)return g;a.set(t,s);var y=f?o:(l?c?Lo:Io:c?su:au)(t);return Ge(y||t,function(r,i){y&&(r=t[i=r]),jr(s,i,Fr(r,e,n,i,t,a))}),s}function Mr(t,e,n){var r=n.length;if(null==t)return!r;for(t=ne(t);r--;){var i=n[r],a=e[i],s=t[i];if(s===o&&!(i in t)||!a(s))return!1}return!0}function qr(t,e,n){if("function"!=typeof t)throw new oe(u);return aa(function(){t.apply(o,n)},e)}function Br(t,e,n,r){var i=-1,o=tn,s=!0,u=t.length,c=[],l=e.length;if(!u)return c;n&&(e=nn(e,_n(n))),r?(o=en,s=!1):e.length>=a&&(o=xn,s=!1,e=new Tr(e));t:for(;++i-1},xr.prototype.set=function(t,e){var n=this.__data__,r=Nr(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this},Cr.prototype.clear=function(){this.size=0,this.__data__={hash:new wr,map:new(er||xr),string:new wr}},Cr.prototype.delete=function(t){var e=qo(this,t).delete(t);return this.size-=e?1:0,e},Cr.prototype.get=function(t){return qo(this,t).get(t)},Cr.prototype.has=function(t){return qo(this,t).has(t)},Cr.prototype.set=function(t,e){var n=qo(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this},Tr.prototype.add=Tr.prototype.push=function(t){return this.__data__.set(t,c),this},Tr.prototype.has=function(t){return this.__data__.has(t)},kr.prototype.clear=function(){this.__data__=new xr,this.size=0},kr.prototype.delete=function(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n},kr.prototype.get=function(t){return this.__data__.get(t)},kr.prototype.has=function(t){return this.__data__.has(t)},kr.prototype.set=function(t,e){var n=this.__data__;if(n instanceof xr){var r=n.__data__;if(!er||r.length0&&n(s)?e>1?Xr(s,e-1,n,r,i):rn(i,s):r||(i[i.length]=s)}return i}var Kr=lo(),Jr=lo(!0);function Gr(t,e){return t&&Kr(t,e,au)}function Qr(t,e){return t&&Jr(t,e,au)}function Yr(t,e){return Ze(e,function(e){return $s(t[e])})}function Zr(t,e){for(var n=0,r=(e=Ji(e,t)).length;null!=t&&ne}function ri(t,e){return null!=t&&fe.call(t,e)}function ii(t,e){return null!=t&&e in ne(t)}function oi(t,e,n){for(var i=n?en:tn,a=t[0].length,s=t.length,u=s,c=r(s),l=1/0,f=[];u--;){var p=t[u];u&&e&&(p=nn(p,_n(e))),l=Jn(p.length,l),c[u]=!n&&(e||a>=120&&p.length>=120)?new Tr(u&&p):o}p=t[0];var d=-1,h=c[0];t:for(;++d=s)return u;var c=n[r];return u*("desc"==c?-1:1)}}return t.index-e.index}(t,e,n)})}function wi(t,e,n){for(var r=-1,i=e.length,o={};++r-1;)s!==t&&Re.call(s,u,1),Re.call(t,u,1);return t}function Ci(t,e){for(var n=t?e.length:0,r=n-1;n--;){var i=e[n];if(n==r||i!==o){var o=i;Jo(i)?Re.call(t,i,1):Bi(t,i)}}return t}function Ti(t,e){return t+Hn(Yn()*(e-t+1))}function ki(t,e){var n="";if(!t||e<1||e>I)return n;do{e%2&&(n+=t),(e=Hn(e/2))&&(t+=t)}while(e);return n}function $i(t,e){return sa(ra(t,e,Nu),t+"")}function Ai(t){return Ar(vu(t))}function Si(t,e){var n=vu(t);return la(n,Pr(e,0,n.length))}function Ei(t,e,n,r){if(!Es(t))return t;for(var i=-1,a=(e=Ji(e,t)).length,s=a-1,u=t;null!=u&&++io?0:o+e),(n=n>o?o:n)<0&&(n+=o),o=e>n?0:n-e>>>0,e>>>=0;for(var a=r(o);++i>>1,a=t[o];null!==a&&!Ps(a)&&(n?a<=e:a=a){var l=e?null:$o(t);if(l)return Nn(l);s=!1,i=xn,c=new Tr}else c=e?[]:u;t:for(;++r=r?t:Di(t,e,n)}var Yi=Fn||function(t){return Ie.clearTimeout(t)};function Zi(t,e){if(e)return t.slice();var n=t.length,r=Ee?Ee(n):new t.constructor(n);return t.copy(r),r}function to(t){var e=new t.constructor(t.byteLength);return new Ce(e).set(new Ce(t)),e}function eo(t,e){var n=e?to(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.length)}function no(t,e){if(t!==e){var n=t!==o,r=null===t,i=t==t,a=Ps(t),s=e!==o,u=null===e,c=e==e,l=Ps(e);if(!u&&!l&&!a&&t>e||a&&s&&c&&!u&&!l||r&&s&&c||!n&&c||!i)return 1;if(!r&&!a&&!l&&t1?n[i-1]:o,s=i>2?n[2]:o;for(a=t.length>3&&"function"==typeof a?(i--,a):o,s&&Go(n[0],n[1],s)&&(a=i<3?o:a,i=1),e=ne(e);++r-1?i[a?e[s]:s]:o}}function mo(t){return Do(function(e){var n=e.length,r=n,i=br.prototype.thru;for(t&&e.reverse();r--;){var a=e[r];if("function"!=typeof a)throw new oe(u);if(i&&!s&&"wrapper"==Po(a))var s=new br([],!0)}for(r=s?r:n;++r1&&_.reverse(),p&&lu))return!1;var l=a.get(t);if(l&&a.get(e))return l==e;var f=-1,p=!0,d=n&m?new Tr:o;for(a.set(t,e),a.set(e,t);++f-1&&t%1==0&&t1?"& ":"")+e[r],e=e.join(n>2?", ":" "),t.replace(Ft,"{\n/* [wrapped with "+e+"] */\n")}(r,function(t,e){return Ge(q,function(n){var r="_."+n[0];e&n[1]&&!tn(t,r)&&t.push(r)}),t.sort()}(function(t){var e=t.match(Mt);return e?e[1].split(qt):[]}(r),n)))}function ca(t){var e=0,n=0;return function(){var r=Gn(),i=O-(r-n);if(n=r,i>0){if(++e>=E)return arguments[0]}else e=0;return t.apply(o,arguments)}}function la(t,e){var n=-1,r=t.length,i=r-1;for(e=e===o?r:e;++n1?t[e-1]:o;return Ia(t,n="function"==typeof n?(t.pop(),n):o)});function Ba(t){var e=mr(t);return e.__chain__=!0,e}function Ha(t,e){return e(t)}var Ua=Do(function(t){var e=t.length,n=e?t[0]:0,r=this.__wrapped__,i=function(e){return Rr(e,t)};return!(e>1||this.__actions__.length)&&r instanceof _r&&Jo(n)?((r=r.slice(n,+n+(e?1:0))).__actions__.push({func:Ha,args:[i],thisArg:o}),new br(r,this.__chain__).thru(function(t){return e&&!t.length&&t.push(o),t})):this.thru(i)});var Wa=so(function(t,e,n){fe.call(t,n)?++t[n]:Lr(t,n,1)});var za=vo(ya),Va=vo(ba);function Xa(t,e){return(bs(t)?Ge:Hr)(t,Mo(e,3))}function Ka(t,e){return(bs(t)?Qe:Ur)(t,Mo(e,3))}var Ja=so(function(t,e,n){fe.call(t,n)?t[n].push(e):Lr(t,n,[e])});var Ga=$i(function(t,e,n){var i=-1,o="function"==typeof e,a=ws(t)?r(t.length):[];return Hr(t,function(t){a[++i]=o?Ke(e,t,n):ai(t,e,n)}),a}),Qa=so(function(t,e,n){Lr(t,n,e)});function Ya(t,e){return(bs(t)?nn:vi)(t,Mo(e,3))}var Za=so(function(t,e,n){t[n?0:1].push(e)},function(){return[[],[]]});var ts=$i(function(t,e){if(null==t)return[];var n=e.length;return n>1&&Go(t,e[0],e[1])?e=[]:n>2&&Go(e[0],e[1],e[2])&&(e=[e[0]]),_i(t,Xr(e,1),[])}),es=Mn||function(){return Ie.Date.now()};function ns(t,e,n){return e=n?o:e,e=t&&null==e?t.length:e,So(t,T,o,o,o,o,e)}function rs(t,e){var n;if("function"!=typeof e)throw new oe(u);return t=Us(t),function(){return--t>0&&(n=e.apply(this,arguments)),t<=1&&(e=o),n}}var is=$i(function(t,e,n){var r=g;if(n.length){var i=jn(n,Fo(is));r|=x}return So(t,r,e,n,i)}),os=$i(function(t,e,n){var r=g|y;if(n.length){var i=jn(n,Fo(os));r|=x}return So(e,r,t,n,i)});function as(t,e,n){var r,i,a,s,c,l,f=0,p=!1,d=!1,h=!0;if("function"!=typeof t)throw new oe(u);function v(e){var n=r,a=i;return r=i=o,f=e,s=t.apply(a,n)}function m(t){var n=t-l;return l===o||n>=e||n<0||d&&t-f>=a}function g(){var t=es();if(m(t))return y(t);c=aa(g,function(t){var n=e-(t-l);return d?Jn(n,a-(t-f)):n}(t))}function y(t){return c=o,h&&r?v(t):(r=i=o,s)}function b(){var t=es(),n=m(t);if(r=arguments,i=this,l=t,n){if(c===o)return function(t){return f=t,c=aa(g,e),p?v(t):s}(l);if(d)return c=aa(g,e),v(l)}return c===o&&(c=aa(g,e)),s}return e=zs(e)||0,Es(n)&&(p=!!n.leading,a=(d="maxWait"in n)?Kn(zs(n.maxWait)||0,e):a,h="trailing"in n?!!n.trailing:h),b.cancel=function(){c!==o&&Yi(c),f=0,r=l=i=c=o},b.flush=function(){return c===o?s:y(es())},b}var ss=$i(function(t,e){return qr(t,1,e)}),us=$i(function(t,e,n){return qr(t,zs(e)||0,n)});function cs(t,e){if("function"!=typeof t||null!=e&&"function"!=typeof e)throw new oe(u);var n=function(){var r=arguments,i=e?e.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=t.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(cs.Cache||Cr),n}function ls(t){if("function"!=typeof t)throw new oe(u);return function(){var e=arguments;switch(e.length){case 0:return!t.call(this);case 1:return!t.call(this,e[0]);case 2:return!t.call(this,e[0],e[1]);case 3:return!t.call(this,e[0],e[1],e[2])}return!t.apply(this,e)}}cs.Cache=Cr;var fs=Gi(function(t,e){var n=(e=1==e.length&&bs(e[0])?nn(e[0],_n(Mo())):nn(Xr(e,1),_n(Mo()))).length;return $i(function(r){for(var i=-1,o=Jn(r.length,n);++i=e}),ys=si(function(){return arguments}())?si:function(t){return Os(t)&&fe.call(t,"callee")&&!Le.call(t,"callee")},bs=r.isArray,_s=qe?_n(qe):function(t){return Os(t)&&ei(t)==ut};function ws(t){return null!=t&&Ss(t.length)&&!$s(t)}function xs(t){return Os(t)&&ws(t)}var Cs=Wn||zu,Ts=Be?_n(Be):function(t){return Os(t)&&ei(t)==z};function ks(t){if(!Os(t))return!1;var e=ei(t);return e==X||e==V||"string"==typeof t.message&&"string"==typeof t.name&&!Ds(t)}function $s(t){if(!Es(t))return!1;var e=ei(t);return e==K||e==J||e==U||e==tt}function As(t){return"number"==typeof t&&t==Us(t)}function Ss(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=I}function Es(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}function Os(t){return null!=t&&"object"==typeof t}var js=He?_n(He):function(t){return Os(t)&&zo(t)==G};function Ns(t){return"number"==typeof t||Os(t)&&ei(t)==Q}function Ds(t){if(!Os(t)||ei(t)!=Z)return!1;var e=Ne(t);if(null===e)return!0;var n=fe.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&le.call(n)==ve}var Is=Ue?_n(Ue):function(t){return Os(t)&&ei(t)==et};var Ls=We?_n(We):function(t){return Os(t)&&zo(t)==nt};function Rs(t){return"string"==typeof t||!bs(t)&&Os(t)&&ei(t)==rt}function Ps(t){return"symbol"==typeof t||Os(t)&&ei(t)==it}var Fs=ze?_n(ze):function(t){return Os(t)&&Ss(t.length)&&!!Ae[ei(t)]};var Ms=Co(hi),qs=Co(function(t,e){return t<=e});function Bs(t){if(!t)return[];if(ws(t))return Rs(t)?Ln(t):oo(t);if(Me&&t[Me])return function(t){for(var e,n=[];!(e=t.next()).done;)n.push(e.value);return n}(t[Me]());var e=zo(t);return(e==G?En:e==nt?Nn:vu)(t)}function Hs(t){return t?(t=zs(t))===D||t===-D?(t<0?-1:1)*L:t==t?t:0:0===t?t:0}function Us(t){var e=Hs(t),n=e%1;return e==e?n?e-n:e:0}function Ws(t){return t?Pr(Us(t),0,P):0}function zs(t){if("number"==typeof t)return t;if(Ps(t))return R;if(Es(t)){var e="function"==typeof t.valueOf?t.valueOf():t;t=Es(e)?e+"":e}if("string"!=typeof t)return 0===t?t:+t;t=t.replace(Lt,"");var n=Vt.test(t);return n||Kt.test(t)?je(t.slice(2),n?2:8):zt.test(t)?R:+t}function Vs(t){return ao(t,su(t))}function Xs(t){return null==t?"":Mi(t)}var Ks=uo(function(t,e){if(ta(e)||ws(e))ao(e,au(e),t);else for(var n in e)fe.call(e,n)&&jr(t,n,e[n])}),Js=uo(function(t,e){ao(e,su(e),t)}),Gs=uo(function(t,e,n,r){ao(e,su(e),t,r)}),Qs=uo(function(t,e,n,r){ao(e,au(e),t,r)}),Ys=Do(Rr);var Zs=$i(function(t){return t.push(o,Eo),Ke(Gs,o,t)}),tu=$i(function(t){return t.push(o,Oo),Ke(cu,o,t)});function eu(t,e,n){var r=null==t?o:Zr(t,e);return r===o?n:r}function nu(t,e){return null!=t&&Vo(t,e,ii)}var ru=yo(function(t,e,n){t[e]=n},Eu(Nu)),iu=yo(function(t,e,n){fe.call(t,e)?t[e].push(n):t[e]=[n]},Mo),ou=$i(ai);function au(t){return ws(t)?$r(t):pi(t)}function su(t){return ws(t)?$r(t,!0):di(t)}var uu=uo(function(t,e,n){yi(t,e,n)}),cu=uo(function(t,e,n,r){yi(t,e,n,r)}),lu=Do(function(t,e){var n={};if(null==t)return n;var r=!1;e=nn(e,function(e){return e=Ji(e,t),r||(r=e.length>1),e}),ao(t,Lo(t),n),r&&(n=Fr(n,p|d|h,jo));for(var i=e.length;i--;)Bi(n,e[i]);return n});var fu=Do(function(t,e){return null==t?{}:function(t,e){return wi(t,e,function(e,n){return nu(t,n)})}(t,e)});function pu(t,e){if(null==t)return{};var n=nn(Lo(t),function(t){return[t]});return e=Mo(e),wi(t,n,function(t,n){return e(t,n[0])})}var du=Ao(au),hu=Ao(su);function vu(t){return null==t?[]:wn(t,au(t))}var mu=po(function(t,e,n){return e=e.toLowerCase(),t+(n?gu(e):e)});function gu(t){return ku(Xs(t).toLowerCase())}function yu(t){return(t=Xs(t))&&t.replace(Gt,kn).replace(_e,"")}var bu=po(function(t,e,n){return t+(n?"-":"")+e.toLowerCase()}),_u=po(function(t,e,n){return t+(n?" ":"")+e.toLowerCase()}),wu=fo("toLowerCase");var xu=po(function(t,e,n){return t+(n?"_":"")+e.toLowerCase()});var Cu=po(function(t,e,n){return t+(n?" ":"")+ku(e)});var Tu=po(function(t,e,n){return t+(n?" ":"")+e.toUpperCase()}),ku=fo("toUpperCase");function $u(t,e,n){return t=Xs(t),(e=n?o:e)===o?function(t){return Te.test(t)}(t)?function(t){return t.match(xe)||[]}(t):function(t){return t.match(Bt)||[]}(t):t.match(e)||[]}var Au=$i(function(t,e){try{return Ke(t,o,e)}catch(t){return ks(t)?t:new Zt(t)}}),Su=Do(function(t,e){return Ge(e,function(e){e=pa(e),Lr(t,e,is(t[e],t))}),t});function Eu(t){return function(){return t}}var Ou=mo(),ju=mo(!0);function Nu(t){return t}function Du(t){return fi("function"==typeof t?t:Fr(t,p))}var Iu=$i(function(t,e){return function(n){return ai(n,t,e)}}),Lu=$i(function(t,e){return function(n){return ai(t,n,e)}});function Ru(t,e,n){var r=au(e),i=Yr(e,r);null!=n||Es(e)&&(i.length||!r.length)||(n=e,e=t,t=this,i=Yr(e,au(e)));var o=!(Es(n)&&"chain"in n&&!n.chain),a=$s(t);return Ge(i,function(n){var r=e[n];t[n]=r,a&&(t.prototype[n]=function(){var e=this.__chain__;if(o||e){var n=t(this.__wrapped__);return(n.__actions__=oo(this.__actions__)).push({func:r,args:arguments,thisArg:t}),n.__chain__=e,n}return r.apply(t,rn([this.value()],arguments))})}),t}function Pu(){}var Fu=_o(nn),Mu=_o(Ye),qu=_o(sn);function Bu(t){return Qo(t)?vn(pa(t)):function(t){return function(e){return Zr(e,t)}}(t)}var Hu=xo(),Uu=xo(!0);function Wu(){return[]}function zu(){return!1}var Vu=bo(function(t,e){return t+e},0),Xu=ko("ceil"),Ku=bo(function(t,e){return t/e},1),Ju=ko("floor");var Gu,Qu=bo(function(t,e){return t*e},1),Yu=ko("round"),Zu=bo(function(t,e){return t-e},0);return mr.after=function(t,e){if("function"!=typeof e)throw new oe(u);return t=Us(t),function(){if(--t<1)return e.apply(this,arguments)}},mr.ary=ns,mr.assign=Ks,mr.assignIn=Js,mr.assignInWith=Gs,mr.assignWith=Qs,mr.at=Ys,mr.before=rs,mr.bind=is,mr.bindAll=Su,mr.bindKey=os,mr.castArray=function(){if(!arguments.length)return[];var t=arguments[0];return bs(t)?t:[t]},mr.chain=Ba,mr.chunk=function(t,e,n){e=(n?Go(t,e,n):e===o)?1:Kn(Us(e),0);var i=null==t?0:t.length;if(!i||e<1)return[];for(var a=0,s=0,u=r(Bn(i/e));ai?0:i+n),(r=r===o||r>i?i:Us(r))<0&&(r+=i),r=n>r?0:Ws(r);n>>0)?(t=Xs(t))&&("string"==typeof e||null!=e&&!Is(e))&&!(e=Mi(e))&&Sn(t)?Qi(Ln(t),0,n):t.split(e,n):[]},mr.spread=function(t,e){if("function"!=typeof t)throw new oe(u);return e=null==e?0:Kn(Us(e),0),$i(function(n){var r=n[e],i=Qi(n,0,e);return r&&rn(i,r),Ke(t,this,i)})},mr.tail=function(t){var e=null==t?0:t.length;return e?Di(t,1,e):[]},mr.take=function(t,e,n){return t&&t.length?Di(t,0,(e=n||e===o?1:Us(e))<0?0:e):[]},mr.takeRight=function(t,e,n){var r=null==t?0:t.length;return r?Di(t,(e=r-(e=n||e===o?1:Us(e)))<0?0:e,r):[]},mr.takeRightWhile=function(t,e){return t&&t.length?Ui(t,Mo(e,3),!1,!0):[]},mr.takeWhile=function(t,e){return t&&t.length?Ui(t,Mo(e,3)):[]},mr.tap=function(t,e){return e(t),t},mr.throttle=function(t,e,n){var r=!0,i=!0;if("function"!=typeof t)throw new oe(u);return Es(n)&&(r="leading"in n?!!n.leading:r,i="trailing"in n?!!n.trailing:i),as(t,e,{leading:r,maxWait:e,trailing:i})},mr.thru=Ha,mr.toArray=Bs,mr.toPairs=du,mr.toPairsIn=hu,mr.toPath=function(t){return bs(t)?nn(t,pa):Ps(t)?[t]:oo(fa(Xs(t)))},mr.toPlainObject=Vs,mr.transform=function(t,e,n){var r=bs(t),i=r||Cs(t)||Fs(t);if(e=Mo(e,4),null==n){var o=t&&t.constructor;n=i?r?new o:[]:Es(t)&&$s(o)?gr(Ne(t)):{}}return(i?Ge:Gr)(t,function(t,r,i){return e(n,t,r,i)}),n},mr.unary=function(t){return ns(t,1)},mr.union=Oa,mr.unionBy=ja,mr.unionWith=Na,mr.uniq=function(t){return t&&t.length?qi(t):[]},mr.uniqBy=function(t,e){return t&&t.length?qi(t,Mo(e,2)):[]},mr.uniqWith=function(t,e){return e="function"==typeof e?e:o,t&&t.length?qi(t,o,e):[]},mr.unset=function(t,e){return null==t||Bi(t,e)},mr.unzip=Da,mr.unzipWith=Ia,mr.update=function(t,e,n){return null==t?t:Hi(t,e,Ki(n))},mr.updateWith=function(t,e,n,r){return r="function"==typeof r?r:o,null==t?t:Hi(t,e,Ki(n),r)},mr.values=vu,mr.valuesIn=function(t){return null==t?[]:wn(t,su(t))},mr.without=La,mr.words=$u,mr.wrap=function(t,e){return ps(Ki(e),t)},mr.xor=Ra,mr.xorBy=Pa,mr.xorWith=Fa,mr.zip=Ma,mr.zipObject=function(t,e){return Vi(t||[],e||[],jr)},mr.zipObjectDeep=function(t,e){return Vi(t||[],e||[],Ei)},mr.zipWith=qa,mr.entries=du,mr.entriesIn=hu,mr.extend=Js,mr.extendWith=Gs,Ru(mr,mr),mr.add=Vu,mr.attempt=Au,mr.camelCase=mu,mr.capitalize=gu,mr.ceil=Xu,mr.clamp=function(t,e,n){return n===o&&(n=e,e=o),n!==o&&(n=(n=zs(n))==n?n:0),e!==o&&(e=(e=zs(e))==e?e:0),Pr(zs(t),e,n)},mr.clone=function(t){return Fr(t,h)},mr.cloneDeep=function(t){return Fr(t,p|h)},mr.cloneDeepWith=function(t,e){return Fr(t,p|h,e="function"==typeof e?e:o)},mr.cloneWith=function(t,e){return Fr(t,h,e="function"==typeof e?e:o)},mr.conformsTo=function(t,e){return null==e||Mr(t,e,au(e))},mr.deburr=yu,mr.defaultTo=function(t,e){return null==t||t!=t?e:t},mr.divide=Ku,mr.endsWith=function(t,e,n){t=Xs(t),e=Mi(e);var r=t.length,i=n=n===o?r:Pr(Us(n),0,r);return(n-=e.length)>=0&&t.slice(n,i)==e},mr.eq=vs,mr.escape=function(t){return(t=Xs(t))&&kt.test(t)?t.replace(Ct,$n):t},mr.escapeRegExp=function(t){return(t=Xs(t))&&It.test(t)?t.replace(Dt,"\\$&"):t},mr.every=function(t,e,n){var r=bs(t)?Ye:Wr;return n&&Go(t,e,n)&&(e=o),r(t,Mo(e,3))},mr.find=za,mr.findIndex=ya,mr.findKey=function(t,e){return cn(t,Mo(e,3),Gr)},mr.findLast=Va,mr.findLastIndex=ba,mr.findLastKey=function(t,e){return cn(t,Mo(e,3),Qr)},mr.floor=Ju,mr.forEach=Xa,mr.forEachRight=Ka,mr.forIn=function(t,e){return null==t?t:Kr(t,Mo(e,3),su)},mr.forInRight=function(t,e){return null==t?t:Jr(t,Mo(e,3),su)},mr.forOwn=function(t,e){return t&&Gr(t,Mo(e,3))},mr.forOwnRight=function(t,e){return t&&Qr(t,Mo(e,3))},mr.get=eu,mr.gt=ms,mr.gte=gs,mr.has=function(t,e){return null!=t&&Vo(t,e,ri)},mr.hasIn=nu,mr.head=wa,mr.identity=Nu,mr.includes=function(t,e,n,r){t=ws(t)?t:vu(t),n=n&&!r?Us(n):0;var i=t.length;return n<0&&(n=Kn(i+n,0)),Rs(t)?n<=i&&t.indexOf(e,n)>-1:!!i&&fn(t,e,n)>-1},mr.indexOf=function(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=null==n?0:Us(n);return i<0&&(i=Kn(r+i,0)),fn(t,e,i)},mr.inRange=function(t,e,n){return e=Hs(e),n===o?(n=e,e=0):n=Hs(n),function(t,e,n){return t>=Jn(e,n)&&t=-I&&t<=I},mr.isSet=Ls,mr.isString=Rs,mr.isSymbol=Ps,mr.isTypedArray=Fs,mr.isUndefined=function(t){return t===o},mr.isWeakMap=function(t){return Os(t)&&zo(t)==at},mr.isWeakSet=function(t){return Os(t)&&ei(t)==st},mr.join=function(t,e){return null==t?"":Vn.call(t,e)},mr.kebabCase=bu,mr.last=ka,mr.lastIndexOf=function(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=r;return n!==o&&(i=(i=Us(n))<0?Kn(r+i,0):Jn(i,r-1)),e==e?function(t,e,n){for(var r=n+1;r--;)if(t[r]===e)return r;return r}(t,e,i):ln(t,dn,i,!0)},mr.lowerCase=_u,mr.lowerFirst=wu,mr.lt=Ms,mr.lte=qs,mr.max=function(t){return t&&t.length?zr(t,Nu,ni):o},mr.maxBy=function(t,e){return t&&t.length?zr(t,Mo(e,2),ni):o},mr.mean=function(t){return hn(t,Nu)},mr.meanBy=function(t,e){return hn(t,Mo(e,2))},mr.min=function(t){return t&&t.length?zr(t,Nu,hi):o},mr.minBy=function(t,e){return t&&t.length?zr(t,Mo(e,2),hi):o},mr.stubArray=Wu,mr.stubFalse=zu,mr.stubObject=function(){return{}},mr.stubString=function(){return""},mr.stubTrue=function(){return!0},mr.multiply=Qu,mr.nth=function(t,e){return t&&t.length?bi(t,Us(e)):o},mr.noConflict=function(){return Ie._===this&&(Ie._=me),this},mr.noop=Pu,mr.now=es,mr.pad=function(t,e,n){t=Xs(t);var r=(e=Us(e))?In(t):0;if(!e||r>=e)return t;var i=(e-r)/2;return wo(Hn(i),n)+t+wo(Bn(i),n)},mr.padEnd=function(t,e,n){t=Xs(t);var r=(e=Us(e))?In(t):0;return e&&re){var r=t;t=e,e=r}if(n||t%1||e%1){var i=Yn();return Jn(t+i*(e-t+Oe("1e-"+((i+"").length-1))),e)}return Ti(t,e)},mr.reduce=function(t,e,n){var r=bs(t)?on:gn,i=arguments.length<3;return r(t,Mo(e,4),n,i,Hr)},mr.reduceRight=function(t,e,n){var r=bs(t)?an:gn,i=arguments.length<3;return r(t,Mo(e,4),n,i,Ur)},mr.repeat=function(t,e,n){return e=(n?Go(t,e,n):e===o)?1:Us(e),ki(Xs(t),e)},mr.replace=function(){var t=arguments,e=Xs(t[0]);return t.length<3?e:e.replace(t[1],t[2])},mr.result=function(t,e,n){var r=-1,i=(e=Ji(e,t)).length;for(i||(i=1,t=o);++rI)return[];var n=P,r=Jn(t,P);e=Mo(e),t-=P;for(var i=bn(r,e);++n=a)return t;var u=n-In(r);if(u<1)return r;var c=s?Qi(s,0,u).join(""):t.slice(0,u);if(i===o)return c+r;if(s&&(u+=c.length-u),Is(i)){if(t.slice(u).search(i)){var l,f=c;for(i.global||(i=re(i.source,Xs(Wt.exec(i))+"g")),i.lastIndex=0;l=i.exec(f);)var p=l.index;c=c.slice(0,p===o?u:p)}}else if(t.indexOf(Mi(i),u)!=u){var d=c.lastIndexOf(i);d>-1&&(c=c.slice(0,d))}return c+r},mr.unescape=function(t){return(t=Xs(t))&&Tt.test(t)?t.replace(xt,Rn):t},mr.uniqueId=function(t){var e=++pe;return Xs(t)+e},mr.upperCase=Tu,mr.upperFirst=ku,mr.each=Xa,mr.eachRight=Ka,mr.first=wa,Ru(mr,(Gu={},Gr(mr,function(t,e){fe.call(mr.prototype,e)||(Gu[e]=t)}),Gu),{chain:!1}),mr.VERSION="4.17.4",Ge(["bind","bindKey","curry","curryRight","partial","partialRight"],function(t){mr[t].placeholder=mr}),Ge(["drop","take"],function(t,e){_r.prototype[t]=function(n){n=n===o?1:Kn(Us(n),0);var r=this.__filtered__&&!e?new _r(this):this.clone();return r.__filtered__?r.__takeCount__=Jn(n,r.__takeCount__):r.__views__.push({size:Jn(n,P),type:t+(r.__dir__<0?"Right":"")}),r},_r.prototype[t+"Right"]=function(e){return this.reverse()[t](e).reverse()}}),Ge(["filter","map","takeWhile"],function(t,e){var n=e+1,r=n==j||3==n;_r.prototype[t]=function(t){var e=this.clone();return e.__iteratees__.push({iteratee:Mo(t,3),type:n}),e.__filtered__=e.__filtered__||r,e}}),Ge(["head","last"],function(t,e){var n="take"+(e?"Right":"");_r.prototype[t]=function(){return this[n](1).value()[0]}}),Ge(["initial","tail"],function(t,e){var n="drop"+(e?"":"Right");_r.prototype[t]=function(){return this.__filtered__?new _r(this):this[n](1)}}),_r.prototype.compact=function(){return this.filter(Nu)},_r.prototype.find=function(t){return this.filter(t).head()},_r.prototype.findLast=function(t){return this.reverse().find(t)},_r.prototype.invokeMap=$i(function(t,e){return"function"==typeof t?new _r(this):this.map(function(n){return ai(n,t,e)})}),_r.prototype.reject=function(t){return this.filter(ls(Mo(t)))},_r.prototype.slice=function(t,e){t=Us(t);var n=this;return n.__filtered__&&(t>0||e<0)?new _r(n):(t<0?n=n.takeRight(-t):t&&(n=n.drop(t)),e!==o&&(n=(e=Us(e))<0?n.dropRight(-e):n.take(e-t)),n)},_r.prototype.takeRightWhile=function(t){return this.reverse().takeWhile(t).reverse()},_r.prototype.toArray=function(){return this.take(P)},Gr(_r.prototype,function(t,e){var n=/^(?:filter|find|map|reject)|While$/.test(e),r=/^(?:head|last)$/.test(e),i=mr[r?"take"+("last"==e?"Right":""):e],a=r||/^find/.test(e);i&&(mr.prototype[e]=function(){var e=this.__wrapped__,s=r?[1]:arguments,u=e instanceof _r,c=s[0],l=u||bs(e),f=function(t){var e=i.apply(mr,rn([t],s));return r&&p?e[0]:e};l&&n&&"function"==typeof c&&1!=c.length&&(u=l=!1);var p=this.__chain__,d=!!this.__actions__.length,h=a&&!p,v=u&&!d;if(!a&&l){e=v?e:new _r(this);var m=t.apply(e,s);return m.__actions__.push({func:Ha,args:[f],thisArg:o}),new br(m,p)}return h&&v?t.apply(this,s):(m=this.thru(f),h?r?m.value()[0]:m.value():m)})}),Ge(["pop","push","shift","sort","splice","unshift"],function(t){var e=ae[t],n=/^(?:push|sort|unshift)$/.test(t)?"tap":"thru",r=/^(?:pop|shift)$/.test(t);mr.prototype[t]=function(){var t=arguments;if(r&&!this.__chain__){var i=this.value();return e.apply(bs(i)?i:[],t)}return this[n](function(n){return e.apply(bs(n)?n:[],t)})}}),Gr(_r.prototype,function(t,e){var n=mr[e];if(n){var r=n.name+"";(sr[r]||(sr[r]=[])).push({name:e,func:n})}}),sr[go(o,y).name]=[{name:"wrapper",func:o}],_r.prototype.clone=function(){var t=new _r(this.__wrapped__);return t.__actions__=oo(this.__actions__),t.__dir__=this.__dir__,t.__filtered__=this.__filtered__,t.__iteratees__=oo(this.__iteratees__),t.__takeCount__=this.__takeCount__,t.__views__=oo(this.__views__),t},_r.prototype.reverse=function(){if(this.__filtered__){var t=new _r(this);t.__dir__=-1,t.__filtered__=!0}else(t=this.clone()).__dir__*=-1;return t},_r.prototype.value=function(){var t=this.__wrapped__.value(),e=this.__dir__,n=bs(t),r=e<0,i=n?t.length:0,o=function(t,e,n){for(var r=-1,i=n.length;++r=this.__values__.length;return{done:t,value:t?o:this.__values__[this.__index__++]}},mr.prototype.plant=function(t){for(var e,n=this;n instanceof yr;){var r=ha(n);r.__index__=0,r.__values__=o,e?i.__wrapped__=r:e=r;var i=r;n=n.__wrapped__}return i.__wrapped__=t,e},mr.prototype.reverse=function(){var t=this.__wrapped__;if(t instanceof _r){var e=t;return this.__actions__.length&&(e=new _r(this)),(e=e.reverse()).__actions__.push({func:Ha,args:[Ea],thisArg:o}),new br(e,this.__chain__)}return this.thru(Ea)},mr.prototype.toJSON=mr.prototype.valueOf=mr.prototype.value=function(){return Wi(this.__wrapped__,this.__actions__)},mr.prototype.first=mr.prototype.head,Me&&(mr.prototype[Me]=function(){return this}),mr}();Ie._=Pn,(i=function(){return Pn}.call(e,n,e,r))===o||(r.exports=i)}).call(this)}).call(e,n(1),n(16)(t))},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){var r;!function(e,n){"use strict";"object"==typeof t&&"object"==typeof t.exports?t.exports=e.document?n(e,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return n(t)}:n(e)}("undefined"!=typeof window?window:this,function(n,i){"use strict";var o=[],a=n.document,s=Object.getPrototypeOf,u=o.slice,c=o.concat,l=o.push,f=o.indexOf,p={},d=p.toString,h=p.hasOwnProperty,v=h.toString,m=v.call(Object),g={},y=function(t){return"function"==typeof t&&"number"!=typeof t.nodeType},b=function(t){return null!=t&&t===t.window},_={type:!0,src:!0,noModule:!0};function w(t,e,n){var r,i=(e=e||a).createElement("script");if(i.text=t,n)for(r in _)n[r]&&(i[r]=n[r]);e.head.appendChild(i).parentNode.removeChild(i)}function x(t){return null==t?t+"":"object"==typeof t||"function"==typeof t?p[d.call(t)]||"object":typeof t}var C=function(t,e){return new C.fn.init(t,e)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function k(t){var e=!!t&&"length"in t&&t.length,n=x(t);return!y(t)&&!b(t)&&("array"===n||0===e||"number"==typeof e&&e>0&&e-1 in t)}C.fn=C.prototype={jquery:"3.3.1",constructor:C,length:0,toArray:function(){return u.call(this)},get:function(t){return null==t?u.call(this):t<0?this[t+this.length]:this[t]},pushStack:function(t){var e=C.merge(this.constructor(),t);return e.prevObject=this,e},each:function(t){return C.each(this,t)},map:function(t){return this.pushStack(C.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return this.pushStack(u.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(t){var e=this.length,n=+t+(t<0?e:0);return this.pushStack(n>=0&&n+~]|"+R+")"+R+"*"),W=new RegExp("="+R+"*([^\\]'\"]*?)"+R+"*\\]","g"),z=new RegExp(M),V=new RegExp("^"+P+"$"),X={ID:new RegExp("^#("+P+")"),CLASS:new RegExp("^\\.("+P+")"),TAG:new RegExp("^("+P+"|[*])"),ATTR:new RegExp("^"+F),PSEUDO:new RegExp("^"+M),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+R+"*(even|odd|(([+-]|)(\\d*)n|)"+R+"*(?:([+-]|)"+R+"*(\\d+)|))"+R+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+R+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+R+"*((?:-\\d)?\\d*)"+R+"*\\)|)(?=[^-]|$)","i")},K=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,G=/^[^{]+\{\s*\[native \w/,Q=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Y=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+R+"?|("+R+")|.)","ig"),tt=function(t,e,n){var r="0x"+e-65536;return r!=r||n?e:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},et=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,nt=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t},rt=function(){p()},it=yt(function(t){return!0===t.disabled&&("form"in t||"label"in t)},{dir:"parentNode",next:"legend"});try{N.apply(E=D.call(w.childNodes),w.childNodes),E[w.childNodes.length].nodeType}catch(t){N={apply:E.length?function(t,e){j.apply(t,D.call(e))}:function(t,e){for(var n=t.length,r=0;t[n++]=e[r++];);t.length=n-1}}}function ot(t,e,r,i){var o,s,c,l,f,h,g,y=e&&e.ownerDocument,x=e?e.nodeType:9;if(r=r||[],"string"!=typeof t||!t||1!==x&&9!==x&&11!==x)return r;if(!i&&((e?e.ownerDocument||e:w)!==d&&p(e),e=e||d,v)){if(11!==x&&(f=Q.exec(t)))if(o=f[1]){if(9===x){if(!(c=e.getElementById(o)))return r;if(c.id===o)return r.push(c),r}else if(y&&(c=y.getElementById(o))&&b(e,c)&&c.id===o)return r.push(c),r}else{if(f[2])return N.apply(r,e.getElementsByTagName(t)),r;if((o=f[3])&&n.getElementsByClassName&&e.getElementsByClassName)return N.apply(r,e.getElementsByClassName(o)),r}if(n.qsa&&!$[t+" "]&&(!m||!m.test(t))){if(1!==x)y=e,g=t;else if("object"!==e.nodeName.toLowerCase()){for((l=e.getAttribute("id"))?l=l.replace(et,nt):e.setAttribute("id",l=_),s=(h=a(t)).length;s--;)h[s]="#"+l+" "+gt(h[s]);g=h.join(","),y=Y.test(t)&&vt(e.parentNode)||e}if(g)try{return N.apply(r,y.querySelectorAll(g)),r}catch(t){}finally{l===_&&e.removeAttribute("id")}}}return u(t.replace(B,"$1"),e,r,i)}function at(){var t=[];return function e(n,i){return t.push(n+" ")>r.cacheLength&&delete e[t.shift()],e[n+" "]=i}}function st(t){return t[_]=!0,t}function ut(t){var e=d.createElement("fieldset");try{return!!t(e)}catch(t){return!1}finally{e.parentNode&&e.parentNode.removeChild(e),e=null}}function ct(t,e){for(var n=t.split("|"),i=n.length;i--;)r.attrHandle[n[i]]=e}function lt(t,e){var n=e&&t,r=n&&1===t.nodeType&&1===e.nodeType&&t.sourceIndex-e.sourceIndex;if(r)return r;if(n)for(;n=n.nextSibling;)if(n===e)return-1;return t?1:-1}function ft(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function pt(t){return function(e){var n=e.nodeName.toLowerCase();return("input"===n||"button"===n)&&e.type===t}}function dt(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&it(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ht(t){return st(function(e){return e=+e,st(function(n,r){for(var i,o=t([],n.length,e),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function vt(t){return t&&void 0!==t.getElementsByTagName&&t}for(e in n=ot.support={},o=ot.isXML=function(t){var e=t&&(t.ownerDocument||t).documentElement;return!!e&&"HTML"!==e.nodeName},p=ot.setDocument=function(t){var e,i,a=t?t.ownerDocument||t:w;return a!==d&&9===a.nodeType&&a.documentElement?(h=(d=a).documentElement,v=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",rt,!1):i.attachEvent&&i.attachEvent("onunload",rt)),n.attributes=ut(function(t){return t.className="i",!t.getAttribute("className")}),n.getElementsByTagName=ut(function(t){return t.appendChild(d.createComment("")),!t.getElementsByTagName("*").length}),n.getElementsByClassName=G.test(d.getElementsByClassName),n.getById=ut(function(t){return h.appendChild(t).id=_,!d.getElementsByName||!d.getElementsByName(_).length}),n.getById?(r.filter.ID=function(t){var e=t.replace(Z,tt);return function(t){return t.getAttribute("id")===e}},r.find.ID=function(t,e){if(void 0!==e.getElementById&&v){var n=e.getElementById(t);return n?[n]:[]}}):(r.filter.ID=function(t){var e=t.replace(Z,tt);return function(t){var n=void 0!==t.getAttributeNode&&t.getAttributeNode("id");return n&&n.value===e}},r.find.ID=function(t,e){if(void 0!==e.getElementById&&v){var n,r,i,o=e.getElementById(t);if(o){if((n=o.getAttributeNode("id"))&&n.value===t)return[o];for(i=e.getElementsByName(t),r=0;o=i[r++];)if((n=o.getAttributeNode("id"))&&n.value===t)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(t,e){return void 0!==e.getElementsByTagName?e.getElementsByTagName(t):n.qsa?e.querySelectorAll(t):void 0}:function(t,e){var n,r=[],i=0,o=e.getElementsByTagName(t);if("*"===t){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(t,e){if(void 0!==e.getElementsByClassName&&v)return e.getElementsByClassName(t)},g=[],m=[],(n.qsa=G.test(d.querySelectorAll))&&(ut(function(t){h.appendChild(t).innerHTML="",t.querySelectorAll("[msallowcapture^='']").length&&m.push("[*^$]="+R+"*(?:''|\"\")"),t.querySelectorAll("[selected]").length||m.push("\\["+R+"*(?:value|"+L+")"),t.querySelectorAll("[id~="+_+"-]").length||m.push("~="),t.querySelectorAll(":checked").length||m.push(":checked"),t.querySelectorAll("a#"+_+"+*").length||m.push(".#.+[+~]")}),ut(function(t){t.innerHTML="";var e=d.createElement("input");e.setAttribute("type","hidden"),t.appendChild(e).setAttribute("name","D"),t.querySelectorAll("[name=d]").length&&m.push("name"+R+"*[*^$|!~]?="),2!==t.querySelectorAll(":enabled").length&&m.push(":enabled",":disabled"),h.appendChild(t).disabled=!0,2!==t.querySelectorAll(":disabled").length&&m.push(":enabled",":disabled"),t.querySelectorAll("*,:x"),m.push(",.*:")})),(n.matchesSelector=G.test(y=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ut(function(t){n.disconnectedMatch=y.call(t,"*"),y.call(t,"[s!='']:x"),g.push("!=",M)}),m=m.length&&new RegExp(m.join("|")),g=g.length&&new RegExp(g.join("|")),e=G.test(h.compareDocumentPosition),b=e||G.test(h.contains)?function(t,e){var n=9===t.nodeType?t.documentElement:t,r=e&&e.parentNode;return t===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):t.compareDocumentPosition&&16&t.compareDocumentPosition(r)))}:function(t,e){if(e)for(;e=e.parentNode;)if(e===t)return!0;return!1},A=e?function(t,e){if(t===e)return f=!0,0;var r=!t.compareDocumentPosition-!e.compareDocumentPosition;return r||(1&(r=(t.ownerDocument||t)===(e.ownerDocument||e)?t.compareDocumentPosition(e):1)||!n.sortDetached&&e.compareDocumentPosition(t)===r?t===d||t.ownerDocument===w&&b(w,t)?-1:e===d||e.ownerDocument===w&&b(w,e)?1:l?I(l,t)-I(l,e):0:4&r?-1:1)}:function(t,e){if(t===e)return f=!0,0;var n,r=0,i=t.parentNode,o=e.parentNode,a=[t],s=[e];if(!i||!o)return t===d?-1:e===d?1:i?-1:o?1:l?I(l,t)-I(l,e):0;if(i===o)return lt(t,e);for(n=t;n=n.parentNode;)a.unshift(n);for(n=e;n=n.parentNode;)s.unshift(n);for(;a[r]===s[r];)r++;return r?lt(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},ot.matches=function(t,e){return ot(t,null,null,e)},ot.matchesSelector=function(t,e){if((t.ownerDocument||t)!==d&&p(t),e=e.replace(W,"='$1']"),n.matchesSelector&&v&&!$[e+" "]&&(!g||!g.test(e))&&(!m||!m.test(e)))try{var r=y.call(t,e);if(r||n.disconnectedMatch||t.document&&11!==t.document.nodeType)return r}catch(t){}return ot(e,d,null,[t]).length>0},ot.contains=function(t,e){return(t.ownerDocument||t)!==d&&p(t),b(t,e)},ot.attr=function(t,e){(t.ownerDocument||t)!==d&&p(t);var i=r.attrHandle[e.toLowerCase()],o=i&&S.call(r.attrHandle,e.toLowerCase())?i(t,e,!v):void 0;return void 0!==o?o:n.attributes||!v?t.getAttribute(e):(o=t.getAttributeNode(e))&&o.specified?o.value:null},ot.escape=function(t){return(t+"").replace(et,nt)},ot.error=function(t){throw new Error("Syntax error, unrecognized expression: "+t)},ot.uniqueSort=function(t){var e,r=[],i=0,o=0;if(f=!n.detectDuplicates,l=!n.sortStable&&t.slice(0),t.sort(A),f){for(;e=t[o++];)e===t[o]&&(i=r.push(o));for(;i--;)t.splice(r[i],1)}return l=null,t},i=ot.getText=function(t){var e,n="",r=0,o=t.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof t.textContent)return t.textContent;for(t=t.firstChild;t;t=t.nextSibling)n+=i(t)}else if(3===o||4===o)return t.nodeValue}else for(;e=t[r++];)n+=i(e);return n},(r=ot.selectors={cacheLength:50,createPseudo:st,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(t){return t[1]=t[1].replace(Z,tt),t[3]=(t[3]||t[4]||t[5]||"").replace(Z,tt),"~="===t[2]&&(t[3]=" "+t[3]+" "),t.slice(0,4)},CHILD:function(t){return t[1]=t[1].toLowerCase(),"nth"===t[1].slice(0,3)?(t[3]||ot.error(t[0]),t[4]=+(t[4]?t[5]+(t[6]||1):2*("even"===t[3]||"odd"===t[3])),t[5]=+(t[7]+t[8]||"odd"===t[3])):t[3]&&ot.error(t[0]),t},PSEUDO:function(t){var e,n=!t[6]&&t[2];return X.CHILD.test(t[0])?null:(t[3]?t[2]=t[4]||t[5]||"":n&&z.test(n)&&(e=a(n,!0))&&(e=n.indexOf(")",n.length-e)-n.length)&&(t[0]=t[0].slice(0,e),t[2]=n.slice(0,e)),t.slice(0,3))}},filter:{TAG:function(t){var e=t.replace(Z,tt).toLowerCase();return"*"===t?function(){return!0}:function(t){return t.nodeName&&t.nodeName.toLowerCase()===e}},CLASS:function(t){var e=T[t+" "];return e||(e=new RegExp("(^|"+R+")"+t+"("+R+"|$)"))&&T(t,function(t){return e.test("string"==typeof t.className&&t.className||void 0!==t.getAttribute&&t.getAttribute("class")||"")})},ATTR:function(t,e,n){return function(r){var i=ot.attr(r,t);return null==i?"!="===e:!e||(i+="","="===e?i===n:"!="===e?i!==n:"^="===e?n&&0===i.indexOf(n):"*="===e?n&&i.indexOf(n)>-1:"$="===e?n&&i.slice(-n.length)===n:"~="===e?(" "+i.replace(q," ")+" ").indexOf(n)>-1:"|="===e&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(t,e,n,r,i){var o="nth"!==t.slice(0,3),a="last"!==t.slice(-4),s="of-type"===e;return 1===r&&0===i?function(t){return!!t.parentNode}:function(e,n,u){var c,l,f,p,d,h,v=o!==a?"nextSibling":"previousSibling",m=e.parentNode,g=s&&e.nodeName.toLowerCase(),y=!u&&!s,b=!1;if(m){if(o){for(;v;){for(p=e;p=p[v];)if(s?p.nodeName.toLowerCase()===g:1===p.nodeType)return!1;h=v="only"===t&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&y){for(b=(d=(c=(l=(f=(p=m)[_]||(p[_]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]||[])[0]===x&&c[1])&&c[2],p=d&&m.childNodes[d];p=++d&&p&&p[v]||(b=d=0)||h.pop();)if(1===p.nodeType&&++b&&p===e){l[t]=[x,d,b];break}}else if(y&&(b=d=(c=(l=(f=(p=e)[_]||(p[_]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]||[])[0]===x&&c[1]),!1===b)for(;(p=++d&&p&&p[v]||(b=d=0)||h.pop())&&((s?p.nodeName.toLowerCase()!==g:1!==p.nodeType)||!++b||(y&&((l=(f=p[_]||(p[_]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]=[x,b]),p!==e)););return(b-=i)===r||b%r==0&&b/r>=0}}},PSEUDO:function(t,e){var n,i=r.pseudos[t]||r.setFilters[t.toLowerCase()]||ot.error("unsupported pseudo: "+t);return i[_]?i(e):i.length>1?(n=[t,t,"",e],r.setFilters.hasOwnProperty(t.toLowerCase())?st(function(t,n){for(var r,o=i(t,e),a=o.length;a--;)t[r=I(t,o[a])]=!(n[r]=o[a])}):function(t){return i(t,0,n)}):i}},pseudos:{not:st(function(t){var e=[],n=[],r=s(t.replace(B,"$1"));return r[_]?st(function(t,e,n,i){for(var o,a=r(t,null,i,[]),s=t.length;s--;)(o=a[s])&&(t[s]=!(e[s]=o))}):function(t,i,o){return e[0]=t,r(e,null,o,n),e[0]=null,!n.pop()}}),has:st(function(t){return function(e){return ot(t,e).length>0}}),contains:st(function(t){return t=t.replace(Z,tt),function(e){return(e.textContent||e.innerText||i(e)).indexOf(t)>-1}}),lang:st(function(t){return V.test(t||"")||ot.error("unsupported lang: "+t),t=t.replace(Z,tt).toLowerCase(),function(e){var n;do{if(n=v?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(n=n.toLowerCase())===t||0===n.indexOf(t+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var n=t.location&&t.location.hash;return n&&n.slice(1)===e.id},root:function(t){return t===h},focus:function(t){return t===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(t.type||t.href||~t.tabIndex)},enabled:dt(!1),disabled:dt(!0),checked:function(t){var e=t.nodeName.toLowerCase();return"input"===e&&!!t.checked||"option"===e&&!!t.selected},selected:function(t){return t.parentNode&&t.parentNode.selectedIndex,!0===t.selected},empty:function(t){for(t=t.firstChild;t;t=t.nextSibling)if(t.nodeType<6)return!1;return!0},parent:function(t){return!r.pseudos.empty(t)},header:function(t){return J.test(t.nodeName)},input:function(t){return K.test(t.nodeName)},button:function(t){var e=t.nodeName.toLowerCase();return"input"===e&&"button"===t.type||"button"===e},text:function(t){var e;return"input"===t.nodeName.toLowerCase()&&"text"===t.type&&(null==(e=t.getAttribute("type"))||"text"===e.toLowerCase())},first:ht(function(){return[0]}),last:ht(function(t,e){return[e-1]}),eq:ht(function(t,e,n){return[n<0?n+e:n]}),even:ht(function(t,e){for(var n=0;n=0;)t.push(r);return t}),gt:ht(function(t,e,n){for(var r=n<0?n+e:n;++r1?function(e,n,r){for(var i=t.length;i--;)if(!t[i](e,n,r))return!1;return!0}:t[0]}function _t(t,e,n,r,i){for(var o,a=[],s=0,u=t.length,c=null!=e;s-1&&(o[c]=!(a[c]=f))}}else g=_t(g===a?g.splice(h,g.length):g),i?i(null,a,g,u):N.apply(a,g)})}function xt(t){for(var e,n,i,o=t.length,a=r.relative[t[0].type],s=a||r.relative[" "],u=a?1:0,l=yt(function(t){return t===e},s,!0),f=yt(function(t){return I(e,t)>-1},s,!0),p=[function(t,n,r){var i=!a&&(r||n!==c)||((e=n).nodeType?l(t,n,r):f(t,n,r));return e=null,i}];u1&&bt(p),u>1&>(t.slice(0,u-1).concat({value:" "===t[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=t.length>0,o=function(o,a,s,u,l){var f,h,m,g=0,y="0",b=o&&[],_=[],w=c,C=o||i&&r.find.TAG("*",l),T=x+=null==w?1:Math.random()||.1,k=C.length;for(l&&(c=a===d||a||l);y!==k&&null!=(f=C[y]);y++){if(i&&f){for(h=0,a||f.ownerDocument===d||(p(f),s=!v);m=t[h++];)if(m(f,a||d,s)){u.push(f);break}l&&(x=T)}n&&((f=!m&&f)&&g--,o&&b.push(f))}if(g+=y,n&&y!==g){for(h=0;m=e[h++];)m(b,_,a,s);if(o){if(g>0)for(;y--;)b[y]||_[y]||(_[y]=O.call(u));_=_t(_)}N.apply(u,_),l&&!o&&_.length>0&&g+e.length>1&&ot.uniqueSort(u)}return l&&(x=T,c=w),b};return n?st(o):o}(o,i))).selector=t}return s},u=ot.select=function(t,e,n,i){var o,u,c,l,f,p="function"==typeof t&&t,d=!i&&a(t=p.selector||t);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(c=u[0]).type&&9===e.nodeType&&v&&r.relative[u[1].type]){if(!(e=(r.find.ID(c.matches[0].replace(Z,tt),e)||[])[0]))return n;p&&(e=e.parentNode),t=t.slice(u.shift().value.length)}for(o=X.needsContext.test(t)?0:u.length;o--&&(c=u[o],!r.relative[l=c.type]);)if((f=r.find[l])&&(i=f(c.matches[0].replace(Z,tt),Y.test(u[0].type)&&vt(e.parentNode)||e))){if(u.splice(o,1),!(t=i.length&>(u)))return N.apply(n,i),n;break}}return(p||s(t,d))(i,e,!v,n,!e||Y.test(t)&&vt(e.parentNode)||e),n},n.sortStable=_.split("").sort(A).join("")===_,n.detectDuplicates=!!f,p(),n.sortDetached=ut(function(t){return 1&t.compareDocumentPosition(d.createElement("fieldset"))}),ut(function(t){return t.innerHTML="","#"===t.firstChild.getAttribute("href")})||ct("type|href|height|width",function(t,e,n){if(!n)return t.getAttribute(e,"type"===e.toLowerCase()?1:2)}),n.attributes&&ut(function(t){return t.innerHTML="",t.firstChild.setAttribute("value",""),""===t.firstChild.getAttribute("value")})||ct("value",function(t,e,n){if(!n&&"input"===t.nodeName.toLowerCase())return t.defaultValue}),ut(function(t){return null==t.getAttribute("disabled")})||ct(L,function(t,e,n){var r;if(!n)return!0===t[e]?e.toLowerCase():(r=t.getAttributeNode(e))&&r.specified?r.value:null}),ot}(n);C.find=$,C.expr=$.selectors,C.expr[":"]=C.expr.pseudos,C.uniqueSort=C.unique=$.uniqueSort,C.text=$.getText,C.isXMLDoc=$.isXML,C.contains=$.contains,C.escapeSelector=$.escape;var A=function(t,e,n){for(var r=[],i=void 0!==n;(t=t[e])&&9!==t.nodeType;)if(1===t.nodeType){if(i&&C(t).is(n))break;r.push(t)}return r},S=function(t,e){for(var n=[];t;t=t.nextSibling)1===t.nodeType&&t!==e&&n.push(t);return n},E=C.expr.match.needsContext;function O(t,e){return t.nodeName&&t.nodeName.toLowerCase()===e.toLowerCase()}var j=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function N(t,e,n){return y(e)?C.grep(t,function(t,r){return!!e.call(t,r,t)!==n}):e.nodeType?C.grep(t,function(t){return t===e!==n}):"string"!=typeof e?C.grep(t,function(t){return f.call(e,t)>-1!==n}):C.filter(e,t,n)}C.filter=function(t,e,n){var r=e[0];return n&&(t=":not("+t+")"),1===e.length&&1===r.nodeType?C.find.matchesSelector(r,t)?[r]:[]:C.find.matches(t,C.grep(e,function(t){return 1===t.nodeType}))},C.fn.extend({find:function(t){var e,n,r=this.length,i=this;if("string"!=typeof t)return this.pushStack(C(t).filter(function(){for(e=0;e1?C.uniqueSort(n):n},filter:function(t){return this.pushStack(N(this,t||[],!1))},not:function(t){return this.pushStack(N(this,t||[],!0))},is:function(t){return!!N(this,"string"==typeof t&&E.test(t)?C(t):t||[],!1).length}});var D,I=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(C.fn.init=function(t,e,n){var r,i;if(!t)return this;if(n=n||D,"string"==typeof t){if(!(r="<"===t[0]&&">"===t[t.length-1]&&t.length>=3?[null,t,null]:I.exec(t))||!r[1]&&e)return!e||e.jquery?(e||n).find(t):this.constructor(e).find(t);if(r[1]){if(e=e instanceof C?e[0]:e,C.merge(this,C.parseHTML(r[1],e&&e.nodeType?e.ownerDocument||e:a,!0)),j.test(r[1])&&C.isPlainObject(e))for(r in e)y(this[r])?this[r](e[r]):this.attr(r,e[r]);return this}return(i=a.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return t.nodeType?(this[0]=t,this.length=1,this):y(t)?void 0!==n.ready?n.ready(t):t(C):C.makeArray(t,this)}).prototype=C.fn,D=C(a);var L=/^(?:parents|prev(?:Until|All))/,R={children:!0,contents:!0,next:!0,prev:!0};function P(t,e){for(;(t=t[e])&&1!==t.nodeType;);return t}C.fn.extend({has:function(t){var e=C(t,this),n=e.length;return this.filter(function(){for(var t=0;t-1:1===n.nodeType&&C.find.matchesSelector(n,t))){o.push(n);break}return this.pushStack(o.length>1?C.uniqueSort(o):o)},index:function(t){return t?"string"==typeof t?f.call(C(t),this[0]):f.call(this,t.jquery?t[0]:t):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(t,e){return this.pushStack(C.uniqueSort(C.merge(this.get(),C(t,e))))},addBack:function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}}),C.each({parent:function(t){var e=t.parentNode;return e&&11!==e.nodeType?e:null},parents:function(t){return A(t,"parentNode")},parentsUntil:function(t,e,n){return A(t,"parentNode",n)},next:function(t){return P(t,"nextSibling")},prev:function(t){return P(t,"previousSibling")},nextAll:function(t){return A(t,"nextSibling")},prevAll:function(t){return A(t,"previousSibling")},nextUntil:function(t,e,n){return A(t,"nextSibling",n)},prevUntil:function(t,e,n){return A(t,"previousSibling",n)},siblings:function(t){return S((t.parentNode||{}).firstChild,t)},children:function(t){return S(t.firstChild)},contents:function(t){return O(t,"iframe")?t.contentDocument:(O(t,"template")&&(t=t.content||t),C.merge([],t.childNodes))}},function(t,e){C.fn[t]=function(n,r){var i=C.map(this,e,n);return"Until"!==t.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=C.filter(r,i)),this.length>1&&(R[t]||C.uniqueSort(i),L.test(t)&&i.reverse()),this.pushStack(i)}});var F=/[^\x20\t\r\n\f]+/g;function M(t){return t}function q(t){throw t}function B(t,e,n,r){var i;try{t&&y(i=t.promise)?i.call(t).done(e).fail(n):t&&y(i=t.then)?i.call(t,e,n):e.apply(void 0,[t].slice(r))}catch(t){n.apply(void 0,[t])}}C.Callbacks=function(t){t="string"==typeof t?function(t){var e={};return C.each(t.match(F)||[],function(t,n){e[n]=!0}),e}(t):C.extend({},t);var e,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||t.once,r=e=!0;a.length;s=-1)for(n=a.shift();++s-1;)o.splice(n,1),n<=s&&s--}),this},has:function(t){return t?C.inArray(t,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||e||(o=n=""),this},locked:function(){return!!i},fireWith:function(t,n){return i||(n=[t,(n=n||[]).slice?n.slice():n],a.push(n),e||u()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},C.extend({Deferred:function(t){var e=[["notify","progress",C.Callbacks("memory"),C.Callbacks("memory"),2],["resolve","done",C.Callbacks("once memory"),C.Callbacks("once memory"),0,"resolved"],["reject","fail",C.Callbacks("once memory"),C.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},catch:function(t){return i.then(null,t)},pipe:function(){var t=arguments;return C.Deferred(function(n){C.each(e,function(e,r){var i=y(t[r[4]])&&t[r[4]];o[r[1]](function(){var t=i&&i.apply(this,arguments);t&&y(t.promise)?t.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[r[0]+"With"](this,i?[t]:arguments)})}),t=null}).promise()},then:function(t,r,i){var o=0;function a(t,e,r,i){return function(){var s=this,u=arguments,c=function(){var n,c;if(!(t=o&&(r!==q&&(s=void 0,u=[n]),e.rejectWith(s,u))}};t?l():(C.Deferred.getStackHook&&(l.stackTrace=C.Deferred.getStackHook()),n.setTimeout(l))}}return C.Deferred(function(n){e[0][3].add(a(0,n,y(i)?i:M,n.notifyWith)),e[1][3].add(a(0,n,y(t)?t:M)),e[2][3].add(a(0,n,y(r)?r:q))}).promise()},promise:function(t){return null!=t?C.extend(t,i):i}},o={};return C.each(e,function(t,n){var a=n[2],s=n[5];i[n[1]]=a.add,s&&a.add(function(){r=s},e[3-t][2].disable,e[3-t][3].disable,e[0][2].lock,e[0][3].lock),a.add(n[3].fire),o[n[0]]=function(){return o[n[0]+"With"](this===o?void 0:this,arguments),this},o[n[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(t){var e=arguments.length,n=e,r=Array(n),i=u.call(arguments),o=C.Deferred(),a=function(t){return function(n){r[t]=this,i[t]=arguments.length>1?u.call(arguments):n,--e||o.resolveWith(r,i)}};if(e<=1&&(B(t,o.done(a(n)).resolve,o.reject,!e),"pending"===o.state()||y(i[n]&&i[n].then)))return o.then();for(;n--;)B(i[n],a(n),o.reject);return o.promise()}});var H=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;C.Deferred.exceptionHook=function(t,e){n.console&&n.console.warn&&t&&H.test(t.name)&&n.console.warn("jQuery.Deferred exception: "+t.message,t.stack,e)},C.readyException=function(t){n.setTimeout(function(){throw t})};var U=C.Deferred();function W(){a.removeEventListener("DOMContentLoaded",W),n.removeEventListener("load",W),C.ready()}C.fn.ready=function(t){return U.then(t).catch(function(t){C.readyException(t)}),this},C.extend({isReady:!1,readyWait:1,ready:function(t){(!0===t?--C.readyWait:C.isReady)||(C.isReady=!0,!0!==t&&--C.readyWait>0||U.resolveWith(a,[C]))}}),C.ready.then=U.then,"complete"===a.readyState||"loading"!==a.readyState&&!a.documentElement.doScroll?n.setTimeout(C.ready):(a.addEventListener("DOMContentLoaded",W),n.addEventListener("load",W));var z=function(t,e,n,r,i,o,a){var s=0,u=t.length,c=null==n;if("object"===x(n))for(s in i=!0,n)z(t,e,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,y(r)||(a=!0),c&&(a?(e.call(t,r),e=null):(c=e,e=function(t,e,n){return c.call(C(t),n)})),e))for(;s1,null,!0)},removeData:function(t){return this.each(function(){Z.remove(this,t)})}}),C.extend({queue:function(t,e,n){var r;if(t)return e=(e||"fx")+"queue",r=Y.get(t,e),n&&(!r||Array.isArray(n)?r=Y.access(t,e,C.makeArray(n)):r.push(n)),r||[]},dequeue:function(t,e){e=e||"fx";var n=C.queue(t,e),r=n.length,i=n.shift(),o=C._queueHooks(t,e);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===e&&n.unshift("inprogress"),delete o.stop,i.call(t,function(){C.dequeue(t,e)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(t,e){var n=e+"queueHooks";return Y.get(t,n)||Y.access(t,n,{empty:C.Callbacks("once memory").add(function(){Y.remove(t,[e+"queue",n])})})}}),C.fn.extend({queue:function(t,e){var n=2;return"string"!=typeof t&&(e=t,t="fx",n--),arguments.length\x20\t\r\n\f]+)/i,ht=/^$|^module$|\/(?:java|ecma)script/i,vt={option:[1,""],thead:[1,"","
                                                                          "],col:[2,"","
                                                                          "],tr:[2,"","
                                                                          "],td:[3,"","
                                                                          "],_default:[0,"",""]};function mt(t,e){var n;return n=void 0!==t.getElementsByTagName?t.getElementsByTagName(e||"*"):void 0!==t.querySelectorAll?t.querySelectorAll(e||"*"):[],void 0===e||e&&O(t,e)?C.merge([t],n):n}function gt(t,e){for(var n=0,r=t.length;n-1)i&&i.push(o);else if(c=C.contains(o.ownerDocument,o),a=mt(f.appendChild(o),"script"),c&>(a),n)for(l=0;o=a[l++];)ht.test(o.type||"")&&n.push(o);return f}yt=a.createDocumentFragment().appendChild(a.createElement("div")),(bt=a.createElement("input")).setAttribute("type","radio"),bt.setAttribute("checked","checked"),bt.setAttribute("name","t"),yt.appendChild(bt),g.checkClone=yt.cloneNode(!0).cloneNode(!0).lastChild.checked,yt.innerHTML="",g.noCloneChecked=!!yt.cloneNode(!0).lastChild.defaultValue;var xt=a.documentElement,Ct=/^key/,Tt=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,kt=/^([^.]*)(?:\.(.+)|)/;function $t(){return!0}function At(){return!1}function St(){try{return a.activeElement}catch(t){}}function Et(t,e,n,r,i,o){var a,s;if("object"==typeof e){for(s in"string"!=typeof n&&(r=r||n,n=void 0),e)Et(t,s,n,r,e[s],o);return t}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=At;else if(!i)return t;return 1===o&&(a=i,(i=function(t){return C().off(t),a.apply(this,arguments)}).guid=a.guid||(a.guid=C.guid++)),t.each(function(){C.event.add(this,e,i,r,n)})}C.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,c,l,f,p,d,h,v,m=Y.get(t);if(m)for(n.handler&&(n=(o=n).handler,i=o.selector),i&&C.find.matchesSelector(xt,i),n.guid||(n.guid=C.guid++),(u=m.events)||(u=m.events={}),(a=m.handle)||(a=m.handle=function(e){return void 0!==C&&C.event.triggered!==e.type?C.event.dispatch.apply(t,arguments):void 0}),c=(e=(e||"").match(F)||[""]).length;c--;)d=v=(s=kt.exec(e[c])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=C.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=C.event.special[d]||{},l=C.extend({type:d,origType:v,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&C.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,l),l.handler.guid||(l.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,l):p.push(l),C.event.global[d]=!0)},remove:function(t,e,n,r,i){var o,a,s,u,c,l,f,p,d,h,v,m=Y.hasData(t)&&Y.get(t);if(m&&(u=m.events)){for(c=(e=(e||"").match(F)||[""]).length;c--;)if(d=v=(s=kt.exec(e[c])||[])[1],h=(s[2]||"").split(".").sort(),d){for(f=C.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)l=p[o],!i&&v!==l.origType||n&&n.guid!==l.guid||s&&!s.test(l.namespace)||r&&r!==l.selector&&("**"!==r||!l.selector)||(p.splice(o,1),l.selector&&p.delegateCount--,f.remove&&f.remove.call(t,l));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(t,h,m.handle)||C.removeEvent(t,d,m.handle),delete u[d])}else for(d in u)C.event.remove(t,d+e[c],n,r,!0);C.isEmptyObject(u)&&Y.remove(t,"handle events")}},dispatch:function(t){var e,n,r,i,o,a,s=C.event.fix(t),u=new Array(arguments.length),c=(Y.get(this,"events")||{})[s.type]||[],l=C.event.special[s.type]||{};for(u[0]=s,e=1;e=1))for(;c!==this;c=c.parentNode||this)if(1===c.nodeType&&("click"!==t.type||!0!==c.disabled)){for(o=[],a={},n=0;n-1:C.find(i,this,null,[c]).length),a[i]&&o.push(r);o.length&&s.push({elem:c,handlers:o})}return c=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,jt=/\s*$/g;function It(t,e){return O(t,"table")&&O(11!==e.nodeType?e:e.firstChild,"tr")&&C(t).children("tbody")[0]||t}function Lt(t){return t.type=(null!==t.getAttribute("type"))+"/"+t.type,t}function Rt(t){return"true/"===(t.type||"").slice(0,5)?t.type=t.type.slice(5):t.removeAttribute("type"),t}function Pt(t,e){var n,r,i,o,a,s,u,c;if(1===e.nodeType){if(Y.hasData(t)&&(o=Y.access(t),a=Y.set(e,o),c=o.events))for(i in delete a.handle,a.events={},c)for(n=0,r=c[i].length;n1&&"string"==typeof h&&!g.checkClone&&Nt.test(h))return t.each(function(i){var o=t.eq(i);v&&(e[0]=h.call(this,i,o.html())),Ft(o,e,n,r)});if(p&&(o=(i=wt(e,t[0].ownerDocument,!1,t,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=C.map(mt(i,"script"),Lt)).length;f")},clone:function(t,e,n){var r,i,o,a,s,u,c,l=t.cloneNode(!0),f=C.contains(t.ownerDocument,t);if(!(g.noCloneChecked||1!==t.nodeType&&11!==t.nodeType||C.isXMLDoc(t)))for(a=mt(l),r=0,i=(o=mt(t)).length;r0&>(a,!f&&mt(t,"script")),l},cleanData:function(t){for(var e,n,r,i=C.event.special,o=0;void 0!==(n=t[o]);o++)if(G(n)){if(e=n[Y.expando]){if(e.events)for(r in e.events)i[r]?C.event.remove(n,r):C.removeEvent(n,r,e.handle);n[Y.expando]=void 0}n[Z.expando]&&(n[Z.expando]=void 0)}}}),C.fn.extend({detach:function(t){return Mt(this,t,!0)},remove:function(t){return Mt(this,t)},text:function(t){return z(this,function(t){return void 0===t?C.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=t)})},null,t,arguments.length)},append:function(){return Ft(this,arguments,function(t){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||It(this,t).appendChild(t)})},prepend:function(){return Ft(this,arguments,function(t){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var e=It(this,t);e.insertBefore(t,e.firstChild)}})},before:function(){return Ft(this,arguments,function(t){this.parentNode&&this.parentNode.insertBefore(t,this)})},after:function(){return Ft(this,arguments,function(t){this.parentNode&&this.parentNode.insertBefore(t,this.nextSibling)})},empty:function(){for(var t,e=0;null!=(t=this[e]);e++)1===t.nodeType&&(C.cleanData(mt(t,!1)),t.textContent="");return this},clone:function(t,e){return t=null!=t&&t,e=null==e?t:e,this.map(function(){return C.clone(this,t,e)})},html:function(t){return z(this,function(t){var e=this[0]||{},n=0,r=this.length;if(void 0===t&&1===e.nodeType)return e.innerHTML;if("string"==typeof t&&!jt.test(t)&&!vt[(dt.exec(t)||["",""])[1].toLowerCase()]){t=C.htmlPrefilter(t);try{for(;n=0&&(u+=Math.max(0,Math.ceil(t["offset"+e[0].toUpperCase()+e.slice(1)]-o-u-s-.5))),u}function te(t,e,n){var r=Bt(t),i=Ut(t,e,r),o="border-box"===C.css(t,"boxSizing",!1,r),a=o;if(qt.test(i)){if(!n)return i;i="auto"}return a=a&&(g.boxSizingReliable()||i===t.style[e]),("auto"===i||!parseFloat(i)&&"inline"===C.css(t,"display",!1,r))&&(i=t["offset"+e[0].toUpperCase()+e.slice(1)],a=!0),(i=parseFloat(i)||0)+Zt(t,e,n||(o?"border":"content"),a,r,i)+"px"}function ee(t,e,n,r,i){return new ee.prototype.init(t,e,n,r,i)}C.extend({cssHooks:{opacity:{get:function(t,e){if(e){var n=Ut(t,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(t,e,n,r){if(t&&3!==t.nodeType&&8!==t.nodeType&&t.style){var i,o,a,s=J(e),u=Vt.test(e),c=t.style;if(u||(e=Qt(s)),a=C.cssHooks[e]||C.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(t,!1,r))?i:c[e];"string"===(o=typeof n)&&(i=it.exec(n))&&i[1]&&(n=ut(t,e,i),o="number"),null!=n&&n==n&&("number"===o&&(n+=i&&i[3]||(C.cssNumber[s]?"":"px")),g.clearCloneStyle||""!==n||0!==e.indexOf("background")||(c[e]="inherit"),a&&"set"in a&&void 0===(n=a.set(t,n,r))||(u?c.setProperty(e,n):c[e]=n))}},css:function(t,e,n,r){var i,o,a,s=J(e);return Vt.test(e)||(e=Qt(s)),(a=C.cssHooks[e]||C.cssHooks[s])&&"get"in a&&(i=a.get(t,!0,n)),void 0===i&&(i=Ut(t,e,r)),"normal"===i&&e in Kt&&(i=Kt[e]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),C.each(["height","width"],function(t,e){C.cssHooks[e]={get:function(t,n,r){if(n)return!zt.test(C.css(t,"display"))||t.getClientRects().length&&t.getBoundingClientRect().width?te(t,e,r):st(t,Xt,function(){return te(t,e,r)})},set:function(t,n,r){var i,o=Bt(t),a="border-box"===C.css(t,"boxSizing",!1,o),s=r&&Zt(t,e,r,a,o);return a&&g.scrollboxSize()===o.position&&(s-=Math.ceil(t["offset"+e[0].toUpperCase()+e.slice(1)]-parseFloat(o[e])-Zt(t,e,"border",!1,o)-.5)),s&&(i=it.exec(n))&&"px"!==(i[3]||"px")&&(t.style[e]=n,n=C.css(t,e)),Yt(0,n,s)}}}),C.cssHooks.marginLeft=Wt(g.reliableMarginLeft,function(t,e){if(e)return(parseFloat(Ut(t,"marginLeft"))||t.getBoundingClientRect().left-st(t,{marginLeft:0},function(){return t.getBoundingClientRect().left}))+"px"}),C.each({margin:"",padding:"",border:"Width"},function(t,e){C.cssHooks[t+e]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[t+ot[r]+e]=o[r]||o[r-2]||o[0];return i}},"margin"!==t&&(C.cssHooks[t+e].set=Yt)}),C.fn.extend({css:function(t,e){return z(this,function(t,e,n){var r,i,o={},a=0;if(Array.isArray(e)){for(r=Bt(t),i=e.length;a1)}}),C.Tween=ee,ee.prototype={constructor:ee,init:function(t,e,n,r,i,o){this.elem=t,this.prop=n,this.easing=i||C.easing._default,this.options=e,this.start=this.now=this.cur(),this.end=r,this.unit=o||(C.cssNumber[n]?"":"px")},cur:function(){var t=ee.propHooks[this.prop];return t&&t.get?t.get(this):ee.propHooks._default.get(this)},run:function(t){var e,n=ee.propHooks[this.prop];return this.options.duration?this.pos=e=C.easing[this.easing](t,this.options.duration*t,0,1,this.options.duration):this.pos=e=t,this.now=(this.end-this.start)*e+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):ee.propHooks._default.set(this),this}},ee.prototype.init.prototype=ee.prototype,ee.propHooks={_default:{get:function(t){var e;return 1!==t.elem.nodeType||null!=t.elem[t.prop]&&null==t.elem.style[t.prop]?t.elem[t.prop]:(e=C.css(t.elem,t.prop,""))&&"auto"!==e?e:0},set:function(t){C.fx.step[t.prop]?C.fx.step[t.prop](t):1!==t.elem.nodeType||null==t.elem.style[C.cssProps[t.prop]]&&!C.cssHooks[t.prop]?t.elem[t.prop]=t.now:C.style(t.elem,t.prop,t.now+t.unit)}}},ee.propHooks.scrollTop=ee.propHooks.scrollLeft={set:function(t){t.elem.nodeType&&t.elem.parentNode&&(t.elem[t.prop]=t.now)}},C.easing={linear:function(t){return t},swing:function(t){return.5-Math.cos(t*Math.PI)/2},_default:"swing"},C.fx=ee.prototype.init,C.fx.step={};var ne,re,ie=/^(?:toggle|show|hide)$/,oe=/queueHooks$/;function ae(){re&&(!1===a.hidden&&n.requestAnimationFrame?n.requestAnimationFrame(ae):n.setTimeout(ae,C.fx.interval),C.fx.tick())}function se(){return n.setTimeout(function(){ne=void 0}),ne=Date.now()}function ue(t,e){var n,r=0,i={height:t};for(e=e?1:0;r<4;r+=2-e)i["margin"+(n=ot[r])]=i["padding"+n]=t;return e&&(i.opacity=i.width=t),i}function ce(t,e,n){for(var r,i=(le.tweeners[e]||[]).concat(le.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(t){return this.each(function(){C.removeAttr(this,t)})}}),C.extend({attr:function(t,e,n){var r,i,o=t.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===t.getAttribute?C.prop(t,e,n):(1===o&&C.isXMLDoc(t)||(i=C.attrHooks[e.toLowerCase()]||(C.expr.match.bool.test(e)?fe:void 0)),void 0!==n?null===n?void C.removeAttr(t,e):i&&"set"in i&&void 0!==(r=i.set(t,n,e))?r:(t.setAttribute(e,n+""),n):i&&"get"in i&&null!==(r=i.get(t,e))?r:null==(r=C.find.attr(t,e))?void 0:r)},attrHooks:{type:{set:function(t,e){if(!g.radioValue&&"radio"===e&&O(t,"input")){var n=t.value;return t.setAttribute("type",e),n&&(t.value=n),e}}}},removeAttr:function(t,e){var n,r=0,i=e&&e.match(F);if(i&&1===t.nodeType)for(;n=i[r++];)t.removeAttribute(n)}}),fe={set:function(t,e,n){return!1===e?C.removeAttr(t,n):t.setAttribute(n,n),n}},C.each(C.expr.match.bool.source.match(/\w+/g),function(t,e){var n=pe[e]||C.find.attr;pe[e]=function(t,e,r){var i,o,a=e.toLowerCase();return r||(o=pe[a],pe[a]=i,i=null!=n(t,e,r)?a:null,pe[a]=o),i}});var de=/^(?:input|select|textarea|button)$/i,he=/^(?:a|area)$/i;function ve(t){return(t.match(F)||[]).join(" ")}function me(t){return t.getAttribute&&t.getAttribute("class")||""}function ge(t){return Array.isArray(t)?t:"string"==typeof t&&t.match(F)||[]}C.fn.extend({prop:function(t,e){return z(this,C.prop,t,e,arguments.length>1)},removeProp:function(t){return this.each(function(){delete this[C.propFix[t]||t]})}}),C.extend({prop:function(t,e,n){var r,i,o=t.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&C.isXMLDoc(t)||(e=C.propFix[e]||e,i=C.propHooks[e]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(t,n,e))?r:t[e]=n:i&&"get"in i&&null!==(r=i.get(t,e))?r:t[e]},propHooks:{tabIndex:{get:function(t){var e=C.find.attr(t,"tabindex");return e?parseInt(e,10):de.test(t.nodeName)||he.test(t.nodeName)&&t.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),g.optSelected||(C.propHooks.selected={get:function(t){var e=t.parentNode;return e&&e.parentNode&&e.parentNode.selectedIndex,null},set:function(t){var e=t.parentNode;e&&(e.selectedIndex,e.parentNode&&e.parentNode.selectedIndex)}}),C.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){C.propFix[this.toLowerCase()]=this}),C.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(y(t))return this.each(function(e){C(this).addClass(t.call(this,e,me(this)))});if((e=ge(t)).length)for(;n=this[u++];)if(i=me(n),r=1===n.nodeType&&" "+ve(i)+" "){for(a=0;o=e[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ve(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(y(t))return this.each(function(e){C(this).removeClass(t.call(this,e,me(this)))});if(!arguments.length)return this.attr("class","");if((e=ge(t)).length)for(;n=this[u++];)if(i=me(n),r=1===n.nodeType&&" "+ve(i)+" "){for(a=0;o=e[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=ve(r))&&n.setAttribute("class",s)}return this},toggleClass:function(t,e){var n=typeof t,r="string"===n||Array.isArray(t);return"boolean"==typeof e&&r?e?this.addClass(t):this.removeClass(t):y(t)?this.each(function(n){C(this).toggleClass(t.call(this,n,me(this),e),e)}):this.each(function(){var e,i,o,a;if(r)for(i=0,o=C(this),a=ge(t);e=a[i++];)o.hasClass(e)?o.removeClass(e):o.addClass(e);else void 0!==t&&"boolean"!==n||((e=me(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===t?"":Y.get(this,"__className__")||""))})},hasClass:function(t){var e,n,r=0;for(e=" "+t+" ";n=this[r++];)if(1===n.nodeType&&(" "+ve(me(n))+" ").indexOf(e)>-1)return!0;return!1}});var ye=/\r/g;C.fn.extend({val:function(t){var e,n,r,i=this[0];return arguments.length?(r=y(t),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?t.call(this,n,C(this).val()):t)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=C.map(i,function(t){return null==t?"":t+""})),(e=C.valHooks[this.type]||C.valHooks[this.nodeName.toLowerCase()])&&"set"in e&&void 0!==e.set(this,i,"value")||(this.value=i))})):i?(e=C.valHooks[i.type]||C.valHooks[i.nodeName.toLowerCase()])&&"get"in e&&void 0!==(n=e.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(ye,""):null==n?"":n:void 0}}),C.extend({valHooks:{option:{get:function(t){var e=C.find.attr(t,"value");return null!=e?e:ve(C.text(t))}},select:{get:function(t){var e,n,r,i=t.options,o=t.selectedIndex,a="select-one"===t.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(t.selectedIndex=-1),o}}}}),C.each(["radio","checkbox"],function(){C.valHooks[this]={set:function(t,e){if(Array.isArray(e))return t.checked=C.inArray(C(t).val(),e)>-1}},g.checkOn||(C.valHooks[this].get=function(t){return null===t.getAttribute("value")?"on":t.value})}),g.focusin="onfocusin"in n;var be=/^(?:focusinfocus|focusoutblur)$/,_e=function(t){t.stopPropagation()};C.extend(C.event,{trigger:function(t,e,r,i){var o,s,u,c,l,f,p,d,v=[r||a],m=h.call(t,"type")?t.type:t,g=h.call(t,"namespace")?t.namespace.split("."):[];if(s=d=u=r=r||a,3!==r.nodeType&&8!==r.nodeType&&!be.test(m+C.event.triggered)&&(m.indexOf(".")>-1&&(m=(g=m.split(".")).shift(),g.sort()),l=m.indexOf(":")<0&&"on"+m,(t=t[C.expando]?t:new C.Event(m,"object"==typeof t&&t)).isTrigger=i?2:3,t.namespace=g.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),e=null==e?[t]:C.makeArray(e,[t]),p=C.event.special[m]||{},i||!p.trigger||!1!==p.trigger.apply(r,e))){if(!i&&!p.noBubble&&!b(r)){for(c=p.delegateType||m,be.test(c+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(r.ownerDocument||a)&&v.push(u.defaultView||u.parentWindow||n)}for(o=0;(s=v[o++])&&!t.isPropagationStopped();)d=s,t.type=o>1?c:p.bindType||m,(f=(Y.get(s,"events")||{})[t.type]&&Y.get(s,"handle"))&&f.apply(s,e),(f=l&&s[l])&&f.apply&&G(s)&&(t.result=f.apply(s,e),!1===t.result&&t.preventDefault());return t.type=m,i||t.isDefaultPrevented()||p._default&&!1!==p._default.apply(v.pop(),e)||!G(r)||l&&y(r[m])&&!b(r)&&((u=r[l])&&(r[l]=null),C.event.triggered=m,t.isPropagationStopped()&&d.addEventListener(m,_e),r[m](),t.isPropagationStopped()&&d.removeEventListener(m,_e),C.event.triggered=void 0,u&&(r[l]=u)),t.result}},simulate:function(t,e,n){var r=C.extend(new C.Event,n,{type:t,isSimulated:!0});C.event.trigger(r,null,e)}}),C.fn.extend({trigger:function(t,e){return this.each(function(){C.event.trigger(t,e,this)})},triggerHandler:function(t,e){var n=this[0];if(n)return C.event.trigger(t,e,n,!0)}}),g.focusin||C.each({focus:"focusin",blur:"focusout"},function(t,e){var n=function(t){C.event.simulate(e,t.target,C.event.fix(t))};C.event.special[e]={setup:function(){var r=this.ownerDocument||this,i=Y.access(r,e);i||r.addEventListener(t,n,!0),Y.access(r,e,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=Y.access(r,e)-1;i?Y.access(r,e,i):(r.removeEventListener(t,n,!0),Y.remove(r,e))}}});var we=n.location,xe=Date.now(),Ce=/\?/;C.parseXML=function(t){var e;if(!t||"string"!=typeof t)return null;try{e=(new n.DOMParser).parseFromString(t,"text/xml")}catch(t){e=void 0}return e&&!e.getElementsByTagName("parsererror").length||C.error("Invalid XML: "+t),e};var Te=/\[\]$/,ke=/\r?\n/g,$e=/^(?:submit|button|image|reset|file)$/i,Ae=/^(?:input|select|textarea|keygen)/i;function Se(t,e,n,r){var i;if(Array.isArray(e))C.each(e,function(e,i){n||Te.test(t)?r(t,i):Se(t+"["+("object"==typeof i&&null!=i?e:"")+"]",i,n,r)});else if(n||"object"!==x(e))r(t,e);else for(i in e)Se(t+"["+i+"]",e[i],n,r)}C.param=function(t,e){var n,r=[],i=function(t,e){var n=y(e)?e():e;r[r.length]=encodeURIComponent(t)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(t)||t.jquery&&!C.isPlainObject(t))C.each(t,function(){i(this.name,this.value)});else for(n in t)Se(n,t[n],e,i);return r.join("&")},C.fn.extend({serialize:function(){return C.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var t=C.prop(this,"elements");return t?C.makeArray(t):this}).filter(function(){var t=this.type;return this.name&&!C(this).is(":disabled")&&Ae.test(this.nodeName)&&!$e.test(t)&&(this.checked||!pt.test(t))}).map(function(t,e){var n=C(this).val();return null==n?null:Array.isArray(n)?C.map(n,function(t){return{name:e.name,value:t.replace(ke,"\r\n")}}):{name:e.name,value:n.replace(ke,"\r\n")}}).get()}});var Ee=/%20/g,Oe=/#.*$/,je=/([?&])_=[^&]*/,Ne=/^(.*?):[ \t]*([^\r\n]*)$/gm,De=/^(?:GET|HEAD)$/,Ie=/^\/\//,Le={},Re={},Pe="*/".concat("*"),Fe=a.createElement("a");function Me(t){return function(e,n){"string"!=typeof e&&(n=e,e="*");var r,i=0,o=e.toLowerCase().match(F)||[];if(y(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(t[r]=t[r]||[]).unshift(n)):(t[r]=t[r]||[]).push(n)}}function qe(t,e,n,r){var i={},o=t===Re;function a(s){var u;return i[s]=!0,C.each(t[s]||[],function(t,s){var c=s(e,n,r);return"string"!=typeof c||o||i[c]?o?!(u=c):void 0:(e.dataTypes.unshift(c),a(c),!1)}),u}return a(e.dataTypes[0])||!i["*"]&&a("*")}function Be(t,e){var n,r,i=C.ajaxSettings.flatOptions||{};for(n in e)void 0!==e[n]&&((i[n]?t:r||(r={}))[n]=e[n]);return r&&C.extend(!0,t,r),t}Fe.href=we.href,C.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:we.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(we.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Pe,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":C.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(t,e){return e?Be(Be(t,C.ajaxSettings),e):Be(C.ajaxSettings,t)},ajaxPrefilter:Me(Le),ajaxTransport:Me(Re),ajax:function(t,e){"object"==typeof t&&(e=t,t=void 0),e=e||{};var r,i,o,s,u,c,l,f,p,d,h=C.ajaxSetup({},e),v=h.context||h,m=h.context&&(v.nodeType||v.jquery)?C(v):C.event,g=C.Deferred(),y=C.Callbacks("once memory"),b=h.statusCode||{},_={},w={},x="canceled",T={readyState:0,getResponseHeader:function(t){var e;if(l){if(!s)for(s={};e=Ne.exec(o);)s[e[1].toLowerCase()]=e[2];e=s[t.toLowerCase()]}return null==e?null:e},getAllResponseHeaders:function(){return l?o:null},setRequestHeader:function(t,e){return null==l&&(t=w[t.toLowerCase()]=w[t.toLowerCase()]||t,_[t]=e),this},overrideMimeType:function(t){return null==l&&(h.mimeType=t),this},statusCode:function(t){var e;if(t)if(l)T.always(t[T.status]);else for(e in t)b[e]=[b[e],t[e]];return this},abort:function(t){var e=t||x;return r&&r.abort(e),k(0,e),this}};if(g.promise(T),h.url=((t||h.url||we.href)+"").replace(Ie,we.protocol+"//"),h.type=e.method||e.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(F)||[""],null==h.crossDomain){c=a.createElement("a");try{c.href=h.url,c.href=c.href,h.crossDomain=Fe.protocol+"//"+Fe.host!=c.protocol+"//"+c.host}catch(t){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=C.param(h.data,h.traditional)),qe(Le,h,e,T),l)return T;for(p in(f=C.event&&h.global)&&0==C.active++&&C.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!De.test(h.type),i=h.url.replace(Oe,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(Ee,"+")):(d=h.url.slice(i.length),h.data&&(h.processData||"string"==typeof h.data)&&(i+=(Ce.test(i)?"&":"?")+h.data,delete h.data),!1===h.cache&&(i=i.replace(je,"$1"),d=(Ce.test(i)?"&":"?")+"_="+xe+++d),h.url=i+d),h.ifModified&&(C.lastModified[i]&&T.setRequestHeader("If-Modified-Since",C.lastModified[i]),C.etag[i]&&T.setRequestHeader("If-None-Match",C.etag[i])),(h.data&&h.hasContent&&!1!==h.contentType||e.contentType)&&T.setRequestHeader("Content-Type",h.contentType),T.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+Pe+"; q=0.01":""):h.accepts["*"]),h.headers)T.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(v,T,h)||l))return T.abort();if(x="abort",y.add(h.complete),T.done(h.success),T.fail(h.error),r=qe(Re,h,e,T)){if(T.readyState=1,f&&m.trigger("ajaxSend",[T,h]),l)return T;h.async&&h.timeout>0&&(u=n.setTimeout(function(){T.abort("timeout")},h.timeout));try{l=!1,r.send(_,k)}catch(t){if(l)throw t;k(-1,t)}}else k(-1,"No Transport");function k(t,e,a,s){var c,p,d,_,w,x=e;l||(l=!0,u&&n.clearTimeout(u),r=void 0,o=s||"",T.readyState=t>0?4:0,c=t>=200&&t<300||304===t,a&&(_=function(t,e,n){for(var r,i,o,a,s=t.contents,u=t.dataTypes;"*"===u[0];)u.shift(),void 0===r&&(r=t.mimeType||e.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||t.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(h,T,a)),_=function(t,e,n,r){var i,o,a,s,u,c={},l=t.dataTypes.slice();if(l[1])for(a in t.converters)c[a.toLowerCase()]=t.converters[a];for(o=l.shift();o;)if(t.responseFields[o]&&(n[t.responseFields[o]]=e),!u&&r&&t.dataFilter&&(e=t.dataFilter(e,t.dataType)),u=o,o=l.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=c[u+" "+o]||c["* "+o]))for(i in c)if((s=i.split(" "))[1]===o&&(a=c[u+" "+s[0]]||c["* "+s[0]])){!0===a?a=c[i]:!0!==c[i]&&(o=s[0],l.unshift(s[1]));break}if(!0!==a)if(a&&t.throws)e=a(e);else try{e=a(e)}catch(t){return{state:"parsererror",error:a?t:"No conversion from "+u+" to "+o}}}return{state:"success",data:e}}(h,_,T,c),c?(h.ifModified&&((w=T.getResponseHeader("Last-Modified"))&&(C.lastModified[i]=w),(w=T.getResponseHeader("etag"))&&(C.etag[i]=w)),204===t||"HEAD"===h.type?x="nocontent":304===t?x="notmodified":(x=_.state,p=_.data,c=!(d=_.error))):(d=x,!t&&x||(x="error",t<0&&(t=0))),T.status=t,T.statusText=(e||x)+"",c?g.resolveWith(v,[p,x,T]):g.rejectWith(v,[T,x,d]),T.statusCode(b),b=void 0,f&&m.trigger(c?"ajaxSuccess":"ajaxError",[T,h,c?p:d]),y.fireWith(v,[T,x]),f&&(m.trigger("ajaxComplete",[T,h]),--C.active||C.event.trigger("ajaxStop")))}return T},getJSON:function(t,e,n){return C.get(t,e,n,"json")},getScript:function(t,e){return C.get(t,void 0,e,"script")}}),C.each(["get","post"],function(t,e){C[e]=function(t,n,r,i){return y(n)&&(i=i||r,r=n,n=void 0),C.ajax(C.extend({url:t,type:e,dataType:i,data:n,success:r},C.isPlainObject(t)&&t))}}),C._evalUrl=function(t){return C.ajax({url:t,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,throws:!0})},C.fn.extend({wrapAll:function(t){var e;return this[0]&&(y(t)&&(t=t.call(this[0])),e=C(t,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&e.insertBefore(this[0]),e.map(function(){for(var t=this;t.firstElementChild;)t=t.firstElementChild;return t}).append(this)),this},wrapInner:function(t){return y(t)?this.each(function(e){C(this).wrapInner(t.call(this,e))}):this.each(function(){var e=C(this),n=e.contents();n.length?n.wrapAll(t):e.append(t)})},wrap:function(t){var e=y(t);return this.each(function(n){C(this).wrapAll(e?t.call(this,n):t)})},unwrap:function(t){return this.parent(t).not("body").each(function(){C(this).replaceWith(this.childNodes)}),this}}),C.expr.pseudos.hidden=function(t){return!C.expr.pseudos.visible(t)},C.expr.pseudos.visible=function(t){return!!(t.offsetWidth||t.offsetHeight||t.getClientRects().length)},C.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(t){}};var He={0:200,1223:204},Ue=C.ajaxSettings.xhr();g.cors=!!Ue&&"withCredentials"in Ue,g.ajax=Ue=!!Ue,C.ajaxTransport(function(t){var e,r;if(g.cors||Ue&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];for(a in t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest"),i)s.setRequestHeader(a,i[a]);e=function(t){return function(){e&&(e=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===t?s.abort():"error"===t?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(He[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=e(),r=s.onerror=s.ontimeout=e("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&n.setTimeout(function(){e&&r()})},e=e("abort");try{s.send(t.hasContent&&t.data||null)}catch(t){if(e)throw t}},abort:function(){e&&e()}}}),C.ajaxPrefilter(function(t){t.crossDomain&&(t.contents.script=!1)}),C.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(t){return C.globalEval(t),t}}}),C.ajaxPrefilter("script",function(t){void 0===t.cache&&(t.cache=!1),t.crossDomain&&(t.type="GET")}),C.ajaxTransport("script",function(t){var e,n;if(t.crossDomain)return{send:function(r,i){e=C(" From 0c7b652a7098e86ad669c48f39db09fbb17968d8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 10:45:16 +0200 Subject: [PATCH 85/86] Last code optimization before release. --- app/Rules/UniqueIban.php | 2 + app/Services/Github/Request/UpdateRequest.php | 11 +- app/Services/IP/IpifyOrg.php | 11 +- app/Services/Internal/File/EncryptService.php | 10 +- .../Support/RecurringTransactionTrait.php | 2 +- app/Services/Password/PwndVerifierV2.php | 8 +- .../Spectre/Request/SpectreRequest.php | 17 +- app/Support/Amount.php | 14 +- app/Support/Binder/AccountList.php | 16 +- app/Support/Binder/BudgetList.php | 8 +- app/Support/Binder/CategoryList.php | 8 +- app/Support/Binder/Date.php | 41 ++-- app/Support/Binder/ImportProvider.php | 2 + app/Support/Binder/JournalList.php | 7 +- app/Support/Binder/SimpleJournalList.php | 11 +- app/Support/Binder/TagList.php | 7 +- app/Support/ExpandedForm.php | 192 ++++++------------ .../File/ConfigureMappingHandler.php | 1 + .../File/ConfigureRolesHandler.php | 1 + .../Spectre/ChooseAccountsHandler.php | 1 + .../Import/Placeholder/ImportTransaction.php | 1 + .../Routine/File/AssetAccountMapper.php | 1 + .../Routine/File/MappedValuesValidator.php | 1 + .../Import/Routine/File/MappingConverger.php | 62 +++--- .../Routine/File/OpposingAccountMapper.php | 1 + .../Spectre/StageImportDataHandler.php | 1 + app/Support/Navigation.php | 1 + app/Support/Search/Search.php | 1 + app/Support/Twig/Extension/Transaction.php | 2 +- app/TransactionRules/Actions/ClearBudget.php | 4 - .../Actions/ClearCategory.php | 4 - app/TransactionRules/Actions/ClearNotes.php | 4 - .../Actions/RemoveAllTags.php | 4 - app/TransactionRules/Actions/SetCategory.php | 4 + .../Actions/SetSourceAccount.php | 9 +- .../Factory/TriggerFactory.php | 4 +- app/TransactionRules/Processor.php | 17 +- .../Triggers/AbstractTrigger.php | 4 +- .../Triggers/NotesContain.php | 2 +- app/TransactionRules/Triggers/NotesEmpty.php | 2 +- config/twigbridge.php | 2 +- resources/views/form/multiRadio.twig | 17 -- 42 files changed, 217 insertions(+), 301 deletions(-) delete mode 100644 resources/views/form/multiRadio.twig diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.php index 292746f40d..28922f3cf2 100644 --- a/app/Rules/UniqueIban.php +++ b/app/Rules/UniqueIban.php @@ -26,6 +26,7 @@ namespace FireflyIII\Rules; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use Illuminate\Contracts\Validation\Rule; +use Illuminate\Support\Collection; use Log; /** @@ -116,6 +117,7 @@ class UniqueIban implements Rule if (null !== $this->account) { $query->where('accounts.id', '!=', $this->account->id); } + /** @var Collection $result */ $result = $query->get(['accounts.*']); foreach ($result as $account) { if ($account->iban === $iban) { diff --git a/app/Services/Github/Request/UpdateRequest.php b/app/Services/Github/Request/UpdateRequest.php index d208e8c06c..44a0bc17b7 100644 --- a/app/Services/Github/Request/UpdateRequest.php +++ b/app/Services/Github/Request/UpdateRequest.php @@ -29,6 +29,7 @@ use FireflyIII\Services\Github\Object\Release; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use Log; +use RuntimeException; use SimpleXMLElement; /** @@ -55,10 +56,14 @@ class UpdateRequest implements GithubRequest } if (200 !== $res->getStatusCode()) { - throw new FireflyException(sprintf('Returned code %d, error: %s', $res->getStatusCode(), $res->getBody()->getContents())); + throw new FireflyException(sprintf('Returned code %d.', $res->getStatusCode())); + } + try { + $releaseXml = new SimpleXMLElement($res->getBody()->getContents(), LIBXML_NOCDATA); + } catch (RunTimeException $e) { + Log::error(sprintf('Could not get body from github updat result: %s', $e->getMessage())); + $releaseXml = new SimpleXMLElement(''); } - - $releaseXml = new SimpleXMLElement($res->getBody()->getContents(), LIBXML_NOCDATA); //fetch the products for each category if (isset($releaseXml->entry)) { diff --git a/app/Services/IP/IpifyOrg.php b/app/Services/IP/IpifyOrg.php index 2349f65dce..a171b3f8eb 100644 --- a/app/Services/IP/IpifyOrg.php +++ b/app/Services/IP/IpifyOrg.php @@ -27,6 +27,7 @@ use Exception; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use Log; +use RunTimeException; /** * Class IpifyOrg @@ -51,11 +52,17 @@ class IpifyOrg implements IPRetrievalInterface return null; } if (200 !== $res->getStatusCode()) { - Log::warning(sprintf('Could not retrieve external IP: %d %s', $res->getStatusCode(), $res->getBody()->getContents())); + Log::warning(sprintf('Could not retrieve external IP: %d', $res->getStatusCode())); return null; } + try { + $body = (string)$res->getBody()->getContents(); + } catch (RunTimeException $e) { + Log::error(sprintf('Could not get body from ipify.org result: %s', $e->getMessage())); + $body = null; + } - return (string)$res->getBody()->getContents(); + return $body; } } diff --git a/app/Services/Internal/File/EncryptService.php b/app/Services/Internal/File/EncryptService.php index 4426e77100..6b97fca04f 100644 --- a/app/Services/Internal/File/EncryptService.php +++ b/app/Services/Internal/File/EncryptService.php @@ -25,6 +25,8 @@ namespace FireflyIII\Services\Internal\File; use Crypt; use FireflyIII\Exceptions\FireflyException; +use Illuminate\Contracts\Encryption\EncryptException; +use Log; /** * Class EncryptService @@ -43,7 +45,13 @@ class EncryptService throw new FireflyException(sprintf('File "%s" does not seem to exist.', $file)); } $content = file_get_contents($file); - $content = Crypt::encrypt($content); + try { + $content = Crypt::encrypt($content); + } catch (EncryptException $e) { + $message = sprintf('Could not encrypt file: %s', $e->getMessage()); + Log::error($message); + throw new FireflyException($message); + } $newName = sprintf('%s.upload', $key); $path = storage_path('upload') . '/' . $newName; diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index b9c03074d9..03e2487fe9 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -228,7 +228,7 @@ trait RecurringTransactionTrait /** * @param Recurrence $recurrence - * @param array $tagst + * @param array $tags */ protected function updateTags(Recurrence $recurrence, array $tags): void { diff --git a/app/Services/Password/PwndVerifierV2.php b/app/Services/Password/PwndVerifierV2.php index de2180c784..87e936b846 100644 --- a/app/Services/Password/PwndVerifierV2.php +++ b/app/Services/Password/PwndVerifierV2.php @@ -26,6 +26,7 @@ use Exception; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use Log; +use RuntimeException; /** * Class PwndVerifierV2. @@ -64,7 +65,12 @@ class PwndVerifierV2 implements Verifier if (404 === $res->getStatusCode()) { return true; } - $strpos = stripos($res->getBody()->getContents(), $rest); + try { + $strpos = stripos($res->getBody()->getContents(), $rest); + } catch (RunTimeException $e) { + Log::error(sprintf('Could not get body from Pwnd result: %s', $e->getMessage())); + $strpos = false; + } if (false === $strpos) { Log::debug(sprintf('%s was not found in result body. Return true.', $rest)); diff --git a/app/Services/Spectre/Request/SpectreRequest.php b/app/Services/Spectre/Request/SpectreRequest.php index a215373a91..cbf62ebe71 100644 --- a/app/Services/Spectre/Request/SpectreRequest.php +++ b/app/Services/Spectre/Request/SpectreRequest.php @@ -28,6 +28,7 @@ use FireflyIII\User; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use Log; +use RuntimeException; /** * Class SpectreRequest @@ -208,7 +209,12 @@ abstract class SpectreRequest throw new FireflyException(sprintf('Guzzle Exception: %s', $e->getMessage())); } $statusCode = $res->getStatusCode(); - $returnBody = $res->getBody()->getContents(); + try { + $returnBody = $res->getBody()->getContents(); + } catch (RunTimeException $e) { + Log::error(sprintf('Could not get body from SpectreRequest::GET result: %s', $e->getMessage())); + $returnBody = ''; + } $this->detectError($returnBody, $statusCode); $array = json_decode($returnBody, true); @@ -252,7 +258,14 @@ abstract class SpectreRequest } catch (GuzzleException|Exception $e) { throw new FireflyException(sprintf('Guzzle Exception: %s', $e->getMessage())); } - $body = $res->getBody()->getContents(); + + try { + $body = $res->getBody()->getContents(); + } catch (RunTimeException $e) { + Log::error(sprintf('Could not get body from SpectreRequest::POST result: %s', $e->getMessage())); + $body = ''; + } + $statusCode = $res->getStatusCode(); $this->detectError($body, $statusCode); diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 17dff88a69..3f25d0f567 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -46,6 +46,9 @@ class Amount * @param bool $csPrecedes * * @return string + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public static function getAmountJsConfig(bool $sepBySpace, int $signPosn, string $sign, bool $csPrecedes): string { @@ -53,7 +56,7 @@ class Amount $space = ' '; // require space between symbol and amount? - if (!$sepBySpace) { + if ($sepBySpace === false) { $space = ''; // no } @@ -116,6 +119,7 @@ class Amount * @param bool $coloured * * @return string + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = null): string { @@ -130,12 +134,8 @@ class Amount // some complicated switches to format the amount correctly: $precedes = $amount < 0 ? $info['n_cs_precedes'] : $info['p_cs_precedes']; $separated = $amount < 0 ? $info['n_sep_by_space'] : $info['p_sep_by_space']; - $space = $separated ? ' ' : ''; - $result = $format->symbol . $space . $formatted; - - if (!$precedes) { - $result = $formatted . $space . $format->symbol; - } + $space = $separated === true ? ' ' : ''; + $result = $precedes === true ? $format->symbol . $space . $formatted : $formatted . $space . $format->symbol; if (true === $coloured) { if ($amount > 0) { diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index b63b8f2c5d..f2b6497213 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -41,11 +41,11 @@ class AccountList implements BinderInterface * * @return Collection * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $collection = new Collection; if ('allAssetAccounts' === $value) { /** @var \Illuminate\Support\Collection $collection */ @@ -55,18 +55,8 @@ class AccountList implements BinderInterface ->get(['accounts.*']); } if ('allAssetAccounts' !== $value) { - - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = (int)$entry; - } - $list = array_unique($list); - if (0 === \count($list)) { - Log::error('Account list is empty.'); - throw new NotFoundHttpException; // @codeCoverageIgnore - } - + $incoming = array_map('\intval', explode(',', $value)); + $list = array_merge(array_unique($incoming), [0]); /** @var \Illuminate\Support\Collection $collection */ $collection = auth()->user()->accounts() ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php index 3c6da0ce92..93921d7c53 100644 --- a/app/Support/Binder/BudgetList.php +++ b/app/Support/Binder/BudgetList.php @@ -38,16 +38,12 @@ class BudgetList implements BinderInterface * * @return Collection * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = (int)$entry; - } - $list = array_unique($list); + $list = array_unique(array_map('\intval', explode(',', $value))); if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php index bd6997423d..37e392b9ab 100644 --- a/app/Support/Binder/CategoryList.php +++ b/app/Support/Binder/CategoryList.php @@ -38,16 +38,12 @@ class CategoryList implements BinderInterface * * @return Collection * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = (int)$entry; - } - $list = array_unique($list); + $list = array_unique(array_map('\intval', explode(',', $value))); if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php index e075179b61..5105c208ce 100644 --- a/app/Support/Binder/Date.php +++ b/app/Support/Binder/Date.php @@ -46,28 +46,25 @@ class Date implements BinderInterface /** @var FiscalHelperInterface $fiscalHelper */ $fiscalHelper = app(FiscalHelperInterface::class); - switch ($value) { - default: - try { - $date = new Carbon($value); - } catch (Exception $e) { - Log::error(sprintf('Could not parse date "%s" for user #%d: %s', $value, auth()->user()->id, $e->getMessage())); - throw new NotFoundHttpException; - } - - return $date; - case 'currentMonthStart': - return Carbon::now()->startOfMonth(); - case 'currentMonthEnd': - return Carbon::now()->endOfMonth(); - case 'currentYearStart': - return Carbon::now()->startOfYear(); - case 'currentYearEnd': - return Carbon::now()->endOfYear(); - case 'currentFiscalYearStart': - return $fiscalHelper->startOfFiscalYear(Carbon::now()); - case 'currentFiscalYearEnd': - return $fiscalHelper->endOfFiscalYear(Carbon::now()); + $magicWords = [ + 'currentMonthStart' => Carbon::now()->startOfMonth(), + 'currentMonthEnd' => Carbon::now()->endOfMonth(), + 'currentYearStart' => Carbon::now()->startOfYear(), + 'currentYearEnd' => Carbon::now()->endOfYear(), + 'currentFiscalYearStart' => $fiscalHelper->startOfFiscalYear(Carbon::now()), + 'currentFiscalYearEnd' => $fiscalHelper->endOfFiscalYear(Carbon::now()), + ]; + if (isset($magicWords[$value])) { + return $magicWords[$value]; } + + try { + $result = new Carbon($value); + } catch (Exception $e) { + Log::error(sprintf('Could not parse date "%s" for user #%d: %s', $value, auth()->user()->id, $e->getMessage())); + throw new NotFoundHttpException; + } + + return $result; } } diff --git a/app/Support/Binder/ImportProvider.php b/app/Support/Binder/ImportProvider.php index 7e5917f50c..989a616936 100644 --- a/app/Support/Binder/ImportProvider.php +++ b/app/Support/Binder/ImportProvider.php @@ -37,6 +37,8 @@ class ImportProvider implements BinderInterface { /** * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public static function getProviders(): array { diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php index 5c034c242c..7562d9346c 100644 --- a/app/Support/Binder/JournalList.php +++ b/app/Support/Binder/JournalList.php @@ -41,12 +41,7 @@ class JournalList implements BinderInterface public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = (int)$entry; - } - $list = array_unique($list); + $list = array_unique(array_map('\intval', explode(',', $value))); if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } diff --git a/app/Support/Binder/SimpleJournalList.php b/app/Support/Binder/SimpleJournalList.php index b33ac2fc9a..35708338ed 100644 --- a/app/Support/Binder/SimpleJournalList.php +++ b/app/Support/Binder/SimpleJournalList.php @@ -41,16 +41,14 @@ class SimpleJournalList implements BinderInterface * * @return mixed * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.NPathComplexity) */ public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = (int)$entry; - } - $list = array_unique($list); + $list = array_unique(array_map('\intval', explode(',', $value))); if (0 === \count($list)) { throw new NotFoundHttpException; // @codeCoverageIgnore } @@ -97,7 +95,6 @@ class SimpleJournalList implements BinderInterface } if ($final->count() > 0) { - if (\count($messages) > 0) { session()->flash('info', $messages); } diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php index b4131e0eea..2201eb09b2 100644 --- a/app/Support/Binder/TagList.php +++ b/app/Support/Binder/TagList.php @@ -44,12 +44,7 @@ class TagList implements BinderInterface public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = strtolower(trim($entry)); - } - $list = array_unique($list); + $list = array_unique(array_map('\strtolower', explode(',', $value))); if (0 === \count($list)) { Log::error('Tag list is empty.'); throw new NotFoundHttpException; // @codeCoverageIgnore diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index e7edc728f2..3f7e706f9e 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -25,6 +25,7 @@ namespace FireflyIII\Support; use Amount as Amt; use Carbon\Carbon; use Eloquent; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\PiggyBank; @@ -46,6 +47,8 @@ use Throwable; /** * Class ExpandedForm. * + * @SuppressWarnings(PHPMD.TooManyMethods) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ class ExpandedForm { @@ -94,6 +97,7 @@ class ExpandedForm * @param array $options * * @return string + * @throws FireflyException */ public function amount(string $name, $value = null, array $options = null): string { @@ -132,19 +136,6 @@ class ExpandedForm return $html; } - /** - * @param string $name - * @param mixed $value - * @param array $options - * - * @return string - * @throws \FireflyIII\Exceptions\FireflyException - */ - public function amountSmall(string $name, $value = null, array $options = null): string - { - return $this->currencyField($name, 'amount-small', $value, $options); - } - /** * @param string $name * @param array $options @@ -232,6 +223,7 @@ class ExpandedForm * @param array $options * * @return string + * @throws FireflyException */ public function balance(string $name, $value = null, array $options = null): string { @@ -428,6 +420,7 @@ class ExpandedForm * @param \Illuminate\Support\Collection $set * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function makeSelectList(Collection $set): array { @@ -453,6 +446,7 @@ class ExpandedForm * @param \Illuminate\Support\Collection $set * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function makeSelectListWithEmpty(Collection $set): array { @@ -475,36 +469,6 @@ class ExpandedForm return $selectList; } - /** @noinspection MoreThanThreeArgumentsInspection */ - - /** - * @param string $name - * @param array $list - * @param mixed $selected - * @param array $options - * - * @return string - * - */ - public function multiRadio(string $name, array $list = null, $selected = null, array $options = null): string - { - $list = $list ?? []; - $label = $this->label($name, $options); - $options = $this->expandOptionArray($name, $label, $options); - $classes = $this->getHolderClasses($name); - $selected = $this->fillFieldValue($name, $selected); - - unset($options['class']); - try { - $html = view('form.multiRadio', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); - } catch (Throwable $e) { - Log::debug(sprintf('Could not render multiRadio(): %s', $e->getMessage())); - $html = 'Could not render multiRadio.'; - } - - return $html; - } - /** * @param string $name * @param mixed $value @@ -538,40 +502,6 @@ class ExpandedForm return $html; } - /** - * @param string $name - * @param mixed $value - * @param array $options - * - * @return string - * @throws \FireflyIII\Exceptions\FireflyException - * - */ - public function nonSelectableBalance(string $name, $value = null, array $options = null): string - { - $label = $this->label($name, $options); - $options = $this->expandOptionArray($name, $label, $options); - $classes = $this->getHolderClasses($name); - $value = $this->fillFieldValue($name, $value); - $options['step'] = 'any'; - $selectedCurrency = $options['currency'] ?? Amt::getDefaultCurrency(); - unset($options['currency'], $options['placeholder']); - - // make sure value is formatted nicely: - if (null !== $value && '' !== $value) { - $decimals = $selectedCurrency->decimal_places ?? 2; - $value = round($value, $decimals); - } - try { - $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); - } catch (Throwable $e) { - Log::debug(sprintf('Could not render nonSelectableBalance(): %s', $e->getMessage())); - $html = 'Could not render nonSelectableBalance.'; - } - - return $html; - } - /** * @param string $name * @param mixed $value @@ -841,6 +771,59 @@ class ExpandedForm return $html; } + /** + * @param string $name + * @param string $view + * @param mixed $value + * @param array $options + * + * @return string + * @throws FireflyException + * + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + protected function currencyField(string $name, string $view, $value = null, array $options = null): string + { + $label = $this->label($name, $options); + $options = $this->expandOptionArray($name, $label, $options); + $classes = $this->getHolderClasses($name); + $value = $this->fillFieldValue($name, $value); + $options['step'] = 'any'; + $defaultCurrency = $options['currency'] ?? Amt::getDefaultCurrency(); + /** @var Collection $currencies */ + $currencies = app('amount')->getAllCurrencies(); + unset($options['currency'], $options['placeholder']); + + // perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount) + $preFilled = session('preFilled'); + $key = 'amount_currency_id_' . $name; + $sentCurrencyId = isset($preFilled[$key]) ? (int)$preFilled[$key] : $defaultCurrency->id; + + Log::debug(sprintf('Sent currency ID is %d', $sentCurrencyId)); + + // find this currency in set of currencies: + foreach ($currencies as $currency) { + if ($currency->id === $sentCurrencyId) { + $defaultCurrency = $currency; + Log::debug(sprintf('default currency is now %s', $defaultCurrency->code)); + break; + } + } + + // make sure value is formatted nicely: + if (null !== $value && '' !== $value) { + $value = round($value, $defaultCurrency->decimal_places); + } + try { + $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); + } catch (Throwable $e) { + Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage())); + $html = 'Could not render currencyField.'; + } + + return $html; + } + /** * @param $name * @param $label @@ -865,6 +848,7 @@ class ExpandedForm * @param $value * * @return mixed + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ protected function fillFieldValue(string $name, $value) { @@ -906,6 +890,8 @@ class ExpandedForm return $classes; } + /** @noinspection MoreThanThreeArgumentsInspection */ + /** * @param $name * @param $options @@ -922,56 +908,4 @@ class ExpandedForm return (string)trans('form.' . $name); } - - /** @noinspection MoreThanThreeArgumentsInspection */ - /** - * @param string $name - * @param string $view - * @param mixed $value - * @param array $options - * - * @return string - * @throws \FireflyIII\Exceptions\FireflyException - * @throws \FireflyIII\Exceptions\FireflyException - */ - private function currencyField(string $name, string $view, $value = null, array $options = null): string - { - $label = $this->label($name, $options); - $options = $this->expandOptionArray($name, $label, $options); - $classes = $this->getHolderClasses($name); - $value = $this->fillFieldValue($name, $value); - $options['step'] = 'any'; - $defaultCurrency = $options['currency'] ?? Amt::getDefaultCurrency(); - $currencies = app('amount')->getAllCurrencies(); - unset($options['currency'], $options['placeholder']); - - // perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount) - $preFilled = session('preFilled'); - $key = 'amount_currency_id_' . $name; - $sentCurrencyId = isset($preFilled[$key]) ? (int)$preFilled[$key] : $defaultCurrency->id; - - Log::debug(sprintf('Sent currency ID is %d', $sentCurrencyId)); - - // find this currency in set of currencies: - foreach ($currencies as $currency) { - if ($currency->id === $sentCurrencyId) { - $defaultCurrency = $currency; - Log::debug(sprintf('default currency is now %s', $defaultCurrency->code)); - break; - } - } - - // make sure value is formatted nicely: - if (null !== $value && '' !== $value) { - $value = round($value, $defaultCurrency->decimal_places); - } - try { - $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); - } catch (Throwable $e) { - Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage())); - $html = 'Could not render currencyField.'; - } - - return $html; - } } diff --git a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php index 4d16537a19..568ff9d384 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php @@ -271,6 +271,7 @@ class ConfigureMappingHandler implements FileConfigurationInterface * * @return array * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getValuesForMapping(Reader $reader, array $config, array $columnConfig): array { diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php index 16a45137f9..ce8413b313 100644 --- a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php +++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php @@ -58,6 +58,7 @@ class ConfigureRolesHandler implements FileConfigurationInterface * @param array $config * * @return MessageBag + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function configurationComplete(array $config): MessageBag { diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php index 8f42ac6ea0..7c7c402cf1 100644 --- a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php @@ -110,6 +110,7 @@ class ChooseAccountsHandler implements SpectreJobConfigurationInterface * * @return array * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getNextData(): array { diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php index c97f3f8f7e..3847c7553c 100644 --- a/app/Support/Import/Placeholder/ImportTransaction.php +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -128,6 +128,7 @@ class ImportTransaction * @param ColumnValue $columnValue * * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function addColumnValue(ColumnValue $columnValue): void { diff --git a/app/Support/Import/Routine/File/AssetAccountMapper.php b/app/Support/Import/Routine/File/AssetAccountMapper.php index 10535e1ad4..800ee89ebd 100644 --- a/app/Support/Import/Routine/File/AssetAccountMapper.php +++ b/app/Support/Import/Routine/File/AssetAccountMapper.php @@ -48,6 +48,7 @@ class AssetAccountMapper * @param array $data * * @return Account + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function map(?int $accountId, array $data): Account { diff --git a/app/Support/Import/Routine/File/MappedValuesValidator.php b/app/Support/Import/Routine/File/MappedValuesValidator.php index ddd2434871..af3d35249d 100644 --- a/app/Support/Import/Routine/File/MappedValuesValidator.php +++ b/app/Support/Import/Routine/File/MappedValuesValidator.php @@ -81,6 +81,7 @@ class MappedValuesValidator * * @return array * @throws FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function validate(array $mappings): array { diff --git a/app/Support/Import/Routine/File/MappingConverger.php b/app/Support/Import/Routine/File/MappingConverger.php index 57d70522ad..50fa6352ad 100644 --- a/app/Support/Import/Routine/File/MappingConverger.php +++ b/app/Support/Import/Routine/File/MappingConverger.php @@ -135,44 +135,32 @@ class MappingConverger return $role; } - switch ($role) { - default: - throw new FireflyException(sprintf('Cannot indicate new role for mapped role "%s"', $role)); // @codeCoverageIgnore - case 'account-id': - case 'account-name': - case 'account-iban': - case 'account-number': - $newRole = 'account-id'; - break; - case 'bill-id': - case 'bill-name': - $newRole = 'bill-id'; - break; - case 'budget-id': - case 'budget-name': - $newRole = 'budget-id'; - break; - case 'currency-id': - case 'currency-name': - case 'currency-code': - case 'currency-symbol': - $newRole = 'currency-id'; - break; - case 'category-id': - case 'category-name': - $newRole = 'category-id'; - break; - case 'foreign-currency-id': - case 'foreign-currency-code': - $newRole = 'foreign-currency-id'; - break; - case 'opposing-id': - case 'opposing-name': - case 'opposing-iban': - case 'opposing-number': - $newRole = 'opposing-id'; - break; + $roleMapping = [ + 'account-id' => 'account-id', + 'account-name' => 'account-id', + 'account-iban' => 'account-id', + 'account-number' => 'account-id', + 'bill-id' => 'bill-id', + 'bill-name' => 'bill-id', + 'budget-id' => 'budget-id', + 'budget-name' => 'budget-id', + 'currency-id' => 'currency-id', + 'currency-name' => 'currency-id', + 'currency-code' => 'currency-id', + 'currency-symbol' => 'currency-id', + 'category-id' => 'category-id', + 'category-name' => 'category-id', + 'foreign-currency-id' => 'foreign-currency-id', + 'foreign-currency-code' => 'foreign-currency-id', + 'opposing-id' => 'opposing-id', + 'opposing-name' => 'opposing-id', + 'opposing-iban' => 'opposing-id', + 'opposing-number' => 'opposing-id', + ]; + if (!isset($roleMapping[$role])) { + throw new FireflyException(sprintf('Cannot indicate new role for mapped role "%s"', $role)); // @codeCoverageIgnore } + $newRole = $roleMapping[$role]; Log::debug(sprintf('Role was "%s", but because of mapping (mapped to #%d), role becomes "%s"', $role, $mapped, $newRole)); // also store the $mapped values in a "mappedValues" array. diff --git a/app/Support/Import/Routine/File/OpposingAccountMapper.php b/app/Support/Import/Routine/File/OpposingAccountMapper.php index 5f67428d7e..a6541785f3 100644 --- a/app/Support/Import/Routine/File/OpposingAccountMapper.php +++ b/app/Support/Import/Routine/File/OpposingAccountMapper.php @@ -45,6 +45,7 @@ class OpposingAccountMapper * @param array $data * * @return Account + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function map(?int $accountId, string $amount, array $data): Account { diff --git a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php index 789aa6c664..bf1c29157c 100644 --- a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php +++ b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php @@ -107,6 +107,7 @@ class StageImportDataHandler * @param LocalAccount $originalSource * * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function convertToArray(array $transactions, SpectreAccount $spectreAccount, LocalAccount $originalSource): array { diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index a539793d17..4317c34b45 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -87,6 +87,7 @@ class Navigation * * @return array * @throws \FireflyIII\Exceptions\FireflyException + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function blockPeriods(\Carbon\Carbon $start, \Carbon\Carbon $end, string $range): array { diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index ff47407573..cc1e884954 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -188,6 +188,7 @@ class Search implements SearchInterface * @param JournalCollectorInterface $collector * * @return JournalCollectorInterface + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function applyModifiers(JournalCollectorInterface $collector): JournalCollectorInterface { diff --git a/app/Support/Twig/Extension/Transaction.php b/app/Support/Twig/Extension/Transaction.php index 327c7af1d6..7e544001ab 100644 --- a/app/Support/Twig/Extension/Transaction.php +++ b/app/Support/Twig/Extension/Transaction.php @@ -46,11 +46,11 @@ class Transaction extends Twig_Extension */ public function amount(TransactionModel $transaction): string { + // at this point amount is always negative. $amount = bcmul(app('steam')->positive((string)$transaction->transaction_amount), '-1'); $format = '%s'; $coloured = true; - // at this point amount is always negative. if (TransactionType::RECONCILIATION === $transaction->transaction_type_type && 1 === bccomp((string)$transaction->transaction_amount, '0')) { $amount = bcmul($amount, '-1'); } diff --git a/app/TransactionRules/Actions/ClearBudget.php b/app/TransactionRules/Actions/ClearBudget.php index e2366b7397..0047f0903f 100644 --- a/app/TransactionRules/Actions/ClearBudget.php +++ b/app/TransactionRules/Actions/ClearBudget.php @@ -32,9 +32,6 @@ use Log; */ class ClearBudget implements ActionInterface { - /** @var RuleAction The rule action */ - private $action; - /** * TriggerInterface constructor. * @@ -42,7 +39,6 @@ class ClearBudget implements ActionInterface */ public function __construct(RuleAction $action) { - $this->action = $action; } /** diff --git a/app/TransactionRules/Actions/ClearCategory.php b/app/TransactionRules/Actions/ClearCategory.php index df9637c448..90ee273feb 100644 --- a/app/TransactionRules/Actions/ClearCategory.php +++ b/app/TransactionRules/Actions/ClearCategory.php @@ -32,9 +32,6 @@ use Log; */ class ClearCategory implements ActionInterface { - /** @var RuleAction The rule action */ - private $action; - /** * TriggerInterface constructor. * @@ -42,7 +39,6 @@ class ClearCategory implements ActionInterface */ public function __construct(RuleAction $action) { - $this->action = $action; } /** diff --git a/app/TransactionRules/Actions/ClearNotes.php b/app/TransactionRules/Actions/ClearNotes.php index ff823ffbeb..7b83617770 100644 --- a/app/TransactionRules/Actions/ClearNotes.php +++ b/app/TransactionRules/Actions/ClearNotes.php @@ -32,9 +32,6 @@ use Log; */ class ClearNotes implements ActionInterface { - /** @var RuleAction The rule action */ - private $action; - /** * TriggerInterface constructor. * @@ -42,7 +39,6 @@ class ClearNotes implements ActionInterface */ public function __construct(RuleAction $action) { - $this->action = $action; } /** diff --git a/app/TransactionRules/Actions/RemoveAllTags.php b/app/TransactionRules/Actions/RemoveAllTags.php index 33535117b8..85ab97668d 100644 --- a/app/TransactionRules/Actions/RemoveAllTags.php +++ b/app/TransactionRules/Actions/RemoveAllTags.php @@ -31,9 +31,6 @@ use Log; */ class RemoveAllTags implements ActionInterface { - /** @var RuleAction The rule action */ - private $action; - /** * TriggerInterface constructor. * @@ -41,7 +38,6 @@ class RemoveAllTags implements ActionInterface */ public function __construct(RuleAction $action) { - $this->action = $action; } /** diff --git a/app/TransactionRules/Actions/SetCategory.php b/app/TransactionRules/Actions/SetCategory.php index 94a776d67a..754f663e15 100644 --- a/app/TransactionRules/Actions/SetCategory.php +++ b/app/TransactionRules/Actions/SetCategory.php @@ -61,7 +61,11 @@ class SetCategory implements ActionInterface $factory = app(CategoryFactory::class); $factory->setUser($journal->user); $category = $factory->findOrCreate(null, $name); + if (null === $category) { + Log::error(sprintf('Action SetCategory did not fire because "%s" did not result in a valid category.', $name)); + return true; + } $journal->categories()->detach(); // set category on transactions: /** @var Transaction $transaction */ diff --git a/app/TransactionRules/Actions/SetSourceAccount.php b/app/TransactionRules/Actions/SetSourceAccount.php index 570d697bbd..ff2f0e870f 100644 --- a/app/TransactionRules/Actions/SetSourceAccount.php +++ b/app/TransactionRules/Actions/SetSourceAccount.php @@ -100,7 +100,12 @@ class SetSourceAccount implements ActionInterface // update source transaction with new source account: // get source transaction: - $transaction = $journal->transactions()->where('amount', '<', 0)->first(); + $transaction = $journal->transactions()->where('amount', '<', 0)->first(); + if (null === $transaction) { + Log::error(sprintf('Cannot change source account of journal #%d because no source transaction exists.', $journal->id)); + + return false; + } $transaction->account_id = $this->newSourceAccount->id; $transaction->save(); $journal->touch(); @@ -130,7 +135,7 @@ class SetSourceAccount implements ActionInterface /** * */ - private function findRevenueAccount() + private function findRevenueAccount(): void { $account = $this->repository->findByName($this->action->action_value, [AccountType::REVENUE]); if (null === $account) { diff --git a/app/TransactionRules/Factory/TriggerFactory.php b/app/TransactionRules/Factory/TriggerFactory.php index e117de55bc..96caf8d78e 100644 --- a/app/TransactionRules/Factory/TriggerFactory.php +++ b/app/TransactionRules/Factory/TriggerFactory.php @@ -52,7 +52,7 @@ class TriggerFactory * * @throws FireflyException */ - public static function getTrigger(RuleTrigger $trigger) + public static function getTrigger(RuleTrigger $trigger): AbstractTrigger { $triggerType = $trigger->trigger_type; @@ -84,7 +84,7 @@ class TriggerFactory * * @throws FireflyException */ - public static function makeTriggerFromStrings(string $triggerType, string $triggerValue, bool $stopProcessing) + public static function makeTriggerFromStrings(string $triggerType, string $triggerValue, bool $stopProcessing): AbstractTrigger { /** @var AbstractTrigger $class */ $class = self::getTriggerClass($triggerType); diff --git a/app/TransactionRules/Processor.php b/app/TransactionRules/Processor.php index ca7298dcdf..14d44d0fc7 100644 --- a/app/TransactionRules/Processor.php +++ b/app/TransactionRules/Processor.php @@ -72,8 +72,9 @@ final class Processor * @return Processor * @throws \FireflyIII\Exceptions\FireflyException */ - public static function make(Rule $rule, $includeActions = true) + public static function make(Rule $rule, bool $includeActions = null): Processor { + $includeActions = $includeActions ?? true; Log::debug(sprintf('Making new rule from Rule %d', $rule->id)); Log::debug(sprintf('Rule is strict: %s', var_export($rule->strict, true))); $self = new self; @@ -85,7 +86,7 @@ final class Processor Log::debug(sprintf('Push trigger %d', $trigger->id)); $self->triggers->push(TriggerFactory::getTrigger($trigger)); } - if ($includeActions) { + if ($includeActions === true) { $self->actions = $rule->ruleActions()->orderBy('order', 'ASC')->get(); } @@ -104,7 +105,7 @@ final class Processor * * @throws \FireflyIII\Exceptions\FireflyException */ - public static function makeFromString(string $triggerName, string $triggerValue) + public static function makeFromString(string $triggerName, string $triggerValue): Processor { Log::debug(sprintf('Processor::makeFromString("%s", "%s")', $triggerName, $triggerValue)); $self = new self; @@ -129,7 +130,7 @@ final class Processor * * @throws \FireflyIII\Exceptions\FireflyException */ - public static function makeFromStringArray(array $triggers) + public static function makeFromStringArray(array $triggers): Processor { $self = new self; foreach ($triggers as $entry) { @@ -156,7 +157,7 @@ final class Processor * * @param int $foundTriggers */ - public function setFoundTriggers(int $foundTriggers) + public function setFoundTriggers(int $foundTriggers): void { $this->foundTriggers = $foundTriggers; } @@ -236,10 +237,10 @@ final class Processor /** * Run the actions * - * @return bool + * @return void * @throws \FireflyIII\Exceptions\FireflyException */ - private function actions() + private function actions(): void { /** * @var int @@ -255,8 +256,6 @@ final class Processor break; } } - - return true; } /** diff --git a/app/TransactionRules/Triggers/AbstractTrigger.php b/app/TransactionRules/Triggers/AbstractTrigger.php index fcf626618b..f4c2afab91 100644 --- a/app/TransactionRules/Triggers/AbstractTrigger.php +++ b/app/TransactionRules/Triggers/AbstractTrigger.php @@ -72,7 +72,7 @@ class AbstractTrigger * * @return AbstractTrigger */ - public static function makeFromTrigger(RuleTrigger $trigger) + public static function makeFromTrigger(RuleTrigger $trigger): AbstractTrigger { $self = new static; $self->trigger = $trigger; @@ -91,7 +91,7 @@ class AbstractTrigger * * @return AbstractTrigger */ - public static function makeFromTriggerValue(string $triggerValue) + public static function makeFromTriggerValue(string $triggerValue): AbstractTrigger { $self = new static; $self->triggerValue = $triggerValue; diff --git a/app/TransactionRules/Triggers/NotesContain.php b/app/TransactionRules/Triggers/NotesContain.php index 54901597b3..4c3eef2ff7 100644 --- a/app/TransactionRules/Triggers/NotesContain.php +++ b/app/TransactionRules/Triggers/NotesContain.php @@ -74,7 +74,7 @@ final class NotesContain extends AbstractTrigger implements TriggerInterface { $search = strtolower(trim($this->triggerValue)); - if (0 === \strlen($search)) { + if ('' === $search) { Log::debug(sprintf('RuleTrigger NotesContain for journal #%d: "%s" is empty, return false.', $journal->id, $search)); return false; diff --git a/app/TransactionRules/Triggers/NotesEmpty.php b/app/TransactionRules/Triggers/NotesEmpty.php index bd42f18ab6..d1d18e3544 100644 --- a/app/TransactionRules/Triggers/NotesEmpty.php +++ b/app/TransactionRules/Triggers/NotesEmpty.php @@ -68,7 +68,7 @@ final class NotesEmpty extends AbstractTrigger implements TriggerInterface $text = $note->text; } - if (0 === \strlen($text)) { + if ('' === $text) { Log::debug(sprintf('RuleTrigger NotesEmpty for journal #%d: strlen is 0, return true.', $journal->id)); return true; diff --git a/config/twigbridge.php b/config/twigbridge.php index f6a6e22ae3..fa0557b7c9 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -187,7 +187,7 @@ return [ 'ExpandedForm' => [ 'is_safe' => [ 'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', - 'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall', 'password', 'nonSelectableBalance', 'nonSelectableAmount', + 'file', 'staticText', 'password', 'nonSelectableAmount', 'number', 'assetAccountList','amountNoCurrency','currencyList','ruleGroupList','assetAccountCheckList','ruleGroupListWithEmpty', 'piggyBankList','currencyListEmpty','activeAssetAccountList' ], diff --git a/resources/views/form/multiRadio.twig b/resources/views/form/multiRadio.twig deleted file mode 100644 index f321eda908..0000000000 --- a/resources/views/form/multiRadio.twig +++ /dev/null @@ -1,17 +0,0 @@ -
                                                                          - - -
                                                                          - {% for value,description in list %} -
                                                                          - -
                                                                          - {% endfor %} - {% include 'form/help' %} - {% include 'form/feedback' %} - -
                                                                          -
                                                                          From 6d4956b5748818c06b7f01e4aacd1b829e83469a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 12:10:25 +0200 Subject: [PATCH 86/86] Updated files for 4.7.5.2 --- .sandstorm/changelog.md | 14 +++++ .sandstorm/sandstorm-pkgdef.capnp | 4 +- app/Support/Amount.php | 2 +- changelog.md | 18 +++++- composer.lock | 39 ++++++------- config/firefly.php | 4 +- resources/lang/fr_FR/firefly.php | 2 +- tests/Unit/Middleware/BinderTest.php | 57 +++++++++++++++---- .../Triggers/BudgetIsTest.php | 3 + .../Triggers/CategoryIsTest.php | 6 +- 10 files changed, 109 insertions(+), 40 deletions(-) diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 0019fa8391..1da400992f 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,3 +1,17 @@ +# 4.7.5.2 +- [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget. +- [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system. +- [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget. +- [Issue 1530](https://github.com/firefly-iii/firefly-iii/issues/1530), fix issue with bill chart. +- [Issue 1563](https://github.com/firefly-iii/firefly-iii/issues/1563), fix piggy bank suggested amount +- [Issue 1571](https://github.com/firefly-iii/firefly-iii/issues/1571), fix OAuth in Sandstorm +- [Issue 1568](https://github.com/firefly-iii/firefly-iii/issues/1568), bug in Sandstorm user code. +- [Issue 1569](https://github.com/firefly-iii/firefly-iii/issues/1569), optimized Sandstorm build by [ocdtrekkie](https://github.com/ocdtrekkie) +- Fixed a bug where transfers would be stored inversely when using the CSV import. +- Retired the "Rabobank description"-fix, because it is no longer necessary. +- Fixed a bug where users could not delete budget limits in the API. +- Piggy bank notes are visible again. + # 4.7.5.1 - [Issue 1531](https://github.com/firefly-iii/firefly-iii/issues/1531), the database routine incorrectly reports empty categories. - [Issue 1532](https://github.com/firefly-iii/firefly-iii/issues/1532), broken dropdown for autosuggest things. diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 211be58c8a..f91c2a0734 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), - appVersion = 14, - appMarketingVersion = (defaultText = "4.7.5.1"), + appVersion = 15, + appMarketingVersion = (defaultText = "4.7.5.2"), actions = [ # Define your "new document" handlers here. diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 3f25d0f567..48c98cc177 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -135,7 +135,7 @@ class Amount $precedes = $amount < 0 ? $info['n_cs_precedes'] : $info['p_cs_precedes']; $separated = $amount < 0 ? $info['n_sep_by_space'] : $info['p_sep_by_space']; $space = $separated === true ? ' ' : ''; - $result = $precedes === true ? $format->symbol . $space . $formatted : $formatted . $space . $format->symbol; + $result = $precedes === false ? $formatted . $space . $format->symbol : $format->symbol . $space . $formatted; if (true === $coloured) { if ($amount > 0) { diff --git a/changelog.md b/changelog.md index 2428f80323..b9c69958c7 100644 --- a/changelog.md +++ b/changelog.md @@ -2,9 +2,23 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -Many updated French translations thanks to https://crowdin.com/profile/bubka - +## [4.7.5.2] - 2017-07-28 +### Added +- Many updated French translations thanks to [@bubka](https://crowdin.com/profile/bubka). +### Fixed +- [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget. +- [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system. +- [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget. +- [Issue 1530](https://github.com/firefly-iii/firefly-iii/issues/1530), fix issue with bill chart. +- [Issue 1563](https://github.com/firefly-iii/firefly-iii/issues/1563), fix piggy bank suggested amount +- [Issue 1571](https://github.com/firefly-iii/firefly-iii/issues/1571), fix OAuth in Sandstorm +- [Issue 1568](https://github.com/firefly-iii/firefly-iii/issues/1568), bug in Sandstorm user code. +- [Issue 1569](https://github.com/firefly-iii/firefly-iii/issues/1569), optimized Sandstorm build by [ocdtrekkie](https://github.com/ocdtrekkie) +- Fixed a bug where transfers would be stored inversely when using the CSV import. +- Retired the "Rabobank description"-fix, because it is no longer necessary. +- Fixed a bug where users could not delete budget limits in the API. +- Piggy bank notes are visible again. ## [4.7.5.1] - 2018-07-14 ### Fixed diff --git a/composer.lock b/composer.lock index acd955e4ec..7ecd5c1198 100644 --- a/composer.lock +++ b/composer.lock @@ -74,11 +74,12 @@ "php": "^7.0.13" }, "require-dev": { + "brianium/paratest": "^1.1", "friendsofphp/php-cs-fixer": "^2.4", "jakub-onderka/php-parallel-lint": "^0.9.2", "phpro/grumphp": "^0.11.6", "phpstan/phpstan": "^0.8", - "phpunit/phpunit": "^5.7", + "phpunit/phpunit": "^6.0.13", "sebastian/phpcpd": "^3.0", "sensiolabs/security-checker": "^4.1" }, @@ -113,7 +114,7 @@ "payment", "sepa" ], - "time": "2018-05-30T09:01:50+00:00" + "time": "2018-07-24T18:37:12+00:00" }, { "name": "davejamesmiller/laravel-breadcrumbs", @@ -176,21 +177,21 @@ }, { "name": "defuse/php-encryption", - "version": "v2.2.0", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/defuse/php-encryption.git", - "reference": "0d4d27c368ca6798bc162469e43248c363c73495" + "reference": "0f407c43b953d571421e0020ba92082ed5fb7620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0d4d27c368ca6798bc162469e43248c363c73495", - "reference": "0d4d27c368ca6798bc162469e43248c363c73495", + "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0f407c43b953d571421e0020ba92082ed5fb7620", + "reference": "0f407c43b953d571421e0020ba92082ed5fb7620", "shasum": "" }, "require": { "ext-openssl": "*", - "paragonie/random_compat": "~2.0", + "paragonie/random_compat": ">= 2", "php": ">=5.4.0" }, "require-dev": { @@ -235,7 +236,7 @@ "security", "symmetric key cryptography" ], - "time": "2018-04-23T19:33:40+00:00" + "time": "2018-07-24T23:27:56+00:00" }, { "name": "doctrine/cache", @@ -1020,16 +1021,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.28", + "version": "v5.6.29", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f" + "reference": "acc6b5c54ab196d3358f60acc5f55d9ebaaccc02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f", - "reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f", + "url": "https://api.github.com/repos/laravel/framework/zipball/acc6b5c54ab196d3358f60acc5f55d9ebaaccc02", + "reference": "acc6b5c54ab196d3358f60acc5f55d9ebaaccc02", "shasum": "" }, "require": { @@ -1155,7 +1156,7 @@ "framework", "laravel" ], - "time": "2018-07-17T14:15:36+00:00" + "time": "2018-07-26T16:01:26+00:00" }, { "name": "laravel/passport", @@ -3829,16 +3830,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.8.2", + "version": "1.8.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced" + "reference": "72c13834fb3db2a962e913758b384ff2e6425d6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/273c18bf6aaab20be9667a3aa4e7702e1e4e7ced", - "reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/72c13834fb3db2a962e913758b384ff2e6425d6e", + "reference": "72c13834fb3db2a962e913758b384ff2e6425d6e", "shasum": "" }, "require": { @@ -3851,7 +3852,7 @@ "require-dev": { "ext-dom": "*", "ext-libxml": "*", - "phpunit/phpunit": "^5.7.16 || ^6.0.8", + "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", "zendframework/zend-coding-standard": "~1.0" }, "type": "library", @@ -3888,7 +3889,7 @@ "psr", "psr-7" ], - "time": "2018-07-19T18:38:31+00:00" + "time": "2018-07-24T21:54:38+00:00" } ], "packages-dev": [ diff --git a/config/firefly.php b/config/firefly.php index d4b52be4a5..11a2c6aa22 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -88,8 +88,8 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.5.1', - 'api_version' => '0.5', + 'version' => '4.7.5.2', + 'api_version' => '0.6', 'db_version' => 4, 'maxUploadSize' => 15242880, 'allowedMimes' => [ diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index c48142c504..9a812d40da 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -1014,7 +1014,7 @@ return [ 'sum_of_piggy_banks' => 'Somme des tirelires', 'saved_so_far' => 'Mis de côté jusqu\'à présent', 'left_to_save' => 'Reste à mettre de côté', - 'suggested_amount' => 'Montant mensuel suggéré à enregistrer', + 'suggested_amount' => 'Montant mensuel suggéré à économiser', 'add_money_to_piggy_title' => 'Ajouter de l’argent à la tirelire ":name"', 'remove_money_from_piggy_title' => 'Retirer l’argent de la tirelire ":name"', 'add' => 'Ajouter', diff --git a/tests/Unit/Middleware/BinderTest.php b/tests/Unit/Middleware/BinderTest.php index 9f4c796af8..1558a05b9c 100644 --- a/tests/Unit/Middleware/BinderTest.php +++ b/tests/Unit/Middleware/BinderTest.php @@ -532,6 +532,13 @@ class BinderTest extends TestCase return 'date: ' . $date->format('Y-m-d'); } ); + + // mock fiscal helper: + $date = new Carbon; + $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); + $this->be($this->user()); $response = $this->get('/_test/binder/20170917'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); @@ -549,11 +556,17 @@ class BinderTest extends TestCase return 'date: ' . $date->format('Y-m-d'); } ); + $date = new Carbon; + $date->endOfMonth(); + + // mock fiscal helper: + $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); + $this->be($this->user()); $response = $this->get('/_test/binder/currentMonthEnd'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $date = new Carbon; - $date->endOfMonth(); $response->assertSee('date: ' . $date->format('Y-m-d')); } @@ -568,11 +581,17 @@ class BinderTest extends TestCase return 'date: ' . $date->format('Y-m-d'); } ); + $date = new Carbon; + $date->startOfMonth(); + + // mock fiscal helper: + $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); + $this->be($this->user()); $response = $this->get('/_test/binder/currentMonthStart'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $date = new Carbon; - $date->startOfMonth(); $response->assertSee('date: ' . $date->format('Y-m-d')); } @@ -587,11 +606,17 @@ class BinderTest extends TestCase return 'date: ' . $date->format('Y-m-d'); } ); + $date = new Carbon; + $date->endOfYear(); + + // mock fiscal helper: + $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); + $this->be($this->user()); $response = $this->get('/_test/binder/currentYearEnd'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $date = new Carbon; - $date->endOfYear(); $response->assertSee('date: ' . $date->format('Y-m-d')); } @@ -601,16 +626,22 @@ class BinderTest extends TestCase */ public function testDateCurrentYearStart(): void { + $date = new Carbon; + $date->startOfYear(); Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { return 'date: ' . $date->format('Y-m-d'); } ); + + // mock fiscal helper: + $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); + $this->be($this->user()); $response = $this->get('/_test/binder/currentYearStart'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $date = new Carbon; - $date->startOfYear(); $response->assertSee('date: ' . $date->format('Y-m-d')); } @@ -632,11 +663,11 @@ class BinderTest extends TestCase // mock fiscal helper: $helper = $this->mock(FiscalHelperInterface::class); $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); $this->be($this->user()); $response = $this->get('/_test/binder/currentFiscalYearEnd'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $response->assertSee('date: ' . $date->format('Y-m-d')); } @@ -657,12 +688,12 @@ class BinderTest extends TestCase // mock fiscal helper: $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); $this->be($this->user()); $response = $this->get('/_test/binder/currentFiscalYearStart'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); - $response->assertSee('date: ' . $date->format('Y-m-d')); } @@ -677,6 +708,12 @@ class BinderTest extends TestCase return 'date: ' . $date->format('Y-m-d'); } ); + $date = new Carbon; + // mock fiscal helper: + $helper = $this->mock(FiscalHelperInterface::class); + $helper->shouldReceive('endOfFiscalYear')->andReturn($date)->once(); + $helper->shouldReceive('startOfFiscalYear')->andReturn($date)->once(); + $this->be($this->user()); $response = $this->get('/_test/binder/fakedate'); $this->assertEquals(Response::HTTP_NOT_FOUND, $response->getStatusCode()); diff --git a/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php b/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php index 871d608ada..54380e8da4 100644 --- a/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Triggers; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\BudgetIs; use Illuminate\Support\Collection; @@ -88,7 +89,9 @@ class BudgetIsTest extends TestCase $budget = $journal->user->budgets()->first(); $journal->budgets()->detach(); + /** @var Transaction $transaction */ foreach($transactions as $transaction) { + $transaction->budgets()->detach(); $transaction->budgets()->save($budget); $this->assertEquals(1, $transaction->budgets()->count()); } diff --git a/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php b/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php index 2fa9dad4ab..c5b7c5a086 100644 --- a/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php @@ -39,7 +39,7 @@ class CategoryIsTest extends TestCase do { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $transactions = $journal->transactions()->count(); - } while ($transactions === 0); + } while ($transactions !== 2); $category = $journal->user->categories()->first(); $journal->categories()->detach(); @@ -59,7 +59,7 @@ class CategoryIsTest extends TestCase do { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $transactions = $journal->transactions()->count(); - } while ($transactions === 0); + } while ($transactions !== 2); $category = $journal->user->categories()->first(); $otherCategory = $journal->user->categories()->where('id', '!=', $category->id)->first(); @@ -80,7 +80,7 @@ class CategoryIsTest extends TestCase do { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $transactions = $journal->transactions()->count(); - } while ($transactions === 0); + } while ($transactions !== 2); $transaction = $journal->transactions()->first(); $category = $journal->user->categories()->first();