diff --git a/app/models/Account.php b/app/models/Account.php index 63f6790b48..896ef8820a 100644 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -5,7 +5,6 @@ use LaravelBook\Ardent\Builder; /** - * * Account * * @property integer $id diff --git a/app/models/Reminder.php b/app/models/Reminder.php index a8d02ee414..3ecb0387eb 100644 --- a/app/models/Reminder.php +++ b/app/models/Reminder.php @@ -18,16 +18,20 @@ use LaravelBook\Ardent\Ardent; * @property-read \Piggybank $remindersable * @property-read \User $user * @property mixed $data - * @method static \Illuminate\Database\Query\Builder|\Reminder whereId($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereUpdatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereStartdate($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereEnddate($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereRemembersableId($value) - * @method static \Illuminate\Database\Query\Builder|\Reminder whereRemembersableType($value) - * @method static \Reminder dateIs($start, $end) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereId($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereStartdate($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereEnddate($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereActive($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereRemembersableId($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereRemembersableType($value) + * @method static \Reminder dateIs($start, $end) + * @property integer $remindersable_id + * @property string $remindersable_type + * @method static \Illuminate\Database\Query\Builder|\Reminder whereRemindersableId($value) + * @method static \Illuminate\Database\Query\Builder|\Reminder whereRemindersableType($value) */ class Reminder extends Eloquent { diff --git a/app/models/TransactionCurrency.php b/app/models/TransactionCurrency.php index 6c1aa0da36..0d7dd981aa 100644 --- a/app/models/TransactionCurrency.php +++ b/app/models/TransactionCurrency.php @@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Model as Eloquent; * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereUpdatedAt($value) * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCode($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionJournals */ class TransactionCurrency extends Eloquent { diff --git a/app/models/TransactionJournal.php b/app/models/TransactionJournal.php index 171e7103ca..9e51ceefd2 100644 --- a/app/models/TransactionJournal.php +++ b/app/models/TransactionJournal.php @@ -52,6 +52,10 @@ use LaravelBook\Ardent\Builder; * 'Budget[] $budgets * @property-read \Illuminate\Database\Eloquent\Collection|\ * 'Category[] $categories + * @property-read \Illuminate\Database\Eloquent\Collection|\ + * 'Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\ + * 'Category[] $categories */ class TransactionJournal extends Ardent { diff --git a/app/models/User.php b/app/models/User.php index e92041ac74..01d7372773 100644 --- a/app/models/User.php +++ b/app/models/User.php @@ -32,6 +32,7 @@ use LaravelBook\Ardent\Ardent; * @method static \Illuminate\Database\Query\Builder|\User whereReset($value) * @method static \Illuminate\Database\Query\Builder|\User whereRememberToken($value) * @method static \Illuminate\Database\Query\Builder|\User whereMigrated($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\Reminder[] $reminders */ class User extends Ardent implements UserInterface, RemindableInterface { diff --git a/scripts/ide-helper.bat b/scripts/ide-helper.bat deleted file mode 100644 index 8ef2cc915c..0000000000 --- a/scripts/ide-helper.bat +++ /dev/null @@ -1,7 +0,0 @@ -REM composer self-update -composer update -php artisan clear-compiled --env=local -php artisan ide-helper:generate --env=local -php artisan ide-helper:models --env=local --write -php artisan optimize --env=local -php artisan dump-autoload --env=local \ No newline at end of file diff --git a/scripts/local-cleanup-reload.sh b/scripts/local-cleanup-reload.sh deleted file mode 100755 index 673296e4d2..0000000000 --- a/scripts/local-cleanup-reload.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -cd .. -composer self-update -composer update -rm -f ./app/storage/firefly-iii-import-*.json -rm -f ./app/storage/debugbar/*.json -rm -f ./app/storage/logs/larave*.log -rm -f ./app/storage/meta/services.json - -for i in `seq 0 9`; -do - rm -f ./app/storage/views/$i* -done - -rm -f ./app/storage/views/a* -rm -f ./app/storage/views/b* -rm -f ./app/storage/views/c* -rm -f ./app/storage/views/d* -rm -f ./app/storage/views/e* -rm -f ./app/storage/views/f* - - - -php artisan clear-compiled --env=local -php artisan ide-helper:generate --env=local -php artisan ide-helper:models --env=local --write -php artisan optimize --env=local -php artisan dump-autoload --env=local -cd scripts -./local-reset.sh diff --git a/scripts/local-reset.sh b/scripts/local-reset.sh deleted file mode 100755 index 963fbd1377..0000000000 --- a/scripts/local-reset.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -php ../artisan migrate:refresh --seed --env=local \ No newline at end of file diff --git a/scripts/vagrant-load.sh b/scripts/vagrant-load.sh deleted file mode 100755 index b7e0f3987c..0000000000 --- a/scripts/vagrant-load.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -composer self-update -composer update -rm -f ../app/storage/firefly-iii-import-*.json -rm -f ../app/storage/debugbar/*.json -rm -f ../app/storage/logs/laravel.log -rm -f ../app/storage/meta/services.json - -for i in `seq 0 9`; -do - rm -f ../app/storage/views/$i* -done - -rm -f ../app/storage/views/a* -rm -f ../app/storage/views/b* -rm -f ../app/storage/views/c* -rm -f ../app/storage/views/d* -rm -f ../app/storage/views/e* -rm -f ../app/storage/views/f* - - -php ../artisan clear-compiled --env=vagrant -php ../artisan ide-helper:generate --env=vagrant -php ../artisan ide-helper:models --env=vagrant --write -php ../artisan optimize --env=vagrant -php ../artisan dump-autoload --env=vagrant -./vagrant-reset.sh diff --git a/scripts/vagrant-migrate.sh b/scripts/vagrant-migrate.sh deleted file mode 100755 index df52192d0c..0000000000 --- a/scripts/vagrant-migrate.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -php ../artisan migrate --seed --env=vagrant \ No newline at end of file diff --git a/scripts/vagrant-reset.sh b/scripts/vagrant-reset.sh deleted file mode 100755 index cc949cb9cf..0000000000 --- a/scripts/vagrant-reset.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -php ../artisan migrate:refresh --seed --env=vagrant \ No newline at end of file