Renamed some stuff, courtesy of sensiolabs.

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * AccountChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Account;
 
@@ -7,11 +14,11 @@ use FireflyIII\Models\Account;
 use Illuminate\Support\Collection;
 
 /**
- * Interface AccountChartGenerator
+ * Interface AccountChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Account
  */
-interface AccountChartGenerator
+interface AccountChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -12,7 +12,7 @@ use Steam;
  *
  * @package FireflyIII\Generator\Chart\Account
  */
-class ChartJsAccountChartGenerator implements AccountChartGenerator
+class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 namespace FireflyIII\Generator\Chart\Bill;
 
 
@@ -6,11 +14,11 @@ use FireflyIII\Models\Bill;
 use Illuminate\Support\Collection;
 
 /**
- * Interface BillChartGenerator
+ * Interface BillChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Bill
  */
-interface BillChartGenerator
+interface BillChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * ChartJsBillChartGenerator.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Bill;
 
@@ -11,7 +18,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Generator\Chart\Bill
  */
-class ChartJsBillChartGenerator implements BillChartGenerator
+class ChartJsBillChartGenerator implements BillChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php

@@ -1,15 +1,22 @@
 <?php
+/**
+ * BudgetChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Budget;
 
 use Illuminate\Support\Collection;
 
 /**
- * Interface BudgetChartGenerator
+ * Interface BudgetChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Budget
  */
-interface BudgetChartGenerator
+interface BudgetChartGeneratorInterface
 {
     /**
      * @param Collection $entries

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -12,7 +12,7 @@ use Preferences;
  *
  * @package FireflyIII\Generator\Chart\Budget
  */
-class ChartJsBudgetChartGenerator implements BudgetChartGenerator
+class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/Category/CategoryChartGeneratorInterface.php

@@ -1,15 +1,22 @@
 <?php
+/**
+ * CategoryChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Category;
 
 use Illuminate\Support\Collection;
 
 /**
- * Interface CategoryChartGenerator
+ * Interface CategoryChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Category
  */
-interface CategoryChartGenerator
+interface CategoryChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -10,7 +10,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Generator\Chart\Category
  */
-class ChartJsCategoryChartGenerator implements CategoryChartGenerator
+class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -11,7 +11,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Generator\Chart\PiggyBank
  */
-class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
+class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
 {
 
     /**

app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace FireflyIII\Generator\Chart\PiggyBank;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface PiggyBankChartGenerator
- *
- * @package FireflyIII\Generator\Chart\PiggyBank
- */
-interface PiggyBankChartGenerator
-{
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    public function history(Collection $set);
-}

app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * PiggyBankChartGenerator.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Generator\Chart\PiggyBank;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface PiggyBankChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\PiggyBank
+ */
+interface PiggyBankChartGeneratorInterface
+{
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    public function history(Collection $set);
+}

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -1,15 +1,22 @@
 <?php
+/**
+ * ReportChartGenerator.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Report;
 
 use Illuminate\Support\Collection;
 
 /**
- * Interface ReportChartGenerator
+ * Interface ReportChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Report
  */
-interface ReportChartGenerator
+interface ReportChartGeneratorInterface
 {
 
     /**

app/Handlers/Events/FireRulesForStore.php

@@ -73,7 +73,5 @@ class FireRulesForStore
 
             }
         }
-        //        echo 'Done processing rules. See log.';
-        //        exit;
     }
-}
+}

app/Handlers/Events/FireRulesForUpdate.php

@@ -71,4 +71,4 @@ class FireRulesForUpdate
             }
         }
     }
-}
+}

app/Helpers/Csv/Specifix/Specifix.php

@@ -41,4 +41,4 @@ class Specifix
     }
 
 
-}
+}

app/Helpers/Report/AccountReportHelper.php

@@ -110,4 +110,4 @@ class AccountReportHelper implements AccountReportHelperInterface
 
         return $object;
     }
-}
+}

app/Helpers/Report/AccountReportHelperInterface.php

@@ -33,4 +33,4 @@ interface AccountReportHelperInterface
      */
     public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts);
 
-}
+}

