diff --git a/app/Generator/Chart/Account/AccountChartGenerator.php b/app/Generator/Chart/Account/AccountChartGeneratorInterface.php similarity index 74% rename from app/Generator/Chart/Account/AccountChartGenerator.php rename to app/Generator/Chart/Account/AccountChartGeneratorInterface.php index 5601e86306..0e09e5e077 100644 --- a/app/Generator/Chart/Account/AccountChartGenerator.php +++ b/app/Generator/Chart/Account/AccountChartGeneratorInterface.php @@ -1,4 +1,11 @@ generator = app('FireflyIII\Generator\Chart\Account\AccountChartGenerator'); + $this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface'); } diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 5f05b25c5c..d1e58998c5 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -19,7 +19,7 @@ use Session; class BillController extends Controller { - /** @var \FireflyIII\Generator\Chart\Bill\BillChartGenerator */ + /** @var \FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface */ protected $generator; /** @@ -29,7 +29,7 @@ class BillController extends Controller { parent::__construct(); // create chart generator: - $this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGenerator'); + $this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface'); } /** diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index b3b8b351c4..848a13179b 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -23,7 +23,7 @@ use Session; class BudgetController extends Controller { - /** @var \FireflyIII\Generator\Chart\Budget\BudgetChartGenerator */ + /** @var \FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface */ protected $generator; /** @@ -33,7 +33,7 @@ class BudgetController extends Controller { parent::__construct(); // create chart generator: - $this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator'); + $this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface'); } /** diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 7925d8fe13..4d2ef3e7ae 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -23,7 +23,7 @@ use stdClass; */ class CategoryController extends Controller { - /** @var \FireflyIII\Generator\Chart\Category\CategoryChartGenerator */ + /** @var \FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface */ protected $generator; /** @@ -33,7 +33,7 @@ class CategoryController extends Controller { parent::__construct(); // create chart generator: - $this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGenerator'); + $this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface'); } diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index a6972d2a75..b21153bfa9 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -18,7 +18,7 @@ use Response; class PiggyBankController extends Controller { - /** @var \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator */ + /** @var \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface */ protected $generator; /** @@ -28,7 +28,7 @@ class PiggyBankController extends Controller { parent::__construct(); // create chart generator: - $this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator'); + $this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface'); } /** diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 3ffb128691..c5aba22ad1 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -18,7 +18,7 @@ use Response; class ReportController extends Controller { - /** @var \FireflyIII\Generator\Chart\Report\ReportChartGenerator */ + /** @var \FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface */ protected $generator; /** @@ -28,7 +28,7 @@ class ReportController extends Controller { parent::__construct(); // create chart generator: - $this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGenerator'); + $this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface'); } diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 6df34944a1..375a42666e 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -204,4 +204,4 @@ class RuleGroupController extends Controller } -} \ No newline at end of file +} diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index d8225e4d1a..13712858c3 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -102,12 +102,18 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper'); // make charts: - $this->app->bind('FireflyIII\Generator\Chart\Account\AccountChartGenerator', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator'); - $this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGenerator', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator'); - $this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator'); - $this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator'); - $this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator'); - $this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator'); + $this->app->bind( + 'FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator' + ); + $this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator'); + $this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator'); + $this->app->bind( + 'FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator' + ); + $this->app->bind( + 'FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator' + ); + $this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator'); $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help'); @@ -121,7 +127,6 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind('FireflyIII\Helpers\Report\BudgetReportHelperInterface', 'FireflyIII\Helpers\Report\BudgetReportHelper'); - } } diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index e55f84b9ee..5bdc3a12d4 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -203,4 +203,4 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface return $ruleGroup; } -} \ No newline at end of file +} diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index 8c6b72f398..3eeb10d860 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -78,4 +78,4 @@ interface RuleGroupRepositoryInterface public function update(RuleGroup $ruleGroup, array $data); -} \ No newline at end of file +} diff --git a/app/Rules/Actions/ActionInterface.php b/app/Rules/Actions/ActionInterface.php index 91cbec46c7..9e7998e854 100644 --- a/app/Rules/Actions/ActionInterface.php +++ b/app/Rules/Actions/ActionInterface.php @@ -31,4 +31,4 @@ interface ActionInterface * @return bool */ public function act(); -} \ No newline at end of file +} diff --git a/app/Rules/Actions/AddTag.php b/app/Rules/Actions/AddTag.php index 147d79a2df..23aaa19d52 100644 --- a/app/Rules/Actions/AddTag.php +++ b/app/Rules/Actions/AddTag.php @@ -53,4 +53,4 @@ class AddTag implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/AppendDescription.php b/app/Rules/Actions/AppendDescription.php index 42254dc86b..f64c91ee03 100644 --- a/app/Rules/Actions/AppendDescription.php +++ b/app/Rules/Actions/AppendDescription.php @@ -45,4 +45,4 @@ class AppendDescription implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/ClearBudget.php b/app/Rules/Actions/ClearBudget.php index e1558afdcd..109bd75d77 100644 --- a/app/Rules/Actions/ClearBudget.php +++ b/app/Rules/Actions/ClearBudget.php @@ -45,4 +45,4 @@ class ClearBudget implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/ClearCategory.php b/app/Rules/Actions/ClearCategory.php index 76569523b8..9f7a7a1857 100644 --- a/app/Rules/Actions/ClearCategory.php +++ b/app/Rules/Actions/ClearCategory.php @@ -45,4 +45,4 @@ class ClearCategory implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/PrependDescription.php b/app/Rules/Actions/PrependDescription.php index d452125002..97cc5fa1fe 100644 --- a/app/Rules/Actions/PrependDescription.php +++ b/app/Rules/Actions/PrependDescription.php @@ -45,4 +45,4 @@ class PrependDescription implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/RemoveAllTags.php b/app/Rules/Actions/RemoveAllTags.php index 868acee3cd..9ac96b68ec 100644 --- a/app/Rules/Actions/RemoveAllTags.php +++ b/app/Rules/Actions/RemoveAllTags.php @@ -45,4 +45,4 @@ class RemoveAllTags implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/RemoveTag.php b/app/Rules/Actions/RemoveTag.php index e6c427d0bb..4c0bb7888c 100644 --- a/app/Rules/Actions/RemoveTag.php +++ b/app/Rules/Actions/RemoveTag.php @@ -58,4 +58,4 @@ class RemoveTag implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/SetBudget.php b/app/Rules/Actions/SetBudget.php index 42d6d23638..559d4387d8 100644 --- a/app/Rules/Actions/SetBudget.php +++ b/app/Rules/Actions/SetBudget.php @@ -62,4 +62,4 @@ class SetBudget implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/SetCategory.php b/app/Rules/Actions/SetCategory.php index 545040e24a..c72bd42f8b 100644 --- a/app/Rules/Actions/SetCategory.php +++ b/app/Rules/Actions/SetCategory.php @@ -51,4 +51,4 @@ class SetCategory implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Actions/SetDescription.php b/app/Rules/Actions/SetDescription.php index 1b3ee0422f..2a2b81c82a 100644 --- a/app/Rules/Actions/SetDescription.php +++ b/app/Rules/Actions/SetDescription.php @@ -45,4 +45,4 @@ class SetDescription implements ActionInterface return true; } -} \ No newline at end of file +} diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php index f12073621b..97d237208b 100644 --- a/app/Rules/Processor.php +++ b/app/Rules/Processor.php @@ -157,4 +157,4 @@ class Processor } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/AmountExactly.php b/app/Rules/Triggers/AmountExactly.php index 908ad31a6f..5116dd1694 100644 --- a/app/Rules/Triggers/AmountExactly.php +++ b/app/Rules/Triggers/AmountExactly.php @@ -61,4 +61,4 @@ class AmountExactly implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/AmountLess.php b/app/Rules/Triggers/AmountLess.php index 4c659db944..e358417128 100644 --- a/app/Rules/Triggers/AmountLess.php +++ b/app/Rules/Triggers/AmountLess.php @@ -61,4 +61,4 @@ class AmountLess implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/AmountMore.php b/app/Rules/Triggers/AmountMore.php index a3470ffd13..fb4c12fef1 100644 --- a/app/Rules/Triggers/AmountMore.php +++ b/app/Rules/Triggers/AmountMore.php @@ -61,4 +61,4 @@ class AmountMore implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/DescriptionContains.php b/app/Rules/Triggers/DescriptionContains.php index e55b850d15..26d311422a 100644 --- a/app/Rules/Triggers/DescriptionContains.php +++ b/app/Rules/Triggers/DescriptionContains.php @@ -62,4 +62,4 @@ class DescriptionContains implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/DescriptionEnds.php b/app/Rules/Triggers/DescriptionEnds.php index ef21b8aa4c..83e7ea0fe9 100644 --- a/app/Rules/Triggers/DescriptionEnds.php +++ b/app/Rules/Triggers/DescriptionEnds.php @@ -71,4 +71,4 @@ class DescriptionEnds implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/DescriptionIs.php b/app/Rules/Triggers/DescriptionIs.php index f7199f0103..a8fb482eb2 100644 --- a/app/Rules/Triggers/DescriptionIs.php +++ b/app/Rules/Triggers/DescriptionIs.php @@ -57,4 +57,4 @@ class DescriptionIs implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/DescriptionStarts.php b/app/Rules/Triggers/DescriptionStarts.php index 8475f99fda..0f8facd716 100644 --- a/app/Rules/Triggers/DescriptionStarts.php +++ b/app/Rules/Triggers/DescriptionStarts.php @@ -59,4 +59,4 @@ class DescriptionStarts implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/FromAccountContains.php b/app/Rules/Triggers/FromAccountContains.php index 5e1e990cb6..d9df90d330 100644 --- a/app/Rules/Triggers/FromAccountContains.php +++ b/app/Rules/Triggers/FromAccountContains.php @@ -61,4 +61,4 @@ class FromAccountContains implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/FromAccountEnds.php b/app/Rules/Triggers/FromAccountEnds.php index 57f686a063..3836e542fa 100644 --- a/app/Rules/Triggers/FromAccountEnds.php +++ b/app/Rules/Triggers/FromAccountEnds.php @@ -71,4 +71,4 @@ class FromAccountEnds implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/FromAccountIs.php b/app/Rules/Triggers/FromAccountIs.php index 27de26653d..a9e42667ab 100644 --- a/app/Rules/Triggers/FromAccountIs.php +++ b/app/Rules/Triggers/FromAccountIs.php @@ -57,4 +57,4 @@ class FromAccountIs implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/FromAccountStarts.php b/app/Rules/Triggers/FromAccountStarts.php index a5206026ea..444a65d0fa 100644 --- a/app/Rules/Triggers/FromAccountStarts.php +++ b/app/Rules/Triggers/FromAccountStarts.php @@ -59,4 +59,4 @@ class FromAccountStarts implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/ToAccountContains.php b/app/Rules/Triggers/ToAccountContains.php index 5e06383f04..9656896fde 100644 --- a/app/Rules/Triggers/ToAccountContains.php +++ b/app/Rules/Triggers/ToAccountContains.php @@ -61,4 +61,4 @@ class ToAccountContains implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/ToAccountEnds.php b/app/Rules/Triggers/ToAccountEnds.php index 7c1984ea2a..354c2015d5 100644 --- a/app/Rules/Triggers/ToAccountEnds.php +++ b/app/Rules/Triggers/ToAccountEnds.php @@ -71,4 +71,4 @@ class ToAccountEnds implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/ToAccountIs.php b/app/Rules/Triggers/ToAccountIs.php index 09f4c66f6a..1a1ab08b91 100644 --- a/app/Rules/Triggers/ToAccountIs.php +++ b/app/Rules/Triggers/ToAccountIs.php @@ -57,4 +57,4 @@ class ToAccountIs implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/ToAccountStarts.php b/app/Rules/Triggers/ToAccountStarts.php index 0af5fc4491..52eddebf2d 100644 --- a/app/Rules/Triggers/ToAccountStarts.php +++ b/app/Rules/Triggers/ToAccountStarts.php @@ -59,4 +59,4 @@ class ToAccountStarts implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/TransactionType.php b/app/Rules/Triggers/TransactionType.php index 9bba776f42..d7aa688d62 100644 --- a/app/Rules/Triggers/TransactionType.php +++ b/app/Rules/Triggers/TransactionType.php @@ -56,4 +56,4 @@ class TransactionType implements TriggerInterface return false; } -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/TriggerInterface.php b/app/Rules/Triggers/TriggerInterface.php index 094ee0f234..17147db9e4 100644 --- a/app/Rules/Triggers/TriggerInterface.php +++ b/app/Rules/Triggers/TriggerInterface.php @@ -31,4 +31,4 @@ interface TriggerInterface * @return bool */ public function triggered(); -} \ No newline at end of file +} diff --git a/app/Rules/Triggers/UserAction.php b/app/Rules/Triggers/UserAction.php index bdde712e36..c1b0d21b74 100644 --- a/app/Rules/Triggers/UserAction.php +++ b/app/Rules/Triggers/UserAction.php @@ -52,4 +52,4 @@ class UserAction implements TriggerInterface return true; } -} \ No newline at end of file +} diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index 59de12db74..b9cbde52ae 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -47,4 +47,4 @@ class AccountList implements BinderInterface } throw new NotFoundHttpException; } -} \ No newline at end of file +} diff --git a/app/Support/Binder/BinderInterface.php b/app/Support/Binder/BinderInterface.php index aba12d6455..900d47b042 100644 --- a/app/Support/Binder/BinderInterface.php +++ b/app/Support/Binder/BinderInterface.php @@ -24,4 +24,4 @@ interface BinderInterface */ public static function routeBinder($value, $route); -} \ No newline at end of file +} diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php index 9961672400..786106e362 100644 --- a/app/Support/Binder/BudgetList.php +++ b/app/Support/Binder/BudgetList.php @@ -49,4 +49,4 @@ class BudgetList implements BinderInterface } throw new NotFoundHttpException; } -} \ No newline at end of file +} diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php index 4f39ca6e2f..799ad7b461 100644 --- a/app/Support/Binder/CategoryList.php +++ b/app/Support/Binder/CategoryList.php @@ -47,4 +47,4 @@ class CategoryList implements BinderInterface } throw new NotFoundHttpException; } -} \ No newline at end of file +} diff --git a/app/Support/Domain.php b/app/Support/Domain.php index 8506fcc998..0c4d209b26 100644 --- a/app/Support/Domain.php +++ b/app/Support/Domain.php @@ -42,4 +42,4 @@ class Domain { return Config::get('firefly.rule-triggers'); } -} \ No newline at end of file +} diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php index 6b0a9e181d..090f1e2473 100644 --- a/app/Support/Twig/Rule.php +++ b/app/Support/Twig/Rule.php @@ -94,4 +94,4 @@ class Rule extends Twig_Extension { return 'FireflyIII\Support\Twig\Rule'; } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 91b23f2f19..936361999c 100644 --- a/composer.lock +++ b/composer.lock @@ -759,16 +759,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.10", + "version": "v5.2.12", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5" + "reference": "6b6255ad7bfbdb721b8d00b09d52b146c5d363d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/93dc5b0089eef468157fd7200e575c3861ec59a5", - "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5", + "url": "https://api.github.com/repos/laravel/framework/zipball/6b6255ad7bfbdb721b8d00b09d52b146c5d363d7", + "reference": "6b6255ad7bfbdb721b8d00b09d52b146c5d363d7", "shasum": "" }, "require": { @@ -883,20 +883,20 @@ "framework", "laravel" ], - "time": "2016-01-13 20:29:10" + "time": "2016-01-26 04:15:37" }, { "name": "laravelcollective/html", - "version": "v5.2.2", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc" + "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/c88b2d59a56ed2290fc5082a1a6099e357c9fdbc", - "reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a312d39ffe37da0f57b602618b61fd07c1fcec5", + "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5", "shasum": "" }, "require": { @@ -937,7 +937,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "http://laravelcollective.com", - "time": "2016-01-16 16:54:49" + "time": "2016-01-27 22:29:54" }, { "name": "league/commonmark", @@ -1227,23 +1227,23 @@ }, { "name": "mtdowling/cron-expression", - "version": "v1.0.4", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/mtdowling/cron-expression.git", - "reference": "fd92e883195e5dfa77720b1868cf084b08be4412" + "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412", - "reference": "fd92e883195e5dfa77720b1868cf084b08be4412", + "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", + "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "~4.0|~5.0" }, "type": "library", "autoload": { @@ -1267,7 +1267,7 @@ "cron", "schedule" ], - "time": "2015-01-11 23:07:46" + "time": "2016-01-26 21:23:30" }, { "name": "nesbot/carbon", @@ -2004,16 +2004,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" + "reference": "1289d16209491b584839022f29257ad859b8532d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", "shasum": "" }, "require": { @@ -2025,7 +2025,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2059,20 +2059,20 @@ "portable", "shim" ], - "time": "2015-11-20 09:19:13" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php56", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" + "reference": "4d891fff050101a53a4caabb03277284942d1ad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9", "shasum": "" }, "require": { @@ -2082,7 +2082,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2115,20 +2115,20 @@ "portable", "shim" ], - "time": "2015-12-18 15:10:25" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-util", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", "shasum": "" }, "require": { @@ -2137,7 +2137,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2167,7 +2167,7 @@ "polyfill", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/process", @@ -2421,16 +2421,16 @@ }, { "name": "twig/twig", - "version": "v1.23.3", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ae53fc2c312fdee63773b75cb570304f85388b08" + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ae53fc2c312fdee63773b75cb570304f85388b08", - "reference": "ae53fc2c312fdee63773b75cb570304f85388b08", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", "shasum": "" }, "require": { @@ -2443,7 +2443,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.23-dev" + "dev-master": "1.24-dev" } }, "autoload": { @@ -2478,7 +2478,7 @@ "keywords": [ "templating" ], - "time": "2016-01-11 14:02:19" + "time": "2016-01-25 21:22:18" }, { "name": "vlucas/phpdotenv", @@ -2533,16 +2533,16 @@ }, { "name": "watson/validating", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/dwightwatson/validating.git", - "reference": "508c130ea82bc83c65071ffcf1680cdfa16412d6" + "reference": "85e31d1f62ebf9dd9b63cf30f7318f379cc36179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/508c130ea82bc83c65071ffcf1680cdfa16412d6", - "reference": "508c130ea82bc83c65071ffcf1680cdfa16412d6", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/85e31d1f62ebf9dd9b63cf30f7318f379cc36179", + "reference": "85e31d1f62ebf9dd9b63cf30f7318f379cc36179", "shasum": "" }, "require": { @@ -2584,7 +2584,7 @@ "laravel", "validation" ], - "time": "2015-12-25 23:19:17" + "time": "2016-01-27 00:10:53" }, { "name": "zizaco/entrust", diff --git a/config/upgrade.php b/config/upgrade.php index be8b331d37..b590467b75 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -12,4 +12,4 @@ return [ 'text' => [ '3.7.0' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' . 'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0'], -]; \ No newline at end of file +]; diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php index bff773ef8c..83cb5bac94 100644 --- a/database/seeds/TestDataSeeder.php +++ b/database/seeds/TestDataSeeder.php @@ -41,7 +41,7 @@ class TestDataSeeder extends Seeder public function run() { $user = User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]); - $emptyUser = User::create(['email' => 'thegrumpydictator+empty@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]); + User::create(['email' => 'thegrumpydictator+empty@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]); $admin = Role::where('name', 'owner')->first(); diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig index 546e74043b..8798ec7a21 100644 --- a/resources/views/rules/index.twig +++ b/resources/views/rules/index.twig @@ -196,4 +196,4 @@ {% block scripts %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/rules/partials/action.twig b/resources/views/rules/partials/action.twig index 1e5d1247bc..d3b215ee6b 100644 --- a/resources/views/rules/partials/action.twig +++ b/resources/views/rules/partials/action.twig @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/resources/views/rules/partials/trigger.twig b/resources/views/rules/partials/trigger.twig index bc5df80649..2f60699ea4 100644 --- a/resources/views/rules/partials/trigger.twig +++ b/resources/views/rules/partials/trigger.twig @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php index fdb855aac6..ba2d8cc4c6 100644 --- a/tests/acceptance/Controllers/HomeControllerTest.php +++ b/tests/acceptance/Controllers/HomeControllerTest.php @@ -48,4 +48,4 @@ class HomeControllerTest extends TestCase $this->call('GET', '/'); $this->assertResponseStatus(200); } -} \ No newline at end of file +}