From 9086259a65c741e25f115d59fab05ee93ae29b84 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 16 Dec 2017 19:46:36 +0100 Subject: [PATCH] Small code change for controllers. --- app/Http/Controllers/Account/ReconcileController.php | 4 ++-- app/Http/Controllers/AccountController.php | 4 ++-- app/Http/Controllers/Admin/ConfigurationController.php | 4 ++-- app/Http/Controllers/Admin/LinkController.php | 4 ++-- app/Http/Controllers/Admin/UserController.php | 4 ++-- app/Http/Controllers/AttachmentController.php | 4 ++-- app/Http/Controllers/BillController.php | 4 ++-- app/Http/Controllers/BudgetController.php | 4 ++-- app/Http/Controllers/CategoryController.php | 4 ++-- app/Http/Controllers/CurrencyController.php | 4 ++-- app/Http/Controllers/ExportController.php | 4 ++-- app/Http/Controllers/HomeController.php | 4 ++-- app/Http/Controllers/NewUserController.php | 4 ++-- app/Http/Controllers/PiggyBankController.php | 4 ++-- app/Http/Controllers/PreferencesController.php | 4 ++-- app/Http/Controllers/ProfileController.php | 4 ++-- app/Http/Controllers/ReportController.php | 4 ++-- app/Http/Controllers/RuleController.php | 4 ++-- app/Http/Controllers/RuleGroupController.php | 4 ++-- app/Http/Controllers/SearchController.php | 4 ++-- app/Http/Controllers/TagController.php | 4 ++-- app/Http/Controllers/Transaction/ConvertController.php | 4 ++-- app/Http/Controllers/Transaction/LinkController.php | 4 ++-- app/Http/Controllers/Transaction/MassController.php | 4 ++-- app/Http/Controllers/Transaction/SingleController.php | 4 ++-- app/Http/Controllers/Transaction/SplitController.php | 4 ++-- app/Http/Controllers/TransactionController.php | 4 ++-- app/Import/Routine/{ImportRoutine.php => FileRoutine.php} | 0 28 files changed, 54 insertions(+), 54 deletions(-) rename app/Import/Routine/{ImportRoutine.php => FileRoutine.php} (100%) diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 06fc158fcc..1125a79472 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -59,8 +59,8 @@ class ReconcileController extends Controller // translations: $this->middleware( function ($request, $next) { - View::share('mainTitleIcon', 'fa-credit-card'); - View::share('title', trans('firefly.accounts')); + app('view')->share('mainTitleIcon', 'fa-credit-card'); + app('view')->share('title', trans('firefly.accounts')); return $next($request); } diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index aa85f922c2..0b57e0555c 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -60,8 +60,8 @@ class AccountController extends Controller // translations: $this->middleware( function ($request, $next) { - View::share('mainTitleIcon', 'fa-credit-card'); - View::share('title', trans('firefly.accounts')); + app('view')->share('mainTitleIcon', 'fa-credit-card'); + app('view')->share('title', trans('firefly.accounts')); return $next($request); } diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 3dba4e77b4..1629aa7677 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -45,8 +45,8 @@ class ConfigurationController extends Controller $this->middleware( function ($request, $next) { - View::share('title', strval(trans('firefly.administration'))); - View::share('mainTitleIcon', 'fa-hand-spock-o'); + app('view')->share('title', strval(trans('firefly.administration'))); + app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); return $next($request); } diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index ec66da1a36..ada71fbcda 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -45,8 +45,8 @@ class LinkController extends Controller $this->middleware( function ($request, $next) { - View::share('title', strval(trans('firefly.administration'))); - View::share('mainTitleIcon', 'fa-hand-spock-o'); + app('view')->share('title', strval(trans('firefly.administration'))); + app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); return $next($request); } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index e23f91e012..2ee4cb7684 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -46,8 +46,8 @@ class UserController extends Controller $this->middleware( function ($request, $next) { - View::share('title', strval(trans('firefly.administration'))); - View::share('mainTitleIcon', 'fa-hand-spock-o'); + app('view')->share('title', strval(trans('firefly.administration'))); + app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); return $next($request); } diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index dc156b49e4..4261310574 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -50,8 +50,8 @@ class AttachmentController extends Controller // translations: $this->middleware( function ($request, $next) { - View::share('mainTitleIcon', 'fa-paperclip'); - View::share('title', trans('firefly.attachments')); + app('view')->share('mainTitleIcon', 'fa-paperclip'); + app('view')->share('title', trans('firefly.attachments')); return $next($request); } diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index a433b292ac..389c0b689c 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -58,8 +58,8 @@ class BillController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.bills')); - View::share('mainTitleIcon', 'fa-calendar-o'); + app('view')->share('title', trans('firefly.bills')); + app('view')->share('mainTitleIcon', 'fa-calendar-o'); $this->attachments = app(AttachmentHelperInterface::class); return $next($request); diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index f7bce98240..848d8df320 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -64,8 +64,8 @@ class BudgetController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.budgets')); - View::share('mainTitleIcon', 'fa-tasks'); + app('view')->share('title', trans('firefly.budgets')); + app('view')->share('mainTitleIcon', 'fa-tasks'); $this->repository = app(BudgetRepositoryInterface::class); return $next($request); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 1773902ee8..b447f9c614 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -55,8 +55,8 @@ class CategoryController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.categories')); - View::share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('title', trans('firefly.categories')); + app('view')->share('mainTitleIcon', 'fa-bar-chart'); return $next($request); } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index ca7cf7b9f3..9524c971b9 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -52,8 +52,8 @@ class CurrencyController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.currencies')); - View::share('mainTitleIcon', 'fa-usd'); + app('view')->share('title', trans('firefly.currencies')); + app('view')->share('mainTitleIcon', 'fa-usd'); $this->repository = app(CurrencyRepositoryInterface::class); $this->userRepository = app(UserRepositoryInterface::class); diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index fa746b8145..33df4d9f0a 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -50,8 +50,8 @@ class ExportController extends Controller $this->middleware( function ($request, $next) { - View::share('mainTitleIcon', 'fa-file-archive-o'); - View::share('title', trans('firefly.export_and_backup_data')); + app('view')->share('mainTitleIcon', 'fa-file-archive-o'); + app('view')->share('title', trans('firefly.export_and_backup_data')); return $next($request); } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 01dad0f145..5167168692 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -53,8 +53,8 @@ class HomeController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Firefly III'); - View::share('mainTitleIcon', 'fa-fire'); + app('view')->share('title', 'Firefly III'); + app('view')->share('mainTitleIcon', 'fa-fire'); $this->middleware(IsLimitedUser::class)->except(['dateRange', 'index']); } diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index b8a88a0289..2a703340b0 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -56,8 +56,8 @@ class NewUserController extends Controller */ public function index(AccountRepositoryInterface $repository) { - View::share('title', trans('firefly.welcome')); - View::share('mainTitleIcon', 'fa-fire'); + app('view')->share('title', trans('firefly.welcome')); + app('view')->share('mainTitleIcon', 'fa-fire'); $types = config('firefly.accountTypesByIdentifier.asset'); $count = $repository->count($types); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 5d150b6193..b281c64753 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -52,8 +52,8 @@ class PiggyBankController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.piggyBanks')); - View::share('mainTitleIcon', 'fa-sort-amount-asc'); + app('view')->share('title', trans('firefly.piggyBanks')); + app('view')->share('mainTitleIcon', 'fa-sort-amount-asc'); return $next($request); } diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index f97f87bde5..2f19ed02ab 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -46,8 +46,8 @@ class PreferencesController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.preferences')); - View::share('mainTitleIcon', 'fa-gear'); + app('view')->share('title', 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 88532a8d74..463a3cbae0 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -56,8 +56,8 @@ class ProfileController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.profile')); - View::share('mainTitleIcon', 'fa-user'); + app('view')->share('title', trans('firefly.profile')); + app('view')->share('mainTitleIcon', 'fa-user'); return $next($request); } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index c1d7be7e41..cc1b2bb6fb 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -59,8 +59,8 @@ class ReportController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.reports')); - View::share('mainTitleIcon', 'fa-line-chart'); + app('view')->share('title', trans('firefly.reports')); + app('view')->share('mainTitleIcon', 'fa-line-chart'); View::share('subTitleIcon', 'fa-calendar'); return $next($request); diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 82f184600b..a4b259cc49 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -57,8 +57,8 @@ class RuleController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.rules')); - View::share('mainTitleIcon', 'fa-random'); + app('view')->share('title', trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); return $next($request); } diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 9528ee4178..c30d8e80fb 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -50,8 +50,8 @@ class RuleGroupController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.rules')); - View::share('mainTitleIcon', 'fa-random'); + app('view')->share('title', trans('firefly.rules')); + app('view')->share('mainTitleIcon', 'fa-random'); return $next($request); } diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index aebb061620..c6e1ace145 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -43,8 +43,8 @@ class SearchController extends Controller $this->middleware( function ($request, $next) { - View::share('mainTitleIcon', 'fa-search'); - View::share('title', trans('firefly.search')); + app('view')->share('mainTitleIcon', 'fa-search'); + app('view')->share('title', trans('firefly.search')); return $next($request); } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 3d1bb319d6..adf20010fa 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -64,8 +64,8 @@ class TagController extends Controller $this->middleware( function ($request, $next) { $this->repository = app(TagRepositoryInterface::class); - View::share('title', strval(trans('firefly.tags'))); - View::share('mainTitleIcon', 'fa-tags'); + app('view')->share('title', strval(trans('firefly.tags'))); + app('view')->share('mainTitleIcon', 'fa-tags'); return $next($request); } diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index c6c2b62b1f..393c4d1ce6 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -55,8 +55,8 @@ class ConvertController extends Controller function ($request, $next) { $this->accounts = app(AccountRepositoryInterface::class); - View::share('title', trans('firefly.transactions')); - View::share('mainTitleIcon', 'fa-exchange'); + app('view')->share('title', trans('firefly.transactions')); + app('view')->share('mainTitleIcon', 'fa-exchange'); return $next($request); } diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index 866924014a..cb4bfe5e8e 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -48,8 +48,8 @@ class LinkController extends Controller // some useful repositories: $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.transactions')); - View::share('mainTitleIcon', 'fa-repeat'); + app('view')->share('title', trans('firefly.transactions')); + app('view')->share('mainTitleIcon', 'fa-repeat'); return $next($request); } diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index ae7a3dabcc..fb512aa3dc 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -51,8 +51,8 @@ class MassController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.transactions')); - View::share('mainTitleIcon', 'fa-repeat'); + app('view')->share('title', trans('firefly.transactions')); + app('view')->share('mainTitleIcon', 'fa-repeat'); return $next($request); } diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 13a0578616..36d04b6dda 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -89,8 +89,8 @@ class SingleController extends Controller $this->currency = app(CurrencyRepositoryInterface::class); $this->repository = app(JournalRepositoryInterface::class); - View::share('title', trans('firefly.transactions')); - View::share('mainTitleIcon', 'fa-repeat'); + app('view')->share('title', trans('firefly.transactions')); + app('view')->share('mainTitleIcon', 'fa-repeat'); return $next($request); } diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 9b141fe5e8..865e086493 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -78,8 +78,8 @@ class SplitController extends Controller $this->tasker = app(JournalTaskerInterface::class); $this->attachments = app(AttachmentHelperInterface::class); $this->currencies = app(CurrencyRepositoryInterface::class); - View::share('mainTitleIcon', 'fa-share-alt'); - View::share('title', trans('firefly.split-transactions')); + app('view')->share('mainTitleIcon', 'fa-share-alt'); + app('view')->share('title', trans('firefly.split-transactions')); return $next($request); } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 0f48c39b0a..bc86d5e35c 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -55,8 +55,8 @@ class TransactionController extends Controller $this->middleware( function ($request, $next) { - View::share('title', trans('firefly.transactions')); - View::share('mainTitleIcon', 'fa-repeat'); + app('view')->share('title', trans('firefly.transactions')); + app('view')->share('mainTitleIcon', 'fa-repeat'); return $next($request); } diff --git a/app/Import/Routine/ImportRoutine.php b/app/Import/Routine/FileRoutine.php similarity index 100% rename from app/Import/Routine/ImportRoutine.php rename to app/Import/Routine/FileRoutine.php