diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 2c7e2d2b60..501842a7ce 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -16,7 +16,6 @@ use Crypt; use FireflyIII\Models\Attachment; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\MessageBag; -use Input; use Storage; use Symfony\Component\HttpFoundation\File\UploadedFile; @@ -81,20 +80,19 @@ class AttachmentHelper implements AttachmentHelperInterface } /** - * @param Model $model + * @param Model $model + * @param array|null $files * * @return bool */ - public function saveAttachmentsForModel(Model $model): bool + public function saveAttachmentsForModel(Model $model, array $files = null): bool { - $files = $this->getFiles(); - - if (!is_null($files) && !is_array($files)) { - $this->processFile($files, $model); - } - if (is_array($files)) { - $this->processFiles($files, $model); + foreach ($files as $entry) { + if (!is_null($entry)) { + $this->processFile($entry, $model); + } + } } return true; @@ -227,37 +225,4 @@ class AttachmentHelper implements AttachmentHelperInterface return true; } - - /** - * @return array|null|UploadedFile - */ - private function getFiles() - { - $files = null; - if (Input::hasFile('attachments')) { - $files = Input::file('attachments'); - } - - return $files; - } - - /** - * @param array $files - * - * @param Model $model - * - * @return bool - */ - private function processFiles(array $files, Model $model): bool - { - foreach ($files as $entry) { - if (!is_null($entry)) { - $this->processFile($entry, $model); - } - } - - return true; - } - - } diff --git a/app/Helpers/Attachments/AttachmentHelperInterface.php b/app/Helpers/Attachments/AttachmentHelperInterface.php index ba98fd07db..dc6f9420aa 100644 --- a/app/Helpers/Attachments/AttachmentHelperInterface.php +++ b/app/Helpers/Attachments/AttachmentHelperInterface.php @@ -46,6 +46,6 @@ interface AttachmentHelperInterface * * @return bool */ - public function saveAttachmentsForModel(Model $model): bool; + public function saveAttachmentsForModel(Model $model, array $files = null): bool; } diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index e48c17cf2c..8549e18907 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -27,8 +27,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; +use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Input; use Log; use Navigation; use Preferences; @@ -116,18 +116,19 @@ class AccountController extends Controller } /** + * @param Request $request * @param ARI $repository * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(ARI $repository, Account $account) + public function destroy(Request $request, ARI $repository, Account $account) { $type = $account->accountType->type; $typeName = config('firefly.shortNamesByFullName.' . $type); $name = $account->name; $accountId = $account->id; - $moveTo = $repository->find(intval(Input::get('move_account_before_delete'))); + $moveTo = $repository->find(intval($request->get('move_account_before_delete'))); $repository->destroy($account, $moveTo); @@ -227,12 +228,13 @@ class AccountController extends Controller } /** + * @param Request $request * @param JournalCollectorInterface $collector * @param Account $account * - * @return View + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ - public function show(JournalCollectorInterface $collector, Account $account) + public function show(Request $request, JournalCollectorInterface $collector, Account $account) { if ($account->accountType->type === AccountType::INITIAL_BALANCE) { return $this->redirectToOriginalAccount($account); @@ -243,7 +245,7 @@ class AccountController extends Controller $range = Preferences::get('viewRange', '1M')->data; $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $chartUri = route('chart.account.single', [$account->id]); @@ -259,15 +261,16 @@ class AccountController extends Controller } /** + * @param Request $request * @param ARI $repository * @param Account $account * * @return View */ - public function showAll(AccountRepositoryInterface $repository, Account $account) + public function showAll(Request $request, AccountRepositoryInterface $repository, Account $account) { $subTitle = sprintf('%s (%s)', $account->name, strtolower(trans('firefly.everything'))); - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $chartUri = route('chart.account.all', [$account->id]); @@ -287,19 +290,20 @@ class AccountController extends Controller } /** + * @param Request $request * @param Account $account * @param string $date * * @return View */ - public function showByDate(Account $account, string $date) + public function showByDate(Request $request, Account $account, string $date) { $carbon = new Carbon($date); $range = Preferences::get('viewRange', '1M')->data; $start = Navigation::startOfPeriod($carbon, $range); $end = Navigation::endOfPeriod($carbon, $range); $subTitle = $account->name . ' (' . Navigation::periodShow($start, $range) . ')'; - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $chartUri = route('chart.account.period', [$account->id, $carbon->format('Y-m-d')]); @@ -336,7 +340,7 @@ class AccountController extends Controller Preferences::set('frontPageAccounts', $frontPage); } - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: Session::put('accounts.create.fromStore', true); @@ -362,7 +366,7 @@ class AccountController extends Controller Session::flash('success', strval(trans('firefly.updated_account', ['name' => $account->name]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('accounts.edit.fromUpdate', true); diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 727b3e9b0e..189f92ce68 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -18,7 +18,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Requests\AttachmentFormRequest; use FireflyIII\Models\Attachment; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; -use Input; use Log; use Preferences; use Response; @@ -172,7 +171,7 @@ class AttachmentController extends Controller Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('attachments.edit.fromUpdate', true); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index d058d8d6a3..961090e1e2 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -19,8 +19,8 @@ use FireflyIII\Http\Requests\BillFormRequest; use FireflyIII\Models\Bill; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Input; use Preferences; use Session; use URL; @@ -197,17 +197,18 @@ class BillController extends Controller } /** + * @param Request $request * @param BillRepositoryInterface $repository * @param Bill $bill * * @return View */ - public function show(BillRepositoryInterface $repository, Bill $bill) + public function show(Request $request, BillRepositoryInterface $repository, Bill $bill) { /** @var Carbon $date */ $date = session('start'); $year = $date->year; - $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $yearAverage = $repository->getYearAverage($bill, $date); $overallAverage = $repository->getOverallAverage($bill); @@ -240,7 +241,7 @@ class BillController extends Controller Session::flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)]))); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: Session::put('bills.create.fromStore', true); @@ -267,7 +268,7 @@ class BillController extends Controller Session::flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('bills.edit.fromUpdate', true); diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 3e8189cde5..303c6ac578 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -24,8 +24,8 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\LimitRepetition; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Input; use Preferences; use Response; use Session; @@ -64,14 +64,15 @@ class BudgetController extends Controller } /** + * @param Request $request * @param BudgetRepositoryInterface $repository * @param Budget $budget * - * @return \Symfony\Component\HttpFoundation\Response + * @return \Illuminate\Http\JsonResponse */ - public function amount(BudgetRepositoryInterface $repository, Budget $budget) + public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget) { - $amount = intval(Input::get('amount')); + $amount = intval($request->get('amount')); /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ @@ -194,15 +195,17 @@ class BudgetController extends Controller } /** + * @param Request $request + * * @return View */ - public function noBudget() + public function noBudget(Request $request) { /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); - $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $subTitle = trans( 'firefly.without_budget_between', @@ -236,18 +239,19 @@ class BudgetController extends Controller } /** + * @param Request $request * @param BudgetRepositoryInterface $repository * @param AccountRepositoryInterface $accountRepository * @param Budget $budget * * @return View */ - public function show(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Budget $budget) + public function show(Request $request, BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Budget $budget) { /** @var Carbon $start */ $start = session('first', Carbon::create()->startOfYear()); $end = new Carbon; - $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); $repetition = null; @@ -273,13 +277,14 @@ class BudgetController extends Controller } /** + * @param Request $request * @param Budget $budget * @param LimitRepetition $repetition * * @return View * @throws FireflyException */ - public function showByRepetition(Budget $budget, LimitRepetition $repetition) + public function showByRepetition(Request $request, Budget $budget, LimitRepetition $repetition) { if ($repetition->budgetLimit->budget->id != $budget->id) { throw new FireflyException('This budget limit is not part of this budget.'); @@ -291,7 +296,7 @@ class BudgetController extends Controller $accountRepository = app(AccountRepositoryInterface::class); $start = $repetition->startdate; $end = $repetition->enddate; - $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $subTitle = trans( 'firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)] @@ -328,7 +333,7 @@ class BudgetController extends Controller Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)]))); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: Session::put('budgets.create.fromStore', true); @@ -355,7 +360,7 @@ class BudgetController extends Controller Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('budgets.edit.fromUpdate', true); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 8992a894a3..b9146890db 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -21,8 +21,8 @@ use FireflyIII\Models\Category; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; +use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Input; use Navigation; use Preferences; use Session; @@ -177,18 +177,19 @@ class CategoryController extends Controller } /** + * @param Request $request * @param JournalCollectorInterface $collector * @param Category $category * * @return View */ - public function show(JournalCollectorInterface $collector, Category $category) + public function show(Request $request, JournalCollectorInterface $collector, Category $category) { $range = Preferences::get('viewRange', '1M')->data; $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); $hideCategory = true; // used in list. - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $subTitle = $category->name; $subTitleIcon = 'fa-bar-chart'; @@ -203,12 +204,13 @@ class CategoryController extends Controller } /** + * @param Request $request * @param CategoryRepositoryInterface $repository * @param Category $category * * @return View */ - public function showAll(CategoryRepositoryInterface $repository, Category $category) + public function showAll(Request $request, CategoryRepositoryInterface $repository, Category $category) { $range = Preferences::get('viewRange', '1M')->data; $start = $repository->firstUseDate($category); @@ -219,7 +221,7 @@ class CategoryController extends Controller $subTitle = $category->name; $subTitleIcon = 'fa-bar-chart'; $hideCategory = true; // used in list. - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $showAll = true; @@ -233,12 +235,13 @@ class CategoryController extends Controller } /** + * @param Request $request * @param Category $category - * @param $date + * @param string $date * * @return View */ - public function showByDate(Category $category, string $date) + public function showByDate(Request $request, Category $category, string $date) { $carbon = new Carbon($date); $range = Preferences::get('viewRange', '1M')->data; @@ -247,7 +250,7 @@ class CategoryController extends Controller $subTitle = $category->name; $subTitleIcon = 'fa-bar-chart'; $hideCategory = true; // used in list. - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); /** @var JournalCollectorInterface $collector */ @@ -273,7 +276,7 @@ class CategoryController extends Controller Session::flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)]))); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { Session::put('categories.create.fromStore', true); return redirect(route('categories.create'))->withInput(); @@ -298,7 +301,7 @@ class CategoryController extends Controller Session::flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { Session::put('categories.edit.fromUpdate', true); return redirect(route('categories.edit', [$category->id])); diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index e003005e4e..2b01c3043c 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -17,7 +17,6 @@ use Cache; use FireflyIII\Http\Requests\CurrencyFormRequest; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use Input; use Log; use Preferences; use Session; @@ -196,7 +195,7 @@ class CurrencyController extends Controller $currency = $repository->store($data); Session::flash('success', trans('firefly.created_currency', ['name' => $currency->name])); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { Session::put('currencies.create.fromStore', true); return redirect(route('currencies.create'))->withInput(); @@ -225,7 +224,7 @@ class CurrencyController extends Controller Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { Session::put('currencies.edit.fromUpdate', true); return redirect(route('currencies.edit', [$currency->id])); diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 1b6656af97..d38012e6a2 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -23,7 +23,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Support\CacheProperties; -use Input; +use Illuminate\Http\Request; use Preferences; use Response; @@ -43,11 +43,13 @@ class JsonController extends Controller } /** + * @param Request $request + * * @return \Illuminate\Http\JsonResponse */ - public function action() + public function action(Request $request) { - $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; + $count = intval($request->get('count')) > 0 ? intval($request->get('count')) : 1; $keys = array_keys(config('firefly.rule-actions')); $actions = []; foreach ($keys as $key) { @@ -269,19 +271,18 @@ class JsonController extends Controller } /** - * @param $what + * @param JournalCollectorInterface $collector + * @param string $what * * @return \Illuminate\Http\JsonResponse */ - public function transactionJournals($what) + public function transactionJournals(JournalCollectorInterface $collector, string $what) { $descriptions = []; $type = config('firefly.transactionTypesByWhat.' . $what); $types = [$type]; // use journal collector instead: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); $collector->setTypes($types)->setLimit(100)->setPage(1); $journals = $collector->getJournals(); foreach ($journals as $j) { @@ -297,11 +298,13 @@ class JsonController extends Controller } /** + * @param Request $request + * * @return \Illuminate\Http\JsonResponse */ - public function trigger() + public function trigger(Request $request) { - $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; + $count = intval($request->get('count')) > 0 ? intval($request->get('count')) : 1; $keys = array_keys(config('firefly.rule-triggers')); $triggers = []; foreach ($keys as $key) { diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 5d494b5985..6e2fabe084 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -20,8 +20,8 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Input; use Log; use Preferences; use Response; @@ -248,13 +248,14 @@ class PiggyBankController extends Controller } /** + * @param Request $request * @param PiggyBankRepositoryInterface $repository * * @return \Illuminate\Http\JsonResponse */ - public function order(PiggyBankRepositoryInterface $repository) + public function order(Request $request, PiggyBankRepositoryInterface $repository) { - $data = Input::get('order'); + $data = $request->get('order'); // set all users piggy banks to zero: $repository->reset(); @@ -270,14 +271,15 @@ class PiggyBankController extends Controller } /** + * @param Request $request * @param PiggyBankRepositoryInterface $repository * @param PiggyBank $piggyBank * * @return \Illuminate\Http\RedirectResponse */ - public function postAdd(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) + public function postAdd(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - $amount = strval(round(Input::get('amount'), 2)); + $amount = strval(round($request->get('amount'), 2)); /** @var Carbon $date */ $date = session('end', Carbon::now()->endOfMonth()); $leftOnAccount = $piggyBank->leftOnAccount($date); @@ -309,14 +311,15 @@ class PiggyBankController extends Controller } /** + * @param Request $request * @param PiggyBankRepositoryInterface $repository * @param PiggyBank $piggyBank * * @return \Illuminate\Http\RedirectResponse */ - public function postRemove(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) + public function postRemove(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - $amount = strval(round(Input::get('amount'), 2)); + $amount = strval(round($request->get('amount'), 2)); $savedSoFar = $piggyBank->currentRelevantRep()->currentamount; @@ -394,7 +397,7 @@ class PiggyBankController extends Controller Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => e($piggyBank->name)]))); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { Session::put('piggy-banks.create.fromStore', true); return redirect(route('piggy-banks.create'))->withInput(); @@ -420,7 +423,7 @@ class PiggyBankController extends Controller Session::flash('success', strval(trans('firefly.updated_piggy_bank', ['name' => e($piggyBank->name)]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { Session::put('piggy-banks.edit.fromUpdate', true); return redirect(route('piggy-banks.edit', [$piggyBank->id])); diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 0216496be6..8e0e466933 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -23,7 +23,6 @@ use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Rules\TransactionMatcher; use Illuminate\Http\Request; -use Input; use Preferences; use Response; use Session; @@ -58,11 +57,12 @@ class RuleController extends Controller /** * Create a new rule. It will be stored under the given $ruleGroup. * + * @param Request $request * @param RuleGroup $ruleGroup * * @return View */ - public function create(RuleGroup $ruleGroup) + public function create(Request $request, RuleGroup $ruleGroup) { // count for possible present previous entered triggers/actions. $triggerCount = 0; @@ -73,13 +73,13 @@ class RuleController extends Controller $oldActions = []; // has old input? - if (Input::old()) { + if ($request->old()) { // process old triggers. - $oldTriggers = $this->getPreviousTriggers(); + $oldTriggers = $this->getPreviousTriggers($request); $triggerCount = count($oldTriggers); // process old actions - $oldActions = $this->getPreviousActions(); + $oldActions = $this->getPreviousActions($request); $actionCount = count($oldActions); } @@ -154,12 +154,13 @@ class RuleController extends Controller } /** + * @param Request $request * @param RuleRepositoryInterface $repository * @param Rule $rule * * @return View */ - public function edit(RuleRepositoryInterface $repository, Rule $rule) + public function edit(Request $request, RuleRepositoryInterface $repository, Rule $rule) { $oldTriggers = $this->getCurrentTriggers($rule); $triggerCount = count($oldTriggers); @@ -167,10 +168,10 @@ class RuleController extends Controller $actionCount = count($oldActions); // has old input? - if (Input::old()) { - $oldTriggers = $this->getPreviousTriggers(); + if ($request->old()) { + $oldTriggers = $this->getPreviousTriggers($request); $triggerCount = count($oldTriggers); - $oldActions = $this->getPreviousActions(); + $oldActions = $this->getPreviousActions($request); $actionCount = count($oldActions); } @@ -255,7 +256,7 @@ class RuleController extends Controller Session::flash('success', trans('firefly.stored_new_rule', ['title' => $rule->title])); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: Session::put('rules.create.fromStore', true); @@ -342,7 +343,7 @@ class RuleController extends Controller Session::flash('success', trans('firefly.updated_rule', ['title' => $rule->title])); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('rules.edit.fromUpdate', true); @@ -461,22 +462,24 @@ class RuleController extends Controller } /** + * @param Request $request + * * @return array */ - private function getPreviousActions() + private function getPreviousActions(Request $request) { $newIndex = 0; $actions = []; /** @var array $oldActions */ - $oldActions = is_array(Input::old('rule-action')) ? Input::old('rule-action') : []; + $oldActions = is_array($request->old('rule-action')) ? $request->old('rule-action') : []; foreach ($oldActions as $index => $entry) { $count = ($newIndex + 1); - $checked = isset(Input::old('rule-action-stop')[$index]) ? true : false; + $checked = isset($request->old('rule-action-stop')[$index]) ? true : false; $actions[] = view( 'rules.partials.action', [ 'oldTrigger' => $entry, - 'oldValue' => Input::old('rule-action-value')[$index], + 'oldValue' => $request->old('rule-action-value')[$index], 'oldChecked' => $checked, 'count' => $count, ] @@ -488,22 +491,24 @@ class RuleController extends Controller } /** + * @param Request $request + * * @return array */ - private function getPreviousTriggers() + private function getPreviousTriggers(Request $request) { $newIndex = 0; $triggers = []; /** @var array $oldTriggers */ - $oldTriggers = is_array(Input::old('rule-trigger')) ? Input::old('rule-trigger') : []; + $oldTriggers = is_array($request->old('rule-trigger')) ? $request->old('rule-trigger') : []; foreach ($oldTriggers as $index => $entry) { $count = ($newIndex + 1); - $oldChecked = isset(Input::old('rule-trigger-stop')[$index]) ? true : false; + $oldChecked = isset($request->old('rule-trigger-stop')[$index]) ? true : false; $triggers[] = view( 'rules.partials.trigger', [ 'oldTrigger' => $entry, - 'oldValue' => Input::old('rule-trigger-value')[$index], + 'oldValue' => $request->old('rule-trigger-value')[$index], 'oldChecked' => $oldChecked, 'count' => $count, ] diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 6f0a136a1d..ee0cb84c26 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -22,7 +22,7 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; -use Input; +use Illuminate\Http\Request; use Preferences; use Session; use URL; @@ -94,17 +94,17 @@ class RuleGroupController extends Controller } /** + * @param Request $request * @param RuleGroupRepositoryInterface $repository - * * @param RuleGroup $ruleGroup * - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) + public function destroy(Request $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) { $title = $ruleGroup->title; - $moveTo = auth()->user()->ruleGroups()->find(intval(Input::get('move_rules_before_delete'))); + $moveTo = auth()->user()->ruleGroups()->find(intval($request->get('move_rules_before_delete'))); $repository->destroy($ruleGroup, $moveTo); @@ -218,7 +218,7 @@ class RuleGroupController extends Controller Session::flash('success', strval(trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]))); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: Session::put('rule-groups.create.fromStore', true); @@ -263,7 +263,7 @@ class RuleGroupController extends Controller Session::flash('success', strval(trans('firefly.updated_rule_group', ['title' => $ruleGroup->title]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('rule-groups.edit.fromUpdate', true); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 6e16b55fde..f404a08e26 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -18,8 +18,8 @@ use FireflyIII\Http\Requests\TagFormRequest; use FireflyIII\Models\Tag; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Input; use Preferences; use Session; use URL; @@ -68,9 +68,11 @@ class TagController extends Controller } /** + * @param Request $request + * * @return View */ - public function create() + public function create(Request $request) { $subTitle = trans('firefly.new_tag'); $subTitleIcon = 'fa-tag'; @@ -78,7 +80,7 @@ class TagController extends Controller $preFilled = [ 'tagMode' => 'nothing', ]; - if (!Input::old('tagMode')) { + if (!$request->old('tagMode')) { Session::flash('preFilled', $preFilled); } // put previous url in session if not redirect from store (not "create another"). @@ -206,15 +208,17 @@ class TagController extends Controller } /** - * @param Tag $tag + * @param Request $request + * @param JournalCollectorInterface $collector + * @param Tag $tag * * @return View */ - public function show(JournalCollectorInterface $collector, Tag $tag) + public function show(Request $request, JournalCollectorInterface $collector, Tag $tag) { $subTitle = $tag->tag; $subTitleIcon = 'fa-tag'; - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); // use collector: @@ -246,7 +250,7 @@ class TagController extends Controller Session::flash('success', strval(trans('firefly.created_tag', ['tag' => e($data['tag'])]))); Preferences::mark(); - if (intval(Input::get('create_another')) === 1) { + if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: Session::put('tags.create.fromStore', true); @@ -273,7 +277,7 @@ class TagController extends Controller Session::flash('success', strval(trans('firefly.updated_tag', ['tag' => e($data['tag'])]))); Preferences::mark(); - if (intval(Input::get('return_to_edit')) === 1) { + if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('tags.edit.fromUpdate', true); diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 96915dae35..1956de22ae 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -265,8 +265,8 @@ class SingleController extends Controller return redirect(route('transactions.create', [$request->input('what')]))->withInput(); } - - $this->attachments->saveAttachmentsForModel($journal); + $files = $request->hasFile('attachments') ? $request->file('attachments') : null; + $this->attachments->saveAttachmentsForModel($journal, $files); // store the journal only, flash the rest. if (count($this->attachments->getErrors()->get('attachments')) > 0) { @@ -315,7 +315,8 @@ class SingleController extends Controller $data = $request->getJournalData(); $journal = $repository->update($journal, $data); - $this->attachments->saveAttachmentsForModel($journal); + $files = $request->hasFile('attachments') ? $request->file('attachments') : null; + $this->attachments->saveAttachmentsForModel($journal, $files); // flash errors if (count($this->attachments->getErrors()->get('attachments')) > 0) { diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index eb061a862f..087bfc8f36 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -138,9 +138,9 @@ class SplitController extends Controller $data = $this->arrayFromInput($request); $journal = $repository->updateSplitJournal($journal, $data); - + $files = $request->hasFile('attachments') ? $request->file('attachments') : null; // save attachments: - $this->attachments->saveAttachmentsForModel($journal); + $this->attachments->saveAttachmentsForModel($journal, $files); event(new UpdatedTransactionJournal($journal)); // update, get events by date and sort DESC diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index db1d974c07..c2f2d3becd 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -36,9 +36,9 @@ class ConfigurationRequest extends Request public function getConfigurationData(): array { return [ - 'single_user_mode' => intval($this->get('single_user_mode')) === 1, - 'must_confirm_account' => intval($this->get('must_confirm_account')) === 1, - 'is_demo_site' => intval($this->get('is_demo_site')) === 1, + 'single_user_mode' => intval($this->get('single_user_mode')) === 1, + 'must_confirm_account' => intval($this->get('must_confirm_account')) === 1, + 'is_demo_site' => intval($this->get('is_demo_site')) === 1, ]; } @@ -48,9 +48,9 @@ class ConfigurationRequest extends Request public function rules() { $rules = [ - 'single_user_mode' => 'between:0,1|numeric', - 'must_confirm_account' => 'between:0,1|numeric', - 'is_demo_site' => 'between:0,1|numeric', + 'single_user_mode' => 'between:0,1|numeric', + 'must_confirm_account' => 'between:0,1|numeric', + 'is_demo_site' => 'between:0,1|numeric', ]; return $rules;