app/Helpers/Report/BalanceReportHelper.php

@@ -238,4 +238,4 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         return $tags;
     }
 
-}
+}

app/Helpers/Report/BalanceReportHelperInterface.php

@@ -29,4 +29,4 @@ interface BalanceReportHelperInterface
      * @return Balance
      */
     public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts);
-}
+}

app/Helpers/Report/BudgetReportHelper.php

@@ -130,4 +130,4 @@ class BudgetReportHelper implements BudgetReportHelperInterface
 
         return $sum;
     }
-}
+}

app/Helpers/Report/BudgetReportHelperInterface.php

@@ -29,4 +29,4 @@ interface BudgetReportHelperInterface
      * @return BudgetCollection
      */
     public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts);
-}
+}

app/Http/Controllers/Chart/AccountController.php

@@ -20,7 +20,7 @@ use Session;
 class AccountController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Account\AccountChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -30,7 +30,7 @@ class AccountController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface');
     }
 
 

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');
     }
 
     /**

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');
     }
 
     /**

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');
     }
 
 

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');
     }
 
     /**

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');
     }
 
 

app/Http/Controllers/RuleGroupController.php

@@ -204,4 +204,4 @@ class RuleGroupController extends Controller
 
     }
 
-}
+}

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(
-        $this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGenerator', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator');
+            'FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator'
-        $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\Bill\BillChartGeneratorInterface', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator');
-        $this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator');
+        $this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator');
-        $this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator');
+        $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');
 
 
-
     }
 
 }

app/Repositories/RuleGroup/RuleGroupRepository.php

@@ -203,4 +203,4 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
         return $ruleGroup;
     }
 
-}
+}

app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php

@@ -78,4 +78,4 @@ interface RuleGroupRepositoryInterface
     public function update(RuleGroup $ruleGroup, array $data);
 
 
-}
+}

app/Rules/Actions/ActionInterface.php

@@ -31,4 +31,4 @@ interface ActionInterface
      * @return bool
      */
     public function act();
-}
+}

app/Rules/Actions/AddTag.php

@@ -53,4 +53,4 @@ class AddTag implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/AppendDescription.php

@@ -45,4 +45,4 @@ class AppendDescription implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/ClearBudget.php

@@ -45,4 +45,4 @@ class ClearBudget implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/ClearCategory.php

@@ -45,4 +45,4 @@ class ClearCategory implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/PrependDescription.php

@@ -45,4 +45,4 @@ class PrependDescription implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/RemoveAllTags.php

@@ -45,4 +45,4 @@ class RemoveAllTags implements ActionInterface
         return true;
 
     }
-}
+}

app/Rules/Actions/RemoveTag.php

@@ -58,4 +58,4 @@ class RemoveTag implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/SetBudget.php

@@ -62,4 +62,4 @@ class SetBudget implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/SetCategory.php

@@ -51,4 +51,4 @@ class SetCategory implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Actions/SetDescription.php

@@ -45,4 +45,4 @@ class SetDescription implements ActionInterface
 
         return true;
     }
-}
+}

app/Rules/Processor.php

@@ -157,4 +157,4 @@ class Processor
     }
 
 
-}
+}

app/Rules/Triggers/AmountExactly.php

@@ -61,4 +61,4 @@ class AmountExactly implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/AmountLess.php

@@ -61,4 +61,4 @@ class AmountLess implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/AmountMore.php

@@ -61,4 +61,4 @@ class AmountMore implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/DescriptionContains.php

@@ -62,4 +62,4 @@ class DescriptionContains implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/DescriptionEnds.php

@@ -71,4 +71,4 @@ class DescriptionEnds implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/DescriptionIs.php

@@ -57,4 +57,4 @@ class DescriptionIs implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/DescriptionStarts.php

@@ -59,4 +59,4 @@ class DescriptionStarts implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/FromAccountContains.php

