From 1240c8f6857bd4c892ccda88d1cbe9abcf6628c5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 3 Jun 2015 21:27:36 +0200 Subject: [PATCH] Update models [skip ci] --- app/Models/Account.php | 1 - app/Models/AccountMeta.php | 2 +- app/Models/AccountType.php | 2 +- app/Models/Bill.php | 2 +- app/Models/Budget.php | 2 +- app/Models/BudgetLimit.php | 2 +- app/Models/Component.php | 2 +- app/Models/LimitRepetition.php | 2 +- app/Models/Permission.php | 13 +++++++++++++ app/Models/PiggyBank.php | 2 +- app/Models/PiggyBankEvent.php | 2 +- app/Models/PiggyBankRepetition.php | 2 +- app/Models/Preference.php | 2 +- app/Models/Reminder.php | 2 +- app/Models/Role.php | 14 ++++++++++++++ app/Models/Transaction.php | 2 +- app/Models/TransactionCurrency.php | 2 +- app/Models/TransactionGroup.php | 2 +- app/Models/TransactionJournal.php | 1 + app/Models/TransactionRelation.php | 2 +- app/Models/TransactionType.php | 2 +- app/User.php | 1 + 22 files changed, 46 insertions(+), 18 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index 5453a136a1..f5092a9c96 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -47,7 +47,6 @@ use Watson\Validating\ValidatingTrait; * @property mixed piggyBalance * @property mixed difference * @propery mixed percentage - * */ class Account extends Model { diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 279fe60765..1e2d0ce3c3 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -6,7 +6,7 @@ use Watson\Validating\ValidatingTrait; /** * Class AccountMeta * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 2148b9e961..6de461749b 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class AccountType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Bill.php b/app/Models/Bill.php index a1b048e99a..91f934dbfa 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; * FireflyIII\Models\Bill * * @codeCoverageIgnore Class Bill - * @package FireflyIII\Models + * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $updated_at diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 02f1e46808..ab529f3e62 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Budget * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 42e72dc502..97f2b16dab 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class BudgetLimit * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Component.php b/app/Models/Component.php index 84686751be..c65a9c8812 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Component * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index d5fd692dae..5f6ea2a6cf 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class LimitRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Permission.php b/app/Models/Permission.php index a075f74e01..e3c5943928 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -8,6 +8,19 @@ use Zizaco\Entrust\EntrustPermission; * Class Permission * * @package FireflyIII\Models + * @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|\Config::get('entrust.role')[] $roles + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDisplayName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDescription($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereUpdatedAt($value) */ class Permission extends EntrustPermission { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 44c05fa63b..127a65e619 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class PiggyBank * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 6b9bdceda1..98de0f04ef 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankEvent * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index a24066f2ee..68d2388acc 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 3f22c4330d..488a57d0bb 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class Preference * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index b4797dae8d..d8c5d90afe 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class Reminder * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/Role.php b/app/Models/Role.php index d7df217c7f..543c0580fb 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -8,6 +8,20 @@ use Zizaco\Entrust\EntrustRole; * Class Role * * @package FireflyIII\Models + * @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|\Config::get('auth.model')[] $users + * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.permission')[] $perms + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDisplayName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDescription($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereUpdatedAt($value) */ class Role extends EntrustRole { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 26ca48ef45..43f9928439 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -9,7 +9,7 @@ use Watson\Validating\ValidatingTrait; /** * Class Transaction * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 27b21f36c3..4adad9b216 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionCurrency * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index bb41749ca2..6c980bfac0 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionGroup * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 2248c31229..9c577b68f9 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -68,6 +68,7 @@ use Watson\Validating\ValidatingTrait; * @property mixed account_id * @property mixed name * @property mixed symbol + * @property-read mixed $correct_amount */ class TransactionJournal extends Model { diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php index aa4d3810af..056d61fdd8 100644 --- a/app/Models/TransactionRelation.php +++ b/app/Models/TransactionRelation.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class TransactionRelation * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models */ class TransactionRelation extends Model diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 098d5bcfc7..886858bb2c 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models * @property integer $id * @property \Carbon\Carbon $created_at diff --git a/app/User.php b/app/User.php index f1c7774829..9744811fd3 100644 --- a/app/User.php +++ b/app/User.php @@ -33,6 +33,7 @@ use Zizaco\Entrust\Traits\EntrustUserTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User wherePassword($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereReset($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereRememberToken($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role')[] $roles */ class User extends Model implements AuthenticatableContract, CanResetPasswordContract {