From 0c072c7d51579f5b3a0bc31d2c4ac1b9efb84469 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 18 Nov 2016 19:58:06 +0100 Subject: [PATCH] Some code cleanup. --- app/Models/Account.php | 56 +-- app/Models/AccountMeta.php | 18 - app/Models/AccountType.php | 14 - app/Models/Attachment.php | 37 -- app/Models/Bill.php | 44 -- app/Models/Budget.php | 31 -- app/Models/BudgetLimit.php | 24 - app/Models/Category.php | 27 - app/Models/Configuration.php | 17 - app/Models/ExportJob.php | 19 - app/Models/ImportJob.php | 25 - app/Models/LimitRepetition.php | 24 - app/Models/Note.php | 23 - app/Models/PiggyBank.php | 38 -- app/Models/PiggyBankEvent.php | 21 - app/Models/PiggyBankRepetition.php | 22 - app/Models/Preference.php | 21 - app/Models/Role.php | 20 - app/Models/Rule.php | 32 -- app/Models/RuleAction.php | 25 - app/Models/RuleGroup.php | 26 - app/Models/RuleTrigger.php | 25 - app/Models/Tag.php | 33 -- app/Models/Transaction.php | 32 -- app/Models/TransactionCurrency.php | 20 - app/Models/TransactionGroup.php | 20 - app/Models/TransactionJournal.php | 71 --- app/Models/TransactionJournalMeta.php | 22 - app/Models/TransactionType.php | 16 - composer.lock | 692 +++++++++++++------------- config/app.php | 1 + 31 files changed, 363 insertions(+), 1133 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index d9325d1dea..b38d14c2b0 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -26,47 +26,7 @@ use Illuminate\Database\Query\JoinClause; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\Account - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property integer $account_type_id - * @property string $name - * @property boolean $active - * @property boolean $encrypted - * @property float $virtual_balance - * @property string $iban - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta - * @property-read \FireflyIII\Models\AccountType $accountType - * @property-read mixed $name_for_editform - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value) - * @property string $startBalance - * @property string $endBalance - * @property float $difference - * @property \Carbon\Carbon $lastActivityDate - * @property float $piggyBalance - * @property float $percentage - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereAccountTypeId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereEncrypted($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalance($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereIban($value) - * @mixin \Eloquent - */ + class Account extends Model { use SoftDeletes, ValidatingTrait; @@ -264,6 +224,20 @@ class Account extends Model return $journal->date; } + /** + * @return string + */ + public function nameForEdit(): string + { + $name = $this->name; + + if ($this->accountType->type === AccountType::CASH) { + return ''; + } + + return $name; + } + /** * @return HasMany */ diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index c6a2c6004a..6c92343c18 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -16,24 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -/** - * FireflyIII\Models\AccountMeta - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $account_id - * @property string $name - * @property string $data - * @property-read Account $account - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereData($value) - * @mixin \Eloquent - */ class AccountMeta extends Model { diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 920b62a950..06a2c37003 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -16,20 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; -/** - * FireflyIII\Models\AccountType - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $type - * @property-read \Illuminate\Database\Eloquent\Collection|Account[] $accounts - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereType($value) - * @mixin \Eloquent - */ class AccountType extends Model { const DEFAULT = 'Default account'; diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 85d21c16c8..6c798372d8 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -20,43 +20,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * FireflyIII\Models\Attachment - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $attachable_id - * @property string $attachable_type - * @property integer $user_id - * @property string $md5 - * @property string $filename - * @property string $title - * @property string $description - * @property string $notes - * @property string $mime - * @property integer $size - * @property boolean $uploaded - * @property-read Attachment $attachable - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereAttachableId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereAttachableType($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereMd5($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereFilename($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereTitle($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereDescription($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereNotes($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereMime($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereSize($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUploaded($value) - * @mixin \Eloquent - */ class Attachment extends Model { use SoftDeletes; diff --git a/app/Models/Bill.php b/app/Models/Bill.php index d13f6d372e..ab9f37e99e 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -20,50 +20,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\Bill - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $match - * @property float $amount_min - * @property float $amount_max - * @property \Carbon\Carbon $date - * @property boolean $active - * @property boolean $automatch - * @property string $repeat_freq - * @property integer $skip - * @property boolean $name_encrypted - * @property boolean $match_encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user - * @property \Carbon\Carbon $nextExpectedMatch - * @property \Carbon\Carbon $lastFoundMatch - * @property bool $paidInPeriod - * @property string $lastPaidAmount - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatch($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMin($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMax($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAutomatch($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value) - * @mixin \Eloquent - * @property string $deleted_at - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereDeletedAt($value) - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals - */ class Bill extends Model { diff --git a/app/Models/Budget.php b/app/Models/Budget.php index db69a0da47..ba8cddea4f 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -20,37 +20,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\Budget - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property boolean $active - * @property boolean $encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|BudgetLimit[] $budgetlimits - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user - * @property string $dateFormatted - * @property string $budgeted - * @property float $amount - * @property \Carbon\Carbon $date - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereEncrypted($value) - * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals - */ class Budget extends Model { diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index fa1ab82f95..9a2843b1b4 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -15,30 +15,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; -/** - * FireflyIII\Models\BudgetLimit - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $budget_id - * @property \Carbon\Carbon $startdate - * @property float $amount - * @property boolean $repeats - * @property string $repeat_freq - * @property-read Budget $budget - * @property int $component_id - * @property-read \Illuminate\Database\Eloquent\Collection|LimitRepetition[] $limitrepetitions - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereStartdate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeats($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeatFreq($value) - * @mixin \Eloquent - */ class BudgetLimit extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index c51dabc025..5b12d93558 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -20,33 +20,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\Category - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property boolean $encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user - * @property string $dateFormatted - * @property string $spent - * @property \Carbon\Carbon $lastActivity - * @property string $type - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value) - * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals - */ class Category extends Model { use SoftDeletes, ValidatingTrait; diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index d74eb7255d..4b10d83860 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -16,23 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -/** - * FireflyIII\Models\Configuration - * - * @mixin \Eloquent - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property string $data - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Configuration whereData($value) - */ class Configuration extends Model { use SoftDeletes; diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index 4e9997abe1..5111f8918d 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -16,25 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * Class ExportJob - * - * @package FireflyIII - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $key - * @property string $status - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ExportJob whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ExportJob whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ExportJob whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ExportJob whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ExportJob whereKey($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ExportJob whereStatus($value) - * @mixin \Eloquent - */ class ExportJob extends Model { /** diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index c7ba8c4427..75066b734d 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -18,31 +18,6 @@ use Illuminate\Database\Eloquent\Model; use Storage; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - -/** - * FireflyIII\Models\ImportJob - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $key - * @property string $file_type - * @property string $status - * @property array $configuration - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereKey($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereFileType($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereStatus($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereConfiguration($value) - * @mixin \Eloquent - * @property string $extended_status - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\ImportJob whereExtendedStatus($value) - */ class ImportJob extends Model { diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 9d2dc5b416..4732b9e950 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -18,30 +18,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * FireflyIII\Models\LimitRepetition - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $budget_limit_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $enddate - * @property float $amount - * @property-read BudgetLimit $budgetLimit - * @property int $budget_id - * @property string $spent - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereBudgetLimitId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereStartdate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereEnddate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmount($value) - * @mixin \Eloquent - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition after($date) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition before($date) - */ class LimitRepetition extends Model { diff --git a/app/Models/Note.php b/app/Models/Note.php index c26a397421..4b2c3df254 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -16,29 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use League\CommonMark\CommonMarkConverter; - -/** - * FireflyIII\Models\Note - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $noteable_id - * @property string $noteable_type - * @property string $title - * @property string $text - * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $noteable - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereNoteableId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereNoteableType($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereTitle($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereText($value) - * @mixin \Eloquent - */ class Note extends Model { protected $dates = ['created_at', 'updated_at', 'deleted_at']; diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 9a57917b26..d0c001fb23 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -20,44 +20,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Steam; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * FireflyIII\Models\PiggyBank - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property string $name - * @property float $targetamount - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property integer $order - * @property boolean $encrypted - * @property-read Account $account - * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankRepetition[] $piggyBankRepetitions - * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[] $piggyBankEvents - * @property string $reminder - * @property PiggyBankRepetition $currentRep - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) - * @mixin \Eloquent - * @property boolean $active - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereActive($value) - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes - */ class PiggyBank extends Model { use SoftDeletes; diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 5e959c66c9..b8f589b55f 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -15,27 +15,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; -/** - * FireflyIII\Models\PiggyBankEvent - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $piggy_bank_id - * @property integer $transaction_journal_id - * @property \Carbon\Carbon $date - * @property float $amount - * @property PiggyBank $piggyBank - * @property-read TransactionJournal $transactionJournal - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value) - * @mixin \Eloquent - */ class PiggyBankEvent extends Model { diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 57aff06279..a6a7ed41b5 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -17,28 +17,6 @@ use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; -/** - * FireflyIII\Models\PiggyBankRepetition - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $piggy_bank_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property float $currentamount - * @property-read PiggyBank $piggyBank - * @method static \Illuminate\Database\Query\Builder|PiggyBankRepetition onDates($start, $target) - * @method static \Illuminate\Database\Query\Builder|PiggyBankRepetition relevantOnDate($date) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value) - * @mixin \Eloquent - */ class PiggyBankRepetition extends Model { diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 7a843e2470..5909ef55aa 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -19,27 +19,6 @@ use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Database\Eloquent\Model; use Log; -/** - * FireflyIII\Models\Preference - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $name_encrypted - * @property string $data - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereNameEncrypted($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereData($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereDataEncrypted($value) - * @mixin \Eloquent - */ class Preference extends Model { diff --git a/app/Models/Role.php b/app/Models/Role.php index c560cd6e3c..b400b69394 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -16,26 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; - -/** - * Class Role - * - * @package FireflyIII\Models - * @property integer $id - * @property string $name - * @property string $display_name - * @property string $description - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\User[] $users - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDisplayName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDescription($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereUpdatedAt($value) - * @mixin \Eloquent - */ class Role extends Model { diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 43d3631773..3e965f1f40 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -17,38 +17,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * Class Rule - * - * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $user_id - * @property integer $rule_group_id - * @property integer $order - * @property string $title - * @property string $description - * @property boolean $active - * @property boolean $stop_processing - * @property-read \FireflyIII\User $user - * @property-read \FireflyIII\Models\RuleGroup $ruleGroup - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\RuleAction[] $ruleActions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\RuleTrigger[] $ruleTriggers - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereRuleGroupId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereOrder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereStopProcessing($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereTitle($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Rule whereDescription($value) - * @mixin \Eloquent - */ class Rule extends Model { use SoftDeletes; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 2e13c89b9f..271aaf1164 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -22,31 +22,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; - -/** - * FireflyIII\Models\RuleAction - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $rule_id - * @property integer $order - * @property boolean $active - * @property boolean $stop_processing - * @property string $action_type - * @property string $action_value - * @property-read \FireflyIII\Models\Rule $rule - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereRuleId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereOrder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereStopProcessing($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereActionType($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleAction whereActionValue($value) - * @mixin \Eloquent - */ class RuleAction extends Model { /** diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 532ca0eba2..e89a88ee8d 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -17,32 +17,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * Class RuleGroup - * - * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $user_id - * @property integer $order - * @property string $title - * @property string $description - * @property boolean $active - * @property-read \FireflyIII\User $user - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Rule[] $rules - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereOrder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereTitle($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereDescription($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleGroup whereActive($value) - * @mixin \Eloquent - */ class RuleGroup extends Model { use SoftDeletes; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 684d9a9509..399b262c12 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -15,31 +15,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; -/** - * FireflyIII\Models\RuleTrigger - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $rule_id - * @property integer $order - * @property string $title - * @property string $trigger_type - * @property string $trigger_value - * @property boolean $active - * @property boolean $stop_processing - * @property-read \FireflyIII\Models\Rule $rule - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereRuleId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereOrder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereStopProcessing($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereTriggerType($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\RuleTrigger whereTriggerValue($value) - * @mixin \Eloquent - */ class RuleTrigger extends Model { /** diff --git a/app/Models/Tag.php b/app/Models/Tag.php index a89220efea..d69c13eb68 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -18,39 +18,6 @@ use FireflyIII\Support\Models\TagSupport; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\Tag - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $user_id - * @property string $tag - * @property string $tagMode - * @property \Carbon\Carbon $date - * @property string $description - * @property float $latitude - * @property float $longitude - * @property integer $zoomLevel - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user - * @property int $account_id - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTag($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTagMode($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDescription($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLatitude($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLongitude($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereZoomLevel($value) - * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals - */ class Tag extends TagSupport { protected $dates = ['created_at', 'updated_at', 'date']; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index f35efcb180..1033611b21 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -19,38 +19,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\Transaction - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property integer $transaction_journal_id - * @property string $description - * @property float $amount - * @property-read Account $account - * @property-read TransactionJournal $transactionJournal - * @method static \Illuminate\Database\Query\Builder|Transaction after($date) - * @method static \Illuminate\Database\Query\Builder|Transaction before($date) - * @property float $before - * @property float $after - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAccountId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDescription($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmount($value) - * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction transactionTypes($types) - * @property integer $identifier - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereIdentifier($value) - */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 1cf89fc7de..da1c887cad 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -18,26 +18,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\TransactionCurrency - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $code - * @property string $name - * @property string $symbol - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value) - * @mixin \Eloquent - */ class TransactionCurrency extends Model { use SoftDeletes, ValidatingTrait; diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index e075cfb63b..bcef0817e5 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -16,26 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -/** - * FireflyIII\Models\TransactionGroup - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property string $relation - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereRelation($value) - * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals - */ class TransactionGroup extends Model { use SoftDeletes; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 3c763b7302..e698c0ab15 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -25,77 +25,6 @@ use Preferences; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; -/** - * FireflyIII\Models\TransactionJournal - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property integer $transaction_type_id - * @property integer $bill_id - * @property integer $transaction_currency_id - * @property string $description - * @property boolean $completed - * @property \Carbon\Carbon $date - * @property \Carbon\Carbon $interest_date - * @property \Carbon\Carbon $book_date - * @property boolean $encrypted - * @property integer $order - * @property integer $tag_count - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments - * @property-read \FireflyIII\Models\Bill $bill - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags - * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency - * @property-read \FireflyIII\Models\TransactionType $transactionType - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalMeta[] $transactionjournalmeta - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read \FireflyIII\User $user - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal after($date) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal before($date) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types) - * @property string $transaction_type_type - * @property-read string $transaction_currency_code - * @property-read string $destination_amount - * @property string $destination_account_id - * @property string $destination_account_name - * @property-read string $destination_account_type - * @property-read string $source_amount - * @property string $source_account_id - * @property string $source_account_name - * @property-read string $source_account_type - * @property \Carbon\Carbon $process_date - * @property int $account_id - * @property float $journalAmount - * @property string $account_name - * @property int $budget_id - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereInterestDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereBookDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereProcessDate($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal expanded() - * @mixin \Eloquent - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal sortCorrectly() - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournalMeta[] $transactionJournalMeta - */ class TransactionJournal extends TransactionJournalSupport { use SoftDeletes, ValidatingTrait; diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index d855897713..86653f07fc 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -16,28 +16,6 @@ namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -/** - * Class TransactionJournalMeta - * - * @package FireflyIII\Models - * @property-read \FireflyIII\Models\TransactionJournal $transactionjournal - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $transaction_journal_id - * @property string $name - * @property string $data - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereTransactionJournalId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereName($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereData($value) - * @mixin \Eloquent - * @property string $hash - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereHash($value) - * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal - */ class TransactionJournalMeta extends Model { diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 51a912ca12..b18b10a7b0 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -17,22 +17,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -/** - * FireflyIII\Models\TransactionType - * - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $type - * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value) - * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereType($value) - * @mixin \Eloquent - */ class TransactionType extends Model { use SoftDeletes; diff --git a/composer.lock b/composer.lock index 193f6cd621..675c12bb64 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "12c9e9450c824d192b8c049989188b8e", - "content-hash": "473d3c681e5c41989e9dced651a939df", + "hash": "3c2ecf3f444f89ec56e069b5452744fa", + "content-hash": "19ebf906c75d026c93d83cb8186e5d27", "packages": [ { "name": "bacon/bacon-qr-code", @@ -49,175 +49,6 @@ "homepage": "https://github.com/Bacon/BaconQrCode", "time": "2016-01-09 22:55:35" }, - { - "name": "barryvdh/laravel-debugbar", - "version": "v2.3.0", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "0c87981df959c7c1943abe227baf607c92f204f9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/0c87981df959c7c1943abe227baf607c92f204f9", - "reference": "0c87981df959c7c1943abe227baf607c92f204f9", - "shasum": "" - }, - "require": { - "illuminate/support": "5.1.*|5.2.*|5.3.*", - "maximebf/debugbar": "~1.13.0", - "php": ">=5.5.9", - "symfony/finder": "~2.7|~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Barryvdh\\Debugbar\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "PHP Debugbar integration for Laravel", - "keywords": [ - "debug", - "debugbar", - "laravel", - "profiler", - "webprofiler" - ], - "time": "2016-09-15 14:05:56" - }, - { - "name": "barryvdh/laravel-ide-helper", - "version": "v2.2.1", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", - "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", - "shasum": "" - }, - "require": { - "barryvdh/reflection-docblock": "^2.0.4", - "illuminate/console": "^5.0,<5.4", - "illuminate/filesystem": "^5.0,<5.4", - "illuminate/support": "^5.0,<5.4", - "php": ">=5.4.0", - "symfony/class-loader": "^2.3|^3.0" - }, - "require-dev": { - "doctrine/dbal": "~2.3", - "phpunit/phpunit": "4.*", - "scrutinizer/ocular": "~1.1", - "squizlabs/php_codesniffer": "~2.3" - }, - "suggest": { - "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-4": { - "Barryvdh\\LaravelIdeHelper\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.", - "keywords": [ - "autocomplete", - "codeintel", - "helper", - "ide", - "laravel", - "netbeans", - "phpdoc", - "phpstorm", - "sublime" - ], - "time": "2016-07-04 11:52:48" - }, - { - "name": "barryvdh/reflection-docblock", - "version": "v2.0.4", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0,<4.5" - }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Barryvdh": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" - } - ], - "time": "2016-06-13 19:28:20" - }, { "name": "christian-riesen/base32", "version": "1.3.1", @@ -1206,16 +1037,16 @@ }, { "name": "league/commonmark", - "version": "0.15.0", + "version": "0.15.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "19fb96643beba24e681c371dc133e25409742664" + "reference": "20bdba6777e6c63f861711501eec8887e65412fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/19fb96643beba24e681c371dc133e25409742664", - "reference": "19fb96643beba24e681c371dc133e25409742664", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/20bdba6777e6c63f861711501eec8887e65412fc", + "reference": "20bdba6777e6c63f861711501eec8887e65412fc", "shasum": "" }, "require": { @@ -1271,7 +1102,7 @@ "markdown", "parser" ], - "time": "2016-09-14 15:44:35" + "time": "2016-11-08 15:28:32" }, { "name": "league/csv", @@ -1413,67 +1244,6 @@ ], "time": "2016-10-19 20:38:46" }, - { - "name": "maximebf/debugbar", - "version": "v1.13.0", - "source": { - "type": "git", - "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "5f49a5ed6cfde81d31d89378806670d77462526e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/5f49a5ed6cfde81d31d89378806670d77462526e", - "reference": "5f49a5ed6cfde81d31d89378806670d77462526e", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "^1.0", - "symfony/var-dumper": "^2.6|^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "suggest": { - "kriswallsmith/assetic": "The best way to manage assets", - "monolog/monolog": "Log using Monolog", - "predis/predis": "Redis storage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.13-dev" - } - }, - "autoload": { - "psr-4": { - "DebugBar\\": "src/DebugBar/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maxime Bouroumeau-Fuseau", - "email": "maxime.bouroumeau@gmail.com", - "homepage": "http://maximebf.com" - }, - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Debug bar in the browser for php application", - "homepage": "https://github.com/maximebf/php-debugbar", - "keywords": [ - "debug", - "debugbar" - ], - "time": "2016-09-15 14:01:59" - }, { "name": "monolog/monolog", "version": "1.21.0", @@ -1696,16 +1466,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "c0125896dbb151380ab47e96c621741e79623beb" + "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c0125896dbb151380ab47e96c621741e79623beb", - "reference": "c0125896dbb151380ab47e96c621741e79623beb", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", + "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", "shasum": "" }, "require": { @@ -1740,7 +1510,7 @@ "pseudorandom", "random" ], - "time": "2016-10-17 15:23:22" + "time": "2016-11-07 23:38:38" }, { "name": "pragmarx/google2fa", @@ -2168,62 +1938,6 @@ ], "time": "2016-07-08 11:51:25" }, - { - "name": "symfony/class-loader", - "version": "v3.1.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/class-loader.git", - "reference": "bcb072aba46ddf3b1a496438c63be6be647739aa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/bcb072aba46ddf3b1a496438c63be6be647739aa", - "reference": "bcb072aba46ddf3b1a496438c63be6be647739aa", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "require-dev": { - "symfony/finder": "~2.8|~3.0", - "symfony/polyfill-apcu": "~1.1" - }, - "suggest": { - "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\ClassLoader\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony ClassLoader Component", - "homepage": "https://symfony.com", - "time": "2016-09-06 23:30:54" - }, { "name": "symfony/console", "version": "v3.1.6", @@ -2588,16 +2302,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "dff51f72b0706335131b00a7f49606168c582594" + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", - "reference": "dff51f72b0706335131b00a7f49606168c582594", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", "shasum": "" }, "require": { @@ -2609,7 +2323,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2643,20 +2357,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-php56", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a" + "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a", - "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c", + "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c", "shasum": "" }, "require": { @@ -2666,7 +2380,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2699,20 +2413,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-util", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99" + "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99", - "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb", + "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb", "shasum": "" }, "require": { @@ -2721,7 +2435,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2751,7 +2465,7 @@ "polyfill", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/process", @@ -3006,16 +2720,16 @@ }, { "name": "twig/twig", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97" + "reference": "60ae30368f7ac50a95de032f16c1e882b0f69813" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97", - "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/60ae30368f7ac50a95de032f16c1e882b0f69813", + "reference": "60ae30368f7ac50a95de032f16c1e882b0f69813", "shasum": "" }, "require": { @@ -3028,7 +2742,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.27-dev" + "dev-master": "1.28-dev" } }, "autoload": { @@ -3063,7 +2777,7 @@ "keywords": [ "templating" ], - "time": "2016-10-25 19:17:17" + "time": "2016-11-17 17:46:53" }, { "name": "vlucas/phpdotenv", @@ -3167,6 +2881,175 @@ } ], "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v2.3.0", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "0c87981df959c7c1943abe227baf607c92f204f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/0c87981df959c7c1943abe227baf607c92f204f9", + "reference": "0c87981df959c7c1943abe227baf607c92f204f9", + "shasum": "" + }, + "require": { + "illuminate/support": "5.1.*|5.2.*|5.3.*", + "maximebf/debugbar": "~1.13.0", + "php": ">=5.5.9", + "symfony/finder": "~2.7|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "time": "2016-09-15 14:05:56" + }, + { + "name": "barryvdh/laravel-ide-helper", + "version": "v2.2.1", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-ide-helper.git", + "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", + "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", + "shasum": "" + }, + "require": { + "barryvdh/reflection-docblock": "^2.0.4", + "illuminate/console": "^5.0,<5.4", + "illuminate/filesystem": "^5.0,<5.4", + "illuminate/support": "^5.0,<5.4", + "php": ">=5.4.0", + "symfony/class-loader": "^2.3|^3.0" + }, + "require-dev": { + "doctrine/dbal": "~2.3", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1", + "squizlabs/php_codesniffer": "~2.3" + }, + "suggest": { + "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\LaravelIdeHelper\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.", + "keywords": [ + "autocomplete", + "codeintel", + "helper", + "ide", + "laravel", + "netbeans", + "phpdoc", + "phpstorm", + "sublime" + ], + "time": "2016-07-04 11:52:48" + }, + { + "name": "barryvdh/reflection-docblock", + "version": "v2.0.4", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/ReflectionDocBlock.git", + "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c", + "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0,<4.5" + }, + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Barryvdh": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } + ], + "time": "2016-06-13 19:28:20" + }, { "name": "doctrine/instantiator", "version": "1.0.5", @@ -3315,17 +3198,78 @@ "time": "2015-05-11 14:41:42" }, { - "name": "mockery/mockery", - "version": "0.9.5", + "name": "maximebf/debugbar", + "version": "v1.13.0", "source": { "type": "git", - "url": "https://github.com/padraic/mockery.git", - "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2" + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "5f49a5ed6cfde81d31d89378806670d77462526e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/padraic/mockery/zipball/4db079511a283e5aba1b3c2fb19037c645e70fc2", - "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/5f49a5ed6cfde81d31d89378806670d77462526e", + "reference": "5f49a5ed6cfde81d31d89378806670d77462526e", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "^1.0", + "symfony/var-dumper": "^2.6|^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.13-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug", + "debugbar" + ], + "time": "2016-09-15 14:01:59" + }, + { + "name": "mockery/mockery", + "version": "0.9.6", + "source": { + "type": "git", + "url": "https://github.com/padraic/mockery.git", + "reference": "65d4ca18e15cb02eeb1e5336f884e46b9b905be0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/padraic/mockery/zipball/65d4ca18e15cb02eeb1e5336f884e46b9b905be0", + "reference": "65d4ca18e15cb02eeb1e5336f884e46b9b905be0", "shasum": "" }, "require": { @@ -3377,7 +3321,7 @@ "test double", "testing" ], - "time": "2016-05-22 21:52:33" + "time": "2016-09-30 12:09:40" }, { "name": "myclabs/deep-copy", @@ -3826,16 +3770,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.8", + "version": "1.4.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b", + "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b", "shasum": "" }, "require": { @@ -3871,20 +3815,20 @@ "keywords": [ "tokenizer" ], - "time": "2015-09-15 10:49:45" + "time": "2016-11-15 14:06:22" }, { "name": "phpunit/phpunit", - "version": "5.6.2", + "version": "5.6.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "cd13b23ac5a519a4708e00736c26ee0bb28b2e01" + "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cd13b23ac5a519a4708e00736c26ee0bb28b2e01", - "reference": "cd13b23ac5a519a4708e00736c26ee0bb28b2e01", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ddb822f1de421b4cadb47570a525fd7d9359493", + "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493", "shasum": "" }, "require": { @@ -3912,7 +3856,9 @@ "symfony/yaml": "~2.1|~3.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpdocumentor/reflection-docblock": "3.0.2", + "sebastian/object-enumerator": "1.0.1", + "sebastian/recursion-context": "1.0.3 || 1.0.4" }, "require-dev": { "ext-pdo": "*" @@ -3953,7 +3899,7 @@ "testing", "xunit" ], - "time": "2016-10-25 07:40:25" + "time": "2016-11-18 09:50:51" }, { "name": "phpunit/phpunit-mock-objects", @@ -4061,16 +4007,16 @@ }, { "name": "sebastian/comparator", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + "reference": "ce2bda23a56456f19e35d98241446b581f648c14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ce2bda23a56456f19e35d98241446b581f648c14", + "reference": "ce2bda23a56456f19e35d98241446b581f648c14", "shasum": "" }, "require": { @@ -4121,7 +4067,7 @@ "compare", "equality" ], - "time": "2015-07-26 15:48:44" + "time": "2016-11-17 14:39:37" }, { "name": "sebastian/diff", @@ -4527,6 +4473,62 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-02-04 12:56:52" }, + { + "name": "symfony/class-loader", + "version": "v3.1.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/class-loader.git", + "reference": "bcb072aba46ddf3b1a496438c63be6be647739aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/bcb072aba46ddf3b1a496438c63be6be647739aa", + "reference": "bcb072aba46ddf3b1a496438c63be6be647739aa", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/finder": "~2.8|~3.0", + "symfony/polyfill-apcu": "~1.1" + }, + "suggest": { + "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\ClassLoader\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "https://symfony.com", + "time": "2016-09-06 23:30:54" + }, { "name": "symfony/css-selector", "version": "v3.1.6", diff --git a/config/app.php b/config/app.php index 68c0f500a9..bae2903930 100755 --- a/config/app.php +++ b/config/app.php @@ -65,6 +65,7 @@ return [ // own stuff: + //Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, //Barryvdh\Debugbar\ServiceProvider::class, DaveJamesMiller\Breadcrumbs\ServiceProvider::class,