From f331e7d8205e06027895bb8bcbe85225e295aed0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 5 May 2015 12:57:27 +0200 Subject: [PATCH] Removed unnecessary imports (use statements) [skip ci] --- .../Events/UpdateJournalConnection.php | 1 - app/Http/Controllers/BudgetController.php | 1 - app/Http/Controllers/JsonController.php | 40 +++++++++---------- app/Http/Controllers/PiggyBankController.php | 2 - app/Providers/EventServiceProvider.php | 1 - app/Providers/FireflyServiceProvider.php | 1 - app/Repositories/Bill/BillRepository.php | 2 +- .../Category/CategoryRepositoryInterface.php | 6 +-- app/Support/ExpandedForm.php | 1 - app/Support/Navigation.php | 2 +- app/Support/Search/Search.php | 1 + app/Support/Steam.php | 4 +- app/Support/Twig/Journal.php | 1 + 13 files changed, 28 insertions(+), 35 deletions(-) diff --git a/app/Handlers/Events/UpdateJournalConnection.php b/app/Handlers/Events/UpdateJournalConnection.php index 20803aacf4..f18f0bf17e 100644 --- a/app/Handlers/Events/UpdateJournalConnection.php +++ b/app/Handlers/Events/UpdateJournalConnection.php @@ -2,7 +2,6 @@ use FireflyIII\Events\JournalSaved; use FireflyIII\Models\PiggyBankEvent; -use FireflyIII\Models\Transaction; /** * Class UpdateJournalConnection diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 5dcca9fc59..27205a295b 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -5,7 +5,6 @@ use Carbon\Carbon; use FireflyIII\Http\Requests; use FireflyIII\Http\Requests\BudgetFormRequest; use FireflyIII\Models\Budget; -use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\LimitRepetition; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Input; diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 02c326d2fd..43863523c9 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -6,8 +6,6 @@ use FireflyIII\Helpers\Report\ReportQueryInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Bill; use FireflyIII\Models\Preference; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; @@ -187,25 +185,6 @@ class JsonController extends Controller } - /** - * Returns a JSON list of all beneficiaries. - * - * @param TagRepositoryInterface $tagRepository - * - * @return \Illuminate\Http\JsonResponse - */ - public function tags(TagRepositoryInterface $tagRepository) - { - $list = $tagRepository->get(); - $return = []; - foreach ($list as $entry) { - $return[] = $entry->tag; - } - - return Response::json($return); - - } - /** * @param AccountRepositoryInterface $accountRepository * @@ -247,6 +226,25 @@ class JsonController extends Controller return Response::json(['value' => $pref->data]); } + /** + * Returns a JSON list of all beneficiaries. + * + * @param TagRepositoryInterface $tagRepository + * + * @return \Illuminate\Http\JsonResponse + */ + public function tags(TagRepositoryInterface $tagRepository) + { + $list = $tagRepository->get(); + $return = []; + foreach ($list as $entry) { + $return[] = $entry->tag; + } + + return Response::json($return); + + } + /** * @param JournalRepositoryInterface $repository * @param $what diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 6799f4d8d3..8ffa215491 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -6,9 +6,7 @@ use Config; use ExpandedForm; use FireflyIII\Http\Requests; use FireflyIII\Http\Requests\PiggyBankFormRequest; -use FireflyIII\Models\Account; use FireflyIII\Models\PiggyBank; -use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a9d54e9e0f..0c85491199 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -1,7 +1,6 @@ repeat_freq, 0); $skip = $bill->skip + 1; diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 3cf025e354..30456995a1 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -71,9 +71,9 @@ interface CategoryRepositoryInterface public function getWithoutCategory(Carbon $start, Carbon $end); /** - * @param Category $category - * @param \Carbon\Carbon $start - * @param \Carbon\Carbon $end + * @param Category $category + * @param \Carbon\Carbon $start + * @param \Carbon\Carbon $end * * @return float */ diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index a28c87ba02..35eb8855b9 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -3,7 +3,6 @@ namespace FireflyIII\Support; use Amount as Amt; -use FireflyIII\Models\TransactionCurrency; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Input; diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 69025ba3b2..470089f369 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -384,7 +384,7 @@ class Navigation } /** - * @param $range + * @param $range * @param \Carbon\Carbon $start * * @return \Carbon\Carbon diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index e07e538ecf..a493ad0741 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -121,6 +121,7 @@ class Search implements SearchInterface return $journal; } } + return null; } diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 8206024886..22fa07e211 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -18,8 +18,8 @@ class Steam /** * * @param \FireflyIII\Models\Account $account - * @param \Carbon\Carbon $date - * @param bool $ignoreVirtualBalance + * @param \Carbon\Carbon $date + * @param bool $ignoreVirtualBalance * * @return float */ diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index aa56a310c0..bb63d656c4 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -39,6 +39,7 @@ class Journal extends Twig_Extension if ($type == 'Opening balance') { return ''; } + return ''; }, ['is_safe' => ['html']]