diff --git a/app/models/TransactionJournal.php b/app/models/TransactionJournal.php index eb47bb4a86..eeb268cf1e 100644 --- a/app/models/TransactionJournal.php +++ b/app/models/TransactionJournal.php @@ -83,6 +83,14 @@ 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 + * @property-read \Illuminate\Database\Eloquent\Collection|\ + * 'Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\ + * 'Category[] $categories */ class TransactionJournal extends Ardent { diff --git a/bootstrap/start.php b/bootstrap/start.php index 1ea0c94653..a2e2cb98a3 100644 --- a/bootstrap/start.php +++ b/bootstrap/start.php @@ -74,7 +74,6 @@ $framework = $app['path.base'] . require $framework . '/Illuminate/Foundation/start.php'; -Event::subscribe('Firefly\Helper\Form\FormTrigger'); /* |-------------------------------------------------------------------------- @@ -93,12 +92,4 @@ Event::subscribe('Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger'); Event::subscribe('Firefly\Trigger\Budgets\EloquentBudgetTrigger'); Event::subscribe('Firefly\Trigger\Recurring\EloquentRecurringTrigger'); -//App::booted( -// function () { -// $forms = new \Firefly\Helper\Form\FormTrigger; -// $forms->registerFormExtensions(); -// } -//); - - return $app; diff --git a/composer.json b/composer.json index b9d1e16520..f4f69c8241 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ }, "require-dev": { "barryvdh/laravel-debugbar": "@stable", - "barryvdh/laravel-ide-helper": "@stable" + "barryvdh/laravel-ide-helper": "@stable", + "doctrine/dbal": "~2.3" }, "autoload": { "classmap": [ diff --git a/ide-helper.sh b/ide-helper.sh index 3096df2ceb..fdd0c3c2c9 100755 --- a/ide-helper.sh +++ b/ide-helper.sh @@ -1,5 +1,22 @@ #!/bin/bash #composer self-update + +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* + composer update php artisan clear-compiled --env=local php artisan ide-helper:generate --env=local