From 0a2a01c44cf0fd3d51e8b94dee559e796d5b0308 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Jul 2015 21:06:26 +0200 Subject: [PATCH] Code reformat. --- app/Helpers/Csv/Converter/AccountId.php | 2 +- app/Helpers/Csv/Wizard.php | 4 +- app/Http/Controllers/NewUserController.php | 6 +- app/Models/Account.php | 48 +++++++-------- app/Models/AccountMeta.php | 14 ++--- app/Models/AccountType.php | 12 ++-- app/Models/Bill.php | 38 ++++++------ app/Models/Budget.php | 22 +++---- app/Models/BudgetLimit.php | 20 +++---- app/Models/Category.php | 22 +++---- app/Models/Component.php | 14 ++--- app/Models/LimitRepetition.php | 16 ++--- app/Models/Permission.php | 14 ++--- app/Models/PiggyBank.php | 34 +++++------ app/Models/PiggyBankEvent.php | 18 +++--- app/Models/PiggyBankRepetition.php | 16 ++--- app/Models/Preference.php | 18 +++--- app/Models/Role.php | 16 ++--- app/Models/Tag.php | 28 ++++----- app/Models/Transaction.php | 24 ++++---- app/Models/TransactionCurrency.php | 16 ++--- app/Models/TransactionGroup.php | 16 ++--- app/Models/TransactionJournal.php | 70 +++++++++++----------- app/Models/TransactionType.php | 12 ++-- app/User.php | 30 +++++----- 25 files changed, 266 insertions(+), 264 deletions(-) diff --git a/app/Helpers/Csv/Converter/AccountId.php b/app/Helpers/Csv/Converter/AccountId.php index 333839ef0e..c489fa36a4 100644 --- a/app/Helpers/Csv/Converter/AccountId.php +++ b/app/Helpers/Csv/Converter/AccountId.php @@ -29,7 +29,7 @@ class AccountId extends BasicConverter implements ConverterInterface $account = Auth::user()->accounts()->find($this->value); if (!is_null($account)) { - Log::debug('Found ' . $account->accountType->type . ' named "******" with ID: ' . $this->value.' (not mapped) '); + Log::debug('Found ' . $account->accountType->type . ' named "******" with ID: ' . $this->value . ' (not mapped) '); } } diff --git a/app/Helpers/Csv/Wizard.php b/app/Helpers/Csv/Wizard.php index 4045c97102..148934ee60 100644 --- a/app/Helpers/Csv/Wizard.php +++ b/app/Helpers/Csv/Wizard.php @@ -7,9 +7,10 @@ use Crypt; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Csv\Mapper\MapperInterface; use League\Csv\Reader; +use Log; use ReflectionException; use Session; -use Log; + /** * Class Wizard * @@ -110,6 +111,7 @@ class Wizard implements WizardInterface foreach ($fields as $field) { if (!Session::has($field)) { Log::error('Session is missing field: ' . $field); + return false; } } diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index f568da53f7..984f196dd7 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -53,7 +53,7 @@ class NewUserController extends Controller // create normal asset account: $assetAccount = [ 'name' => $request->get('bank_name'), - 'iban' => null, + 'iban' => null, 'accountType' => 'asset', 'virtualBalance' => 0, 'active' => true, @@ -70,7 +70,7 @@ class NewUserController extends Controller if (strlen($request->get('savings_balance') > 0)) { $savingsAccount = [ 'name' => $request->get('bank_name') . ' savings account', - 'iban' => null, + 'iban' => null, 'accountType' => 'asset', 'virtualBalance' => 0, 'active' => true, @@ -88,7 +88,7 @@ class NewUserController extends Controller if (strlen($request->get('credit_card_limit') > 0)) { $creditAccount = [ 'name' => 'Credit card', - 'iban' => null, + 'iban' => null, 'accountType' => 'asset', 'virtualBalance' => floatval($request->get('credit_card_limit')), 'active' => true, diff --git a/app/Models/Account.php b/app/Models/Account.php index 71c60a5360..b3967b1da4 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -11,23 +11,23 @@ use Watson\Validating\ValidatingTrait; * Class Account * * @package FireflyIII\Models - * @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 + * @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 whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value) @@ -41,13 +41,13 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereIban($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value) - * @property-read bool $joinedAccountTypes - * @property float $startBalance - * @property float $endBalance - * @property float $piggyBalance - * @property float $percentage - * @property float $difference - * @property \Carbon\Carbon $lastActivityDate + * @property-read bool $joinedAccountTypes + * @property float $startBalance + * @property float $endBalance + * @property float $piggyBalance + * @property float $percentage + * @property float $difference + * @property \Carbon\Carbon $lastActivityDate */ class Account extends Model { diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index f511b64145..42c0f4837b 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -7,13 +7,13 @@ use Watson\Validating\ValidatingTrait; * Class AccountMeta * * @package FireflyIII\Models - * @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 \FireflyIII\Models\Account $account + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $account_id + * @property string $name + * @property string $data + * @property-read \FireflyIII\Models\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) diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index c62827f2d6..6716a9ab69 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Model; * Class AccountType * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $type - * @property boolean $editable - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $type + * @property boolean $editable + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\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) diff --git a/app/Models/Bill.php b/app/Models/Bill.php index d3bd82ca78..e1196585c0 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -7,23 +7,23 @@ use Illuminate\Database\Eloquent\Model; * Class Bill * * @package FireflyIII\Models - * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @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) @@ -39,8 +39,8 @@ use Illuminate\Database\Eloquent\Model; * @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) - * @property-read \Carbon\Carbon $nextExpectedMatch - * @property-read \Carbon\Carbon $lastFoundMatch + * @property-read \Carbon\Carbon $nextExpectedMatch + * @property-read \Carbon\Carbon $lastFoundMatch */ class Bill extends Model { diff --git a/app/Models/Budget.php b/app/Models/Budget.php index cea282cb95..5184b576e6 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -8,17 +8,17 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class Budget * * @package FireflyIII\Models - * @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|\FireflyIII\Models\BudgetLimit[] $budgetlimits - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @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|\FireflyIII\Models\BudgetLimit[] $budgetlimits + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @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) diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 56093bfd8d..2a4a61b64d 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -6,16 +6,16 @@ use Illuminate\Database\Eloquent\Model; * Class BudgetLimit * * @package FireflyIII\Models - * @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 \FireflyIII\Models\Budget $budget - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_id + * @property \Carbon\Carbon $startdate + * @property float $amount + * @property boolean $repeats + * @property string $repeat_freq + * @property-read \FireflyIII\Models\Budget $budget + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\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) diff --git a/app/Models/Category.php b/app/Models/Category.php index cd6d554be2..7792eba5f0 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -8,15 +8,15 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class Category * * @package FireflyIII\Models - * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @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) @@ -24,8 +24,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @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) - * @property-read float $spent - * @property-read \Carbon\Carbon $lastActivity + * @property-read float $spent + * @property-read \Carbon\Carbon $lastActivity */ class Category extends Model { diff --git a/app/Models/Component.php b/app/Models/Component.php index 29c15b922b..cd21c366b7 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -7,13 +7,13 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class Component * * @package FireflyIII\Models - * @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 string $class + * @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 string $class * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value) diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 9f4307e587..29c48ed359 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -6,14 +6,14 @@ use Illuminate\Database\Eloquent\Model; * Class LimitRepetition * * @package FireflyIII\Models - * @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 \FireflyIII\Models\BudgetLimit $budgetLimit + * @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 \FireflyIII\Models\BudgetLimit $budgetLimit * @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) diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 1463451a81..1b6aaeb147 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -8,13 +8,13 @@ use Zizaco\Entrust\EntrustPermission; * Class Permission * * @package FireflyIII\Models - * @property integer $id - * @property string $name - * @property string $display_name - * @property string $description - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles + * @property integer $id + * @property string $name + * @property string $display_name + * @property string $description + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereName($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDisplayName($value) diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 1b4c52983c..76878dc7c5 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -8,22 +8,22 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class PiggyBank * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property string $name - * @property float $targetamount - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property integer $order - * @property boolean $encrypted - * @property boolean $remind_me - * @property integer $reminder_skip - * @property-read \FireflyIII\Models\Account $account - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property string $name + * @property float $targetamount + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property integer $order + * @property boolean $encrypted + * @property boolean $remind_me + * @property integer $reminder_skip + * @property-read \FireflyIII\Models\Account $account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents * @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) @@ -37,7 +37,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value) - * @property-read \FireflyIII\Models\PiggyBankRepetition $currentRep + * @property-read \FireflyIII\Models\PiggyBankRepetition $currentRep */ class PiggyBank extends Model { diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 9ee5836bb9..0678ea5865 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -6,15 +6,15 @@ use Illuminate\Database\Eloquent\Model; * Class PiggyBankEvent * * @package FireflyIII\Models - * @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-read \FireflyIII\Models\PiggyBank $piggyBank - * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal + * @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-read \FireflyIII\Models\PiggyBank $piggyBank + * @property-read \FireflyIII\Models\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) diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index ba6c50fb72..2c410351e4 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -8,14 +8,14 @@ use Illuminate\Database\Eloquent\Model; * Class PiggyBankRepetition * * @package FireflyIII\Models - * @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 \FireflyIII\Models\PiggyBank $piggyBank + * @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 \FireflyIII\Models\PiggyBank $piggyBank * @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) diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 4f813c53a5..258216dd6f 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -7,15 +7,15 @@ use Illuminate\Database\Eloquent\Model; * Class Preference * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $name_encrypted - * @property string $data - * @property string $data_encrypted - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $name_encrypted + * @property string $data + * @property string $data_encrypted + * @property-read \FireflyIII\User $user * @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) diff --git a/app/Models/Role.php b/app/Models/Role.php index 7f7c74ff74..6cee8151d3 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -8,14 +8,14 @@ use Zizaco\Entrust\EntrustRole; * Class Role * * @package FireflyIII\Models - * @property integer $id - * @property string $name - * @property string $display_name - * @property string $description - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('auth.model[] $users - * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.permission[] $perms + * @property integer $id + * @property string $name + * @property string $display_name + * @property string $description + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('auth.model[] $users + * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.permission[] $perms * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereName($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDisplayName($value) diff --git a/app/Models/Tag.php b/app/Models/Tag.php index d4c9259473..73f23b7699 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -10,20 +10,20 @@ use Watson\Validating\ValidatingTrait; * Class Tag * * @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 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|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @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) diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 7729db02cb..e2b799220b 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -10,16 +10,16 @@ use Watson\Validating\ValidatingTrait; * Class Transaction * * @package FireflyIII\Models - * @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 \FireflyIII\Models\Account $account - * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal + * @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 \FireflyIII\Models\Account $account + * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal * @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) @@ -30,8 +30,8 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmount($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction after($date) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction before($date) - * @property float $before - * @property float $after + * @property float $before + * @property float $after */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index dafe776d46..8323329c99 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -7,14 +7,14 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class TransactionCurrency * * @package FireflyIII\Models - * @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|\FireflyIII\Models\TransactionJournal[] $transactionJournals + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $code + * @property string $name + * @property string $symbol + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\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) diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 33451a4faa..606bb59f15 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -7,14 +7,14 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class TransactionGroup * * @package FireflyIII\Models - * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property string $relation + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\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) diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 48d96de99e..1d2fd4caf6 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -13,35 +13,35 @@ use Watson\Validating\ValidatingTrait; * Class TransactionJournal * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property integer $transaction_type_id - * @property integer $bill_id - * @property integer $transaction_currency_id - * @property string $description - * @property boolean $completed - * @property \Carbon\Carbon $date - * @property boolean $encrypted - * @property integer $order - * @property integer $tag_count - * @property-read \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 mixed $actual_amount - * @property-read mixed $amount - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags - * @property-read mixed $correct_amount - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read mixed $destination_account - * @property-read mixed $source_account - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents - * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency - * @property-read \FireflyIII\Models\TransactionType $transactionType - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property integer $transaction_type_id + * @property integer $bill_id + * @property integer $transaction_currency_id + * @property string $description + * @property boolean $completed + * @property \Carbon\Carbon $date + * @property boolean $encrypted + * @property integer $order + * @property integer $tag_count + * @property-read \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 mixed $actual_amount + * @property-read mixed $amount + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read mixed $correct_amount + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions + * @property-read mixed $destination_account + * @property-read mixed $source_account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency + * @property-read \FireflyIII\Models\TransactionType $transactionType + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups + * @property-read \FireflyIII\User $user * @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) @@ -62,12 +62,12 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal onDate($date) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withRelevantData() - * @property-read bool $account_encrypted - * @property-read bool $joinedTransactions - * @property-read bool $joinedTransactionTypes - * @property-read int $account_id - * @property-read string $name - * @property-read string $symbol + * @property-read bool $account_encrypted + * @property-read bool $joinedTransactions + * @property-read bool $joinedTransactionTypes + * @property-read int $account_id + * @property-read string $name + * @property-read string $symbol */ class TransactionJournal extends Model { diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 60b3940a0c..3b00323459 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -7,12 +7,12 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class TransactionType * * @package FireflyIII\Models - * @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|\FireflyIII\Models\TransactionJournal[] $transactionJournals + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $type + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\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) diff --git a/app/User.php b/app/User.php index e46ad621e0..4c879febf4 100644 --- a/app/User.php +++ b/app/User.php @@ -11,21 +11,21 @@ use Zizaco\Entrust\Traits\EntrustUserTrait; * Class User * * @package FireflyIII - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $email - * @property string $password - * @property string $reset - * @property string $remember_token - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills - * @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\Preference[] $preferences - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $email + * @property string $password + * @property string $reset + * @property string $remember_token + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills + * @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\Preference[] $preferences + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereUpdatedAt($value)