From a205367b62c27b3dbbd853dc0737a3cb2c9c0e1f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 11 Aug 2018 14:15:07 +0200
Subject: [PATCH] Various refactoring.

---
 app/Http/Controllers/Account/ShowController.php                 | 2 --
 app/Http/Controllers/Report/ExpenseController.php               | 2 --
 app/Support/Http/Controllers/AugumentData.php                   | 1 -
 app/Support/Http/Controllers/BasicDataSupport.php               | 1 -
 app/Support/Http/Controllers/CreateStuff.php                    | 1 -
 app/Support/Http/Controllers/GetConfigurationData.php           | 1 -
 app/Support/Http/Controllers/ModelInformation.php               | 1 -
 app/Support/Http/Controllers/PeriodOverview.php                 | 1 -
 app/Support/Http/Controllers/RenderPartialViews.php             | 1 -
 app/Support/Http/Controllers/RequestInformation.php             | 1 -
 app/Support/Http/Controllers/RuleManagement.php                 | 1 -
 app/Support/Http/Controllers/TransactionCalculation.php         | 1 -
 app/Support/Http/Controllers/UserNavigation.php                 | 1 -
 .../JobConfiguration/Ynab/YnabJobConfigurationInterface.php     | 1 -
 14 files changed, 16 deletions(-)

diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index 8f6a572c47..5768320ee5 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -29,10 +29,8 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use FireflyIII\Support\Http\Controllers\UserNavigation;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php
index 8157fdbf56..62d4b738ed 100644
--- a/app/Http/Controllers/Report/ExpenseController.php
+++ b/app/Http/Controllers/Report/ExpenseController.php
@@ -25,8 +25,6 @@ namespace FireflyIII\Http\Controllers\Report;
 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\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php
index 07183f108a..e70a25b0a0 100644
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -38,7 +38,6 @@ use Illuminate\Support\Collection;
 /**
  * Trait AugumentData
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait AugumentData
 {
diff --git a/app/Support/Http/Controllers/BasicDataSupport.php b/app/Support/Http/Controllers/BasicDataSupport.php
index ee6855051e..0a1809542b 100644
--- a/app/Support/Http/Controllers/BasicDataSupport.php
+++ b/app/Support/Http/Controllers/BasicDataSupport.php
@@ -26,7 +26,6 @@ namespace FireflyIII\Support\Http\Controllers;
 /**
  * Trait BasicDataSupport
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait BasicDataSupport
 {
diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.php
index ce73d6c6e2..6fc4a3e798 100644
--- a/app/Support/Http/Controllers/CreateStuff.php
+++ b/app/Support/Http/Controllers/CreateStuff.php
@@ -40,7 +40,6 @@ use phpseclib\Crypt\RSA;
 /**
  * Trait CreateStuff
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait CreateStuff
 {
diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.php
index 9e5da73394..824a5e1f11 100644
--- a/app/Support/Http/Controllers/GetConfigurationData.php
+++ b/app/Support/Http/Controllers/GetConfigurationData.php
@@ -30,7 +30,6 @@ use Log;
 /**
  * Trait GetConfigurationData
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait GetConfigurationData
 {
diff --git a/app/Support/Http/Controllers/ModelInformation.php b/app/Support/Http/Controllers/ModelInformation.php
index 3bb8282d63..688a1b12ca 100644
--- a/app/Support/Http/Controllers/ModelInformation.php
+++ b/app/Support/Http/Controllers/ModelInformation.php
@@ -30,7 +30,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 /**
  * Trait ModelInformation
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait ModelInformation
 {
diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php
index f504673782..4971c89f9b 100644
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -56,7 +56,6 @@ use Illuminate\Support\Collection;
  * - start (Carbon), end (Carbon), title (string), spent (string), earned (string), transferred (string)
  *
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait PeriodOverview
 {
diff --git a/app/Support/Http/Controllers/RenderPartialViews.php b/app/Support/Http/Controllers/RenderPartialViews.php
index 7d4abdc409..85a2ca3568 100644
--- a/app/Support/Http/Controllers/RenderPartialViews.php
+++ b/app/Support/Http/Controllers/RenderPartialViews.php
@@ -39,7 +39,6 @@ use Throwable;
 /**
  * Trait RenderPartialViews
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait RenderPartialViews
 {
diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php
index 5af126d3f6..3c808cce23 100644
--- a/app/Support/Http/Controllers/RequestInformation.php
+++ b/app/Support/Http/Controllers/RequestInformation.php
@@ -50,7 +50,6 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 /**
  * Trait RequestInformation
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait RequestInformation
 {
diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.php
index 2dd2415f6c..ee55a39d7d 100644
--- a/app/Support/Http/Controllers/RuleManagement.php
+++ b/app/Support/Http/Controllers/RuleManagement.php
@@ -32,7 +32,6 @@ use Throwable;
 /**
  * Trait RuleManagement
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait RuleManagement
 {
diff --git a/app/Support/Http/Controllers/TransactionCalculation.php b/app/Support/Http/Controllers/TransactionCalculation.php
index 97dddc2034..5ae4cb4050 100644
--- a/app/Support/Http/Controllers/TransactionCalculation.php
+++ b/app/Support/Http/Controllers/TransactionCalculation.php
@@ -35,7 +35,6 @@ use Illuminate\Support\Collection;
 /**
  * Trait TransactionCalculation
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait TransactionCalculation
 {
diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php
index f52a12e462..3d55d27f95 100644
--- a/app/Support/Http/Controllers/UserNavigation.php
+++ b/app/Support/Http/Controllers/UserNavigation.php
@@ -34,7 +34,6 @@ use URL;
 /**
  * Trait UserNavigation
  *
- * @package FireflyIII\Support\Http\Controllers
  */
 trait UserNavigation
 {
diff --git a/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php
index bc9bcc3d2e..539f26dc44 100644
--- a/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php
@@ -29,7 +29,6 @@ use Illuminate\Support\MessageBag;
 /**
  * Interface YnabJobConfigurationInterface
  *
- * @package FireflyIII\Support\Import\JobConfiguration\Ynab
  */
 interface YnabJobConfigurationInterface
 {