Merge branch 'release/3.4.0.2'

.env.backup

@@ -1,18 +0,0 @@
-APP_ENV=local
-APP_DEBUG=true
-APP_KEY=SomeRandomString
-
-DB_CONNECTION=mysql
-DB_HOST=localhost
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-EMAIL_SMTP=
-EMAIL_DRIVER=smtp
-EMAIL_USERNAME=
-EMAIL_PASSWORD=
-ANALYTICS_ID=

.env.local

@@ -1,18 +0,0 @@
-APP_ENV=local
-APP_DEBUG=true
-APP_KEY=SomeRandomString
-
-DB_CONNECTION=mysql
-DB_HOST=localhost
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-EMAIL_SMTP=
-EMAIL_DRIVER=smtp
-EMAIL_USERNAME=
-EMAIL_PASSWORD=
-ANALYTICS_ID=

.env.testing

@@ -8,8 +8,8 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-CACHE_DRIVER=file
+CACHE_DRIVER=array
-SESSION_DRIVER=file
+SESSION_DRIVER=array
 
 EMAIL_SMTP=
 EMAIL_USERNAME=

.gitignore

@@ -29,3 +29,5 @@ clover.xml
 node_modules/
 addNewLines.php
 .phpstorm.meta.php
+.env.backup
+.env.local

.travis.yml

@@ -16,7 +16,7 @@ install:
   - mv -v .env.testing .env
 
 script:
-  - phpunit --debug
+  - phpunit
 
 after_script:
   - php vendor/bin/coveralls

README.md

