Refactor various code.

app/Models/Account.php

@@ -42,7 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class Account
  *
- * @property int                             $id
+ * @property int|string                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at

app/Models/AccountMeta.php

@@ -32,7 +32,7 @@ use Carbon\Carbon;
 /**
  * Class AccountMeta
  *
- * @property int          $id
+ * @property int|string          $id
  * @property Carbon|null  $created_at
  * @property Carbon|null  $updated_at
  * @property int          $account_id

app/Models/AccountType.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\AccountType
  *
- * @property int                       $id
+ * @property int|string                       $id
  * @property Carbon|null               $created_at
  * @property Carbon|null               $updated_at
  * @property string                    $type

app/Models/Attachment.php

@@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Attachment
  *
- * @property int                 $id
+ * @property int|string                 $id
  * @property Carbon|null         $created_at
  * @property Carbon|null         $updated_at
  * @property Carbon|null         $deleted_at

app/Models/AuditLogEntry.php

@@ -42,7 +42,7 @@ use Carbon\Carbon;
  * @method static Builder|AuditLogEntry query()
  * @method static \Illuminate\Database\Query\Builder|AuditLogEntry withTrashed()
  * @method static \Illuminate\Database\Query\Builder|AuditLogEntry withoutTrashed()
- * @property int                 $id
+ * @property int|string                 $id
  * @property Carbon|null         $created_at
  * @property Carbon|null         $updated_at
  * @property Carbon|null         $deleted_at

app/Models/AutoBudget.php

@@ -35,7 +35,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\AutoBudget
  *
- * @property int                      $id
+ * @property int|string                      $id
  * @property Carbon|null              $created_at
  * @property Carbon|null              $updated_at
  * @property Carbon|null              $deleted_at

app/Models/AvailableBudget.php

@@ -36,7 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\AvailableBudget
  *
- * @property int                      $id
+ * @property int|string                      $id
  * @property Carbon|null              $created_at
  * @property Carbon|null              $updated_at
  * @property Carbon|null              $deleted_at

app/Models/Bill.php

@@ -41,7 +41,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Bill
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null                          $created_at
  * @property Carbon|null                          $updated_at
  * @property Carbon|null                          $deleted_at

app/Models/Budget.php

@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Budget
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null                          $created_at
  * @property Carbon|null                          $updated_at
  * @property Carbon|null                          $deleted_at

app/Models/BudgetLimit.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\BudgetLimit
  *
- * @property int                           $id
+ * @property int|string                           $id
  * @property Carbon|null                   $created_at
  * @property Carbon|null                   $updated_at
  * @property int                           $budget_id

app/Models/Category.php

@@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Category
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null      $created_at
  * @property Carbon|null      $updated_at
  * @property Carbon|null      $deleted_at

app/Models/Configuration.php

@@ -32,7 +32,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\Configuration
  *
- * @property int         $id
+ * @property int|string         $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at

app/Models/CurrencyExchangeRate.php

@@ -35,7 +35,7 @@ use Carbon\Carbon;
 /**
  * Class CurrencyExchangeRate
  *
- * @property int                      $id
+ * @property int|string                      $id
  * @property Carbon|null              $created_at
  * @property Carbon|null              $updated_at
  * @property string|null              $deleted_at

app/Models/InvitedUser.php

@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static Builder|InvitedUser newModelQuery()
  * @method static Builder|InvitedUser newQuery()
  * @method static Builder|InvitedUser query()
- * @property int         $id
+ * @property int|string         $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property int         $user_id

app/Models/LinkType.php

@@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\LinkType
  *
- * @property int                                      $id
+ * @property int|string                                      $id
  * @property Carbon|null                              $created_at
  * @property Carbon|null                              $updated_at
  * @property Carbon|null                              $deleted_at

app/Models/Location.php

@@ -35,7 +35,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\Location
  *
- * @property int                       $id
+ * @property int|string                       $id
  * @property Carbon|null               $created_at
  * @property Carbon|null               $updated_at
  * @property Carbon|null               $deleted_at

app/Models/Note.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\Note
  *
- * @property int                 $id
+ * @property int|string                 $id
  * @property Carbon|null         $created_at
  * @property Carbon|null         $updated_at
  * @property Carbon|null         $deleted_at

app/Models/ObjectGroup.php

@@ -37,8 +37,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\ObjectGroup
  *
- * @property int                         $id
- * @property int                         $user_id
+ * @property int|string                         $id
+ * @property int|string                         $user_id
  * @property Carbon|null                 $created_at
  * @property Carbon|null                 $updated_at
  * @property Carbon|null                 $deleted_at

app/Models/PiggyBank.php

@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\PiggyBank
  *
- * @property int                                   $id
+ * @property int|string                                   $id
  * @property Carbon|null                           $created_at
  * @property Carbon|null                           $updated_at
  * @property Carbon|null                           $deleted_at

app/Models/PiggyBankEvent.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\PiggyBankEvent
  *
- * @property int                          $id
+ * @property int|string                          $id
  * @property Carbon|null                  $created_at
  * @property Carbon|null                  $updated_at
  * @property int                          $piggy_bank_id

app/Models/PiggyBankRepetition.php

@@ -33,7 +33,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 /**
  * FireflyIII\Models\PiggyBankRepetition
  *
- * @property int                             $id
+ * @property int|string                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property int                             $piggy_bank_id

app/Models/Preference.php

@@ -34,7 +34,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Preference
  *
- * @property int                   $id
+ * @property int|string                   $id
  * @property Carbon|null           $created_at
  * @property Carbon|null           $updated_at
  * @property int                   $user_id

app/Models/Recurrence.php

@@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Recurrence
  *
- * @property int                                     $id
+ * @property int|string                                     $id
  * @property Carbon|null                             $created_at
  * @property Carbon|null                             $updated_at
  * @property Carbon|null                             $deleted_at

app/Models/RecurrenceMeta.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\RecurrenceMeta
  *
- * @property int             $id
+ * @property int|string             $id
  * @property Carbon|null     $created_at
  * @property Carbon|null     $updated_at
  * @property Carbon|null     $deleted_at

app/Models/RecurrenceRepetition.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\RecurrenceRepetition
  *
- * @property int             $id
+ * @property int|string             $id
  * @property Carbon|null     $created_at
  * @property Carbon|null     $updated_at
  * @property Carbon|null     $deleted_at

app/Models/RecurrenceTransaction.php

@@ -36,7 +36,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\RecurrenceTransaction
  *
- * @property int                                         $id
+ * @property int|string                                         $id
  * @property Carbon|null                                 $created_at
  * @property Carbon|null                                 $updated_at
  * @property Carbon|null                                 $deleted_at

app/Models/RecurrenceTransactionMeta.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\RecurrenceTransactionMeta
  *
- * @property int                        $id
+ * @property int|string                        $id
  * @property Carbon|null                $created_at
  * @property Carbon|null                $updated_at
  * @property Carbon|null                $deleted_at

app/Models/Role.php

@@ -34,7 +34,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\Role
  *
- * @property int                    $id
+ * @property int|string                    $id
  * @property Carbon|null            $created_at
  * @property Carbon|null            $updated_at
  * @property string                 $name

app/Models/Rule.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Rule
  *
- * @property int                          $id
+ * @property int|string                          $id
  * @property Carbon|null                  $created_at
  * @property Carbon|null                  $updated_at
  * @property Carbon|null                  $deleted_at

app/Models/RuleAction.php

@@ -32,7 +32,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\RuleAction
  *
- * @property int         $id
+ * @property int|string         $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property int         $rule_id

app/Models/RuleGroup.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\RuleGroup
  *
- * @property int               $id
+ * @property int|string               $id
  * @property Carbon|null       $created_at
  * @property Carbon|null       $updated_at
  * @property Carbon|null       $deleted_at

app/Models/RuleTrigger.php

@@ -32,7 +32,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\RuleTrigger
  *
- * @property int         $id
+ * @property int|string         $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property int         $rule_id

app/Models/Tag.php

@@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Tag
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null                          $created_at
  * @property Carbon|null                          $updated_at
  * @property Carbon|null                          $deleted_at

app/Models/Transaction.php

@@ -37,7 +37,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 /**
  * FireflyIII\Models\Transaction
  *
- * @property int                             $id
+ * @property int|string                             $id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $deleted_at

app/Models/TransactionCurrency.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\TransactionCurrency
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null                          $created_at
  * @property Carbon|null                          $updated_at
  * @property Carbon|null                          $deleted_at

app/Models/TransactionGroup.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\TransactionGroup
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null                          $created_at
  * @property Carbon|null                          $updated_at
  * @property Carbon|null                          $deleted_at

app/Models/TransactionJournal.php

@@ -41,7 +41,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\TransactionJournal
  *
- * @property int                                      $id
+ * @property int|string                                      $id
  * @property Carbon|null                              $created_at
  * @property Carbon|null                              $updated_at
  * @property Carbon|null                              $deleted_at

app/Models/TransactionJournalLink.php

@@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\TransactionJournalLink
  *
- * @property int                     $id
+ * @property int|string                    $id
  * @property Carbon|null             $created_at
  * @property Carbon|null             $updated_at
  * @property int                     $link_type_id

app/Models/TransactionJournalMeta.php

@@ -33,7 +33,7 @@ use Carbon\Carbon;
 /**
  * FireflyIII\Models\TransactionJournalMeta
  *
- * @property int                     $id
+ * @property int|string                     $id
  * @property Carbon|null             $created_at
  * @property Carbon|null             $updated_at
  * @property int                     $transaction_journal_id

app/Models/TransactionType.php

@@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\TransactionType
  *
- * @property int                                  $id
+ * @property int|string                                  $id
  * @property Carbon|null                          $created_at
  * @property Carbon|null                          $updated_at
  * @property Carbon|null                          $deleted_at

app/Models/UserGroup.php

@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class UserGroup
  *
- * @property int                                        $id
+ * @property int|string                                        $id
  * @property Carbon|null                                $created_at
  * @property Carbon|null                                $updated_at
  * @property string|null                                $deleted_at

app/Models/UserRole.php

@@ -34,7 +34,7 @@ use Carbon\Carbon;
 /**
  * Class UserRole
  *
- * @property int                               $id
+ * @property int|string                               $id
  * @property Carbon|null                       $created_at
  * @property Carbon|null                       $updated_at
  * @property string|null                       $deleted_at

app/Models/Webhook.php

@@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Webhook
  *
- * @property int                              $id
+ * @property int|string                              $id
  * @property Carbon|null                      $created_at
  * @property Carbon|null                      $updated_at
  * @property Carbon|null                      $deleted_at

app/Models/WebhookAttempt.php

@@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Class WebhookAttempt
  *
- * @property int                 $id
+ * @property int|string                 $id
  * @property Carbon|null         $created_at
  * @property Carbon|null         $updated_at
  * @property string|null         $deleted_at

app/Models/WebhookMessage.php

@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\WebhookMessage
  *
- * @property int                              $id
+ * @property int|string                              $id
  * @property Carbon|null                      $created_at
  * @property Carbon|null                      $updated_at
  * @property string|null                      $deleted_at