From 6423feff3a9d184e3fbeac49ba16d5281278880a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 4 Sep 2014 08:31:45 +0200
Subject: [PATCH] Cleaned up some models and controllers.

---
 app/controllers/AccountController.php        |  2 ++
 app/controllers/BaseController.php           |  2 ++
 app/lib/Firefly/Helper/Controllers/Chart.php |  1 -
 app/models/AccountType.php                   |  2 ++
 app/models/Importentry.php                   | 16 ++++++++--------
 app/models/Importmap.php                     | 12 ++++++------
 app/models/TransactionCurrency.php           |  2 +-
 app/models/TransactionJournal.php            | 20 ++++++++++++++++++++
 8 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 605401a120..6ffeb7a7aa 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -8,6 +8,8 @@ use Firefly\Storage\Account\AccountRepositoryInterface as ARI;
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
+
+
 class AccountController extends \BaseController
 {
 
diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php
index 8d59afad2d..93066edc52 100644
--- a/app/controllers/BaseController.php
+++ b/app/controllers/BaseController.php
@@ -1,5 +1,7 @@
 <?php
 
+use \Illuminate\Routing\Controller;
+
 /**
  * Class BaseController
  */
diff --git a/app/lib/Firefly/Helper/Controllers/Chart.php b/app/lib/Firefly/Helper/Controllers/Chart.php
index 45b8cac004..264c4ffbaa 100644
--- a/app/lib/Firefly/Helper/Controllers/Chart.php
+++ b/app/lib/Firefly/Helper/Controllers/Chart.php
@@ -7,7 +7,6 @@ use Firefly\Exception\FireflyException;
 
 /**
  * Class Chart
- *
  * @package Firefly\Helper\Controllers
  */
 class Chart implements ChartInterface
diff --git a/app/models/AccountType.php b/app/models/AccountType.php
index bdffe1b2fc..211ab4b146 100644
--- a/app/models/AccountType.php
+++ b/app/models/AccountType.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Database\Eloquent\Model as Eloquent;
+
 /**
  * AccountType
  *
diff --git a/app/models/Importentry.php b/app/models/Importentry.php
index 66fd773f80..14ca5afd15 100644
--- a/app/models/Importentry.php
+++ b/app/models/Importentry.php
@@ -1,5 +1,5 @@
 <?php
-
+use Illuminate\Database\Eloquent\Model as Eloquent;
 /**
  * Importentry
  *
@@ -11,13 +11,13 @@
  * @property integer $importmap_id
  * @property integer $old
  * @property integer $new
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereClass($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereImportmapId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereOld($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importentry whereNew($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereClass($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereImportmapId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereOld($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importentry whereNew($value)
  */
 class Importentry extends Eloquent {
     public function importmap()
diff --git a/app/models/Importmap.php b/app/models/Importmap.php
index b9c3862add..4fddba727f 100644
--- a/app/models/Importmap.php
+++ b/app/models/Importmap.php
@@ -1,5 +1,5 @@
 <?php
-
+use Illuminate\Database\Eloquent\Model as Eloquent;
 /**
  * Class Importmap
  *
@@ -9,11 +9,11 @@
  * @property \Carbon\Carbon $updated_at
  * @property integer $user_id
  * @property string $file
- * @method static \Illuminate\Database\Query\Builder|\Importmap whereId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importmap whereCreatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importmap whereUpdatedAt($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importmap whereUserId($value) 
- * @method static \Illuminate\Database\Query\Builder|\Importmap whereFile($value) 
+ * @method static \Illuminate\Database\Query\Builder|\Importmap whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importmap whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importmap whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importmap whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\Importmap whereFile($value)
  */
 class Importmap extends Eloquent
 {
diff --git a/app/models/TransactionCurrency.php b/app/models/TransactionCurrency.php
index 72aca6472e..f038d84e99 100644
--- a/app/models/TransactionCurrency.php
+++ b/app/models/TransactionCurrency.php
@@ -1,5 +1,5 @@
 <?php
-
+use Illuminate\Database\Eloquent\Model as Eloquent;
 /**
  * TransactionCurrency
  *
diff --git a/app/models/TransactionJournal.php b/app/models/TransactionJournal.php
index 533882df17..eb47bb4a86 100644
--- a/app/models/TransactionJournal.php
+++ b/app/models/TransactionJournal.php
@@ -63,6 +63,26 @@ use LaravelBook\Ardent\Builder;
  *                     'Budget[] $budgets
  * @property-read \Illuminate\Database\Eloquent\Collection|\
  *                     'Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\
+ *                     'Category[] $categories
  */
 class TransactionJournal extends Ardent
 {