From d9bafe34eba51b2e89b64a592642916d9fd3573f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 28 Jan 2016 22:06:16 +0100
Subject: [PATCH] Renamed some stuff, courtesy of sensiolabs.

---
 app/Models/Account.php             | 24 ++++-----
 app/Models/AccountMeta.php         | 15 +++---
 app/Models/AccountType.php         | 14 +++--
 app/Models/Attachment.php          | 36 ++++++-------
 app/Models/Bill.php                | 41 +++++++--------
 app/Models/Budget.php              | 33 ++++++------
 app/Models/BudgetLimit.php         | 24 ++++-----
 app/Models/Category.php            | 29 +++++------
 app/Models/LimitRepetition.php     |  9 ++--
 app/Models/Permission.php          | 16 +++---
 app/Models/PiggyBank.php           | 38 +++++++-------
 app/Models/PiggyBankEvent.php      |  7 ++-
 app/Models/PiggyBankRepetition.php | 13 +++--
 app/Models/Preference.php          | 22 ++++----
 app/Models/Role.php                | 18 +++----
 app/Models/Tag.php                 | 33 ++++++------
 app/Models/Transaction.php         | 15 +++---
 app/Models/TransactionCurrency.php | 18 +++----
 app/Models/TransactionGroup.php    | 19 +++----
 app/Models/TransactionJournal.php  | 83 ++++++++++++++----------------
 app/Models/TransactionType.php     | 14 +++--
 21 files changed, 239 insertions(+), 282 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index eb76d2ae4b..1bdfd2ad71 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1,12 +1,10 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Watson\Validating\ValidatingTrait;
@@ -31,27 +29,27 @@ use Watson\Validating\ValidatingTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[]   $piggyBanks
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
  * @property-read \FireflyIII\User                                                          $user
- * @method static Builder|\FireflyIII\Models\Account accountTypeIn($types)
- * @method static Builder|\FireflyIII\Models\Account hasMetaValue($name, $value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value)
  * @property string                                                                         $startBalance
  * @property string                                                                         $endBalance
  * @property float                                                                          $difference
- * @property Carbon                                                                         $lastActivityDate
- * @property float $piggyBalance
- * @property float $percentage
+ * @property \Carbon\Carbon                                                                 $lastActivityDate
+ * @property float                                                                          $piggyBalance
+ * @property float                                                                          $percentage
  */
 class Account extends Model
 {
     use SoftDeletes, ValidatingTrait;
 
-    /** @var array  */
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    /** @var array  */
+    /** @var array */
+    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    /** @var array */
     protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];
-    /** @var array  */
-    protected $hidden   = ['virtual_balance_encrypted', 'encrypted'];
+    /** @var array */
+    protected $hidden = ['virtual_balance_encrypted', 'encrypted'];
     protected $rules
