Update model phpdoc [skip ci]

app/Models/Account.php

@@ -37,41 +37,43 @@ use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Account.
+ * Class Account
  *
- * @property int                                                                            $id
+ * @property int $id
- * @property string                                                                         $name
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property string                                                                         $iban
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property AccountType                                                                    $accountType
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property bool                                                                           $active
+ * @property int $user_id
- * @property string                                                                         $virtual_balance
+ * @property int $account_type_id
- * @property User                                                                           $user
+ * @property string $name
- * @property string                                                                         startBalance
+ * @property string|null $virtual_balance
- * @property string                                                                         endBalance
+ * @property string|null $iban
- * @property string                                                                         difference
+ * @property bool $active
- * @property Carbon                                                                         lastActivityDate
+ * @property bool $encrypted
- * @property Collection                                                                     accountMeta
+ * @property int $order
- * @property bool                                                                           encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta
- * @property int                                                                            account_type_id
+ * @property-read int|null $account_meta_count
- * @property Collection                                                  piggyBanks
+ * @property-read \FireflyIII\Models\AccountType $accountType
- * @property string                                                      $interest
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property string                                                      $interestPeriod
+ * @property-read int|null $attachments_count
- * @property string                                                      accountTypeString
+ * @property-read string $account_number
- * @property Carbon                                                      created_at
+ * @property-read string $edit_name
- * @property Carbon                                                      updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Location[] $locations
- * @SuppressWarnings (PHPMD.CouplingBetweenObjects)
+ * @property-read int|null $locations_count
- * @property \Illuminate\Support\Carbon|null                             $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
- * @property int                                                         $user_id
+ * @property-read int|null $notes_count
- * @property-read string                                                 $edit_name
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\ObjectGroup[] $objectGroups
- * @property-read \Illuminate\Database\Eloquent\Collection|Note[]        $notes
+ * @property-read int|null $object_groups_count
- * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[] $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks
+ * @property-read int|null $piggy_banks_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read int|null $transactions_count
+ * @property-read User $user
  * @method static EloquentBuilder|Account accountTypeIn($types)
- * @method static bool|null forceDelete()
  * @method static EloquentBuilder|Account newModelQuery()
  * @method static EloquentBuilder|Account newQuery()
  * @method static Builder|Account onlyTrashed()
  * @method static EloquentBuilder|Account query()
- * @method static bool|null restore()
  * @method static EloquentBuilder|Account whereAccountTypeId($value)
  * @method static EloquentBuilder|Account whereActive($value)
  * @method static EloquentBuilder|Account whereCreatedAt($value)
@@ -80,21 +82,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static EloquentBuilder|Account whereIban($value)
  * @method static EloquentBuilder|Account whereId($value)
  * @method static EloquentBuilder|Account whereName($value)
+ * @method static EloquentBuilder|Account whereOrder($value)
  * @method static EloquentBuilder|Account whereUpdatedAt($value)
  * @method static EloquentBuilder|Account whereUserId($value)
  * @method static EloquentBuilder|Account whereVirtualBalance($value)
  * @method static Builder|Account withTrashed()
  * @method static Builder|Account withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null                                              $account_meta_count
- * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[] $attachments
- * @property-read int|null                                              $attachments_count
- * @property-read string                                                $account_number
- * @property-read \Illuminate\Database\Eloquent\Collection|Location[]   $locations
- * @property-read int|null                                              $locations_count
- * @property-read int|null                                              $notes_count
- * @property-read int|null                                              $piggy_banks_count
- * @property-read int|null                                              $transactions_count
  */
 class Account extends Model
 {

app/Models/AccountMeta.php

@@ -29,15 +29,15 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
 
 /**
- * Class AccountMeta.
+ * Class AccountMeta
  *
- * @property string                          $data
+ * @property int $id
- * @property string                          $name
- * @property int                             $account_id
- * @property int                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
- * @property-read Account                    $account
+ * @property int $account_id
+ * @property string $name
+ * @property mixed $data
+ * @property-read \FireflyIII\Models\Account $account
  * @method static Builder|AccountMeta newModelQuery()
  * @method static Builder|AccountMeta newQuery()
  * @method static Builder|AccountMeta query()

app/Models/AccountType.php

@@ -29,23 +29,24 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
 
+
 /**
- * Class AccountType.
+ * FireflyIII\Models\AccountType
  *
- * @property string                    $type
+ * @property int $id
- * @method whereType(string $type)
+ * @property Carbon|null $created_at
- * @property int                       $id
+ * @property Carbon|null $updated_at
- * @property Carbon|null               $created_at
+ * @property string $type
- * @property Carbon|null               $updated_at
+ * @property-read Collection|\FireflyIII\Models\Account[] $accounts
- * @property-read Collection|Account[] $accounts
+ * @property-read int|null $accounts_count
  * @method static Builder|AccountType newModelQuery()
  * @method static Builder|AccountType newQuery()
  * @method static Builder|AccountType query()
  * @method static Builder|AccountType whereCreatedAt($value)
  * @method static Builder|AccountType whereId($value)
+ * @method static Builder|AccountType whereType($value)
  * @method static Builder|AccountType whereUpdatedAt($value)
  * @mixin Eloquent
- * @property-read int|null             $accounts_count
  */
 class AccountType extends Model
 {

app/Models/Attachment.php

@@ -35,32 +35,30 @@ use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Attachment.
+ * FireflyIII\Models\Attachment
  *
- * @property int                                                                           $id
+ * @property int $id
- * @property Carbon                                                                        $created_at
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon                                                                        $updated_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string                                                                        $attachable_type
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property string                                                                        $md5
+ * @property int $user_id
- * @property string                                                                        $filename
+ * @property int $attachable_id
- * @property string                                                                        $title
+ * @property string $attachable_type
- * @property string                                                     $description
+ * @property string $md5
- * @property string                                                     $notes
+ * @property string $filename
- * @property string                                                     $mime
+ * @property string|null $title
- * @property int                                                        $size
+ * @property string|null $description
- * @property User                                                       $user
+ * @property string $mime
- * @property bool                                                       $uploaded
+ * @property int $size
- * @property bool                                                       file_exists
+ * @property bool $uploaded
- * @property \Illuminate\Support\Carbon|null                            $deleted_at
+ * @property-read Model|\Eloquent $attachable
- * @property int                                                        $user_id
+ * @property-read Collection|\FireflyIII\Models\Note[] $notes
- * @property int                                                        $attachable_id
+ * @property-read int|null $notes_count
- * @property-read Collection|Attachment[] $attachable
+ * @property-read User $user
- * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Eloquent\Builder|Attachment newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Attachment newQuery()
  * @method static Builder|Attachment onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Attachment query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereAttachableId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereAttachableType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereCreatedAt($value)
@@ -78,7 +76,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Attachment withTrashed()
  * @method static Builder|Attachment withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null $notes_count
  */
 class Attachment extends Model
 {

app/Models/AutoBudget.php

@@ -32,25 +32,23 @@ use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Carbon;
 
 /**
- * Class AutoBudget
+ * FireflyIII\Models\AutoBudget
  *
- * @property int                             $id
+ * @property int $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at
- * @property int                             $budget_id
+ * @property int $budget_id
- * @property int                             $transaction_currency_id
+ * @property int $transaction_currency_id
- * @property int                             $auto_budget_type
+ * @property int $auto_budget_type
- * @property float                           $amount
+ * @property string $amount
- * @property string                          $period
+ * @property string $period
- * @property-read Budget                     $budget
+ * @property-read \FireflyIII\Models\Budget $budget
- * @property-read TransactionCurrency        $transactionCurrency
+ * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency
- * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Eloquent\Builder|AutoBudget newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AutoBudget newQuery()
  * @method static Builder|AutoBudget onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|AutoBudget query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|AutoBudget whereAmount($value)
  * @method static \Illuminate\Database\Eloquent\Builder|AutoBudget whereAutoBudgetType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|AutoBudget whereBudgetId($value)

app/Models/AvailableBudget.php

@@ -32,25 +32,23 @@ use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class AvailableBudget.
+ * FireflyIII\Models\AvailableBudget
  *
- * @property int                             $id
+ * @property int $id
- * @property Carbon                          $created_at
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon                          $updated_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property User                            $user
- * @property TransactionCurrency             $transactionCurrency
- * @property int                             $transaction_currency_id
- * @property Carbon                          $start_date
- * @property Carbon                          $end_date
- * @property string                          $amount
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property int                             $user_id
+ * @property int $user_id
- * @method static bool|null forceDelete()
+ * @property int $transaction_currency_id
+ * @property string $amount
+ * @property \Illuminate\Support\Carbon $start_date
+ * @property \Illuminate\Support\Carbon $end_date
+ * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget newQuery()
  * @method static Builder|AvailableBudget onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereAmount($value)
  * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereDeletedAt($value)

app/Models/Bill.php

@@ -35,37 +35,42 @@ use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Bill.
+ * FireflyIII\Models\Bill
  *
- * @property bool                                                                                  $active
+ * @property int $id
- * @property int                                                                                   $transaction_currency_id
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property string                                                                                $amount_min
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string                                                                                $amount_max
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property int                                                                                   $id
+ * @property int $user_id
- * @property string                                                                                $name
+ * @property int|null $transaction_currency_id
- * @property Collection                                                                            $notes
+ * @property string $name
- * @property TransactionCurrency                                                                   $transactionCurrency
+ * @property string $match
- * @property Carbon                                                                                $created_at
+ * @property string $amount_min
- * @property Carbon                                                                                $updated_at
+ * @property string $amount_max
- * @property Carbon                                                                                $date
+ * @property \Illuminate\Support\Carbon $date
- * @property string                                                                                $repeat_freq
+ * @property string|null $end_date
- * @property int                                                                                   $skip
+ * @property string|null $extension_date
- * @property bool                                                               $automatch
+ * @property string $repeat_freq
- * @property User                                                               $user
+ * @property int $skip
- * @property string                                                             $match
+ * @property bool $automatch
- * @property bool                                                               match_encrypted
+ * @property bool $active
- * @property bool                                                               name_encrypted
+ * @property bool $name_encrypted
- * @SuppressWarnings (PHPMD.CouplingBetweenObjects)
+ * @property bool $match_encrypted
- * @property \Illuminate\Support\Carbon|null                                    $deleted_at
+ * @property int $order
- * @property int                                                                $user_id
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[]         $attachments
+ * @property-read int|null $attachments_count
- * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
- * @method static bool|null forceDelete()
+ * @property-read int|null $notes_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\ObjectGroup[] $objectGroups
+ * @property-read int|null $object_groups_count
+ * @property-read \FireflyIII\Models\TransactionCurrency|null $transactionCurrency
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @property-read int|null $transaction_journals_count
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|Bill newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Bill newQuery()
  * @method static Builder|Bill onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Bill query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAmountMax($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereAmountMin($value)
@@ -73,11 +78,14 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereDate($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereEndDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereExtensionDate($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereMatch($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereMatchEncrypted($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereNameEncrypted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bill whereOrder($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereRepeatFreq($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereSkip($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Bill whereTransactionCurrencyId($value)
@@ -86,11 +94,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Bill withTrashed()
  * @method static Builder|Bill withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null $attachments_count
- * @property-read int|null $notes_count
- * @property-read int|null $transaction_journals_count
- * @property bool $name_encrypted
- * @property bool $match_encrypted
  */
 class Bill extends Model
 {

app/Models/Budget.php

@@ -36,28 +36,32 @@ use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Budget.
+ * FireflyIII\Models\Budget
  *
- * @property int                                                                                   $id
+ * @property int $id
- * @property string                                                                                $name
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property bool                                                               $active
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property int                                                                $user_id
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read string                                                        $email
+ * @property int $user_id
- * @property bool                                                               encrypted
+ * @property string $name
- * @property Collection                                                         budgetlimits
+ * @property bool $active
- * @property int                                                                $order
+ * @property bool $encrypted
- * @property Carbon                                                             created_at
+ * @property int $order
- * @property Carbon                                                             updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property User                                                               $user
+ * @property-read int|null $attachments_count
- * @property \Illuminate\Support\Carbon|null                                    $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AutoBudget[] $autoBudgets
- * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
+ * @property-read int|null $auto_budgets_count
- * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[]        $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits
- * @method static bool|null forceDelete()
+ * @property-read int|null $budgetlimits_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @property-read int|null $transaction_journals_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read int|null $transactions_count
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|Budget newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Budget newQuery()
  * @method static Builder|Budget onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Budget query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Budget whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Budget whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Budget whereDeletedAt($value)
@@ -70,17 +74,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Budget withTrashed()
  * @method static Builder|Budget withoutTrashed()
  * @mixin Eloquent
- * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[] $attachments
- * @property-read int|null                                              $attachments_count
- * @property-read \Illuminate\Database\Eloquent\Collection|AutoBudget[] $autoBudgets
- * @property-read int|null                                              $auto_budgets_count
- * @property-read int|null                                              $budgetlimits_count
- * @property-read int|null                                              $transaction_journals_count
- * @property-read int|null                                              $transactions_count
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property bool $encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits
  */
 class Budget extends Model
 {

app/Models/BudgetLimit.php

@@ -30,21 +30,20 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class BudgetLimit.
+ * FireflyIII\Models\BudgetLimit
  *
- * @property Budget              $budget
+ * @property int $id
- * @property int                 $id
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon              $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property Carbon              $updated_at
+ * @property int $budget_id
- * @property Carbon              $start_date
+ * @property int|null $transaction_currency_id
- * @property Carbon              $end_date
+ * @property \Illuminate\Support\Carbon $start_date
- * @property string              $amount
+ * @property \Illuminate\Support\Carbon|null $end_date
- * @property int                 $budget_id
+ * @property string $amount
- * @property string              spent
+ * @property string|null $period
- * @property int                 $transaction_currency_id
+ * @property int $generated
- * @property TransactionCurrency $transactionCurrency
+ * @property-read \FireflyIII\Models\Budget $budget
- * @property string              $repeat_freq
+ * @property-read \FireflyIII\Models\TransactionCurrency|null $transactionCurrency
- * @property bool @auto_budget
  * @method static Builder|BudgetLimit newModelQuery()
  * @method static Builder|BudgetLimit newQuery()
  * @method static Builder|BudgetLimit query()
@@ -52,7 +51,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|BudgetLimit whereBudgetId($value)
  * @method static Builder|BudgetLimit whereCreatedAt($value)
  * @method static Builder|BudgetLimit whereEndDate($value)
+ * @method static Builder|BudgetLimit whereGenerated($value)
  * @method static Builder|BudgetLimit whereId($value)
+ * @method static Builder|BudgetLimit wherePeriod($value)
  * @method static Builder|BudgetLimit whereStartDate($value)
  * @method static Builder|BudgetLimit whereTransactionCurrencyId($value)
  * @method static Builder|BudgetLimit whereUpdatedAt($value)

app/Models/Category.php

@@ -36,26 +36,28 @@ use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Category.
+ * FireflyIII\Models\Category
  *
- * @property string                                                                                $name
+ * @property int $id
- * @property int                                  $id
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property float                                $spent // used in category reports
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property Carbon|null                          lastActivity
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property bool                                 encrypted
+ * @property int $user_id
- * @property User                                 $user
+ * @property string $name
- * @property Carbon                               $created_at
+ * @property bool $encrypted
- * @property Carbon                               $updated_at
+ * @property-read Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property \Illuminate\Support\Carbon|null      $deleted_at
+ * @property-read int|null $attachments_count
- * @property int                                  $user_id
+ * @property-read Collection|\FireflyIII\Models\Note[] $notes
- * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read int|null $notes_count
- * @property-read Collection|Transaction[]        $transactions
+ * @property-read Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @method static bool|null forceDelete()
+ * @property-read int|null $transaction_journals_count
+ * @property-read Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read int|null $transactions_count
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|Category newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Category newQuery()
  * @method static Builder|Category onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Category query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Category whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Category whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Category whereEncrypted($value)
@@ -66,10 +68,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Category withTrashed()
  * @method static Builder|Category withoutTrashed()
  * @mixin Eloquent
- * @property-read Collection|Attachment[] $attachments
- * @property-read int|null                $attachments_count
- * @property-read int|null                $transaction_journals_count
- * @property-read int|null                $transactions_count
  */
 class Category extends Model
 {

app/Models/Configuration.php

@@ -29,20 +29,18 @@ use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Carbon;
 
 /**
- * Class Configuration.
+ * FireflyIII\Models\Configuration
  *
- * @property string                          $data
+ * @property int $id
- * @property string                          $name
- * @property int                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at
- * @method static bool|null forceDelete()
+ * @property string $name
+ * @property mixed $data
  * @method static \Illuminate\Database\Eloquent\Builder|Configuration newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Configuration newQuery()
  * @method static Builder|Configuration onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Configuration query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereData($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Configuration whereDeletedAt($value)

app/Models/CurrencyExchangeRate.php

@@ -30,21 +30,21 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class CurrencyExchange.
+ * FireflyIII\Models\CurrencyExchangeRate
  *
- * @property int                   $id
+ * @property int $id
- * @property Carbon                $created_at
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon              $updated_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property TransactionCurrency $fromCurrency
+ * @property string|null $deleted_at
- * @property TransactionCurrency $toCurrency
+ * @property int $user_id
- * @property float               $rate
+ * @property int $from_currency_id
- * @property Carbon              $date
+ * @property int $to_currency_id
- * @property int                 $from_currency_id
+ * @property \Illuminate\Support\Carbon $date
- * @property int                 $to_currency_id
+ * @property string $rate
- * @property string|null         $deleted_at
+ * @property string|null $user_rate
- * @property int                 $user_id
+ * @property-read \FireflyIII\Models\TransactionCurrency $fromCurrency
- * @property float|null          $user_rate
+ * @property-read \FireflyIII\Models\TransactionCurrency $toCurrency
- * @property-read User           $user
+ * @property-read User $user
  * @method static Builder|CurrencyExchangeRate newModelQuery()
  * @method static Builder|CurrencyExchangeRate newQuery()
  * @method static Builder|CurrencyExchangeRate query()

app/Models/LinkType.php

@@ -31,26 +31,24 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+
 /**
  * FireflyIII\Models\LinkType
  *
- * @property int                                                                    $journalCount
+ * @property int $id
- * @property string                                                                 $inward
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property string                                                                 $outward
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string                                                                 $name
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property bool                                                                   $editable
+ * @property string $name
- * @property Carbon                                                                 $created_at
+ * @property string $outward
- * @property Carbon                                                                 $updated_at
+ * @property string $inward
- * @property int                                                                    $id
+ * @property bool $editable
- * Class LinkType
+ * @property-read Collection|\FireflyIII\Models\TransactionJournalLink[] $transactionJournalLinks
- * @property \Illuminate\Support\Carbon|null                                        $deleted_at
+ * @property-read int|null $transaction_journal_links_count
- * @property-read Collection|TransactionJournalLink[] $transactionJournalLinks
- * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Eloquent\Builder|LinkType newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|LinkType newQuery()
  * @method static Builder|LinkType onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|LinkType query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|LinkType whereEditable($value)
@@ -62,7 +60,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|LinkType withTrashed()
  * @method static Builder|LinkType withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null                                                          $transaction_journal_links_count
  */
 class LinkType extends Model
 {

app/Models/Location.php

@@ -33,21 +33,22 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Carbon;
 
+
 /**
- * Class Location
+ * FireflyIII\Models\Location
  *
- * @property int                                                     $id
+ * @property int $id
- * @property Carbon|null                         $created_at
+ * @property Carbon|null $created_at
- * @property Carbon|null                         $updated_at
+ * @property Carbon|null $updated_at
- * @property Carbon|null                         $deleted_at
+ * @property Carbon|null $deleted_at
- * @property int                                                     $locatable_id
+ * @property int $locatable_id
- * @property string                                                  $locatable_type
+ * @property string $locatable_type
- * @property float|null                                              $latitude
+ * @property float|null $latitude
- * @property float|null                                              $longitude
+ * @property float|null $longitude
- * @property int|null                                                $zoom_level
+ * @property int|null $zoom_level
- * @property-read Collection|Account[] $accounts
+ * @property-read Collection|\FireflyIII\Models\Account[] $accounts
- * @property-read int|null                                           $accounts_count
+ * @property-read int|null $accounts_count
- * @property-read Model|Eloquent                                     $locatable
+ * @property-read Model|\Eloquent $locatable
  * @method static Builder|Location newModelQuery()
  * @method static Builder|Location newQuery()
  * @method static Builder|Location query()

app/Models/Note.php

@@ -31,23 +31,21 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 
 /**
- * Class Note.
+ * FireflyIII\Models\Note
  *
- * @property int                                                  $id
+ * @property int $id
- * @property Carbon                                               $created_at
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon                                               $updated_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string                                               $text
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property string                                               $title
+ * @property int $noteable_id
- * @property int                                                  $noteable_id
+ * @property string $noteable_type
- * @property \Illuminate\Support\Carbon|null                      $deleted_at
+ * @property string|null $title
- * @property string                                               $noteable_type
+ * @property string|null $text
- * @property-read Collection|Note[] $noteable
+ * @property-read Model|\Eloquent $noteable
- * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Eloquent\Builder|Note newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Note newQuery()
  * @method static Builder|Note onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Note query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Note whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Note whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Note whereId($value)

app/Models/ObjectGroup.php

@@ -30,27 +30,35 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+
 /**
- * Class ObjectGroup
+ * FireflyIII\Models\ObjectGroup
  *
+ * @property int $id
+ * @property int $user_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property string $title
+ * @property int $order
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts
+ * @property-read int|null $accounts_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills
+ * @property-read int|null $bills_count
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks
- * @property-read int|null                                                                $piggy_banks_count
+ * @property-read int|null $piggy_banks_count
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup newModelQuery()
+ * @property-read User $user
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ObjectGroup whereUserId($value)
  * @mixin \Eloquent
- * @property int                                                                          $id
- * @property \Illuminate\Support\Carbon|null                                              $created_at
- * @property \Illuminate\Support\Carbon|null                                              $updated_at
- * @property string|null                                                                  $deleted_at
- * @property string                                                                       $title
- * @property int                                                                          $order
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup whereOrder($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup whereTitle($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ObjectGroup whereUpdatedAt($value)
  */
 class ObjectGroup extends Model
 {

app/Models/PiggyBank.php

@@ -33,31 +33,37 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+
 /**
- * Class PiggyBank.
+ * FireflyIII\Models\PiggyBank
  *
- * @property Carbon                                                                                 $targetdate
+ * @property int $id
- * @property Carbon                                                                                 $startdate
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property string                                                                                 $targetamount
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property int                                                                                    $id
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property string                                $name
+ * @property int $account_id
- * @property Account                               $account
+ * @property string $name
- * @property Carbon                                $updated_at
+ * @property string $targetamount
- * @property Carbon                                $created_at
+ * @property \Illuminate\Support\Carbon|null $startdate
- * @property int                                   $order
+ * @property \Illuminate\Support\Carbon|null $targetdate
- * @property bool                                  $active
+ * @property int $order
- * @property int                                   $account_id
+ * @property bool $active
- * @property bool                                  encrypted
+ * @property bool $encrypted
- * @property \Illuminate\Support\Carbon|null       $deleted_at
+ * @property-read \FireflyIII\Models\Account $account
- * @property-read Collection|Note[]                $notes
+ * @property-read Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property-read Collection|PiggyBankEvent[]      $piggyBankEvents
+ * @property-read int|null $attachments_count
- * @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions
+ * @property-read Collection|\FireflyIII\Models\Note[] $notes
- * @method static bool|null forceDelete()
+ * @property-read int|null $notes_count
+ * @property-read Collection|\FireflyIII\Models\ObjectGroup[] $objectGroups
+ * @property-read int|null $object_groups_count
+ * @property-read Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents
+ * @property-read int|null $piggy_bank_events_count
+ * @property-read Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions
+ * @property-read int|null $piggy_bank_repetitions_count
  * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank newQuery()
  * @method static Builder|PiggyBank onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereAccountId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|PiggyBank whereCreatedAt($value)
@@ -73,13 +79,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|PiggyBank withTrashed()
  * @method static Builder|PiggyBank withoutTrashed()
  * @mixin Eloquent
- * @property-read Collection|Attachment[] $attachments
- * @property-read int|null                $attachments_count
- * @property-read int|null                $notes_count
- * @property-read int|null                $piggy_bank_events_count
- * @property-read int|null                $piggy_bank_repetitions_count
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\ObjectGroup[] $objectGroups
- * @property-read int|null $object_groups_count
  */
 class PiggyBank extends Model
 {

app/Models/PiggyBankEvent.php

@@ -28,18 +28,19 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
+
 /**
- * Class PiggyBankEvent.
+ * FireflyIII\Models\PiggyBankEvent
  *
- * @property PiggyBank          $piggyBank
+ * @property int $id
- * @property int                $transaction_journal_id
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property int                $piggy_bank_id
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property int                $id
+ * @property int $piggy_bank_id
- * @property Carbon             date
+ * @property int|null $transaction_journal_id
- * @property TransactionJournal transactionJournal
+ * @property \Illuminate\Support\Carbon $date
- * @property string             $amount
+ * @property string $amount
- * @property Carbon             created_at
+ * @property-read \FireflyIII\Models\PiggyBank $piggyBank
- * @property Carbon             updated_at
+ * @property-read \FireflyIII\Models\TransactionJournal|null $transactionJournal
  * @method static Builder|PiggyBankEvent newModelQuery()
  * @method static Builder|PiggyBankEvent newQuery()
  * @method static Builder|PiggyBankEvent query()
@@ -51,10 +52,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @method static Builder|PiggyBankEvent whereTransactionJournalId($value)
  * @method static Builder|PiggyBankEvent whereUpdatedAt($value)
  * @mixin Eloquent
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon $date
- * @property-read \FireflyIII\Models\TransactionJournal|null $transactionJournal
  */
 class PiggyBankEvent extends Model
 {

app/Models/PiggyBankRepetition.php

@@ -29,21 +29,21 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class PiggyBankRepetition.
+ * FireflyIII\Models\PiggyBankRepetition
  *
- * @property string                          $currentamount
+ * @property int $id
- * @property Carbon                          $startdate
- * @property Carbon                          $targetdate
- * @property int                             $id
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property int                             $piggy_bank_id
+ * @property int $piggy_bank_id
- * @property-read PiggyBank                  $piggyBank
+ * @property \Illuminate\Support\Carbon|null $startdate
+ * @property \Illuminate\Support\Carbon|null $targetdate
+ * @property string $currentamount
+ * @property-read \FireflyIII\Models\PiggyBank $piggyBank
  * @method static EloquentBuilder|PiggyBankRepetition newModelQuery()
  * @method static EloquentBuilder|PiggyBankRepetition newQuery()
- * @method static EloquentBuilder|PiggyBankRepetition onDates(Carbon $start, Carbon $target)
+ * @method static EloquentBuilder|PiggyBankRepetition onDates(\Carbon\Carbon $start, \Carbon\Carbon $target)
  * @method static EloquentBuilder|PiggyBankRepetition query()
- * @method static EloquentBuilder|PiggyBankRepetition relevantOnDate(Carbon $date)
+ * @method static EloquentBuilder|PiggyBankRepetition relevantOnDate(\Carbon\Carbon $date)
  * @method static EloquentBuilder|PiggyBankRepetition whereCreatedAt($value)
  * @method static EloquentBuilder|PiggyBankRepetition whereCurrentamount($value)
  * @method static EloquentBuilder|PiggyBankRepetition whereId($value)

app/Models/Preference.php

@@ -31,15 +31,15 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Preference.
+ * FireflyIII\Models\Preference
  *
- * @property mixed  $data
+ * @property int $id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $user_id
  * @property string $name
- * @property Carbon $updated_at
+ * @property array|null $data
- * @property Carbon $created_at
+ * @property-read User $user
- * @property int    $id
- * @property User   user
- * @property int    $user_id
  * @method static Builder|Preference newModelQuery()
  * @method static Builder|Preference newQuery()
  * @method static Builder|Preference query()
@@ -50,7 +50,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Preference whereUpdatedAt($value)
  * @method static Builder|Preference whereUserId($value)
  * @mixin Eloquent
- * @property-read \FireflyIII\User $user
  */
 class Preference extends Model
 {

app/Models/Recurrence.php

@@ -37,39 +37,39 @@ use Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Recurrence
+ * FireflyIII\Models\Recurrence
  *
- * @property int                                                                     $id
+ * @property int $id
- * @property \Carbon\Carbon                                                          $created_at
+ * @property Carbon|null $created_at
- * @property \Carbon\Carbon                                                          $updated_at
+ * @property Carbon|null $updated_at
- * @property int                                                                     $user_id
+ * @property Carbon|null $deleted_at
- * @property int                                                                     $transaction_type_id
+ * @property int $user_id
- * @property int                                                                     $transaction_currency_id
+ * @property int $transaction_type_id
- * @property string                                                                  $title
+ * @property string $title
- * @property string                         $description
+ * @property string $description
- * @property \Carbon\Carbon                 $first_date
+ * @property Carbon $first_date
- * @property \Carbon\Carbon                 $repeat_until
+ * @property Carbon|null $repeat_until
- * @property \Carbon\Carbon                 $latest_date
+ * @property Carbon|null $latest_date
- * @property string                         $repetition_type
+ * @property int $repetitions
- * @property string                         $repetition_moment
+ * @property bool $apply_rules
- * @property int                            $repetition_skip
+ * @property bool $active
- * @property int                            $repetitions
+ * @property-read Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property bool                           $active
+ * @property-read int|null $attachments_count
- * @property bool                           $apply_rules
+ * @property-read Collection|\FireflyIII\Models\Note[] $notes
- * @property User                           $user
+ * @property-read int|null $notes_count
- * @property \Illuminate\Support\Collection $recurrenceRepetitions
+ * @property-read Collection|\FireflyIII\Models\RecurrenceMeta[] $recurrenceMeta
- * @property \Illuminate\Support\Collection $recurrenceMeta
+ * @property-read int|null $recurrence_meta_count
- * @property \Illuminate\Support\Collection $recurrenceTransactions
+ * @property-read Collection|\FireflyIII\Models\RecurrenceRepetition[] $recurrenceRepetitions
- * @property TransactionType                $transactionType
+ * @property-read int|null $recurrence_repetitions_count
- * @property Carbon|null                    $deleted_at
+ * @property-read Collection|\FireflyIII\Models\RecurrenceTransaction[] $recurrenceTransactions
- * @property-read Collection|Note[]         $notes
+ * @property-read int|null $recurrence_transactions_count
- * @property-read TransactionCurrency       $transactionCurrency
+ * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency
- * @method static bool|null forceDelete()
+ * @property-read \FireflyIII\Models\TransactionType $transactionType
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|Recurrence newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Recurrence newQuery()
  * @method static Builder|Recurrence onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Recurrence query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereApplyRules($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereCreatedAt($value)
@@ -87,10 +87,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Recurrence withTrashed()
  * @method static Builder|Recurrence withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null $notes_count
- * @property-read int|null $recurrence_meta_count
- * @property-read int|null $recurrence_repetitions_count
- * @property-read int|null $recurrence_transactions_count
  */
 class Recurrence extends Model
 {

app/Models/RecurrenceMeta.php

@@ -32,22 +32,20 @@ use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Carbon;
 
 /**
- * Class RecurrenceMeta
+ * FireflyIII\Models\RecurrenceMeta
  *
- * @property string                          $name
+ * @property int $id
- * @property string                          $value
- * @property int                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at
- * @property int                             $recurrence_id
+ * @property int $recurrence_id
- * @property-read Recurrence                 $recurrence
+ * @property string $name
- * @method static bool|null forceDelete()
+ * @property string $value
+ * @property-read \FireflyIII\Models\Recurrence $recurrence
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta newQuery()
  * @method static Builder|RecurrenceMeta onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceMeta whereId($value)

app/Models/RecurrenceRepetition.php

@@ -32,24 +32,22 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 
 /**
- * Class RecurrenceRepetition
+ * FireflyIII\Models\RecurrenceRepetition
  *
- * @property string          $repetition_type
+ * @property int $id
- * @property string          $repetition_moment
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property int             $repetition_skip
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property int             $weekend
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property Carbon  $created_at
+ * @property int $recurrence_id
- * @property Carbon  $deleted_at
+ * @property string $repetition_type
- * @property Carbon  $updated_at
+ * @property string $repetition_moment
- * @property int             $id
+ * @property int $repetition_skip
- * @property int             $recurrence_id
+ * @property int $weekend
- * @property-read Recurrence $recurrence
+ * @property-read \FireflyIII\Models\Recurrence $recurrence
- * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition newQuery()
  * @method static Builder|RecurrenceRepetition onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceRepetition whereId($value)

app/Models/RecurrenceTransaction.php

@@ -34,32 +34,31 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 
 /**
- * Class RecurrenceTransaction
+ * FireflyIII\Models\RecurrenceTransaction
  *
- * @property int                 $transaction_currency_id,
+ * @property int $id
- * @property int                 $foreign_currency_id
+ * @property Carbon|null $created_at
- * @property int                 $source_id
+ * @property Carbon|null $updated_at
- * @property int                 $destination_id
+ * @property Carbon|null $deleted_at
- * @property string              $amount
+ * @property int $recurrence_id
- * @property string              $foreign_amount
+ * @property int $transaction_currency_id
- * @property string              $description
+ * @property int|null $foreign_currency_id
- * @property TransactionCurrency $transactionCurrency
+ * @property int $source_id
- * @property TransactionCurrency $foreignCurrency
+ * @property int $destination_id
- * @property Account             $sourceAccount
+ * @property string $amount
- * @property Account             $destinationAccount
+ * @property string|null $foreign_amount
- * @property Collection          $recurrenceTransactionMeta
+ * @property string $description
- * @property int                 $id
+ * @property-read \FireflyIII\Models\Account $destinationAccount
- * @property Recurrence          $recurrence
+ * @property-read \FireflyIII\Models\TransactionCurrency|null $foreignCurrency
- * @property Carbon|null         $created_at
+ * @property-read \FireflyIII\Models\Recurrence $recurrence
- * @property Carbon|null         $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\RecurrenceTransactionMeta[] $recurrenceTransactionMeta
- * @property Carbon|null         $deleted_at
+ * @property-read int|null $recurrence_transaction_meta_count
- * @property int                 $recurrence_id
+ * @property-read \FireflyIII\Models\Account $sourceAccount
- * @method static bool|null forceDelete()
+ * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction newQuery()
  * @method static Builder|RecurrenceTransaction onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereAmount($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransaction whereDeletedAt($value)
@@ -75,8 +74,6 @@ use Illuminate\Support\Collection;
  * @method static Builder|RecurrenceTransaction withTrashed()
  * @method static Builder|RecurrenceTransaction withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null $recurrence_transaction_meta_count
- * @property int $transaction_currency_id
  */
 class RecurrenceTransaction extends Model
 {

app/Models/RecurrenceTransactionMeta.php

@@ -32,22 +32,20 @@ use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Carbon;
 
 /**
- * Class RecurrenceTransactionMeta
+ * FireflyIII\Models\RecurrenceTransactionMeta
  *
- * @property string                          $name
+ * @property int $id
- * @property string                          $value
- * @property int                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at
- * @property int                             $rt_id
+ * @property int $rt_id
- * @property-read RecurrenceTransaction      $recurrenceTransaction
+ * @property string $name
- * @method static bool|null forceDelete()
+ * @property string $value
+ * @property-read \FireflyIII\Models\RecurrenceTransaction $recurrenceTransaction
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta newQuery()
  * @method static Builder|RecurrenceTransactionMeta onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RecurrenceTransactionMeta whereId($value)

app/Models/Role.php

@@ -31,15 +31,16 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Support\Carbon;
 
 /**
- * Class Role.
+ * FireflyIII\Models\Role
  *
- * @property int                                                  $id
+ * @property int $id
- * @property string                                               $name
+ * @property Carbon|null $created_at
- * @property Carbon|null                      $created_at
+ * @property Carbon|null $updated_at
- * @property Carbon|null                      $updated_at
+ * @property string $name
- * @property string|null                                          $display_name
+ * @property string|null $display_name
- * @property string|null                                          $description
+ * @property string|null $description
  * @property-read Collection|User[] $users
+ * @property-read int|null $users_count
  * @method static Builder|Role newModelQuery()
  * @method static Builder|Role newQuery()
  * @method static Builder|Role query()
@@ -50,7 +51,6 @@ use Illuminate\Support\Carbon;
  * @method static Builder|Role whereName($value)
  * @method static Builder|Role whereUpdatedAt($value)
  * @mixin Eloquent
- * @property-read int|null                                        $users_count
  */
 class Role extends Model
 {

app/Models/Rule.php

@@ -34,30 +34,30 @@ use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Rule.
+ * FireflyIII\Models\Rule
  *
- * @property bool                            $stop_processing
+ * @property int $id
- * @property int                             $id
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Collection                      $ruleTriggers
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property Collection                      $ruleActions
- * @property bool                            $active
- * @property bool                            $strict
- * @property User                            $user
- * @property Carbon                          $created_at
- * @property Carbon                          $updated_at
- * @property string                          $title
- * @property int                             $order
- * @property RuleGroup                       $ruleGroup
- * @property int                             $rule_group_id
- * @property string                          $description
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property int                             $user_id
+ * @property int $user_id
- * @method static bool|null forceDelete()
+ * @property int $rule_group_id
+ * @property string $title
+ * @property string|null $description
+ * @property int $order
+ * @property bool $active
+ * @property bool $stop_processing
+ * @property bool $strict
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\RuleAction[] $ruleActions
+ * @property-read int|null $rule_actions_count
+ * @property-read \FireflyIII\Models\RuleGroup $ruleGroup
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\RuleTrigger[] $ruleTriggers
+ * @property-read int|null $rule_triggers_count
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|Rule newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Rule newQuery()
  * @method static Builder|Rule onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Rule query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Rule whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Rule whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Rule whereDeletedAt($value)
@@ -73,8 +73,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Rule withTrashed()
  * @method static Builder|Rule withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null $rule_actions_count
- * @property-read int|null $rule_triggers_count
  */
 class Rule extends Model
 {

app/Models/RuleAction.php

@@ -29,18 +29,18 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class RuleAction.
+ * FireflyIII\Models\RuleAction
  *
- * @property string $action_value
+ * @property int $id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $rule_id
  * @property string $action_type
- * @property int    $id
+ * @property string $action_value
- * @property Carbon $created_at
+ * @property int $order
- * @property Carbon $updated_at
+ * @property bool $active
- * @property int    $order
+ * @property bool $stop_processing
- * @property bool   $active
+ * @property-read \FireflyIII\Models\Rule $rule
- * @property bool   $stop_processing
- * @property Rule   $rule
- * @property int    $rule_id
  * @method static Builder|RuleAction newModelQuery()
  * @method static Builder|RuleAction newQuery()
  * @method static Builder|RuleAction query()

app/Models/RuleGroup.php

@@ -33,43 +33,40 @@ use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+
 /**
- * Class RuleGroup.
+ * FireflyIII\Models\RuleGroup
  *
- * @property bool                            $active
+ * @property int $id
- * @property User                            $user
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon                          $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property Carbon                          $updated_at
- * @property string                          $title
- * @property string                          $text
- * @property int                             $id
- * @property int                             $order
- * @property Collection                      $rules
- * @property string                          description
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property int                             $user_id
+ * @property int $user_id
- * @method static bool|null forceDelete()
+ * @property string $title
+ * @property string|null $description
+ * @property int $order
+ * @property bool $active
+ * @property bool $stop_processing
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Rule[] $rules
+ * @property-read int|null $rules_count
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup newQuery()
  * @method static Builder|RuleGroup onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereDescription($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereStopProcessing($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereTitle($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUserId($value)
  * @method static Builder|RuleGroup withTrashed()
  * @method static Builder|RuleGroup withoutTrashed()
- * @property bool                            $stop_processing
  * @mixin Eloquent
- * @property-read int|null                   $rules_count
- * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereStopProcessing($value)
- * @property string|null $description
  */
 class RuleGroup extends Model
 {

app/Models/RuleTrigger.php

@@ -29,18 +29,18 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class RuleTrigger.
+ * FireflyIII\Models\RuleTrigger
  *
- * @property string    $trigger_value
+ * @property int $id
- * @property string    $trigger_type
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property int       $id
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property Carbon    $created_at
+ * @property int $rule_id
- * @property Carbon    $updated_at
+ * @property string $trigger_type
- * @property int       $order
+ * @property string $trigger_value
- * @property bool      $active
+ * @property int $order
- * @property bool      $stop_processing
+ * @property bool $active
- * @property int       $rule_id
+ * @property bool $stop_processing
- * @property-read Rule $rule
+ * @property-read \FireflyIII\Models\Rule $rule
  * @method static Builder|RuleTrigger newModelQuery()
  * @method static Builder|RuleTrigger newQuery()
  * @method static Builder|RuleTrigger query()

app/Models/Tag.php

@@ -35,29 +35,31 @@ use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Tag.
+ * FireflyIII\Models\Tag
  *
- * @property Collection                      $transactionJournals
+ * @property int $id
- * @property string                          $tag
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property int                             $id
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property Carbon                          $date
- * @property int                             zoomLevel
- * @property float                           latitude
- * @property float                           longitude
- * @property string                          description
- * @property string                          amount_sum
- * @property string                          tagMode
- * @property Carbon                          created_at
- * @property Carbon                          updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property int                             $user_id
+ * @property int $user_id
- * @property-read User                       $user
+ * @property string $tag
- * @method static bool|null forceDelete()
+ * @property string $tagMode
+ * @property \Illuminate\Support\Carbon|null $date
+ * @property string|null $description
+ * @property float|null $latitude
+ * @property float|null $longitude
+ * @property int|null $zoomLevel
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
+ * @property-read int|null $attachments_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Location[] $locations
+ * @property-read int|null $locations_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @property-read int|null $transaction_journals_count
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|Tag newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Tag newQuery()
  * @method static Builder|Tag onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Tag query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|Tag whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDate($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Tag whereDeletedAt($value)
@@ -73,18 +75,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|Tag withTrashed()
  * @method static Builder|Tag withoutTrashed()
  * @mixin Eloquent
- * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[] $attachments
- * @property-read int|null                                              $attachments_count
- * @property-read \Illuminate\Database\Eloquent\Collection|Location[]   $locations
- * @property-read int|null                                              $locations_count
- * @property-read int|null                                              $transaction_journals_count
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string $tagMode
- * @property string|null $description
- * @property float|null $latitude
- * @property float|null $longitude
- * @property int|null $zoomLevel
  */
 class Tag extends Model
 {

app/Models/Telemetry.php

@@ -31,17 +31,17 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 
 /**
- * Class Telemetry
+ * FireflyIII\Models\Telemetry
  *
- * @property int                             $id
+ * @property int $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $submitted
- * @property int|null                        $user_id
+ * @property int|null $user_id
- * @property string                          $installation_id
+ * @property string $installation_id
- * @property string                          $type
+ * @property string $type
- * @property string                          $key
+ * @property string $key
- * @property array                           $value
+ * @property array $value
  * @method static Builder|Telemetry newModelQuery()
  * @method static Builder|Telemetry newQuery()
  * @method static Builder|Telemetry query()

app/Models/Transaction.php

@@ -33,87 +33,35 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class Transaction.
+ * FireflyIII\Models\Transaction
  *
- * @property int                                                                         $journal_id
+ * @property int $id
- * @property Carbon                                                                      $date
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property string                                                                      $transaction_description
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string                                                                      $transaction_amount
- * @property string                                                                      $transaction_foreign_amount
- * @property string                                                                      $transaction_type_type
- * @property string                                                                      $foreign_currency_symbol
- * @property int                                                                         $foreign_currency_dp
- * @property int                                                                         $account_id
- * @property string                                                                      $account_name
- * @property string                                                                      $account_iban
- * @property string                                                                      $account_number
- * @property string                                                                      $account_bic
- * @property string                                                                      $account_type
- * @property string                                                                      $account_currency_code
- * @property int                                                                         $opposing_account_id
- * @property string                                                                      $opposing_account_name
- * @property string                                                                      $opposing_account_iban
- * @property string                                                                      $opposing_account_number
- * @property string                                                                      $opposing_account_bic
- * @property string                                                                      $opposing_account_type
- * @property string                                                                      $opposing_currency_code
- * @property int                                                                         $transaction_budget_id
- * @property string                                                                      $transaction_budget_name
- * @property int                                                                         $transaction_journal_budget_id
- * @property string                                                                      $transaction_journal_budget_name
- * @property int                                                                         $transaction_category_id
- * @property string                                                                      $transaction_category_name
- * @property int                                                                         $transaction_journal_category_id
- * @property string                                                                      $transaction_journal_category_name
- * @property int                                                                         $bill_id
- * @property string                                                                      $bill_name
- * @property string                                                                      $bill_name_encrypted
- * @property string                                                                      $notes
- * @property string                                                                      $tags
- * @property string                                                                      $transaction_currency_name
- * @property string                                                                      $transaction_currency_symbol
- * @property int                                                                         $transaction_currency_dp
- * @property string                                                                      $transaction_currency_code
- * @property string                                                                      $description
- * @property bool                                                                        $is_split
- * @property int                                                                         $attachmentCount
- * @property int                                                                         $transaction_currency_id
- * @property int                                                                         $foreign_currency_id
- * @property string                                                                      $amount
- * @property string                                                                      $foreign_amount
- * @property TransactionJournal                                                          $transactionJournal
- * @property Account                                                                     $account
- * @property int                                                                         $identifier
- * @property int                                                                         $id
- * @property TransactionCurrency                                                         $transactionCurrency
- * @property int                                                                         $transaction_journal_id
- * @property TransactionCurrency                                                         $foreignCurrency
- * @property string                                                                      $before      // used in audit reports.
- * @property string                                                                      $after       // used in audit reports.
- * @property int                                                                         $opposing_id // ID of the opposing transaction, used in collector
- * @property bool                                                                        $encrypted   // is the journal encrypted
- * @property bool                                                                        reconciled
- * @property string                                                                      transaction_category_encrypted
- * @property string                          transaction_journal_category_encrypted
- * @property string                          transaction_budget_encrypted
- * @property string                          transaction_journal_budget_encrypted
- * @property string                          type
- * @property string                          name
- * @property Carbon                          created_at
- * @property Carbon                          updated_at
- * @property string                          foreign_currency_code
- * @SuppressWarnings (PHPMD.TooManyPublicMethods)
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read Collection|Budget[]        $budgets
+ * @property bool $reconciled
- * @property-read Collection|Category[]      $categories
+ * @property int $account_id
- * @method static Builder|Transaction after(Carbon $date)
+ * @property int $transaction_journal_id
- * @method static Builder|Transaction before(Carbon $date)
+ * @property string|null $description
- * @method static bool|null forceDelete()
+ * @property int|null $transaction_currency_id
+ * @property string $amount
+ * @property string|null $foreign_amount
+ * @property int|null $foreign_currency_id
+ * @property int $identifier
+ * @property-read \FireflyIII\Models\Account $account
+ * @property-read Collection|\FireflyIII\Models\Budget[] $budgets
+ * @property-read int|null $budgets_count
+ * @property-read Collection|\FireflyIII\Models\Category[] $categories
+ * @property-read int|null $categories_count
+ * @property-read \FireflyIII\Models\TransactionCurrency|null $foreignCurrency
+ * @property-read \FireflyIII\Models\TransactionCurrency|null $transactionCurrency
+ * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
+ * @method static Builder|Transaction after(\Carbon\Carbon $date)
+ * @method static Builder|Transaction before(\Carbon\Carbon $date)
  * @method static Builder|Transaction newModelQuery()
  * @method static Builder|Transaction newQuery()
  * @method static \Illuminate\Database\Query\Builder|Transaction onlyTrashed()
  * @method static Builder|Transaction query()
- * @method static bool|null restore()
  * @method static Builder|Transaction transactionTypes($types)
  * @method static Builder|Transaction whereAccountId($value)
  * @method static Builder|Transaction whereAmount($value)
@@ -131,8 +79,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Query\Builder|Transaction withTrashed()
  * @method static \Illuminate\Database\Query\Builder|Transaction withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null $budgets_count
- * @property-read int|null $categories_count
  */
 class Transaction extends Model
 {

app/Models/TransactionCurrency.php

@@ -31,27 +31,29 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+
 /**
- * Class TransactionCurrency.
+ * FireflyIII\Models\TransactionCurrency
  *
- * @property string                               $code
+ * @property int $id
- * @property string                               $symbol
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property int                                  $decimal_places
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property int                                  $id
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property string                               name
+ * @property bool $enabled
- * @property bool                                 $enabled
+ * @property string $code
- * @property Carbon                               $created_at
+ * @property string $name
- * @property Carbon                               $updated_at
+ * @property string $symbol
- * @property \Illuminate\Support\Carbon|null      $deleted_at
+ * @property int $decimal_places
- * @property-read Collection|BudgetLimit[]        $budgetLimits
+ * @property-read Collection|\FireflyIII\Models\BudgetLimit[] $budgetLimits
- * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read int|null $budget_limits_count
- * @property-read Collection|Transaction[]        $transactions
+ * @property-read Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @method static bool|null forceDelete()
+ * @property-read int|null $transaction_journals_count
+ * @property-read Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read int|null $transactions_count
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency newQuery()
  * @method static Builder|TransactionCurrency onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereCode($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionCurrency whereDecimalPlaces($value)
@@ -64,9 +66,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|TransactionCurrency withTrashed()
  * @method static Builder|TransactionCurrency withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null                        $budget_limits_count
- * @property-read int|null                        $transaction_journals_count
- * @property-read int|null                        $transactions_count
  */
 class TransactionCurrency extends Model
 {

app/Models/TransactionGroup.php

@@ -35,22 +35,21 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 
 /**
- * Class TransactionGroup.
+ * FireflyIII\Models\TransactionGroup
  *
- * @property int                                                                $id
+ * @property int $id
- * @property Carbon|null                                    $created_at
+ * @property Carbon|null $created_at
- * @property Carbon|null                                    $updated_at
+ * @property Carbon|null $updated_at
- * @property Carbon|null                                    $deleted_at
+ * @property Carbon|null $deleted_at
- * @property int                                                                $user_id
+ * @property int $user_id
- * @property string|null                                                        $title
+ * @property string|null $title
- * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @property-read User                                                          $user
+ * @property-read int|null $transaction_journals_count
- * @method static bool|null forceDelete()
+ * @property-read User $user
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup newQuery()
  * @method static Builder|TransactionGroup onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereId($value)
@@ -60,12 +59,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|TransactionGroup withTrashed()
  * @method static Builder|TransactionGroup withoutTrashed()
  * @mixin Eloquent
- * @property string        amount
- * @property string        foreign_amount
- * @property int           transaction_group_id
- * @property int           transaction_journal_id
- * @property string        transaction_group_title
- * @property-read int|null $transaction_journals_count
  */
 class TransactionGroup extends Model
 {

app/Models/TransactionJournal.php

@@ -40,55 +40,57 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 
 /**
- * Class TransactionJournal.
+ * FireflyIII\Models\TransactionJournal
  *
- * @property User                                                                                      $user
+ * @property int $id
- * @property int                                                                                       $bill_id
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Collection                                                                                $categories
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property bool                                                                                      $completed
+ * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property string                                                                                    $description
+ * @property int $user_id
- * @property int                                                                                       $transaction_type_id
+ * @property int $transaction_type_id
- * @property int                                                                                       transaction_currency_id
+ * @property int|null $transaction_group_id
- * @property TransactionCurrency                                                                       $transactionCurrency
+ * @property int|null $bill_id
- * @property Collection                                                                                $tags
+ * @property int|null $transaction_currency_id
- * @property int                                                                                       user_id
+ * @property string $description
- * @property Collection                                                                                transactions
+ * @property \Illuminate\Support\Carbon $date
- * @property int                                                                                       transaction_count
+ * @property \Illuminate\Support\Carbon|null $interest_date
- * @property Carbon                                                                                    interest_date
+ * @property \Illuminate\Support\Carbon|null $book_date
- * @property Carbon                                                                                    book_date
+ * @property \Illuminate\Support\Carbon|null $process_date
- * @property Carbon                                                                                    process_date
+ * @property int $order
- * @property bool                                                                                      encrypted
+ * @property int $tag_count
- * @property int                                                                                       order
+ * @property bool $encrypted
- * @property int                                                                                       budget_id
+ * @property bool $completed
- * @property string                                                                                    period_marker
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
- * @property Carbon                                                                                    $date
+ * @property-read int|null $attachments_count
- * @property string                                                                                    $transaction_type_type
+ * @property-read \FireflyIII\Models\Bill|null $bill
- * @property int                                                                                       $id
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets
- * @property TransactionType                                                                           $transactionType
+ * @property-read int|null $budgets_count
- * @property Collection                                                                                budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories
- * @property Bill                                                                   $bill
+ * @property-read int|null $categories_count
- * @property Collection                                                             transactionJournalMeta
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $destJournalLinks
- * @property TransactionGroup                                                       transactionGroup
+ * @property-read int|null $dest_journal_links_count
- * @property int                                                                    transaction_group_id
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
- * @SuppressWarnings (PHPMD.TooManyPublicMethods)
+ * @property-read int|null $notes_count
- * @SuppressWarnings (PHPMD.CouplingBetweenObjects)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents
- * @property \Illuminate\Support\Carbon|null                                        $created_at
+ * @property-read int|null $piggy_bank_events_count
- * @property \Illuminate\Support\Carbon|null                                        $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalLink[] $sourceJournalLinks
- * @property \Illuminate\Support\Carbon|null                                        $deleted_at
+ * @property-read int|null $source_journal_links_count
- * @property int                                                                    $tag_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags
- * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[]             $attachments
+ * @property-read int|null $tags_count
- * @property-read \Illuminate\Database\Eloquent\Collection|Note[]                   $notes
+ * @property-read \FireflyIII\Models\TransactionCurrency|null $transactionCurrency
- * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[]         $piggyBankEvents
+ * @property-read \FireflyIII\Models\TransactionGroup|null $transactionGroup
- * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournalLink[] $sourceJournalLinks
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalMeta[] $transactionJournalMeta
- * @property-read \Illuminate\Database\Eloquent\Collection|Category[]               $transactionGroups
+ * @property-read int|null $transaction_journal_meta_count
- * @method static EloquentBuilder|TransactionJournal after(Carbon $date)
+ * @property-read \FireflyIII\Models\TransactionType $transactionType
- * @method static EloquentBuilder|TransactionJournal before(Carbon $date)
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
- * @method static bool|null forceDelete()
+ * @property-read int|null $transactions_count
+ * @property-read User $user
+ * @method static EloquentBuilder|TransactionJournal after(\Carbon\Carbon $date)
+ * @method static EloquentBuilder|TransactionJournal before(\Carbon\Carbon $date)
  * @method static EloquentBuilder|TransactionJournal newModelQuery()
  * @method static EloquentBuilder|TransactionJournal newQuery()
  * @method static \Illuminate\Database\Query\Builder|TransactionJournal onlyTrashed()
  * @method static EloquentBuilder|TransactionJournal query()
- * @method static bool|null restore()
  * @method static EloquentBuilder|TransactionJournal transactionTypes($types)
  * @method static EloquentBuilder|TransactionJournal whereBillId($value)
  * @method static EloquentBuilder|TransactionJournal whereBookDate($value)
@@ -104,24 +106,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static EloquentBuilder|TransactionJournal whereProcessDate($value)
  * @method static EloquentBuilder|TransactionJournal whereTagCount($value)
  * @method static EloquentBuilder|TransactionJournal whereTransactionCurrencyId($value)
+ * @method static EloquentBuilder|TransactionJournal whereTransactionGroupId($value)
  * @method static EloquentBuilder|TransactionJournal whereTransactionTypeId($value)
  * @method static EloquentBuilder|TransactionJournal whereUpdatedAt($value)
  * @method static EloquentBuilder|TransactionJournal whereUserId($value)
  * @method static \Illuminate\Database\Query\Builder|TransactionJournal withTrashed()
  * @method static \Illuminate\Database\Query\Builder|TransactionJournal withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null                                                          $attachments_count
- * @property-read int|null                                                          $budgets_count
- * @property-read int|null                                                          $categories_count
- * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournalLink[] $destJournalLinks
- * @property-read int|null                                                          $dest_journal_links_count
- * @property-read int|null                                                          $notes_count
- * @property-read int|null                                                          $piggy_bank_events_count
- * @property-read int|null                                                          $source_journal_links_count
- * @property-read int|null                                                          $tags_count
- * @property-read int|null                                                          $transaction_journal_meta_count
- * @property-read int|null                                                          $transactions_count
- * @method static EloquentBuilder|TransactionJournal whereTransactionGroupId($value)
  */
 class TransactionJournal extends Model
 {

app/Models/TransactionJournalLink.php

@@ -32,19 +32,20 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class TransactionJournalLink.
+ * FireflyIII\Models\TransactionJournalLink
  *
- * @property int                                                  $id
+ * @property int $id
- * @property Carbon                                               $created_at
+ * @property \Illuminate\Support\Carbon|null $created_at
- * @property Carbon                                               $updated_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string                                               $comment
+ * @property int $link_type_id
- * @property TransactionJournal                                   $source
+ * @property int $source_id
- * @property TransactionJournal                                   $destination
+ * @property int $destination_id
- * @property LinkType                                             $linkType
+ * @property string|null $comment
- * @property int                                                  $link_type_id
+ * @property-read \FireflyIII\Models\TransactionJournal $destination
- * @property int                                                  $source_id
+ * @property-read \FireflyIII\Models\LinkType $linkType
- * @property int                                                  $destination_id
+ * @property-read Collection|\FireflyIII\Models\Note[] $notes
- * @property-read Collection|Note[] $notes
+ * @property-read int|null $notes_count
+ * @property-read \FireflyIII\Models\TransactionJournal $source
  * @method static Builder|TransactionJournalLink newModelQuery()
  * @method static Builder|TransactionJournalLink newQuery()
  * @method static Builder|TransactionJournalLink query()
@@ -56,7 +57,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|TransactionJournalLink whereSourceId($value)
  * @method static Builder|TransactionJournalLink whereUpdatedAt($value)
  * @mixin Eloquent
- * @property-read int|null                                        $notes_count
  */
 class TransactionJournalLink extends Model
 {

app/Models/TransactionJournalMeta.php

@@ -30,23 +30,21 @@ use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Carbon;
 
 /**
- * Class TransactionJournalMeta.
+ * FireflyIII\Models\TransactionJournalMeta
  *
- * @property string                          $name
+ * @property int $id
- * @property int                             $transaction_journal_id
- * @property TransactionJournal              $transactionJournal
- * @property string                          $data
- * @property int                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
- * @property string                          $hash
+ * @property int $transaction_journal_id
+ * @property string $name
+ * @property mixed $data
+ * @property string $hash
  * @property Carbon|null $deleted_at
- * @method static bool|null forceDelete()
+ * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta newQuery()
  * @method static Builder|TransactionJournalMeta onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereData($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionJournalMeta whereDeletedAt($value)

app/Models/TransactionType.php

@@ -32,20 +32,19 @@ use Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class TransactionType.
+ * FireflyIII\Models\TransactionType
  *
- * @property string                                                             $type
+ * @property int $id
- * @property int                                                                $id
+ * @property Carbon|null $created_at
- * @property Carbon|null                                    $created_at
+ * @property Carbon|null $updated_at
- * @property Carbon|null                                    $updated_at
+ * @property Carbon|null $deleted_at
- * @property Carbon|null                                    $deleted_at
+ * @property string $type
- * @property-read Collection|TransactionJournal[] $transactionJournals
+ * @property-read Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @method static bool|null forceDelete()
+ * @property-read int|null $transaction_journals_count
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionType newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionType newQuery()
  * @method static Builder|TransactionType onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionType query()
- * @method static bool|null restore()
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|TransactionType whereId($value)
@@ -54,7 +53,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|TransactionType withTrashed()
  * @method static Builder|TransactionType withoutTrashed()
  * @mixin Eloquent
- * @property-read int|null                                                      $transaction_journals_count
  */
 class TransactionType extends Model
 {

app/Models/Webhook.php

@@ -30,21 +30,24 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class Webhook
+ * FireflyIII\Models\Webhook
  *
- * @property int                             $id
+ * @property int                                                                               $id
- * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null                                                   $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null                                                   $updated_at
- * @property string|null                     $deleted_at
+ * @property \Illuminate\Support\Carbon|null                                                   $deleted_at
- * @property int                             $user_id
+ * @property int                                                                               $user_id
- * @property bool                            $active
+ * @property bool                                                                              $active
- * @property int                             $trigger
+ * @property int                                                                               $trigger
- * @property int                             $response
+ * @property int                                                                               $response
- * @property int                             $delivery
+ * @property int                                                                               $delivery
- * @property string                          $url
+ * @property string                                                                            $url
- * @property-read User                       $user
+ * @property-read User                                                                         $user
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\WebhookMessage[] $webhookMessages
+ * @property-read int|null                                                                     $webhook_messages_count
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook newQuery()
+ * @method static \Illuminate\Database\Query\Builder|Webhook onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook query()
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook whereActive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook whereCreatedAt($value)
@@ -56,12 +59,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook whereUrl($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Webhook whereUserId($value)
- * @mixin \Eloquent
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\WebhookMessage[] $webhookMessages
- * @property-read int|null $webhook_messages_count
- * @method static \Illuminate\Database\Query\Builder|Webhook onlyTrashed()
  * @method static \Illuminate\Database\Query\Builder|Webhook withTrashed()
  * @method static \Illuminate\Database\Query\Builder|Webhook withoutTrashed()
+ * @mixin \Eloquent
  */
 class Webhook extends Model
 {
@@ -76,6 +76,7 @@ class Webhook extends Model
     // actions
     public const RESPONSE_TRANSACTIONS = 200;
     public const RESPONSE_ACCOUNTS     = 210;
+    public const RESPONSE_NONE         = 220;
 
     // delivery
     public const DELIVERY_JSON = 300;
@@ -130,5 +131,4 @@ class Webhook extends Model
     {
         return $this->hasMany(WebhookMessage::class);
     }
-
 }

app/Models/WebhookAttempt.php

@@ -0,0 +1,41 @@
+<?php
+/*
+ * WebhookAttempt.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Models;
+
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Class WebhookAttempt
+ */
+class WebhookAttempt extends Model
+{
+    /**
+     * @codeCoverageIgnore
+     * @return BelongsTo
+     */
+    public function webhookMessage(): BelongsTo
+    {
+        return $this->belongsTo(WebhookMessage::class);
+    }
+}

app/Models/WebhookMessage.php

@@ -24,37 +24,38 @@ namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * Class WebhookMessage
+ * FireflyIII\Models\WebhookMessage
  *
- * @property int                             $id
+ * @property int $id
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property string|null                     $deleted_at
+ * @property string|null $deleted_at
- * @property int                             $webhook_id
+ * @property int $webhook_id
- * @property int                             $sent
+ * @property bool $sent
- * @property int                             $errored
+ * @property bool $errored
- * @property string                          $uuid
+ * @property int $attempts
- * @property string                          $message
+ * @property string $uuid
+ * @property array $message
+ * @property array|null $logs
  * @property-read \FireflyIII\Models\Webhook $webhook
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage query()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereAttempts($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereErrored($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereLogs($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereMessage($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereSent($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereUuid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereWebhookId($value)
  * @mixin \Eloquent
- * @property int $attempts
- * @property array|null $logs
- * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereAttempts($value)
- * @method static \Illuminate\Database\Eloquent\Builder|WebhookMessage whereLogs($value)
  */
 class WebhookMessage extends Model
 {
@@ -77,5 +78,14 @@ class WebhookMessage extends Model
         return $this->belongsTo(Webhook::class);
     }
 
+    /**
+     * @codeCoverageIgnore
+     * @return HasMany
+     */
+    public function webhookAttempts(): HasMany
+    {
+        return $this->hasMany(WebhookAttempt::class);
+    }
+
 
 }