@@ -61,4 +61,4 @@ class FromAccountContains implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/FromAccountEnds.php

@@ -71,4 +71,4 @@ class FromAccountEnds implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/FromAccountIs.php

@@ -57,4 +57,4 @@ class FromAccountIs implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/FromAccountStarts.php

@@ -59,4 +59,4 @@ class FromAccountStarts implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/ToAccountContains.php

@@ -61,4 +61,4 @@ class ToAccountContains implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/ToAccountEnds.php

@@ -71,4 +71,4 @@ class ToAccountEnds implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/ToAccountIs.php

@@ -57,4 +57,4 @@ class ToAccountIs implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/ToAccountStarts.php

@@ -59,4 +59,4 @@ class ToAccountStarts implements TriggerInterface
         return false;
 
     }
-}
+}

app/Rules/Triggers/TransactionType.php

@@ -56,4 +56,4 @@ class TransactionType implements TriggerInterface
 
         return false;
     }
-}
+}

app/Rules/Triggers/TriggerInterface.php

@@ -31,4 +31,4 @@ interface TriggerInterface
      * @return bool
      */
     public function triggered();
-}
+}

app/Rules/Triggers/UserAction.php

@@ -52,4 +52,4 @@ class UserAction implements TriggerInterface
         return true;
     }
 
-}
+}

app/Support/Binder/AccountList.php

@@ -47,4 +47,4 @@ class AccountList implements BinderInterface
         }
         throw new NotFoundHttpException;
     }
-}
+}

app/Support/Binder/BinderInterface.php

@@ -24,4 +24,4 @@ interface BinderInterface
      */
     public static function routeBinder($value, $route);
 
-}
+}

app/Support/Binder/BudgetList.php

@@ -49,4 +49,4 @@ class BudgetList implements BinderInterface
         }
         throw new NotFoundHttpException;
     }
-}
+}

app/Support/Binder/CategoryList.php

@@ -47,4 +47,4 @@ class CategoryList implements BinderInterface
         }
         throw new NotFoundHttpException;
     }
-}
+}

app/Support/Domain.php

@@ -42,4 +42,4 @@ class Domain
     {
         return Config::get('firefly.rule-triggers');
     }
-}
+}

app/Support/Twig/Rule.php

@@ -94,4 +94,4 @@ class Rule extends Twig_Extension
     {
         return 'FireflyIII\Support\Twig\Rule';
     }
-}
+}

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",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6b6255ad7bfbdb721b8d00b09d52b146c5d363d7",
-                "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5",
+                "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",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a312d39ffe37da0f57b602618b61fd07c1fcec5",
-                "reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc",
+                "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",
+                "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
-                "reference": "fd92e883195e5dfa77720b1868cf084b08be4412",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
-                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9",
-                "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
-                "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
+                "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",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
-                "reference": "ae53fc2c312fdee63773b75cb570304f85388b08",
+                "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",
+                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/85e31d1f62ebf9dd9b63cf30f7318f379cc36179",
-                "reference": "508c130ea82bc83c65071ffcf1680cdfa16412d6",
+                "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",

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'],
-];
+];

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();

resources/views/rules/index.twig

@@ -196,4 +196,4 @@
 {% block scripts %}
     <script src="js/jquery-ui.min.js" type="text/javascript"></script>
     <script type="text/javascript" src="js/rules/index.js"></script>
-{% endblock %}
+{% endblock %}

resources/views/rules/partials/action.twig

@@ -37,4 +37,4 @@
             </label>
         </div>
     </td>
-</tr>
+</tr>

resources/views/rules/partials/trigger.twig

@@ -37,4 +37,4 @@
             </label>
         </div>
     </td>
-</tr>
+</tr>

tests/acceptance/Controllers/HomeControllerTest.php

@@ -48,4 +48,4 @@ class HomeControllerTest extends TestCase
         $this->call('GET', '/');
         $this->assertResponseStatus(200);
     }
-}
+}