-                        = [
+                      = [
             'user_id'         => 'required|exists:users,id',
             'account_type_id' => 'required|exists:account_types,id',
             'name'            => 'required',
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index 846ff8954b..cf44fb4c8a 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -1,18 +1,17 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * FireflyIII\Models\AccountMeta
  *
- * @property integer      $id
- * @property Carbon       $created_at
- * @property Carbon       $updated_at
- * @property integer      $account_id
- * @property string       $name
- * @property string       $data
- * @property-read Account $account
+ * @property integer        $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer        $account_id
+ * @property string         $name
+ * @property string         $data
+ * @property-read Account   $account
  */
 class AccountMeta extends Model
 {
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index 817d488b14..bf4727ee19 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -1,18 +1,16 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * FireflyIII\Models\AccountType
  *
- * @property integer                   $id
- * @property Carbon                    $created_at
- * @property Carbon                    $updated_at
- * @property string                    $type
- * @property boolean                   $editable
- * @property-read Collection|Account[] $accounts
+ * @property integer                                                 $id
+ * @property \Carbon\Carbon                                          $created_at
+ * @property \Carbon\Carbon                                          $updated_at
+ * @property string                                                  $type
+ * @property boolean                                                 $editable
+ * @property-read \Illuminate\Database\Eloquent\Collection|Account[] $accounts
  */
 class AccountType extends Model
 {
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index f57d1d31b5..f0aa86f69a 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -3,9 +3,7 @@
 namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
-use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -13,23 +11,23 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Attachment
  *
- * @property integer         $id
- * @property Carbon          $created_at
- * @property Carbon          $updated_at
- * @property string          $deleted_at
- * @property integer         $attachable_id
- * @property string          $attachable_type
- * @property integer         $user_id
- * @property string          $md5
- * @property string          $filename
- * @property string          $title
- * @property string          $description
- * @property string          $notes
- * @property string          $mime
- * @property integer         $size
- * @property boolean         $uploaded
- * @property-read Attachment $attachable
- * @property-read User       $user
+ * @property integer               $id
+ * @property \Carbon\Carbon        $created_at
+ * @property \Carbon\Carbon        $updated_at
+ * @property string                $deleted_at
+ * @property integer               $attachable_id
+ * @property string                $attachable_type
+ * @property integer               $user_id
+ * @property string                $md5
+ * @property string                $filename
+ * @property string                $title
+ * @property string                $description
+ * @property string                $notes
+ * @property string                $mime
+ * @property integer               $size
+ * @property boolean               $uploaded
+ * @property-read Attachment       $attachable
+ * @property-read \FireflyIII\User $user
  */
 class Attachment extends Model
 {
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index d8ca9ef6dd..5094390e7c 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -1,35 +1,32 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
-use FireflyIII\User;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * FireflyIII\Models\Bill
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property integer                              $user_id
- * @property string                               $name
- * @property string                               $match
- * @property float                                $amount_min
- * @property float                                $amount_max
- * @property Carbon                               $date
- * @property boolean                              $active
- * @property boolean                              $automatch
- * @property string                               $repeat_freq
- * @property integer                              $skip
- * @property boolean                              $name_encrypted
- * @property boolean                              $match_encrypted
- * @property-read Collection|TransactionJournal[] $transactionjournals
- * @property-read User                            $user
- * @property Carbon                               $nextExpectedMatch
- * @property Carbon                               $lastFoundMatch
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property integer                                                            $user_id
+ * @property string                                                             $name
+ * @property string                                                             $match
+ * @property float                                                              $amount_min
+ * @property float                                                              $amount_max
+ * @property \Carbon\Carbon                                                     $date
+ * @property boolean                                                            $active
+ * @property boolean                                                            $automatch
+ * @property string                                                             $repeat_freq
+ * @property integer                                                            $skip
+ * @property boolean                                                            $name_encrypted
+ * @property boolean                                                            $match_encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                              $user
+ * @property \Carbon\Carbon                                                     $nextExpectedMatch
+ * @property \Carbon\Carbon                                                     $lastFoundMatch
  */
 class Bill extends Model
 {
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index 81a3c49395..231c70bcf5 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -1,10 +1,7 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
-use FireflyIII\User;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -12,21 +9,21 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Budget
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property Carbon                               $deleted_at
- * @property string                               $name
- * @property integer                              $user_id
- * @property boolean                              $active
- * @property boolean                              $encrypted
- * @property-read Collection|BudgetLimit[]        $budgetlimits
- * @property-read Collection|TransactionJournal[] $transactionjournals
- * @property-read User                            $user
- * @property string                               $dateFormatted
- * @property string                               $budgeted
- * @property float                                $amount
- * @property Carbon                               $date
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property \Carbon\Carbon                                                     $deleted_at
+ * @property string                                                             $name
+ * @property integer                                                            $user_id
+ * @property boolean                                                            $active
+ * @property boolean                                                            $encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|BudgetLimit[]        $budgetlimits
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                              $user
+ * @property string                                                             $dateFormatted
+ * @property string                                                             $budgeted
+ * @property float                                                              $amount
+ * @property \Carbon\Carbon                                                     $date
  */
 class Budget extends Model
 {
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 0a05e24836..de3733c353 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -1,28 +1,26 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * FireflyIII\Models\BudgetLimit
  *
- * @property integer                           $id
- * @property Carbon                            $created_at
- * @property Carbon                            $updated_at
- * @property integer                           $budget_id
- * @property Carbon                            $startdate
- * @property float                             $amount
- * @property boolean                           $repeats
- * @property string                            $repeat_freq
- * @property-read Budget                       $budget
- * @property-read Collection|LimitRepetition[] $limitrepetitions
+ * @property integer                                                         $id
+ * @property \Carbon\Carbon                                                  $created_at
+ * @property \Carbon\Carbon                                                  $updated_at
+ * @property integer                                                         $budget_id
+ * @property \Carbon\Carbon                                                  $startdate
+ * @property float                                                           $amount
+ * @property boolean                                                         $repeats
+ * @property string                                                          $repeat_freq
+ * @property-read Budget                                                     $budget
+ * @property-read \Illuminate\Database\Eloquent\Collection|LimitRepetition[] $limitrepetitions
  */
 class BudgetLimit extends Model
 {
 
-    protected $hidden = ['amount_encrypted'];
     protected $dates  = ['created_at', 'updated_at', 'startdate'];
+    protected $hidden = ['amount_encrypted'];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
diff --git a/app/Models/Category.php b/app/Models/Category.php
index b601995bb0..f18ddb75a4 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -1,10 +1,7 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
-use FireflyIII\User;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -12,19 +9,19 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Category
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property Carbon                               $deleted_at
- * @property string                               $name
- * @property integer                              $user_id
- * @property boolean                              $encrypted
- * @property-read Collection|TransactionJournal[] $transactionjournals
- * @property-read User                            $user
- * @property string                               $dateFormatted
- * @property float                                $spent
- * @property Carbon                               $lastActivity
- * @property string                               $type
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property \Carbon\Carbon                                                     $deleted_at
+ * @property string                                                             $name
+ * @property integer                                                            $user_id
+ * @property boolean                                                            $encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                              $user
+ * @property string                                                             $dateFormatted
+ * @property float                                                              $spent
+ * @property \Carbon\Carbon                                                     $lastActivity
+ * @property string                                                             $type
  */
 class Category extends Model
 {
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index 6cc57c28f9..e08bcc1160 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -9,11 +8,11 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * FireflyIII\Models\LimitRepetition
  *
  * @property integer          $id
- * @property Carbon           $created_at
- * @property Carbon           $updated_at
+ * @property \Carbon\Carbon   $created_at
+ * @property \Carbon\Carbon   $updated_at
  * @property integer          $budget_limit_id
- * @property Carbon           $startdate
- * @property Carbon           $enddate
+ * @property \Carbon\Carbon   $startdate
+ * @property \Carbon\Carbon   $enddate
  * @property float            $amount
  * @property-read BudgetLimit $budgetLimit
  * @property int              $budget_id
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
index 26fe705877..f0b6d51c46 100644
--- a/app/Models/Permission.php
+++ b/app/Models/Permission.php
@@ -2,20 +2,18 @@
 
 namespace FireflyIII\Models;
 
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Zizaco\Entrust\EntrustPermission;
 
 /**
  * FireflyIII\Models\Permission
  *
- * @property integer                $id
- * @property string                 $name
- * @property string                 $display_name
- * @property string                 $description
- * @property Carbon                 $created_at
- * @property Carbon                 $updated_at
- * @property-read Collection|Role[] $roles
+ * @property integer                                              $id
+ * @property string                                               $name
+ * @property string                                               $display_name
+ * @property string                                               $description
+ * @property \Carbon\Carbon                                       $created_at
+ * @property \Carbon\Carbon                                       $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|Role[] $roles
  */
 class Permission extends EntrustPermission
 {
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index fd8de16152..300da75cfc 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -1,9 +1,7 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -11,24 +9,24 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\PiggyBank
  *
- * @property integer                               $id
- * @property Carbon                                $created_at
- * @property Carbon                                $updated_at
- * @property Carbon                                $deleted_at
- * @property integer                               $account_id
- * @property string                                $name
- * @property float                                 $targetamount
- * @property Carbon                                $startdate
- * @property Carbon                                $targetdate
- * @property integer                               $order
- * @property boolean                               $encrypted
- * @property boolean                               $remind_me
- * @property integer                               $reminder_skip
- * @property-read Account                          $account
- * @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions
- * @property-read Collection|PiggyBankEvent[]      $piggyBankEvents
- * @property string                                $reminder
- * @property PiggyBankRepetition $currentRep
+ * @property integer                                                             $id
+ * @property \Carbon\Carbon                                                      $created_at
+ * @property \Carbon\Carbon                                                      $updated_at
+ * @property \Carbon\Carbon                                                      $deleted_at
+ * @property integer                                                             $account_id
+ * @property string                                                              $name
+ * @property float                                                               $targetamount
+ * @property \Carbon\Carbon                                                      $startdate
+ * @property \Carbon\Carbon                                                      $targetdate
+ * @property integer                                                             $order
+ * @property boolean                                                             $encrypted
+ * @property boolean                                                             $remind_me
+ * @property integer                                                             $reminder_skip
+ * @property-read Account                                                        $account
+ * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankRepetition[] $piggyBankRepetitions
+ * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[]      $piggyBankEvents
+ * @property string                                                              $reminder
+ * @property PiggyBankRepetition                                                 $currentRep
  */
 class PiggyBank extends Model
 {
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 1710da1617..3077c58f23 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -1,17 +1,16 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * FireflyIII\Models\PiggyBankEvent
  *
  * @property integer                 $id
- * @property Carbon                  $created_at
- * @property Carbon                  $updated_at
+ * @property \Carbon\Carbon          $created_at
+ * @property \Carbon\Carbon          $updated_at
  * @property integer                 $piggy_bank_id
  * @property integer                 $transaction_journal_id
- * @property Carbon                  $date
+ * @property \Carbon\Carbon          $date
  * @property float                   $amount
  * @property PiggyBank               $piggyBank
  * @property-read TransactionJournal $transactionJournal
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index b8fb7eec61..eb099856d2 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -3,21 +3,20 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Query\Builder;
 
 /**
  * FireflyIII\Models\PiggyBankRepetition
  *
  * @property integer        $id
- * @property Carbon         $created_at
- * @property Carbon         $updated_at
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
  * @property integer        $piggy_bank_id
- * @property Carbon         $startdate
- * @property Carbon         $targetdate
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $targetdate
  * @property float          $currentamount
  * @property-read PiggyBank $piggyBank
- * @method static Builder|PiggyBankRepetition onDates($start, $target)
- * @method static Builder|PiggyBankRepetition relevantOnDate($date)
+ * @method static \Illuminate\Database\Query\Builder|PiggyBankRepetition onDates($start, $target)
+ * @method static \Illuminate\Database\Query\Builder|PiggyBankRepetition relevantOnDate($date)
  */
 class PiggyBankRepetition extends Model
 {
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index 641054e3f4..8a72948656 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -1,29 +1,27 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
 use Crypt;
-use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * FireflyIII\Models\Preference
  *
- * @property integer   $id
- * @property Carbon    $created_at
- * @property Carbon    $updated_at
- * @property integer   $user_id
- * @property string    $name
- * @property string    $name_encrypted
- * @property string    $data
- * @property string    $data_encrypted
- * @property-read User $user
+ * @property integer               $id
+ * @property \Carbon\Carbon        $created_at
+ * @property \Carbon\Carbon        $updated_at
+ * @property integer               $user_id
+ * @property string                $name
+ * @property string                $name_encrypted
+ * @property string                $data
+ * @property string                $data_encrypted
+ * @property-read \FireflyIII\User $user
  */
 class Preference extends Model
 {
 
+    protected $dates    = ['created_at', 'updated_at'];
     protected $fillable = ['user_id', 'data', 'name'];
     protected $hidden   = ['data_encrypted', 'name_encrypted'];
-    protected $dates    = ['created_at', 'updated_at'];
 
     /**
      * @param $value
diff --git a/app/Models/Role.php b/app/Models/Role.php
index 6eaa81e92b..7b44740583 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -2,21 +2,19 @@
 namespace FireflyIII\Models;
 
 
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Zizaco\Entrust\EntrustRole;
 
 /**
  * FireflyIII\Models\Role
  *
- * @property integer                            $id
- * @property string                             $name
- * @property string                             $display_name
- * @property string                             $description
- * @property Carbon                             $created_at
- * @property Carbon                             $updated_at
- * @property-read Collection|\FireflyIII\User[] $users
- * @property-read Collection|Permission[]       $perms
+ * @property integer                                                          $id
+ * @property string                                                           $name
+ * @property string                                                           $display_name
+ * @property string                                                           $description
+ * @property \Carbon\Carbon                                                   $created_at
+ * @property \Carbon\Carbon                                                   $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\User[] $users
+ * @property-read \Illuminate\Database\Eloquent\Collection|Permission[]       $perms
  */
 class Role extends EntrustRole
 {
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index aae30f866b..2ca139f9bd 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -3,31 +3,28 @@
 namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
 use Crypt;
-use FireflyIII\User;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * FireflyIII\Models\Tag
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property string                               $deleted_at
- * @property integer                              $user_id
- * @property string                               $tag
- * @property string                               $tagMode
- * @property Carbon                               $date
- * @property string                               $description
- * @property float                                $latitude
- * @property float                                $longitude
- * @property integer                              $zoomLevel
- * @property-read Collection|TransactionJournal[] $transactionjournals
- * @property-read User                            $user
- * @property int                                  $account_id
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property string                                                             $deleted_at
+ * @property integer                                                            $user_id
+ * @property string                                                             $tag
+ * @property string                                                             $tagMode
+ * @property \Carbon\Carbon                                                     $date
+ * @property string                                                             $description
+ * @property float                                                              $latitude
+ * @property float                                                              $longitude
+ * @property integer                                                            $zoomLevel
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                              $user
+ * @property int                                                                $account_id
  */
 class Tag extends Model
 {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index cc0561e241..90d7d72146 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -4,26 +4,25 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Query\Builder;
 use Watson\Validating\ValidatingTrait;
 
 /**
  * FireflyIII\Models\Transaction
  *
  * @property integer                 $id
- * @property Carbon                  $created_at
- * @property Carbon                  $updated_at
- * @property Carbon                  $deleted_at
+ * @property \Carbon\Carbon          $created_at
+ * @property \Carbon\Carbon          $updated_at
+ * @property \Carbon\Carbon          $deleted_at
  * @property integer                 $account_id
  * @property integer                 $transaction_journal_id
  * @property string                  $description
  * @property float                   $amount
  * @property-read Account            $account
  * @property-read TransactionJournal $transactionJournal
- * @method static Builder|Transaction after($date)
- * @method static Builder|Transaction before($date)
- * @property float $before
- * @property float $after
+ * @method static \Illuminate\Database\Query\Builder|Transaction after($date)
+ * @method static \Illuminate\Database\Query\Builder|Transaction before($date)
+ * @property float                   $before
+ * @property float                   $after
  */
 class Transaction extends Model
 {
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index 1ed3691164..bee2755a6a 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -1,8 +1,6 @@
 <?php namespace FireflyIII\Models;
 
 use Auth;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -10,14 +8,14 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\TransactionCurrency
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property Carbon                               $deleted_at
- * @property string                               $code
- * @property string                               $name
- * @property string                               $symbol
- * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property \Carbon\Carbon                                                     $deleted_at
+ * @property string                                                             $code
+ * @property string                                                             $name
+ * @property string                                                             $symbol
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
  */
 class TransactionCurrency extends Model
 {
diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php
index 51275cf773..45b525bb00 100644
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@@ -1,22 +1,19 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
-use FireflyIII\User;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * FireflyIII\Models\TransactionGroup
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property Carbon                               $deleted_at
- * @property integer                              $user_id
- * @property string                               $relation
- * @property-read Collection|TransactionJournal[] $transactionjournals
- * @property-read User                            $user
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property \Carbon\Carbon                                                     $deleted_at
+ * @property integer                                                            $user_id
+ * @property string                                                             $relation
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                              $user
  */
 class TransactionGroup extends Model
 {
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 573ecb63b4..fa892edc4a 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -4,59 +4,56 @@ use Auth;
 use Carbon\Carbon;
 use Crypt;
 use FireflyIII\Support\CacheProperties;
-use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Watson\Validating\ValidatingTrait;
 
 /**
  * FireflyIII\Models\TransactionJournal
  *
- * @property integer                            $id
- * @property Carbon                             $created_at
- * @property Carbon                             $updated_at
- * @property Carbon                             $deleted_at
- * @property integer                            $user_id
- * @property integer                            $transaction_type_id
- * @property integer                            $bill_id
- * @property integer                            $transaction_currency_id
- * @property string                             $description
- * @property boolean                            $completed
- * @property Carbon                             $date
- * @property boolean                            $encrypted
- * @property integer                            $order
- * @property integer                            $tag_count
- * @property-read Bill                          $bill
- * @property-read Collection|Budget[]           $budgets
- * @property-read Collection|Category[]         $categories
- * @property-read mixed                         $amount_positive
- * @property-read mixed                         $amount
- * @property-read Collection|Tag[]              $tags
- * @property-read Collection|Transaction[]      $transactions
- * @property-read mixed                         $destination_account
- * @property-read mixed                         $source_account
- * @property-read Collection|PiggyBankEvent[]   $piggyBankEvents
- * @property-read Collection|Attachment[]       $attachments
- * @property-read TransactionCurrency           $transactionCurrency
- * @property-read TransactionType               $transactionType
- * @property-read Collection|TransactionGroup[] $transactiongroups
- * @property-read User                          $user
- * @property float                              $journalAmount
- * @property int                                $account_id
- * @property int                                $budget_id
- * @property string                             $account_name
- * @method static Builder|TransactionJournal accountIs($account)
- * @method static Builder|TransactionJournal after($date)
- * @method static Builder|TransactionJournal before($date)
- * @method static Builder|TransactionJournal onDate($date)
- * @method static Builder|TransactionJournal transactionTypes($types)
- * @method static Builder|TransactionJournal withRelevantData()
- * @property string $type
+ * @property integer                                                          $id
+ * @property \Carbon\Carbon                                                   $created_at
+ * @property \Carbon\Carbon                                                   $updated_at
+ * @property \Carbon\Carbon                                                   $deleted_at
+ * @property integer                                                          $user_id
+ * @property integer                                                          $transaction_type_id
+ * @property integer                                                          $bill_id
+ * @property integer                                                          $transaction_currency_id
+ * @property string                                                           $description
+ * @property boolean                                                          $completed
+ * @property \Carbon\Carbon                                                   $date
+ * @property boolean                                                          $encrypted
+ * @property integer                                                          $order
+ * @property integer                                                          $tag_count
+ * @property-read Bill                                                        $bill
+ * @property-read \Illuminate\Database\Eloquent\Collection|Budget[]           $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|Category[]         $categories
+ * @property-read mixed                                                       $amount_positive
+ * @property-read mixed                                                       $amount
+ * @property-read \Illuminate\Database\Eloquent\Collection|Tag[]              $tags
+ * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[]      $transactions
+ * @property-read mixed                                                       $destination_account
+ * @property-read mixed                                                       $source_account
+ * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[]   $piggyBankEvents
+ * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[]       $attachments
+ * @property-read TransactionCurrency                                         $transactionCurrency
+ * @property-read TransactionType                                             $transactionType
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionGroup[] $transactiongroups
+ * @property-read \FireflyIII\User                                            $user
+ * @property float                                                            $journalAmount
+ * @property int                                                              $account_id
+ * @property int                                                              $budget_id
+ * @property string                                                           $account_name
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal accountIs($account)
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal after($date)
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal before($date)
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal onDate($date)
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal transactionTypes($types)
+ * @method static \Illuminate\Database\Query\Builder|TransactionJournal withRelevantData()
+ * @property string                                                           $type
  */
 class TransactionJournal extends Model
 {
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index f3201469c1..801cc9c6d0 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -1,19 +1,17 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * FireflyIII\Models\TransactionType
  *
- * @property integer                              $id
- * @property Carbon                               $created_at
- * @property Carbon                               $updated_at
- * @property Carbon                               $deleted_at
- * @property string                               $type
- * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property integer                                                            $id
+ * @property \Carbon\Carbon                                                     $created_at
+ * @property \Carbon\Carbon                                                     $updated_at
+ * @property \Carbon\Carbon                                                     $deleted_at
+ * @property string                                                             $type
+ * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
  */
 class TransactionType extends Model
 {