@@ -1,4 +1,4 @@
-Firefly III (v3.4)
+Firefly III (v3.4.0.2)
 ===========
 
 [![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
@@ -6,7 +6,7 @@ Firefly III (v3.4)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
 [![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii)
 [![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master)
-[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=develop)](https://coveralls.io/r/JC5/firefly-iii?branch=develop)
 
 [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
 [![Total Downloads](https://poser.pugx.org/grumpydictator/firefly-iii/downloads.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)

app/Events/JournalCreated.php

@@ -19,7 +19,8 @@ class JournalCreated extends Event
     /**
      * Create a new event instance.
      *
-     * @return void
+     * @param TransactionJournal $journal
+     * @param                    $piggyBankId
      */
     public function __construct(TransactionJournal $journal, $piggyBankId)
     {

app/Events/JournalDeleted.php

@@ -2,6 +2,11 @@
 
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class JournalDeleted
+ *
+ * @package FireflyIII\Events
+ */
 class JournalDeleted extends Event
 {
 
@@ -10,7 +15,6 @@ class JournalDeleted extends Event
     /**
      * Create a new event instance.
      *
-     * @return void
      */
     public function __construct()
     {

app/Events/JournalSaved.php

@@ -3,6 +3,11 @@
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class JournalSaved
+ *
+ * @package FireflyIII\Events
+ */
 class JournalSaved extends Event
 {
 
@@ -13,7 +18,7 @@ class JournalSaved extends Event
     /**
      * Create a new event instance.
      *
-     * @return void
+     * @param TransactionJournal $journal
      */
     public function __construct(TransactionJournal $journal)
     {

app/Exceptions/Handler.php

@@ -49,8 +49,7 @@ class Handler extends ExceptionHandler
      */
     public function report(Exception $e)
     {
-        /** @noinspection PhpInconsistentReturnPointsInspection */
+        parent::report($e);
-        return parent::report($e);
     }
 
 }

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -19,7 +19,6 @@ class ConnectJournalToPiggyBank
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {

app/Handlers/Events/RescanJournal.php

@@ -15,7 +15,6 @@ class RescanJournal
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {
@@ -41,7 +40,7 @@ class RescanJournal
 
         Log::debug('Found ' . $list->count() . ' bills to check.');
 
-        /** @var Bill $bill */
+        /** @var \FireflyIII\Models\Bill $bill */
         foreach ($list as $bill) {
             Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
             $repository->scan($bill, $journal);

app/Handlers/Events/UpdateJournalConnection.php

@@ -2,7 +2,6 @@
 
 use FireflyIII\Events\JournalSaved;
 use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\Transaction;
 
 /**
  * Class UpdateJournalConnection
@@ -15,7 +14,6 @@ class UpdateJournalConnection
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {

app/Helpers/Help/Help.php

@@ -54,7 +54,9 @@ class Help implements HelpInterface
     }
 
     /**
-     * @return boolean
+     * @param $route
+     *
+     * @return bool
      */
     public function hasRoute($route)
     {
@@ -62,10 +64,10 @@ class Help implements HelpInterface
     }
 
     /**
-     * @param       $title
+     * @param       $route
      * @param array $content
      *
-     * @return void
+     * @internal param $title
      */
     public function putInCache($route, array $content)
     {
@@ -82,4 +84,4 @@ class Help implements HelpInterface
     {
         return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
     }
-}
+}

app/Helpers/Help/HelpInterface.php

@@ -18,16 +18,25 @@ interface HelpInterface
     public function getFromCache($key);
 
     /**
-     * @return boolean
+     * @param $route
+     *
+     * @return array
+     */
+    public function getFromGithub($route);
+
+    /**
+     * @param $route
+     *
+     * @return bool
      */
     public function hasRoute($route);
 
     /**
      * @param $route
      *
-     * @return array
+     * @return bool
      */
-    public function getFromGithub($route);
+    public function inCache($route);
 
     /**
      * @param       $route
@@ -36,11 +45,4 @@ interface HelpInterface
      * @return void
      */
     public function putInCache($route, array $content);
-
+}
-    /**
-     * @param $route
-     *
-     * @return bool
-     */
-    public function inCache($route);
-}

app/Helpers/Report/ReportHelper.php

@@ -91,11 +91,11 @@ class ReportHelper implements ReportHelperInterface
         $end    = Carbon::now();
         $months = [];
         while ($start <= $end) {
-            $year            = $start->format('Y');
+            $year            = $start->year;
             $months[$year][] = [
                 'formatted' => $start->format('F Y'),
-                'month'     => intval($start->format('m')),
+                'month'     => $start->month,
-                'year'      => intval($start->format('Y')),
+                'year'      => $year,
             ];
             $start->addMonth();
         }
@@ -114,10 +114,10 @@ class ReportHelper implements ReportHelperInterface
         $end   = Carbon::now();
         $years = [];
         while ($start <= $end) {
-            $years[] = $start->format('Y');
+            $years[] = $start->year;
             $start->addYear();
         }
-        $years[] = Carbon::now()->format('Y');
+        $years[] = Carbon::now()->year;
         // force the current year.
         $years = array_unique($years);
 

app/Helpers/Report/ReportQuery.php

@@ -150,8 +150,16 @@ class ReportQuery implements ReportQueryInterface
         $set = $query->get(['accounts.*']);
         $set->each(
             function (Account $account) use ($start, $end) {
+                /**
+                 * The balance for today always incorporates transactions
+                 * made on today. So to get todays "start" balance, we sub one
+                 * day.
+                 */
+                $yesterday = clone $start;
+                $yesterday->subDay();
+
                 /** @noinspection PhpParamsInspection */
-                $account->startBalance = Steam::balance($account, $start);
+                $account->startBalance = Steam::balance($account, $yesterday);
                 $account->endBalance   = Steam::balance($account, $end);
             }
         );

app/Http/Controllers/AccountController.php

@@ -67,11 +67,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Account $account
+     * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Account $account, AccountRepositoryInterface $repository)
+    public function destroy(AccountRepositoryInterface $repository, Account $account)
     {
 
         $type     = $account->accountType->type;
@@ -86,12 +87,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Account                    $account
      * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
      * @return View
      */
-    public function edit(Account $account, AccountRepositoryInterface $repository)
+    public function edit(AccountRepositoryInterface $repository, Account $account)
     {
 
         $what           = Config::get('firefly.shortNamesByFullName')[$account->accountType->type];
@@ -129,12 +130,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param                            $what
      * @param AccountRepositoryInterface $repository
+     * @param                            $what
      *
      * @return View
      */
-    public function index($what, AccountRepositoryInterface $repository)
+    public function index(AccountRepositoryInterface $repository, $what)
     {
         $subTitle     = Config::get('firefly.subTitlesByIdentifier.' . $what);
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
@@ -158,12 +159,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Account                    $account
      * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
      * @return View
      */
-    public function show(Account $account, AccountRepositoryInterface $repository)
+    public function show(AccountRepositoryInterface $repository, Account $account)
     {
         $page         = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
         $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
@@ -214,13 +215,13 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Account                    $account
      * @param AccountFormRequest         $request
      * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Account $account, AccountFormRequest $request, AccountRepositoryInterface $repository)
+    public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account)
     {
 
         $accountData = [

app/Http/Controllers/BillController.php

@@ -4,7 +4,6 @@ use Config;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BillFormRequest;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
@@ -35,11 +34,12 @@ class BillController extends Controller
     }
 
     /**
-     * @param Bill $bill
+     * @param AccountRepositoryInterface $repository
+     * @param Bill                       $bill
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function add(Bill $bill, AccountRepositoryInterface $repository)
+    public function add(AccountRepositoryInterface $repository, Bill $bill)
     {
         $matches     = explode(',', $bill->match);
         $description = [];
@@ -89,8 +89,9 @@ class BillController extends Controller
             Session::put('bills.create.url', URL::previous());
         }
         Session::forget('bills.create.fromStore');
+        $subTitle = 'Create new bill';
 
-        return view('bills.create')->with('periods', $periods)->with('subTitle', 'Create new');
+        return view('bills.create', compact('periods', 'subTitle'));
     }
 
     /**
@@ -102,16 +103,18 @@ class BillController extends Controller
     {
         // put previous url in session
         Session::put('bills.delete.url', URL::previous());
+        $subTitle = 'Delete "' . e($bill->name) . '"';
 
-        return view('bills.delete')->with('bill', $bill)->with('subTitle', 'Delete "' . e($bill->name) . '"');
+        return view('bills.delete', compact('bill', 'subTitle'));
     }
 
     /**
-     * @param Bill $bill
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Bill $bill, BillRepositoryInterface $repository)
+    public function destroy(BillRepositoryInterface $repository, Bill $bill)
     {
         $repository->destroy($bill);
 
@@ -128,7 +131,8 @@ class BillController extends Controller
      */
     public function edit(Bill $bill)
     {
-        $periods = Config::get('firefly.periods_to_text');
+        $periods  = Config::get('firefly.periods_to_text');
+        $subTitle = 'Edit "' . e($bill->name) . '"';
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (Session::get('bills.edit.fromUpdate') !== true) {
@@ -136,7 +140,7 @@ class BillController extends Controller
         }
         Session::forget('bills.edit.fromUpdate');
 
-        return view('bills.edit')->with('periods', $periods)->with('bill', $bill)->with('subTitle', 'Edit "' . e($bill->name) . '"');
+        return view('bills.edit', compact('subTitle', 'periods', 'bill'));
     }
 
     /**
@@ -158,11 +162,12 @@ class BillController extends Controller
     }
 
     /**
-     * @param Bill $bill
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
-    public function rescan(Bill $bill, BillRepositoryInterface $repository)
+    public function rescan(BillRepositoryInterface $repository, Bill $bill)
     {
         if (intval($bill->active) == 0) {
             Session::flash('warning', 'Inactive bills cannot be scanned.');
@@ -183,21 +188,26 @@ class BillController extends Controller
     }
 
     /**
-     * @param Bill $bill
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
      * @return mixed
      */
-    public function show(Bill $bill, BillRepositoryInterface $repository)
+    public function show(BillRepositoryInterface $repository, Bill $bill)
     {
         $journals                = $repository->getJournals($bill);
         $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
         $hideBill                = true;
+        $subTitle                = e($bill->name);
 
-        return view('bills.show', compact('journals', 'hideBill', 'bill'))->with('subTitle', e($bill->name));
+        return view('bills.show', compact('journals', 'hideBill', 'bill', 'subTitle'));
     }
 
     /**
-     * @return $this
+     * @param BillFormRequest         $request
+     * @param BillRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function store(BillFormRequest $request, BillRepositoryInterface $repository)
     {
@@ -218,11 +228,13 @@ class BillController extends Controller
     }
 
     /**
-     * @param Bill $bill
+     * @param BillFormRequest         $request
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
-     * @return $this
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Bill $bill, BillFormRequest $request, BillRepositoryInterface $repository)
+    public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill)
     {
         $billData = $request->getBillData();
         $bill     = $repository->update($bill, $billData);

app/Http/Controllers/BudgetController.php

@@ -5,7 +5,6 @@ use Carbon\Carbon;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BudgetFormRequest;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Input;
@@ -36,11 +35,12 @@ class BudgetController extends Controller
     }
 
     /**
-     * @param Budget $budget
+     * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function amount(Budget $budget, BudgetRepositoryInterface $repository)
+    public function amount(BudgetRepositoryInterface $repository, Budget $budget)
     {
         $amount          = intval(Input::get('amount'));
         $date            = Session::get('start', Carbon::now()->startOfMonth());
@@ -60,8 +60,9 @@ class BudgetController extends Controller
             Session::put('budgets.create.url', URL::previous());
         }
         Session::forget('budgets.create.fromStore');
+        $subTitle = 'Create a new budget';
 
-        return view('budgets.create')->with('subTitle', 'Create a new budget');
+        return view('budgets.create', compact('subTitle'));
     }
 
     /**
@@ -80,7 +81,8 @@ class BudgetController extends Controller
     }
 
     /**
-     * @param Budget $budget
+     * @param Budget                    $budget
+     * @param BudgetRepositoryInterface $repository
      *
      * @return \Illuminate\Http\RedirectResponse
      */
@@ -116,7 +118,9 @@ class BudgetController extends Controller
     }
 
     /**
-     * @return mixed
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return View
      */
     public function index(BudgetRepositoryInterface $repository)
     {
@@ -150,7 +154,9 @@ class BudgetController extends Controller
     }
 
     /**
-     * @return \Illuminate\View\View
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return View
      */
     public function noBudget(BudgetRepositoryInterface $repository)
     {
@@ -163,7 +169,7 @@ class BudgetController extends Controller
     }
 
     /**
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function postUpdateIncome()
     {
@@ -175,16 +181,18 @@ class BudgetController extends Controller
     }
 
     /**
+     * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
+     * @param LimitRepetition           $repetition
      *
-     * @param Budget          $budget
+     * @return View
-     * @param LimitRepetition $repetition
-     *
-     * @return \Illuminate\View\View
      */
-    public function show(Budget $budget, LimitRepetition $repetition = null, BudgetRepositoryInterface $repository)
+    public function show(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition = null)
     {
         if (!is_null($repetition->id) && $repetition->budgetLimit->budget->id != $budget->id) {
-            return view('error')->with('message', 'Invalid selection.');
+            $message = 'Invalid selection.';
+
+            return view('error', compact('message'));
         }
 
         $journals = $repository->getJournals($budget, $repetition);
@@ -224,13 +232,13 @@ class BudgetController extends Controller
     }
 
     /**
-     * @param Budget                    $budget
      * @param BudgetFormRequest         $request
      * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Budget $budget, BudgetFormRequest $request, BudgetRepositoryInterface $repository)
+    public function update(BudgetFormRequest $request, BudgetRepositoryInterface $repository, Budget $budget)
     {
         $budgetData = [
             'name'   => $request->input('name'),
@@ -254,14 +262,14 @@ class BudgetController extends Controller
     }
 
     /**
-     * @return $this
+     * @return View
      */
     public function updateIncome()
     {
-        $date         = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
+        $date   = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
-        $budgetAmount = Preferences::get('budgetIncomeTotal' . $date, 1000);
+        $amount = Preferences::get('budgetIncomeTotal' . $date, 1000);
 
-        return view('budgets.income')->with('amount', $budgetAmount);
+        return view('budgets.income', compact('amount'));
     }
 
 }

app/Http/Controllers/CategoryController.php

@@ -2,7 +2,6 @@
 
 use Auth;
 use Carbon\Carbon;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -41,8 +40,9 @@ class CategoryController extends Controller
             Session::put('categories.create.url', URL::previous());
         }
         Session::forget('categories.create.fromStore');
+        $subTitle = 'Create a new category';
 
-        return view('categories.create')->with('subTitle', 'Create a new category');
+        return view('categories.create', compact('subTitle'));
     }
 
     /**
@@ -61,11 +61,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param Category $category
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Category $category, CategoryRepositoryInterface $repository)
+    public function destroy(CategoryRepositoryInterface $repository, Category $category)
     {
 
         $name = $category->name;
@@ -96,8 +97,9 @@ class CategoryController extends Controller
     }
 
     /**
-     * @return $this
+     * @param CategoryRepositoryInterface $repository
      *
+     * @return $this
      */
     public function index(CategoryRepositoryInterface $repository)
     {
@@ -113,6 +115,8 @@ class CategoryController extends Controller
     }
 
     /**
+     * @param CategoryRepositoryInterface $repository
+     *
      * @return \Illuminate\View\View
      */
     public function noCategory(CategoryRepositoryInterface $repository)
@@ -126,11 +130,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param Category $category
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
-     * @return $this
+     * @return View
      */
-    public function show(Category $category, CategoryRepositoryInterface $repository)
+    public function show(CategoryRepositoryInterface $repository, Category $category)
     {
         $hideCategory = true; // used in list.
         $page         = intval(Input::get('page'));
@@ -169,13 +174,13 @@ class CategoryController extends Controller
 
 
     /**
-     * @param Category                    $category
      * @param CategoryFormRequest         $request
      * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(Category $category, CategoryFormRequest $request, CategoryRepositoryInterface $repository)
+    public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category)
     {
         $categoryData = [
             'name' => $request->input('name'),

app/Http/Controllers/CurrencyController.php

@@ -68,11 +68,12 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * @return \Illuminate\Http\RedirectResponse|View
      */
-    public function delete(TransactionCurrency $currency, CurrencyRepositoryInterface $repository)
+    public function delete(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
 
         if ($repository->countJournals($currency) > 0) {
@@ -89,11 +90,13 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
      * @return \Illuminate\Http\RedirectResponse
+     * @throws \Exception
      */
-    public function destroy(TransactionCurrency $currency, CurrencyRepositoryInterface $repository)
+    public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
         if ($repository->countJournals($currency) > 0) {
             Session::flash('error', 'Cannot destroy ' . e($currency->name) . ' because there are still transactions attached to it.');
@@ -130,6 +133,8 @@ class CurrencyController extends Controller
     }
 
     /**
+     * @param CurrencyRepositoryInterface $repository
+     *
      * @return \Illuminate\View\View
      */
     public function index(CurrencyRepositoryInterface $repository)
@@ -141,7 +146,9 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @param CurrencyFormRequest         $request
+     * @param CurrencyRepositoryInterface $repository
      *
      * @return $this|\Illuminate\Http\RedirectResponse
      */
@@ -166,11 +173,13 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyFormRequest         $request
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(TransactionCurrency $currency, CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
+    public function update(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
         $data     = $request->getCurrencyData();
         $currency = $repository->update($currency, $data);

app/Http/Controllers/GoogleChartController.php

@@ -35,12 +35,12 @@ class GoogleChartController extends Controller
 
 
     /**
+     * @param GChart  $chart
      * @param Account $account
-     * @param string  $view
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function accountBalanceChart(Account $account, GChart $chart)
+    public function accountBalanceChart(GChart $chart, Account $account)
     {
         $chart->addColumn('Day of month', 'date');
         $chart->addColumn('Balance for ' . $account->name, 'number');
@@ -64,7 +64,8 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param GChart $chart
+     * @param GChart                     $chart
+     * @param AccountRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -104,11 +105,13 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param int $year
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
+     * @param                           $year
      *
-     * @return $this|\Illuminate\Http\JsonResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function allBudgetsAndSpending($year, GChart $chart, BudgetRepositoryInterface $repository)
+    public function allBudgetsAndSpending(GChart $chart, BudgetRepositoryInterface $repository, $year)
     {
         $budgets = $repository->getBudgets();
         $chart->addColumn('Month', 'date');
@@ -137,7 +140,8 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param GChart $chart
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -145,7 +149,7 @@ class GoogleChartController extends Controller
     {
         $chart->addColumn('Budget', 'string');
         $chart->addColumn('Left', 'number');
-        //$chart->addColumn('Spent', 'number');
+        $chart->addColumn('Overspent', 'number');
 
         $budgets    = $repository->getBudgets();
         $start      = Session::get('start', Carbon::now()->startOfMonth());
@@ -172,7 +176,14 @@ class GoogleChartController extends Controller
         foreach ($allEntries as $entry) {
             if ($entry[2] > 0) {
                 $left = $entry[1] - $entry[2];
-                $chart->addRow($entry[0], $left);
+                if ($left > 0) {
+                    $chart->addRow($entry[0], $left, null);
+                } else {
+                    if ($left < 0) {
+                        $chart->addRow($entry[0], null, $left);
+                    }
+                }
+
             }
         }
 
@@ -183,7 +194,8 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param GChart $chart
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -210,12 +222,13 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param Bill   $bill
+     * @param GChart                  $chart
-     * @param GChart $chart
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function billOverview(Bill $bill, GChart $chart, BillRepositoryInterface $repository)
+    public function billOverview(GChart $chart, BillRepositoryInterface $repository, Bill $bill)
     {
 
         $chart->addColumn('Date', 'date');
@@ -237,7 +250,10 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param GChart $chart
+     * @param GChart                     $chart
+     *
+     * @param BillRepositoryInterface    $repository
+     * @param AccountRepositoryInterface $accounts
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -319,13 +335,14 @@ class GoogleChartController extends Controller
     }
 
     /**
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
+     * @param LimitRepetition           $repetition
      *
-     * @param Budget          $budget
+     * @return \Symfony\Component\HttpFoundation\Response
-     * @param LimitRepetition $repetition
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function budgetLimitSpending(Budget $budget, LimitRepetition $repetition, GChart $chart, BudgetRepositoryInterface $repository)
+    public function budgetLimitSpending(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition)
     {
         $start = clone $repetition->startdate;
         $end   = $repetition->enddate;
@@ -352,10 +369,10 @@ class GoogleChartController extends Controller
     }
 
     /**
-     * @param Budget                    $budget
-     * @param int                       $year
      * @param GChart                    $chart
      * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
+     * @param int                       $year
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -389,12 +406,13 @@ class GoogleChartController extends Controller
     }
 
     /**
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
-     * @param Category $category
+     * @return \Symfony\Component\HttpFoundation\Response
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function categoryOverviewChart(Category $category, GChart $chart, CategoryRepositoryInterface $repository)
+    public function categoryOverviewChart(GChart $chart, CategoryRepositoryInterface $repository, Category $category)
     {
         // oldest transaction in category:
         $start = $repository->getFirstActivityDate($category);
@@ -425,12 +443,13 @@ class GoogleChartController extends Controller
     }
 
     /**
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
-     * @param Category $category
+     * @return \Symfony\Component\HttpFoundation\Response
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function categoryPeriodChart(Category $category, GChart $chart, CategoryRepositoryInterface $repository)
+    public function categoryPeriodChart(GChart $chart, CategoryRepositoryInterface $repository, Category $category)
     {
         $start = clone Session::get('start', Carbon::now()->startOfMonth());
         $chart->addColumn('Period', 'date');
@@ -452,11 +471,13 @@ class GoogleChartController extends Controller
 
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param GChart                       $chart
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function piggyBankHistory(PiggyBank $piggyBank, GChart $chart, PiggyBankRepositoryInterface $repository)
+    public function piggyBankHistory(GChart $chart, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $chart->addColumn('Date', 'date');
         $chart->addColumn('Balance', 'number');
@@ -477,12 +498,13 @@ class GoogleChartController extends Controller
     }
 
     /**
+     * @param GChart               $chart
+     * @param ReportQueryInterface $query
+     * @param                      $year
      *
-     * @param $year
+     * @return \Symfony\Component\HttpFoundation\Response
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function yearInExp($year, GChart $chart, ReportQueryInterface $query)
+    public function yearInExp(GChart $chart, ReportQueryInterface $query, $year)
     {
         $start = new Carbon('01-01-' . $year);
         $chart->addColumn('Month', 'date');
@@ -515,12 +537,13 @@ class GoogleChartController extends Controller
     }
 
     /**
+     * @param GChart               $chart
+     * @param ReportQueryInterface $query
+     * @param                      $year
      *
-     * @param $year
+     * @return \Symfony\Component\HttpFoundation\Response
-     *
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function yearInExpSum($year, GChart $chart, ReportQueryInterface $query)
+    public function yearInExpSum(GChart $chart, ReportQueryInterface $query, $year)
     {
         $start = new Carbon('01-01-' . $year);
         $chart->addColumn('Summary', 'string');

app/Http/Controllers/HelpController.php

@@ -13,11 +13,12 @@ class HelpController extends Controller
 {
 
     /**
-     * @param $route
+     * @param HelpInterface $help
+     * @param               $route
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function show($route, HelpInterface $help)
+    public function show(HelpInterface $help, $route)
     {
         $content = [
             'text'  => '<p>There is no help for this route!</p>',

app/Http/Controllers/JsonController.php

@@ -5,8 +5,7 @@ use Carbon\Carbon;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
-use FireflyIII\Models\Transaction;
+use FireflyIII\Models\Preference;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -28,7 +27,9 @@ class JsonController extends Controller
 
 
     /**
-     * @param BillRepositoryInterface $repository
+     * @param BillRepositoryInterface    $repository
+     *
+     * @param AccountRepositoryInterface $accountRepository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -149,6 +150,8 @@ class JsonController extends Controller
     /**
      * Returns a list of categories.
      *
+     * @param CategoryRepositoryInterface $repository
+     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function categories(CategoryRepositoryInterface $repository)
@@ -166,6 +169,8 @@ class JsonController extends Controller
     /**
      * Returns a JSON list of all beneficiaries.
      *
+     * @param AccountRepositoryInterface $accountRepository
+     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function expenseAccounts(AccountRepositoryInterface $accountRepository)
@@ -181,25 +186,10 @@ class JsonController extends Controller
     }
 
     /**
-     * Returns a JSON list of all beneficiaries.
+     * @param AccountRepositoryInterface $accountRepository
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function tags(TagRepositoryInterface $tagRepository)
-    {
-        $list   = $tagRepository->get();
-        $return = [];
-        foreach ($list as $entry) {
-            $return[] = $entry->tag;
-        }
-
-        return Response::json($return);
-
-    }
-
-    /**
-     * @return \Illuminate\Http\JsonResponse
-     */
     public function revenueAccounts(AccountRepositoryInterface $accountRepository)
     {
         $list   = $accountRepository->getAccounts(['Revenue account']);
@@ -217,6 +207,7 @@ class JsonController extends Controller
      */
     public function setSharedReports()
     {
+        /** @var Preference $pref */
         $pref = Preferences::get('showSharedReports', false);
         $new  = !$pref->data;
         Preferences::set('showSharedReports', $new);
@@ -236,11 +227,31 @@ class JsonController extends Controller
     }
 
     /**
-     * @param $what
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @param TagRepositoryInterface $tagRepository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function tags(TagRepositoryInterface $tagRepository)
+    {
+        $list   = $tagRepository->get();
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->tag;
+        }
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * @param JournalRepositoryInterface $repository
+     * @param                            $what
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function transactionJournals($what, JournalRepositoryInterface $repository)
+    public function transactionJournals(JournalRepositoryInterface $repository, $what)
     {
         $descriptions = [];
         $dbType       = $repository->getTransactionType($what);

app/Http/Controllers/PiggyBankController.php

@@ -6,9 +6,7 @@ use Config;
 use ExpandedForm;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Support\Collection;
@@ -40,11 +38,12 @@ class PiggyBankController extends Controller
     /**
      * Add money to piggy bank
      *
-     * @param PiggyBank $piggyBank
+     * @param AccountRepositoryInterface $repository
+     * @param PiggyBank                  $piggyBank
      *
      * @return $this
      */
-    public function add(PiggyBank $piggyBank, AccountRepositoryInterface $repository)
+    public function add(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $leftOnAccount = $repository->leftOnAccount($piggyBank->account);
         $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount;
@@ -55,15 +54,15 @@ class PiggyBankController extends Controller
     }
 
     /**
+     * @param AccountRepositoryInterface $repository
+     *
      * @return mixed
      */
     public function create(AccountRepositoryInterface $repository)
     {
 
-        $periods  = Config::get('firefly.piggy_bank_periods');
+        $periods      = Config::get('firefly.piggy_bank_periods');
-        $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
-        //Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
-        //        );
         $subTitle     = 'Create new piggy bank';
         $subTitleIcon = 'fa-plus';
 
@@ -92,11 +91,12 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
+    public function destroy(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
 
 
@@ -107,13 +107,12 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     * @param AccountRepositoryInterface $repository
+     * @param PiggyBank                  $piggyBank
      *
-     * @param PiggyBank $piggyBank
+     * @return View
-     *
-     * @return $this
      */
-    public function edit(PiggyBank $piggyBank, AccountRepositoryInterface $repository)
+    public function edit(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
     {
 
         $periods      = Config::get('firefly.piggy_bank_periods');
@@ -149,7 +148,10 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @return $this
+     * @param AccountRepositoryInterface   $repository
+     * @param PiggyBankRepositoryInterface $piggyRepository
+     *
+     * @return View
      */
     public function index(AccountRepositoryInterface $repository, PiggyBankRepositoryInterface $piggyRepository)
     {
@@ -187,7 +189,7 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * Allow user to order piggy banks.
+     * @param PiggyBankRepositoryInterface $repository
      */
     public function order(PiggyBankRepositoryInterface $repository)
     {
@@ -204,13 +206,13 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * POST add money to piggy bank
+     * @param PiggyBankRepositoryInterface $repository
-     *
+     * @param AccountRepositoryInterface   $accounts
-     * @param PiggyBank $piggyBank
+     * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postAdd(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    public function postAdd(PiggyBankRepositoryInterface $repository, AccountRepositoryInterface $accounts, PiggyBank $piggyBank)
     {
         $amount        = round(floatval(Input::get('amount')), 2);
         $leftOnAccount = $accounts->leftOnAccount($piggyBank->account);
@@ -240,11 +242,12 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRemove(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
+    public function postRemove(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $amount = floatval(Input::get('amount'));
 
@@ -269,7 +272,6 @@ class PiggyBankController extends Controller
     /**
      * @param PiggyBank $piggyBank
      *
-     * @SuppressWarnings("Unused")
      *
      * @return \Illuminate\View\View
      */
@@ -279,11 +281,12 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
-     * @return $this
+     * @return View
      */
-    public function show(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
+    public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $events = $repository->getEvents($piggyBank);
 
@@ -332,13 +335,13 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
-     *
+     * @param PiggyBankFormRequest         $request
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     * @param PiggyBank                    $piggyBank
      *
      * @return $this
      */
-    public function update(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request)
+    public function update(PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request, PiggyBank $piggyBank)
     {
         $piggyBankData = [
             'name'         => $request->get('name'),

app/Http/Controllers/PreferencesController.php

@@ -26,20 +26,20 @@ class PreferencesController extends Controller
     }
 
     /**
+     * @param AccountRepositoryInterface $repository
+     *
      * @return $this|\Illuminate\View\View
      */
     public function index(AccountRepositoryInterface $repository)
     {
-        $accounts       = $repository->getAccounts(['Default account', 'Asset account']);
+        $accounts          = $repository->getAccounts(['Default account', 'Asset account']);
-        $viewRange      = Preferences::get('viewRange', '1M');
+        $viewRangePref     = Preferences::get('viewRange', '1M');
-        $viewRangeValue = $viewRange->data;
+        $viewRange         = $viewRangePref->data;
-        $frontPage      = Preferences::get('frontPageAccounts', []);
+        $frontPageAccounts = Preferences::get('frontPageAccounts', []);
-        $budgetMax      = Preferences::get('budgetMaximum', 1000);
+        $budgetMax         = Preferences::get('budgetMaximum', 1000);
-        $budgetMaximum  = $budgetMax->data;
+        $budgetMaximum     = $budgetMax->data;
 
-        return view('preferences.index', compact('budgetMaximum'))->with('accounts', $accounts)->with('frontPageAccounts', $frontPage)->with(
+        return view('preferences.index', compact('budgetMaximum', 'accounts', 'frontPageAccounts', 'viewRange'));
-            'viewRange', $viewRangeValue
-        );
     }
 
     /**

app/Http/Controllers/ProfileController.php

@@ -26,16 +26,6 @@ class ProfileController extends Controller
         );
     }
 
-    /**
-     * @return \Illuminate\View\View
-     *
-     */
-    public function index()
-    {
-        return view('profile.index')->with('title', 'Profile')->with('subTitle', Auth::user()->email)->with('mainTitleIcon', 'fa-user');
-    }
-
-
     /**
      * @return \Illuminate\View\View
      */
@@ -47,8 +37,66 @@ class ProfileController extends Controller
     }
 
     /**
+     * @return \Illuminate\View\View
      *
      */
+    public function index()
+    {
+        return view('profile.index')->with('title', 'Profile')->with('subTitle', Auth::user()->email)->with('mainTitleIcon', 'fa-user');
+    }
+
+    /**
+     * @param ProfileFormRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     */
+    public function postChangePassword(ProfileFormRequest $request)
+    {
+        // old, new1, new2
+        if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
+            Session::flash('error', 'Invalid current password!');
+
+            return Redirect::route('change-password');
+        }
+        $result = $this->validatePassword($request->get('current_password'), $request->get('new_password'));
+        if (!($result === true)) {
+            Session::flash('error', $result);
+
+            return Redirect::route('change-password');
+        }
+
+        // update the user with the new password.
+        Auth::user()->password = $request->get('new_password');
+        Auth::user()->save();
+
+        Session::flash('success', 'Password changed!');
+
+        return Redirect::route('profile');
+    }
+
+    /**
+     *
+     * @param string $old
+     * @param string $new1
+     *
+     * @return string|bool
+     */
+    protected function validatePassword($old, $new1)
+    {
+        if ($new1 == $old) {
+            return 'The idea is to change your password.';
+        }
+
+        return true;
+
+    }
+
+    /**
+     * @param DeleteAccountFormRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Exception
+     */
     public function postDeleteAccount(DeleteAccountFormRequest $request)
     {
         // old, new1, new2
@@ -66,57 +114,4 @@ class ProfileController extends Controller
     }
 
 
-    /**
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
-     */
-    public function postChangePassword(ProfileFormRequest $request)
-    {
-        // old, new1, new2
-        if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
-            Session::flash('error', 'Invalid current password!');
-
-            return Redirect::route('change-password');
-        }
-        $result = $this->validatePassword($request->get('current_password'), $request->get('new_password'), $request->get('new_password_confirmation'));
-        if (!($result === true)) {
-            Session::flash('error', $result);
-
-            return Redirect::route('change-password');
-        }
-
-        // update the user with the new password.
-        Auth::user()->password = $request->get('new_password');
-        Auth::user()->save();
-
-        Session::flash('success', 'Password changed!');
-
-        return Redirect::route('profile');
-    }
-
-    /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
-     *
-     * @param string $old
-     * @param string $new1
-     * @param string $new2
-     *
-     * @return string|bool
-     */
-    protected function validatePassword($old, $new1, $new2)
-    {
-        if (strlen($new1) == 0 || strlen($new2) == 0) {
-            return 'Do fill in a password!';
-
-        }
-        if ($new1 == $old) {
-            return 'The idea is to change your password.';
-        }
-
-        if ($new1 !== $new2) {
-            return 'New passwords do not match!';
-        }
-
-        return true;
-
-    }
 }

app/Http/Controllers/ReminderController.php

@@ -1,9 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Auth;
-use Carbon\Carbon;
-use FireflyIII\Helpers\Reminders\ReminderHelperInterface;
 use FireflyIII\Models\Reminder;
+use FireflyIII\Repositories\Reminder\ReminderRepositoryInterface;
 use Redirect;
 use Session;
 use URL;
@@ -19,6 +17,8 @@ class ReminderController extends Controller
 
     /**
      * @param Reminder $reminder
+     *
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function act(Reminder $reminder)
     {
@@ -36,6 +36,8 @@ class ReminderController extends Controller
 
     /**
      * @param Reminder $reminder
+     *
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function dismiss(Reminder $reminder)
     {
@@ -48,55 +50,18 @@ class ReminderController extends Controller
     }
 
     /**
+     * @param ReminderRepositoryInterface $repository
      *
+     * @return \Illuminate\View\View
      */
-    public function index(ReminderHelperInterface $helper)
+    public function index(ReminderRepositoryInterface $repository)
     {
 
-        $reminders = Auth::user()->reminders()->get();
 
-        $reminders->each(
+        $active    = $repository->getActiveReminders();
-            function (Reminder $reminder) use ($helper) {
+        $expired   = $repository->getExpiredReminders();
-                $reminder->description = $helper->getReminderText($reminder);
+        $inactive  = $repository->getInactiveReminders();
-            }
+        $dismissed = $repository->getDismissedReminders();
-        );
-
-        $today = new Carbon;
-        // active reminders:
-        $active = $reminders->filter(
-            function (Reminder $reminder) use ($today) {
-                if ($reminder->notnow === false && $reminder->active === true && $reminder->startdate <= $today && $reminder->enddate >= $today) {
-                    return $reminder;
-                }
-            }
-        );
-
-        // expired reminders:
-        $expired = $reminders->filter(
-            function (Reminder $reminder) use ($today) {
-                if ($reminder->notnow === false && $reminder->active === true && $reminder->startdate > $today || $reminder->enddate < $today) {
-                    return $reminder;
-                }
-            }
-        );
-
-        // inactive reminders
-        $inactive = $reminders->filter(
-            function (Reminder $reminder) {
-                if ($reminder->active === false) {
-                    return $reminder;
-                }
-            }
-        );
-
-        // dismissed reminders
-        $dismissed = $reminders->filter(
-            function (Reminder $reminder) {
-                if ($reminder->notnow === true) {
-                    return $reminder;
-                }
-            }
-        );
 
         $title         = 'Reminders';
         $mainTitleIcon = 'fa-clock-o';
@@ -106,6 +71,8 @@ class ReminderController extends Controller
 
     /**
      * @param Reminder $reminder
+     *
+     * @return \Illuminate\View\View
      */
     public function show(Reminder $reminder)
     {

app/Http/Controllers/ReportController.php

@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
-use Exception;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Models\Account;
@@ -76,6 +75,7 @@ class ReportController extends Controller
             // should always hide account
             $hide = true;
             // loop all budgets
+            /** @var \FireflyIII\Models\Budget $budget */
             foreach ($budgets as $budget) {
                 $id         = intval($budget->id);
                 $data       = $budget->toArray();
@@ -107,9 +107,9 @@ class ReportController extends Controller
     }
 
     /**
-     * @param ReportHelperInterface $helper
-     *
      * @return View
+     * @internal param ReportHelperInterface $helper
+     *
      */
     public function index()
     {
@@ -132,11 +132,6 @@ class ReportController extends Controller
     public function modalBalancedTransfers(Account $account, $year = '2014', $month = '1')
     {
 
-        try {
-            new Carbon($year . '-' . $month . '-01');
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date');
-        }
         $start = new Carbon($year . '-' . $month . '-01');
         $end   = clone $start;
         $end->endOfMonth();
@@ -149,20 +144,16 @@ class ReportController extends Controller
     }
 
     /**
-     * @param Account              $account
+     * @param Account $account
-     * @param string               $year
+     * @param string  $year
-     * @param string               $month
+     * @param string  $month
-     * @param ReportQueryInterface $query
      *
      * @return View
+     * @internal param ReportQueryInterface $query
+     *
      */
     public function modalLeftUnbalanced(Account $account, $year = '2014', $month = '1')
     {
-        try {
-            new Carbon($year . '-' . $month . '-01');
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date');
-        }
         $start = new Carbon($year . '-' . $month . '-01');
         $end   = clone $start;
         $end->endOfMonth();
@@ -174,6 +165,8 @@ class ReportController extends Controller
                 if ($count == 0) {
                     return $journal;
                 }
+
+                return null;
             }
         );
 
@@ -189,11 +182,6 @@ class ReportController extends Controller
      */
     public function modalNoBudget(Account $account, $year = '2014', $month = '1')
     {
-        try {
-            new Carbon($year . '-' . $month . '-01');
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date');
-        }
         $start = new Carbon($year . '-' . $month . '-01');
         $end   = clone $start;
         $end->endOfMonth();
@@ -211,11 +199,6 @@ class ReportController extends Controller
      */
     public function month($year = '2014', $month = '1')
     {
-        try {
-            new Carbon($year . '-' . $month . '-01');
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date.');
-        }
         $date         = new Carbon($year . '-' . $month . '-01');
         $subTitle     = 'Report for ' . $date->format('F Y');
         $subTitleIcon = 'fa-calendar';
@@ -327,11 +310,6 @@ class ReportController extends Controller
      */
     public function year($year)
     {
-        try {
-            new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date.');
-        }
         /** @var Preference $pref */
         $pref              = Preferences::get('showSharedReports', false);
         $showSharedReports = $pref->data;

app/Http/Controllers/SearchController.php

@@ -12,6 +12,10 @@ class SearchController extends Controller
 {
     /**
      * Results always come in the form of an array [results, count, fullCount]
+     *
+     * @param SearchInterface $searcher
+     *
+     * @return $this
      */
     public function index(SearchInterface $searcher)
     {

app/Http/Controllers/TagController.php

@@ -22,10 +22,10 @@ use View;
  * Remember: a balancingAct takes at most one expense and one transfer.
  *           an advancePayment takes at most one expense, infinite deposits and NO transfers.
  *
- * TODO transaction can only have one advancePayment OR balancingAct.
+ *  transaction can only have one advancePayment OR balancingAct.
- * TODO Other attempts to put in such a tag are blocked.
+ *  Other attempts to put in such a tag are blocked.
- * TODO also show an error when editing a tag and it becomes either
+ *  also show an error when editing a tag and it becomes either
- * TODO of these two types. Or rather, block editing of the tag.
+ *  of these two types. Or rather, block editing of the tag.
  *
  * @package FireflyIII\Http\Controllers
  */
@@ -87,11 +87,12 @@ class TagController extends Controller
     }
 
     /**
-     * @param Tag $tag
+     * @param TagRepositoryInterface $repository
+     * @param Tag                    $tag
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Tag $tag, TagRepositoryInterface $repository)
+    public function destroy(TagRepositoryInterface $repository, Tag $tag)
     {
 
         $tagName = $tag->tag;
@@ -149,7 +150,7 @@ class TagController extends Controller
                 $count++;
             }
         }
-        if($count > 1) {
+        if ($count > 1) {
             $allowToAdvancePayment = false;
         }
 
@@ -169,12 +170,12 @@ class TagController extends Controller
                 $count++;
             }
         }
-        if($count > 0) {
+        if ($count > 0) {
             $allowToBalancingAct = false;
         }
 
 
-        // edit tagoptions:
+        // edit tag options:
         if ($allowToAdvancePayment === false) {
             unset($tagOptions['advancePayment']);
         }
@@ -194,6 +195,8 @@ class TagController extends Controller
 
     /**
      * @param $state
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function hideTagHelp($state)
     {
@@ -233,7 +236,11 @@ class TagController extends Controller
     }
 
     /**
-     * @param TagFormRequest $request
+     * @param TagFormRequest         $request
+     *
+     * @param TagRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function store(TagFormRequest $request, TagRepositoryInterface $repository)
     {
@@ -273,9 +280,13 @@ class TagController extends Controller
     }
 
     /**
-     * @param Tag $tag
+     * @param TagFormRequest         $request
+     * @param TagRepositoryInterface $repository
+     * @param Tag                    $tag
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Tag $tag, TagFormRequest $request, TagRepositoryInterface $repository)
+    public function update(TagFormRequest $request, TagRepositoryInterface $repository, Tag $tag)
     {
         if (Input::get('setTag') == 'true') {
             $latitude  = strlen($request->get('latitude')) > 0 ? $request->get('latitude') : null;
@@ -311,4 +322,4 @@ class TagController extends Controller
         // redirect to previous URL.
         return Redirect::to(Session::get('tags.edit.url'));
     }
-}
+}

app/Http/Controllers/TransactionController.php

@@ -1,6 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Auth;
+use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Events\JournalCreated;
 use FireflyIII\Events\JournalSaved;
@@ -8,8 +9,8 @@ use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\JournalFormRequest;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
 use Redirect;
 use Response;
@@ -34,19 +35,14 @@ class TransactionController extends Controller
     }
 
     /**
-     * Shows the view helping the user to create a new transaction journal.
+     * @param AccountRepositoryInterface $repository
+     * @param string                     $what
      *
-     * @param string $what
+     * @return View
-     *
-     * @return \Illuminate\View\View
      */
-    public function create($what = 'deposit')
+    public function create(AccountRepositoryInterface $repository, $what = 'deposit')
     {
-        $accounts   = ExpandedForm::makeSelectList(
+        $accounts   = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
-            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->orderBy('name', 'ASC')->where(
-                'active', 1
-            )->orderBy('name', 'DESC')->get(['accounts.*'])
-        );
         $budgets    = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0] = '(no budget)';
         $piggies    = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
@@ -95,15 +91,16 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param TransactionJournal $transactionJournal
+     * @param JournalRepositoryInterface $repository
+     * @param TransactionJournal         $transactionJournal
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(TransactionJournal $transactionJournal)
+    public function destroy(JournalRepositoryInterface $repository, TransactionJournal $transactionJournal)
     {
         Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');
 
-        $transactionJournal->delete();
+        $repository->delete($transactionJournal);
 
         // redirect to previous URL:
         return Redirect::to(Session::get('transactions.delete.url'));
@@ -112,18 +109,15 @@ class TransactionController extends Controller
     /**
      * Shows the view to edit a transaction.
      *
-     * @param TransactionJournal $journal
+     * @param AccountRepositoryInterface $repository
+     * @param TransactionJournal         $journal
      *
      * @return $this
      */
-    public function edit(TransactionJournal $journal, JournalRepositoryInterface $repository)
+    public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
     {
         $what         = strtolower($journal->transactiontype->type);
-        $accounts     = ExpandedForm::makeSelectList(
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
-            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->where('active', 1)->orderBy(
-                'name', 'DESC'
-            )->get(['accounts.*'])
-        );
         $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0]   = '(no budget)';
         $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
@@ -176,12 +170,14 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param $what
+     * @param JournalRepositoryInterface $repository
+     * @param                            $what
      *
-     * @return $this
+     * @return View
      */
-    public function index($what)
+    public function index(JournalRepositoryInterface $repository, $what)
     {
+        $types = [];
         switch ($what) {
             case 'expenses':
             case 'withdrawal':
@@ -203,18 +199,10 @@ class TransactionController extends Controller
                 break;
         }
 
-        $page   = intval(\Input::get('page'));
+        $page     = intval(Input::get('page'));
-        $offset = $page > 0 ? ($page - 1) * 50 : 0;
+        $offset   = $page > 0 ? ($page - 1) * 50 : 0;
+        $journals = $repository->getJournalsOfTypes($types, $offset, $page);
 
-        $set      = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset)
-                        ->orderBy('date', 'DESC')
-                        ->orderBy('order', 'ASC')
-                        ->orderBy('id', 'DESC')
-                        ->get(
-                            ['transaction_journals.*']
-                        );
-        $count    = Auth::user()->transactionJournals()->transactionTypes($types)->count();
-        $journals = new LengthAwarePaginator($set, $count, 50, $page);
         $journals->setPath('transactions/' . $what);
 
         return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals'));
@@ -222,15 +210,19 @@ class TransactionController extends Controller
     }
 
     /**
-     * Reorder transactions (which all must have the same date)
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function reorder()
+    public function reorder(JournalRepositoryInterface $repository)
     {
-        $ids = Input::get('items');
+        $ids  = Input::get('items');
+        $date = new Carbon(Input::get('date'));
         if (count($ids) > 0) {
             $order = 0;
             foreach ($ids as $id) {
-                $journal = Auth::user()->transactionjournals()->where('id', $id)->where('date', Input::get('date'))->first();
+
+                $journal = $repository->getWithDate($id, $date);
                 if ($journal) {
                     $journal->order = $order;
                     $order++;
@@ -244,31 +236,22 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param TransactionJournal $journal
+     * @param JournalRepositoryInterface $repository
+     * @param TransactionJournal         $journal
      *
      * @return $this
      */
-    public function show(TransactionJournal $journal)
+    public function show(JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
         $journal->transactions->each(
-            function (Transaction $t) use ($journal) {
+            function (Transaction $t) use ($journal, $repository) {
-                $t->before = floatval(
+                $t->before = $repository->getAmountBefore($journal, $t);
-                    $t->account->transactions()->leftJoin(
-                        'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
-                    )
-                               ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
-                               ->where('transaction_journals.order', '>=', $journal->order)
-                               ->where('transaction_journals.id', '!=', $journal->id)
-                               ->sum('transactions.amount')
-                );
                 $t->after  = $t->before + $t->amount;
             }
         );
+        $subTitle = e($journal->transactiontype->type) . ' "' . e($journal->description) . '"';
 
-
+        return view('transactions.show', compact('journal', 'subTitle'));
-        return view('transactions.show', compact('journal'))->with(
-            'subTitle', e($journal->transactiontype->type) . ' "' . e($journal->description) . '"'
-        );
     }
 
     /**
@@ -280,7 +263,6 @@ class TransactionController extends Controller
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
 
-
         $journalData = $request->getJournalData();
         $journal     = $repository->store($journalData);
 
@@ -289,11 +271,7 @@ class TransactionController extends Controller
         // ConnectJournalToPiggyBank
         event(new JournalCreated($journal, intval($request->get('piggy_bank_id'))));
 
-        if (intval($request->get('reminder_id')) > 0) {
+        $repository->deactivateReminder($request->get('reminder_id'));
-            $reminder         = Auth::user()->reminders()->find($request->get('reminder_id'));
-            $reminder->active = 0;
-            $reminder->save();
-        }
 
         Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
 
@@ -309,14 +287,15 @@ class TransactionController extends Controller
 
     }
 
+
     /**
-     * @param TransactionJournal $journal
+     * @param JournalFormRequest         $request
+     * @param JournalRepositoryInterface $repository
+     * @param TransactionJournal         $journal
      *
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     * @return $this|\Illuminate\Http\RedirectResponse
-     *
-     * @return $this
      */
-    public function update(TransactionJournal $journal, JournalFormRequest $request, JournalRepositoryInterface $repository)
+    public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
 
         $journalData = $request->getJournalData();

app/Http/Requests/DeleteAccountFormRequest.php

@@ -26,7 +26,7 @@ class DeleteAccountFormRequest extends Request
     public function rules()
     {
         return [
-            'password'          => 'required',
+            'password' => 'required',
         ];
     }
 }

app/Http/Requests/JournalFormRequest.php

@@ -57,7 +57,7 @@ class JournalFormRequest extends Request
 
         $rules = [
             'description'        => 'required|min:1,max:255',
-            'what'               => 'required|in:withdrawal,deposit,transfer|exists:transaction_types,type',
+            'what'               => 'required|in:withdrawal,deposit,transfer',
             'amount'             => 'numeric|required|min:0.01',
             'date'               => 'required|date',
             'reminder_id'        => 'numeric|exists:reminders,id',

app/Http/Requests/TagFormRequest.php

@@ -33,7 +33,7 @@ class TagFormRequest extends Request
      */
     public function rules()
     {
-        $idRule = '';
+        $idRule  = '';
         $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,TRUE';
         if (Tag::find(Input::get('id'))) {
             $idRule  = 'belongsToUser:tags';
@@ -50,4 +50,4 @@ class TagFormRequest extends Request
             'tagMode'     => 'required|in:nothing,balancingAct,advancePayment'
         ];
     }
-}
+}

app/Http/breadcrumbs.php

@@ -9,9 +9,10 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Reminder;
+use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\Tag;
+
 /*
  * Back home.
  */
@@ -176,13 +177,13 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'currency.edit', function (Generator $breadcrumbs, TransactionCurrency $currency) {
     $breadcrumbs->parent('currency.index');
-    $breadcrumbs->push('Edit '.$currency->name, route('currency.edit', $currency->id));
+    $breadcrumbs->push('Edit ' . $currency->name, route('currency.edit', $currency->id));
 }
 );
 Breadcrumbs::register(
     'currency.delete', function (Generator $breadcrumbs, TransactionCurrency $currency) {
     $breadcrumbs->parent('currency.index');
-    $breadcrumbs->push('Delete '.$currency->name, route('currency.delete', $currency->id));
+    $breadcrumbs->push('Delete ' . $currency->name, route('currency.delete', $currency->id));
 }
 );
 
@@ -312,21 +313,21 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'reports.year', function (Generator $breadcrumbs, Carbon $date) {
     $breadcrumbs->parent('reports.index');
-    $breadcrumbs->push($date->format('Y'), route('reports.year', $date->format('Y')));
+    $breadcrumbs->push($date->year, route('reports.year', $date->year));
 }
 );
 
 Breadcrumbs::register(
     'reports.month', function (Generator $breadcrumbs, Carbon $date) {
     $breadcrumbs->parent('reports.index');
-    $breadcrumbs->push('Monthly report for ' . $date->format('F Y'), route('reports.month', $date));
+    $breadcrumbs->push('Monthly report for ' . $date->format('F Y'), route('reports.month', [$date->year, $date->month]));
 }
 );
 
 Breadcrumbs::register(
     'reports.budget', function (Generator $breadcrumbs, Carbon $date) {
     $breadcrumbs->parent('reports.index');
-    $breadcrumbs->push('Budget report for ' . $date->format('F Y'), route('reports.budget', $date));
+    $breadcrumbs->push('Budget report for ' . $date->format('F Y'), route('reports.budget', [$date->year, $date->month]));
 }
 );
 
@@ -412,6 +413,6 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'tags.show', function (Generator $breadcrumbs, Tag $tag) {
     $breadcrumbs->parent('tags.index');
-    $breadcrumbs->push(e($tag->tag), route('tags.show', $tag));
+    $breadcrumbs->push(e($tag->tag), route('tags.show', $tag->id));
 }
-);
+);

app/Http/routes.php

@@ -13,6 +13,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 
 // models
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'account',
     function ($value, $route) {
@@ -30,6 +31,7 @@ Route::bind(
     }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'tj', function ($value, $route) {
     if (Auth::check()) {
@@ -43,6 +45,7 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'currency', function ($value, $route) {
     if (Auth::check()) {
@@ -55,6 +58,7 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'bill', function ($value, $route) {
     if (Auth::check()) {
@@ -68,6 +72,7 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'budget', function ($value, $route) {
     if (Auth::check()) {
@@ -81,6 +86,7 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'reminder', function ($value, $route) {
     if (Auth::check()) {
@@ -94,6 +100,7 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'limitrepetition', function ($value, $route) {
     if (Auth::check()) {
@@ -111,6 +118,7 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'piggyBank', function ($value, $route) {
     if (Auth::check()) {
@@ -127,12 +135,13 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'category', function ($value, $route) {
     if (Auth::check()) {
-        return Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
-            $object = $object;
+            return $object;
         }
     }
 
@@ -140,12 +149,30 @@ Route::bind(
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
+Route::bind(
+    'reminder', function ($value, $route) {
+    if (Auth::check()) {
+        /** @var \FireflyIII\Models\Reminder $object */
+        $object = Reminder::find($value);
+        if ($object) {
+            if ($object->remindersable->account->user_id == Auth::user()->id) {
+                return $object;
+            }
+        }
+    }
+
+    throw new NotFoundHttpException;
+}
+);
+
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'tag', function ($value, $route) {
     if (Auth::check()) {
-        return Tag::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = Tag::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
-            $object = $object;
+            return $object;
         }
     }
 

app/Models/Account.php

@@ -51,7 +51,7 @@ class Account extends Model
         $account = Account::create($fields);
         if (is_null($account->id)) {
             // could not create account:
-            App::abort(500, 'Could not create new account with data: ' . json_encode($fields).' because ' . json_encode($account->getErrors()));
+            App::abort(500, 'Could not create new account with data: ' . json_encode($fields) . ' because ' . json_encode($account->getErrors()));
 
 
         }
@@ -60,6 +60,31 @@ class Account extends Model
 
     }
 
+    /**
+     * @param array $fields
+     *
+     * @return Account|null
+     */
+    public static function firstOrNullEncrypted(array $fields)
+    {
+        // everything but the name:
+        $query = Account::orderBy('id');
+        foreach ($fields as $name => $value) {
+            if ($name != 'name') {
+                $query->where($name, $value);
+            }
+        }
+        $set = $query->get(['accounts.*']);
+        /** @var Account $account */
+        foreach ($set as $account) {
+            if ($account->name == $fields['name']) {
+                return $account;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Models/Category.php

@@ -1,9 +1,10 @@
 <?php namespace FireflyIII\Models;
 
+use App;
 use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App;
+
 /**
  * Class Category
  *

app/Models/PiggyBank.php

@@ -14,7 +14,7 @@ class PiggyBank extends Model
     use SoftDeletes;
 
     protected $fillable
-        = ['name', 'account_id','order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
+        = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Models/PiggyBankRepetition.php

@@ -12,6 +12,8 @@ use Illuminate\Database\Eloquent\Model;
 class PiggyBankRepetition extends Model
 {
 
+    protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];
+
     /**
      * @return array
      */

app/Models/Reminder.php

@@ -78,6 +78,11 @@ class Reminder extends Model
         return $query->where('reminders.startdate', '=', $start->format('Y-m-d 00:00:00'))->where('reminders.enddate', '=', $end->format('Y-m-d 00:00:00'));
     }
 
+    /**
+     * @param EloquentBuilder $query
+     *
+     * @return $this
+     */
     public function scopeToday(EloquentBuilder $query)
     {
         $today = new Carbon;

app/Models/Tag.php

@@ -52,9 +52,9 @@ class Tag extends Model
             }
         }
         // create it!
-        $fields['tagMode'] = 'nothing';
+        $fields['tagMode']     = 'nothing';
         $fields['description'] = isset($fields['description']) && !is_null($fields['description']) ? $fields['description'] : '';
-        $tag               = Tag::create($fields);
+        $tag                   = Tag::create($fields);
         if (is_null($tag->id)) {
             // could not create account:
             App::abort(500, 'Could not create new tag with data: ' . json_encode($fields) . ' because ' . json_encode($tag->getErrors()));
@@ -125,4 +125,4 @@ class Tag extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-}
+}

app/Models/TransactionJournal.php

@@ -66,8 +66,13 @@ class TransactionJournal extends Model
                 return floatval($t->amount);
             }
         }
+
+        return 0;
     }
 
+    /**
+     * @return Account|mixed
+     */
     public function getAssetAccountAttribute()
     {
         $positive = true; // the asset account is in the transaction with the positive amount.

app/Providers/ConfigServiceProvider.php

@@ -173,7 +173,7 @@ class ConfigServiceProvider extends ServiceProvider
                             ],
                             'Form'         => [
                                 'is_safe' => [
-                                    'input', 'select', 'checkbox', 'model', 'open','radio','textarea'
+                                    'input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea'
                                 ]
                             ],
                         ],

app/Providers/EventServiceProvider.php

@@ -1,11 +1,11 @@
 <?php namespace FireflyIII\Providers;
 
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Reminder;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\Facades\Navigation;
@@ -13,7 +13,6 @@ use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use Log;
-use FireflyIII\Models\Reminder;
 
 /**
  * Class EventServiceProvider

app/Providers/FireflyServiceProvider.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Providers;
 
 use App;
-use FireflyIII\Models\Account;
 use FireflyIII\Support\Amount;
 use FireflyIII\Support\ExpandedForm;
 use FireflyIII\Support\Navigation;
@@ -84,6 +83,7 @@ class FireflyServiceProvider extends ServiceProvider
         $this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository');
         $this->app->bind('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface', 'FireflyIII\Repositories\Currency\CurrencyRepository');
         $this->app->bind('FireflyIII\Repositories\Tag\TagRepositoryInterface', 'FireflyIII\Repositories\Tag\TagRepository');
+        $this->app->bind('FireflyIII\Repositories\Reminder\ReminderRepositoryInterface', 'FireflyIII\Repositories\Reminder\ReminderRepository');
         $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search');
 
 

app/Repositories/Account/AccountRepository.php

@@ -16,12 +16,14 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;
 use Session;
 use Steam;
 
+
 /**
  * Class AccountRepository
  *
@@ -224,7 +226,7 @@ class AccountRepository implements AccountRepositoryInterface
                 // then, percentage.
                 $difference          = $account->endBalance - $account->piggyBalance;
                 $account->difference = $difference;
-                $account->percentage = $difference != 0 ? round((($difference / $account->endBalance) * 100)) : 100;
+                $account->percentage = $difference != 0 && $account->endBalance != 0 ? round((($difference / $account->endBalance) * 100)) : 100;
 
             }
         );
@@ -269,6 +271,7 @@ class AccountRepository implements AccountRepositoryInterface
                 $pct                 = $pct > 100 ? 100 : $pct;
                 $account->difference = $diff;
                 $account->percentage = round($pct);
+
             }
         );
 
@@ -287,7 +290,7 @@ class AccountRepository implements AccountRepositoryInterface
     public function getTransfersInRange(Account $account, Carbon $start, Carbon $end)
     {
         return TransactionJournal::whereIn(
-            'id', function ($q) use ($account, $start, $end) {
+            'id', function (Builder $q) use ($account, $start, $end) {
             $q->select('transaction_journals.id')
               ->from('transactions')
               ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
@@ -310,7 +313,7 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function leftOnAccount(Account $account)
     {
-        $balance = \Steam::balance($account, null, true);
+        $balance = Steam::balance($account, null, true);
         /** @var PiggyBank $p */
         foreach ($account->piggybanks()->get() as $p) {
             $balance -= $p->currentRelevantRep()->currentamount;
@@ -374,6 +377,8 @@ class AccountRepository implements AccountRepositoryInterface
     /**
      * @param Account $account
      * @param array   $data
+     *
+     * @return Account
      */
     public function update(Account $account, array $data)
     {
@@ -438,13 +443,20 @@ class AccountRepository implements AccountRepositoryInterface
 
         if (!$newAccount->isValid()) {
             // does the account already exist?
-            $existingAccount = Account::where('user_id', $data['user'])->where('account_type_id', $accountType->id)->where('name', $data['name'])->first();
+            $searchData      = [
+                'user_id'         => $data['user'],
+                'account_type_id' => $accountType->id,
+                'name'            => $data['name']
+            ];
+            $existingAccount = Account::firstOrNullEncrypted($searchData);
             if (!$existingAccount) {
                 Log::error('Account create error: ' . $newAccount->getErrors()->toJson());
                 App::abort(500);
-
+                // @codeCoverageIgnoreStart
             }
+            // @codeCoverageIgnoreEnd
             $newAccount = $existingAccount;
+
         }
         $newAccount->save();
 

app/Repositories/Account/AccountRepositoryInterface.php

@@ -88,7 +88,7 @@ interface AccountRepositoryInterface
 
     /**
      * @param Account $account
-     * @param string  $range
+     * @param         $page
      *
      * @return LengthAwarePaginator
      */

app/Repositories/Bill/BillRepository.php

@@ -211,10 +211,12 @@ class BillRepository implements BillRepositoryInterface
          * $today is the start of the next period, to make sure FF3 won't miss anything
          * when the current period has a transaction journal.
          */
-        $today = Navigation::addPeriod(new Carbon, $bill->repeat_freq, 0);
+        /** @var \Carbon\Carbon $obj */
+        $obj   = new Carbon;
+        $today = Navigation::addPeriod($obj, $bill->repeat_freq, 0);
 
         $skip  = $bill->skip + 1;
-        $start = Navigation::startOfPeriod(new Carbon, $bill->repeat_freq);
+        $start = Navigation::startOfPeriod($obj, $bill->repeat_freq);
         /*
          * go back exactly one month/week/etc because FF3 does not care about 'next'
          * bills if they're too far into the past.

app/Repositories/Category/CategoryRepositoryInterface.php

@@ -71,9 +71,9 @@ interface CategoryRepositoryInterface
     public function getWithoutCategory(Carbon $start, Carbon $end);
 
     /**
-     * @param Category $category
+     * @param Category       $category
-     * @param Carbon   $start
+     * @param \Carbon\Carbon $start
-     * @param Carbon   $end
+     * @param \Carbon\Carbon $end
      *
      * @return float
      */

app/Repositories/Journal/JournalRepository.php

@@ -4,6 +4,7 @@ namespace FireflyIII\Repositories\Journal;
 
 use App;
 use Auth;
+use Carbon\Carbon;
 use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
@@ -13,6 +14,7 @@ use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;
 
@@ -24,6 +26,38 @@ use Log;
 class JournalRepository implements JournalRepositoryInterface
 {
 
+    /**
+     * @param int $reminderId
+     *
+     * @return bool
+     */
+    public function deactivateReminder($reminderId)
+    {
+        $reminder = Auth::user()->reminders()->find($reminderId);
+        if ($reminder) {
+            $reminder->active = 0;
+            $reminder->save();
+        }
+
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function delete(TransactionJournal $journal)
+    {
+        // delete transactions first:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions()->get() as $transaction) {
+            $transaction->delete();
+        }
+        $journal->delete();
+
+        return true;
+    }
+
     /**
      * Get users first transaction journal
      *
@@ -34,6 +68,25 @@ class JournalRepository implements JournalRepositoryInterface
         return Auth::user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
     }
 
+    /**
+     * @param TransactionJournal $journal
+     * @param Transaction        $transaction
+     *
+     * @return float
+     */
+    public function getAmountBefore(TransactionJournal $journal, Transaction $transaction)
+    {
+        return floatval(
+            $transaction->account->transactions()->leftJoin(
+                'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
+            )
+                                 ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
+                                 ->where('transaction_journals.order', '>=', $journal->order)
+                                 ->where('transaction_journals.id', '!=', $journal->id)
+                                 ->sum('transactions.amount')
+        );
+    }
+
     /**
      * @param TransactionType $dbType
      *
@@ -44,6 +97,28 @@ class JournalRepository implements JournalRepositoryInterface
         return Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)->orderBy('id', 'DESC')->take(50)->get();
     }
 
+    /**
+     * @param array $types
+     * @param int   $offset
+     * @param int   $page
+     *
+     * @return LengthAwarePaginator
+     */
+    public function getJournalsOfTypes(array $types, $offset, $page)
+    {
+        $set      = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset)
+                        ->orderBy('date', 'DESC')
+                        ->orderBy('order', 'ASC')
+                        ->orderBy('id', 'DESC')
+                        ->get(
+                            ['transaction_journals.*']
+                        );
+        $count    = Auth::user()->transactionJournals()->transactionTypes($types)->count();
+        $journals = new LengthAwarePaginator($set, $count, 50, $page);
+
+        return $journals;
+    }
+
     /**
      * @param $type
      *
@@ -54,6 +129,17 @@ class JournalRepository implements JournalRepositoryInterface
         return TransactionType::whereType($type)->first();
     }
 
+    /**
+     * @param        $id
+     * @param Carbon $date
+     *
+     * @return TransactionJournal
+     */
+    public function getWithDate($id, Carbon $date)
+    {
+        return Auth::user()->transactionjournals()->where('id', $id)->where('date', $date->format('Y-m-d'))->first();
+    }
+
     /**
      *
      * * Remember: a balancingAct takes at most one expense and one transfer.
@@ -109,6 +195,7 @@ class JournalRepository implements JournalRepositoryInterface
 
         // store or get budget
         if (intval($data['budget_id']) > 0) {
+            /** @var \FireflyIII\Models\Budget $budget */
             $budget = Budget::find($data['budget_id']);
             $journal->budgets()->save($budget);
         }
@@ -168,6 +255,7 @@ class JournalRepository implements JournalRepositoryInterface
         // unlink all budgets and recreate them:
         $journal->budgets()->detach();
         if (intval($data['budget_id']) > 0) {
+            /** @var \FireflyIII\Models\Budget $budget */
             $budget = Budget::find($data['budget_id']);
             $journal->budgets()->save($budget);
         }
@@ -231,7 +319,7 @@ class JournalRepository implements JournalRepositoryInterface
             DB::table('tag_transaction_journal')->where('transaction_journal_id', $journal->id)->whereNotIn('tag_id', $ids)->delete();
         }
         // if count is zero, delete them all:
-        if(count($ids) == 0) {
+        if (count($ids) == 0) {
             DB::table('tag_transaction_journal')->where('transaction_journal_id', $journal->id)->delete();
         }
 

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -2,9 +2,11 @@
 
 namespace FireflyIII\Repositories\Journal;
 
+use Carbon\Carbon;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
 /**
@@ -14,6 +16,20 @@ use Illuminate\Support\Collection;
  */
 interface JournalRepositoryInterface
 {
+    /**
+     * @param int $reminderId
+     *
+     * @return bool
+     */
+    public function deactivateReminder($reminderId);
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function delete(TransactionJournal $journal);
+
     /**
      * Get users first transaction journal
      *
@@ -21,6 +37,14 @@ interface JournalRepositoryInterface
      */
     public function first();
 
+    /**
+     * @param TransactionJournal $journal
+     * @param Transaction        $transaction
+     *
+     * @return float
+     */
+    public function getAmountBefore(TransactionJournal $journal, Transaction $transaction);
+
     /**
      * @param TransactionType $dbType
      *
@@ -28,6 +52,15 @@ interface JournalRepositoryInterface
      */
     public function getJournalsOfType(TransactionType $dbType);
 
+    /**
+     * @param array $types
+     * @param int   $offset
+     * @param int   $page
+     *
+     * @return LengthAwarePaginator
+     */
+    public function getJournalsOfTypes(array $types, $offset, $page);
+
     /**
      * @param $type
      *
@@ -35,6 +68,14 @@ interface JournalRepositoryInterface
      */
     public function getTransactionType($type);
 
+    /**
+     * @param        $id
+     * @param Carbon $date
+     *
+     * @return TransactionJournal
+     */
+    public function getWithDate($id, Carbon $date);
+
     /**
      * @param TransactionJournal $journal
      * @param array              $array

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -21,7 +21,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
 
 
     /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
      * Based on the piggy bank, the reminder-setting and
      * other variables this method tries to divide the piggy bank into equal parts. Each is
@@ -189,10 +188,11 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
     }
 
     /**
-     * @param PiggyBank $account
+     * @param PiggyBank $piggyBank
      * @param array     $data
      *
      * @return PiggyBank
+     * @internal param PiggyBank $account
      */
     public function update(PiggyBank $piggyBank, array $data)
     {

app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php

@@ -15,7 +15,6 @@ interface PiggyBankRepositoryInterface
 {
 
     /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
      * Based on the piggy bank, the reminder-setting and
      * other variables this method tries to divide the piggy bank into equal parts. Each is
@@ -95,7 +94,7 @@ interface PiggyBankRepositoryInterface
     public function store(array $data);
 
     /**
-     * @param PiggyBank $account
+     * @param PiggyBank $piggyBank
      * @param array     $data
      *
      * @return PiggyBank

app/Repositories/Reminder/ReminderRepository.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace FireflyIII\Repositories\Reminder;
+
+use App;
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Models\Reminder;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ReminderRepository
+ *
+ * @package FireflyIII\Repositories\Reminder
+ */
+class ReminderRepository implements ReminderRepositoryInterface
+{
+    /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface */
+    protected $helper;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface helper */
+        $this->helper = App::make('FireflyIII\Helpers\Reminders\ReminderHelperInterface');
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getActiveReminders()
+    {
+        $today = new Carbon;
+        // active reminders:
+        $active = Auth::user()->reminders()
+                      ->where('notnow', 0)
+                      ->where('active', 1)
+                      ->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))
+                      ->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))
+                      ->get();
+
+        $active->each(
+            function (Reminder $reminder) {
+                $reminder->description = $this->helper->getReminderText($reminder);
+            }
+        );
+
+        return $active;
+
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getDismissedReminders()
+    {
+        $dismissed = Auth::user()->reminders()
+                         ->where('notnow', 1)
+                         ->get();
+
+        $dismissed->each(
+            function (Reminder $reminder) {
+                $reminder->description = $this->helper->getReminderText($reminder);
+            }
+        );
+
+        return $dismissed;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getExpiredReminders()
+    {
+
+        $expired = Auth::user()->reminders()
+                       ->where('notnow', 0)
+                       ->where('active', 1)
+                       ->where(
+                           function (Builder $q) {
+                               $today = new Carbon;
+                               $q->where('startdate', '>', $today->format('Y-m-d 00:00:00'));
+                               $q->orWhere('enddate', '<', $today->format('Y-m-d 00:00:00'));
+                           }
+                       )->get();
+
+        $expired->each(
+            function (Reminder $reminder) {
+                $reminder->description = $this->helper->getReminderText($reminder);
+            }
+        );
+
+        return $expired;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getInactiveReminders()
+    {
+        $inactive = Auth::user()->reminders()
+                        ->where('active', 0)
+                        ->get();
+
+        $inactive->each(
+            function (Reminder $reminder) {
+                $reminder->description = $this->helper->getReminderText($reminder);
+            }
+        );
+
+        return $inactive;
+    }
+}

app/Repositories/Reminder/ReminderRepositoryInterface.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace FireflyIII\Repositories\Reminder;
+
+use Illuminate\Support\Collection;
+
+
+/**
+ * Interface ReminderRepositoryInterface
+ *
+ * @package FireflyIII\Repositories\Reminder
+ */
+interface ReminderRepositoryInterface
+{
+    /**
+     * @return Collection
+     */
+    public function getActiveReminders();
+
+    /**
+     * @return Collection
+     */
+    public function getDismissedReminders();
+
+    /**
+     * @return Collection
+     */
+    public function getExpiredReminders();
+
+    /**
+     * @return Collection
+     */
+    public function getInactiveReminders();
+
+}

app/Repositories/Tag/TagRepository.php

@@ -177,4 +177,4 @@ class TagRepository implements TagRepositoryInterface
 
         return $tag;
     }
-}
+}

app/Repositories/Tag/TagRepositoryInterface.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace FireflyIII\Repositories\Tag;
+
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
@@ -11,7 +12,8 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Repositories\Tag
  */
-interface TagRepositoryInterface {
+interface TagRepositoryInterface
+{
 
     /**
      * @param array $data
@@ -34,7 +36,7 @@ interface TagRepositoryInterface {
     public function update(Tag $tag, array $data);
 
     /**
-     * @param Tag   $tag
+     * @param Tag $tag
      *
      * @return boolean
      */
@@ -47,4 +49,4 @@ interface TagRepositoryInterface {
      * @return boolean
      */
     public function connect(TransactionJournal $journal, Tag $tag);
-}
+}

app/Support/Amount.php

@@ -84,9 +84,11 @@ class Amount
     }
 
     /**
-     * @return string
      *
      * @param TransactionJournal $journal
+     * @param bool               $coloured
+     *
+     * @return string
      */
     public function formatJournal(TransactionJournal $journal, $coloured = true)
     {
@@ -151,15 +153,11 @@ class Amount
         if (defined('FFCURRENCYCODE')) {
             return FFCURRENCYCODE;
         }
-        if (Cache::has('FFCURRENCYCODE')) {
-            define('FFCURRENCYCODE', Cache::get('FFCURRENCYCODE'));
-
-            return FFCURRENCYCODE;
-        }
 
 
         $currencyPreference = Prefs::get('currencyPreference', 'EUR');
-        $currency           = TransactionCurrency::whereCode($currencyPreference->data)->first();
+
+        $currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
         if ($currency) {
 
             Cache::forever('FFCURRENCYCODE', $currency->code);
@@ -171,6 +169,9 @@ class Amount
         return 'EUR';
     }
 
+    /**
+     * @return mixed|static
+     */
     public function getDefaultCurrency()
     {
         $currencyPreference = Prefs::get('currencyPreference', 'EUR');

app/Support/ExpandedForm.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Support;
 
 use Amount as Amt;
-use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use Input;
@@ -237,12 +236,11 @@ class ExpandedForm
     }
 
     /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
      * Takes any collection and tries to make a sensible select list compatible array of it.
      *
-     * @param Collection $set
+     * @param \Illuminate\Support\Collection $set
-     * @param bool       $addEmpty
+     * @param bool                           $addEmpty
      *
      * @return mixed
      */
@@ -289,10 +287,12 @@ class ExpandedForm
 
     /**
      * @param       $name
-     * @param null  $value
+     * @param array $list
+     * @param null  $selected
      * @param array $options
      *
      * @return string
+     * @internal param null $value
      */
     public function multiRadio($name, array $list = [], $selected = null, array $options = [])
     {

app/Support/Navigation.php

@@ -15,7 +15,7 @@ class Navigation
 
 
     /**
-     * @param Carbon         $theDate
+     * @param \Carbon\Carbon $theDate
      * @param                $repeatFreq
      * @param                $skip
      *
@@ -64,10 +64,10 @@ class Navigation
     }
 
     /**
-     * @param Carbon         $theCurrentEnd
+     * @param \Carbon\Carbon $theCurrentEnd
      * @param                $repeatFreq
      *
-     * @return Carbon
+     * @return \Carbon\Carbon
      * @throws FireflyException
      */
     public function endOfPeriod(Carbon $theCurrentEnd, $repeatFreq)
@@ -148,9 +148,8 @@ class Navigation
 
         }
         if (isset($specials[$repeatFreq])) {
-            $month = intval($theCurrentEnd->format('m'));
             $currentEnd->endOfYear();
-            if ($month <= 6) {
+            if ($theCurrentEnd->month <= 6) {
                 $currentEnd->subMonths(6);
             }
         }
@@ -184,7 +183,7 @@ class Navigation
                 $date->lastOfQuarter()->addDay();
                 break;
             case '6M':
-                if (intval($date->format('m')) >= 7) {
+                if ($date->month >= 7) {
                     $date->startOfYear()->addYear();
                 } else {
                     $date->startOfYear()->addMonths(6);
@@ -230,9 +229,8 @@ class Navigation
             return $date;
         }
         if ($range == '6M') {
-            $month = intval($date->format('m'));
             $date->startOfYear();
-            if ($month <= 6) {
+            if ($date->month <= 6) {
                 $date->subMonths(6);
             }
 
@@ -260,16 +258,15 @@ class Navigation
             return $date->format($formatMap[$range]);
         }
         if ($range == '3M') {
-            $month = intval($date->format('m'));
 
-            return 'Q' . ceil(($month / 12) * 4) . ' ' . $date->format('Y');
+
+            return 'Q' . ceil(($date->month / 12) * 4) . ' ' . $date->year;
         }
         if ($range == '6M') {
-            $month    = intval($date->format('m'));
+            $half     = ceil(($date->month / 12) * 2);
-            $half     = ceil(($month / 12) * 2);
             $halfName = $half == 1 ? 'first' : 'second';
 
-            return $halfName . ' half of ' . $date->format('Y');
+            return $halfName . ' half of ' . $date->year;
         }
         throw new FireflyException('No _periodName() for range "' . $range . '"');
     }
@@ -301,10 +298,10 @@ class Navigation
     }
 
     /**
-     * @param Carbon         $theDate
+     * @param \Carbon\Carbon $theDate
      * @param                $repeatFreq
      *
-     * @return Carbon
+     * @return \Carbon\Carbon
      * @throws FireflyException
      */
     public function startOfPeriod(Carbon $theDate, $repeatFreq)
@@ -333,7 +330,7 @@ class Navigation
             return $date;
         }
         if ($repeatFreq == 'half-year' || $repeatFreq == '6M') {
-            $month = intval($date->format('m'));
+            $month = $date->month;
             $date->startOfYear();
             if ($month >= 7) {
                 $date->addMonths(6);
@@ -387,10 +384,10 @@ class Navigation
     }
 
     /**
-     * @param        $range
+     * @param                $range
-     * @param Carbon $start
+     * @param \Carbon\Carbon $start
      *
-     * @return Carbon
+     * @return \Carbon\Carbon
      * @throws FireflyException
      */
     public function updateEndDate($range, Carbon $start)
@@ -411,7 +408,7 @@ class Navigation
             return $end;
         }
         if ($range == '6M') {
-            if (intval($start->format('m')) >= 7) {
+            if ($start->month >= 7) {
                 $end->endOfYear();
             } else {
                 $end->startOfYear()->addMonths(6);
@@ -423,10 +420,10 @@ class Navigation
     }
 
     /**
-     * @param        $range
+     * @param                $range
-     * @param Carbon $start
+     * @param \Carbon\Carbon $start
      *
-     * @return Carbon
+     * @return \Carbon\Carbon
      * @throws FireflyException
      */
     public function updateStartDate($range, Carbon $start)
@@ -445,7 +442,7 @@ class Navigation
             return $start;
         }
         if ($range == '6M') {
-            if (intval($start->format('m')) >= 7) {
+            if ($start->month >= 7) {
                 $start->startOfYear()->addMonths(6);
             } else {
                 $start->startOfYear();

app/Support/Preferences.php

@@ -16,7 +16,7 @@ class Preferences
      * @param      $name
      * @param null $default
      *
-     * @return null|Preference
+     * @return null|\FireflyIII\Models\Preference
      */
     public function get($name, $default = null)
     {

app/Support/Search/Search.php

@@ -84,7 +84,6 @@ class Search implements SearchInterface
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
      * @param array $words
      *
@@ -123,6 +122,8 @@ class Search implements SearchInterface
                     }
                 }
 
+                return null;
+
             }
         );
         $filtered = $set->merge($decrypted);

app/Support/Steam.php

@@ -17,9 +17,9 @@ class Steam
 {
     /**
      *
-     * @param Account $account
+     * @param \FireflyIII\Models\Account $account
-     * @param Carbon  $date
+     * @param \Carbon\Carbon             $date
-     * @param bool    $ignoreVirtualBalance
+     * @param bool                       $ignoreVirtualBalance
      *
      * @return float
      */
@@ -91,7 +91,7 @@ class Steam
      * Turns a collection into an array. Needs the field 'id' for the key,
      * and saves only 'name' and 'amount' as a sub array.
      *
-     * @param Collection $collection
+     * @param \Illuminate\Support\Collection $collection
      *
      * @return array
      */

app/Support/Twig/Budget.php

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

app/Support/Twig/General.php

@@ -42,7 +42,7 @@ class General extends Twig_Extension
         $filters[] = new Twig_SimpleFilter(
             'formatAmountPlain', function ($string) {
             return App::make('amount')->format($string, false);
-        }
+        }, ['is_safe' => ['html']]
         );
 
         $filters[] = new Twig_SimpleFilter(
@@ -143,4 +143,4 @@ class General extends Twig_Extension
         return 'FireflyIII\Support\Twig\General';
     }
 
-}
+}

app/Support/Twig/Journal.php

@@ -40,6 +40,7 @@ class Journal extends Twig_Extension
                 return '<span class="glyphicon glyphicon-ban-circle" title="Opening balance"></span>';
             }
 
+            return '';
 
         }, ['is_safe' => ['html']]
         );
@@ -96,4 +97,4 @@ class Journal extends Twig_Extension
     {
         return 'FireflyIII\Support\Twig\Journals';
     }
-}
+}

app/Support/Twig/PiggyBank.php

@@ -2,9 +2,9 @@
 
 namespace FireflyIII\Support\Twig;
 
+use FireflyIII\Models\PiggyBank as PB;
 use Twig_Extension;
 use Twig_SimpleFunction;
-use FireflyIII\Models\PiggyBank as PB;
 
 /**
  * Class PiggyBank
@@ -26,6 +26,7 @@ class PiggyBank extends Twig_Extension
             return $piggyBank->currentRelevantRep()->currentamount;
         }
         );
+
         return $functions;
     }
 
@@ -38,4 +39,4 @@ class PiggyBank extends Twig_Extension
     {
         return 'FireflyIII\Support\Twig\PiggyBank';
     }
-}
+}

app/Validation/FireflyValidator.php

@@ -203,7 +203,13 @@ class FireflyValidator extends Validator
             $alwaysEncrypted = true;
         }
 
-        $query = DB::table($table)->where('user_id', Auth::user()->id);
+        if (is_null(Auth::user())) {
+            // user is not logged in.. weird.
+            return true;
+        } else {
+            $query = DB::table($table)->where('user_id', Auth::user()->id);
+        }
+
 
         if (!is_null($exclude)) {
             $query->where('id', '!=', $exclude);

composer.lock

@@ -1375,16 +1375,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v1.2.2",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "08f97eb4efa029e2fafb6d8c98b71731bf0cf621"
+                "reference": "dff239267fd1befa1cd40430c9ed12591aa720ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/08f97eb4efa029e2fafb6d8c98b71731bf0cf621",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dff239267fd1befa1cd40430c9ed12591aa720ca",
-                "reference": "08f97eb4efa029e2fafb6d8c98b71731bf0cf621",
+                "reference": "dff239267fd1befa1cd40430c9ed12591aa720ca",
                 "shasum": ""
             },
             "require": {
@@ -1394,7 +1394,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -1416,7 +1416,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2015-04-03 14:33:59"
+            "time": "2015-05-02 15:40:40"
         },
         {
             "name": "psr/log",
@@ -3582,16 +3582,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.6.4",
+            "version": "4.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "163232991e652e6efed2f8470326fffa61e848e2"
+                "reference": "3afe303d873a4d64c62ef84de491b97b006fbdac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/163232991e652e6efed2f8470326fffa61e848e2",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3afe303d873a4d64c62ef84de491b97b006fbdac",
-                "reference": "163232991e652e6efed2f8470326fffa61e848e2",
+                "reference": "3afe303d873a4d64c62ef84de491b97b006fbdac",
                 "shasum": ""
             },
             "require": {
@@ -3650,7 +3650,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-04-11 05:23:21"
+            "time": "2015-04-29 15:18:52"
         },
         {
             "name": "phpunit/phpunit-mock-objects",

database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -4,6 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ *
  * Class CreatePasswordResetsTable
  */
 class CreatePasswordResetsTable extends Migration

database/migrations/2014_12_13_190730_changes_for_v321.php

@@ -7,6 +7,7 @@ use FireflyIII\Models\Component;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+
 /**
  * @SuppressWarnings(PHPMD.ShortMethodName) // method names are mandated by laravel.
  * @SuppressWarnings("TooManyMethods") // I'm fine with this

database/migrations/2014_12_24_191544_changes_for_v322.php

@@ -5,7 +5,7 @@ use Illuminate\Database\Schema\Blueprint;
 
 /**
  * @SuppressWarnings(PHPMD.ShortMethodName)
- * @SuppressWarnings("MethodLength") // I don't mind this in case of migrations.
+ * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
  *
  * Class ChangesForV322
  */

database/migrations/2015_01_18_082406_changes_for_v325.php

@@ -5,7 +5,7 @@ use Illuminate\Database\Schema\Blueprint;
 
 /**
  * @SuppressWarnings(PHPMD.ShortMethodName)
- * @SuppressWarnings("MethodLength") // I don't mind this in case of migrations.
+ * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
  *
  * Class ChangesForV325
  */

database/migrations/2015_02_27_210653_changes_for_v332.php

@@ -4,6 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ *
  * Class ChangesForV332
  */
 class ChangesForV332 extends Migration

database/migrations/2015_03_27_061038_changes_for_v333.php

@@ -3,6 +3,11 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ *
+ * Class ChangesForV333
+ */
 class ChangesForV333 extends Migration
 {
 

database/migrations/2015_03_29_174140_changes_for_v336.php

@@ -4,6 +4,9 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
+ *
  * Class ChangesForV336
  */
 class ChangesForV336 extends Migration
@@ -134,7 +137,7 @@ class ChangesForV336 extends Migration
         // reinstate a long forgotten index:
         Schema::table(
             'budget_limits', function (Blueprint $table) {
-            $table->unique(['budget_id', 'startdate'],'unique_limit');
+            $table->unique(['budget_id', 'startdate'], 'unique_limit');
         }
         );
 

database/migrations/2015_04_26_054507_changes_for_v3310.php

@@ -3,6 +3,12 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
+ *
+ * Class ChangesForV3310
+ */
 class ChangesForV3310 extends Migration
 {
 
@@ -57,7 +63,8 @@ class ChangesForV3310 extends Migration
         );
 
 
-        Schema::create('tag_transaction_journal',function (Blueprint $table) {
+        Schema::create(
+            'tag_transaction_journal', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('tag_id')->unsigned();
             $table->integer('transaction_journal_id')->unsigned();
@@ -69,7 +76,8 @@ class ChangesForV3310 extends Migration
             // add unique.
             $table->unique(['tag_id', 'transaction_journal_id'], 'tag_t_joined');
 
-        });
+        }
+        );
     }
 
 }

database/migrations/2015_04_28_075215_changes_for_v3310a.php

@@ -4,6 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ *
  * Class ChangesForV3310a
  */
 class ChangesForV3310a extends Migration

database/migrations/2015_04_28_075317_changes_for_v3310b.php

@@ -1,32 +1,34 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
 /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ *
  * Class ChangesForV3310b
  */
-class ChangesForV3310b extends Migration {
+class ChangesForV3310b extends Migration
+{
 
-	/**
+    /**
-	 * Run the migrations.
+     * Reverse the migrations.
-	 *
+     *
-	 * @return void
+     * @return void
-	 */
+     */
-	public function up()
+    public function down()
-	{
+    {
+        //
+    }
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
         // set all current entries to be "balance"
         DB::table('transaction_groups')->update(['relation' => 'balance']);
-	}
+    }
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
 
 }

pu.sh

@@ -11,7 +11,7 @@ fi
 
 if [ ! -z "$1" ]
 then
-    phpunit --verbose tests/controllers/$1.php
+    phpunit --verbose tests/repositories/$1.php
 fi
 
 # restore .env file

public/js/index.js

@@ -14,9 +14,7 @@ function getBoxAmounts() {
     for (x in boxes) {
         var box = boxes[x];
         $.getJSON('/json/box/' + box).success(function (data) {
-            if (data.amount_raw != 0) {
+            $('#box-' + data.box).html(data.amount);
-                $('#box-' + data.box).html(data.amount);
-            }
         }).fail(function () {
             console.log('Failed to get box!')
         });

resources/twig/accounts/create.twig

@@ -58,4 +58,4 @@
         </div>
 
 </form>
-{% endblock %}
+{% endblock %}

resources/twig/accounts/show.twig

@@ -57,4 +57,4 @@
 <script src="js/jquery-ui.min.js" type="text/javascript"></script>
 <script src="js/accounts.js" type="text/javascript"></script>
 
-{% endblock %}
+{% endblock %}

resources/twig/auth/password.twig

@@ -42,4 +42,4 @@
 		</div>
 	</div>
 </div>
-{% endblock %}
+{% endblock %}

resources/twig/bills/delete.twig

@@ -29,4 +29,4 @@
     </div>
 </div>
 </form>
-{% endblock %}
+{% endblock %}

resources/twig/bills/index.twig

@@ -24,4 +24,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

resources/twig/bills/show.twig

@@ -110,4 +110,4 @@
 <script type="text/javascript" src="js/gcharts.js"></script>
 
 <script type="text/javascript" src="js/bills.js"></script>
-{% endblock %}
+{% endblock %}

resources/twig/budgets/delete.twig

@@ -40,4 +40,4 @@
 </div>
 
 </form>
-{% endblock %}
+{% endblock %}

resources/twig/budgets/index.twig

@@ -122,11 +122,11 @@
                 <!-- budget-info-X holds the input and the euro-sign: -->
                 <span id="budget-info-{{ budget.id }}">
                 {% if budget.currentRep.amount > budget.spent %}
-                    <span class="text-success">{{ getCurrencySymbol() }}</span> <input type="number" min="0" max="{{ budgetMaximum }}" data-id="{{ budget.id }}"
+                    <span class="text-success">{{ getCurrencySymbol()|raw }}</span> <input type="number" min="0" max="{{ budgetMaximum }}" data-id="{{ budget.id }}"
                                                                                        step="1" value="{{ budget.currentRep.amount }}"
                                                                                        style="width:90px;color:#3c763d;"/>
                 {% else %}
-                    <span class="text-danger">{{ getCurrencySymbol() }}</span> <input type="number" min="0" max="{{ budgetMaximum }}" data-id="{{ budget.id }}"
+                    <span class="text-danger">{{ getCurrencySymbol()|raw }}</span> <input type="number" min="0" max="{{ budgetMaximum }}" data-id="{{ budget.id }}"
                                                                                       step="1" value="{{ budget.currentRep.amount }}"
                                                                                       style="width:90px;color:#a94442;"/>
                 {% endif %}
@@ -134,7 +134,7 @@
             {% else %}
                 <span id="budget-description-{{ budget.id }}"><em>No budget</em></span>
                 <span id="budget-info-{{ budget.id }}">
-                    <span class="text-success" style="display:none;">{{ Amount.getCurrencySymbol() }}</span> <input data-id="{{ budget.id }}" type="number"
+                    <span class="text-success" style="display:none;">{{ getCurrencySymbol()|raw }}</span> <input data-id="{{ budget.id }}" type="number"
                                                                                                                     min="0" max="{{ budgetMaximum }}" step="1"
                                                                                                                     value="0"
                                                                                                                     style="width:50px;color:#3c763d;display:none;"/>

resources/twig/budgets/noBudget.twig

@@ -14,4 +14,4 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock %}

resources/twig/categories/index.twig

@@ -37,4 +37,4 @@
 <script type="text/javascript" src="js/gcharts.js"></script>
 <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
 <script type="text/javascript" src="js/categories.js"></script>
-{% endblock %}
+{% endblock %}

resources/twig/categories/noCategory.twig

@@ -15,4 +15,4 @@
 </div>
 
 
-{% endblock %}
+{% endblock %}

resources/twig/categories/show.twig

@@ -51,4 +51,4 @@
 <script type="text/javascript" src="js/gcharts.js"></script>
 <script type="text/javascript" src="js/categories.js"></script>
 
-{% endblock %}
+{% endblock %}

resources/twig/currency/delete.twig

@@ -23,4 +23,4 @@
 
 </form>
 
-{% endblock %}
+{% endblock %}

resources/twig/currency/edit.twig

@@ -42,4 +42,4 @@
     </div>
 </div>
 </form>
-{% endblock %}
+{% endblock %}

resources/twig/currency/index.twig

@@ -46,4 +46,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

resources/twig/form/options.twig

@@ -27,4 +27,4 @@
             </div>
         </div>
     </div>
-{% endif %}
+{% endif %}