Code cleanup.

app/Http/Controllers/Admin/UserController.php

@@ -128,6 +128,8 @@ class UserController extends Controller
      * @param UserFormRequest         $request
      * @param User                    $user
      *
+     * @param UserRepositoryInterface $repository
+     *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function update(UserFormRequest $request, User $user, UserRepositoryInterface $repository)

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -43,6 +43,8 @@ class ForgotPasswordController extends Controller
      *
      * @param  Request                $request
      *
+     * @param UserRepositoryInterface $repository
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)

app/Http/Controllers/Auth/LoginController.php

@@ -112,6 +112,8 @@ class LoginController extends Controller
      *
      * @param Request   $request
      *
+     * @param CookieJar $cookieJar
+     *
      * @return \Illuminate\Http\Response
      */
     public function showLoginForm(Request $request, CookieJar $cookieJar)

app/Http/Controllers/BudgetController.php

@@ -192,6 +192,7 @@ class BudgetController extends Controller
 
     /**
      * @param Request                    $request
+     * @param JournalRepositoryInterface $repository
      * @param string                     $moment
      *
      * @return View

app/Http/Controllers/CategoryController.php

@@ -154,6 +154,10 @@ class CategoryController extends Controller
     }
 
     /**
+     * @param Request                    $request
+     * @param JournalRepositoryInterface $repository
+     * @param string                     $moment
+     *
      * @return View
      */
     public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '')

app/Http/Controllers/ImportController.php

@@ -274,10 +274,10 @@ class ImportController extends Controller
      * Step 5. Depending on the importer, this will show the user settings to
      * fill in.
      *
+     * @param ImportJobRepositoryInterface $repository
      * @param ImportJob                    $job
      *
      * @return View
-     * @throws FireflyException
      */
     public function settings(ImportJobRepositoryInterface $repository, ImportJob $job)
     {

app/Http/Controllers/JavascriptController.php

@@ -31,7 +31,10 @@ class JavascriptController extends Controller
 {
 
     /**
+     * @param AccountRepositoryInterface  $repository
+     * @param CurrencyRepositoryInterface $currencyRepository
      *
+     * @return $this
      */
     public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository)
     {

app/Http/Controllers/PreferencesController.php

@@ -134,6 +134,8 @@ class PreferencesController extends Controller
     /**
      * @param Request                 $request
      *
+     * @param UserRepositoryInterface $repository
+     *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function postIndex(Request $request, UserRepositoryInterface $repository)

app/Http/Controllers/TagController.php

@@ -142,6 +142,8 @@ class TagController extends Controller
     /**
      * @param Tag                    $tag
      *
+     * @param TagRepositoryInterface $repository
+     *
      * @return View
      */
     public function edit(Tag $tag, TagRepositoryInterface $repository)

app/Http/Controllers/TransactionController.php

@@ -60,6 +60,8 @@ class TransactionController extends Controller
      * @param JournalRepositoryInterface $repository
      * @param string                     $what
      *
+     * @param string                     $moment
+     *
      * @return View
      */
     public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '')

public/css/firefly.css

@@ -25,11 +25,6 @@ body.waiting * {
     cursor: progress;
 }
 
-.ui-sortable-placeholder {
-    display: inline-block;
-    height: 1px;
-}
-
 .preferences-box {
     border: 1px #ddd solid;
     border-radius: 4px 4px 0 0;
@@ -48,12 +43,6 @@ body.waiting * {
     margin: 20px auto 0 auto;
 }
 
-.ff-error-page > .headline {
-    float: left;
-    font-size: 100px;
-    font-weight: 300;
-}
-
 .ff-error-page > .error-content {
     margin-left: 190px;
     display: block;

public/js/ff/budgets/show.js

@@ -15,7 +15,7 @@ $(function () {
     if (budgetLimitID > 0) {
         lineChart(budgetChartUri, 'budgetOverview');
     }
-    if (budgetLimitID == 0) {
+    if (budgetLimitID === 0) {
         columnChart(budgetChartUri, 'budgetOverview');
     }
 

public/js/ff/import/status.js

@@ -62,7 +62,7 @@ function updateBar(data) {
 
 function reportErrors(data) {
     "use strict";
-    if (data.errors.length == 1) {
+    if (data.errors.length === 1) {
         $('#import-status-error-intro').text(langImportSingleError);
         //'An error has occured during the import. The import can continue, however.'
     }
@@ -93,7 +93,7 @@ function kickStartJob() {
 
 function updateTimeout(data) {
     "use strict";
-    if (data.stepsDone != stepCount) {
+    if (data.stepsDone !== stepCount) {
         stepCount = data.stepsDone;
         currentLimit = 0;
         return;

public/js/ff/index.js

@@ -14,7 +14,7 @@ $(function () {
     "use strict";
     // do chart JS stuff.
     drawChart();
-    if (showTour == true) {
+    if (showTour === true) {
         $.getJSON('json/tour').done(function (data) {
             var tour = new Tour(
                 {

public/js/ff/reports/default/all.js

@@ -99,9 +99,9 @@ function displayAjaxPartial(data, holder) {
 
 function failAjaxPartial(uri, holder) {
     "use strict";
-    var holder = $('#' + holder);
+    var holderObject = $('#' + holder);
-    holder.parent().find('.overlay').remove();
+    holderObject.parent().find('.overlay').remove();
-    holder.addClass('general-chart-error');
+    holderObject.addClass('general-chart-error');
 
 }
 

public/js/ff/reports/index.js

@@ -56,7 +56,7 @@ $(function () {
         // set date from cookie
         var startStr = readCookie('report-start');
         var endStr = readCookie('report-end');
-        if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) {
+        if (startStr !== null && endStr !== null && startStr.length === 8 && endStr.length === 8) {
             var startDate = moment(startStr, "YYYY-MM-DD");
             var endDate = moment(endStr, "YYYY-MM-DD");
             var datePicker = $('#inputDateRange').data('daterangepicker');

public/js/ff/rules/create-edit.js

@@ -104,14 +104,14 @@ function addNewAction() {
 function removeTrigger(e) {
     "use strict";
     var target = $(e.target);
-    if (target.prop("tagName") == "I") {
+    if (target.prop("tagName") === "I") {
         target = target.parent();
     }
     // remove grand parent:
     target.parent().parent().remove();
 
     // if now at zero, immediatly add one again:
-    if ($('.rule-trigger-tbody tr').length == 0) {
+    if ($('.rule-trigger-tbody tr').length === 0) {
         addNewTrigger();
     }
     return false;
@@ -125,14 +125,14 @@ function removeTrigger(e) {
 function removeAction(e) {
     "use strict";
     var target = $(e.target);
-    if (target.prop("tagName") == "I") {
+    if (target.prop("tagName") === "I") {
         target = target.parent();
     }
     // remove grand parent:
     target.parent().parent().remove();
 
     // if now at zero, immediatly add one again:
-    if ($('.rule-action-tbody tr').length == 0) {
+    if ($('.rule-action-tbody tr').length === 0) {
         addNewAction();
     }
     return false;

public/js/ff/tags/create-edit.js

@@ -71,7 +71,7 @@ function initialize() {
     /*
      Maybe place marker?
      */
-    if(doPlaceMarker == true) {
+    if (doPlaceMarker === true) {
         var myLatlng = new google.maps.LatLng(latitude, longitude);
         var fakeEvent = {};
         fakeEvent.latLng = myLatlng;

public/js/ff/transactions/list.js

@@ -72,8 +72,8 @@ function countChecked() {
     "use strict";
     var checked = $('.select_all_single:checked').length;
     if (checked > 0) {
-        $('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')')
+        $('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')');
-        $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')')
+        $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')');
         $('.mass_button_options').show();
 
     } else {

public/js/ff/transactions/single/create.js

@@ -26,7 +26,7 @@ $(document).ready(function () {
     }
 
     // update currency
-    $('select[name="source_account_id"]').on('change', updateCurrency)
+    $('select[name="source_account_id"]').on('change', updateCurrency);
 
     // get JSON things:
     getJSONautocomplete();
@@ -178,7 +178,7 @@ function updateButtons() {
         // new click event:
         button.bind('click', clickButton);
 
-        if (button.data('what') == what) {
+        if (button.data('what') === what) {
             button.removeClass('btn-default').addClass('btn-info').html('<i class="fa fa-fw fa-check"></i> ' + txt[button.data('what')]);
         } else {
             button.removeClass('btn-info').addClass('btn-default').text(txt[button.data('what')]);
@@ -190,7 +190,7 @@ function clickButton(e) {
     "use strict";
     var button = $(e.target);
     var newWhat = button.data('what');
-    if (newWhat != what) {
+    if (newWhat !== what) {
         what = newWhat;
         updateButtons();
         updateForm();

public/js/ff/transactions/split/edit.js

@@ -184,12 +184,12 @@ function calculateSum() {
     var set = $('input[name$="][amount]"]');
     for (var i = 0; i < set.length; i++) {
         var current = $(set[i]);
-        sum += (current.val() == "" ? 0 : parseFloat(current.val()));
+        sum += (current.val() === "" ? 0 : parseFloat(current.val()));
     }
     sum = Math.round(sum * 100) / 100;
 
     $('.amount-warning').remove();
-    if (sum != originalSum) {
+    if (sum !== originalSum) {
         var holder = $('#journal_amount_holder');
         var par = holder.find('p.form-control-static');
         $('<span>').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par);

resources/views/partials/menu-sidebar.twig

@@ -150,11 +150,13 @@
         <ul class="treeview-menu">
             {% if not SANDSTORM %}
                 <li class="{{ activeRoutePartial('profile') }}">
-                <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}</a>
+                    <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}
+                    </a>
                 </li>
             {% endif %}
             <li class="{{ activeRoutePartial('preferences') }}">
-                <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
+                <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i
+                            class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
             </li>
             <li class="{{ activeRoutePartial('currency') }}">
                 <a class="{{ activeRoutePartial('currency') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>

resources/views/reports/budget/month.twig

@@ -27,7 +27,8 @@
                                     <a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
                                 </td>
                                 {% if accountSummary[account.id] %}
-                                    <td data-value="{{ accountSummary[account.id] }}" style="text-align: right;">{{ accountSummary[account.id]|formatAmount }}</td>
+                                    <td data-value="{{ accountSummary[account.id] }}"
+                                        style="text-align: right;">{{ accountSummary[account.id]|formatAmount }}</td>
                                 {% else %}
                                     <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
                                 {% endif %}

resources/views/reports/category/month.twig

@@ -28,12 +28,14 @@
                                     <a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
                                 </td>
                                 {% if accountSummary[account.id] %}
-                                    <td data-value="{{ accountSummary[account.id].earned }}" style="text-align: right;">{{ accountSummary[account.id].earned|formatAmount }}</td>
+                                    <td data-value="{{ accountSummary[account.id].earned }}"
+                                        style="text-align: right;">{{ accountSummary[account.id].earned|formatAmount }}</td>
                                 {% else %}
                                     <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
                                 {% endif %}
                                 {% if accountSummary[account.id] %}
-                                    <td data-value="{{ accountSummary[account.id].spent }}" style="text-align: right;">{{ accountSummary[account.id].spent|formatAmount }}</td>
+                                    <td data-value="{{ accountSummary[account.id].spent }}"
+                                        style="text-align: right;">{{ accountSummary[account.id].spent|formatAmount }}</td>
                                 {% else %}
                                     <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
                                 {% endif %}
@@ -64,12 +66,14 @@
                                     <a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
                                 </td>
                                 {% if categorySummary[category.id] %}
-                                    <td data-value="{{ categorySummary[category.id].earned }}" style="text-align: right;">{{ categorySummary[category.id].earned|formatAmount }}</td>
+                                    <td data-value="{{ categorySummary[category.id].earned }}"
+                                        style="text-align: right;">{{ categorySummary[category.id].earned|formatAmount }}</td>
                                 {% else %}
                                     <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
                                 {% endif %}
                                 {% if categorySummary[category.id] %}
-                                    <td data-value="{{ categorySummary[category.id].spent }}" style="text-align: right;">{{ categorySummary[category.id].spent|formatAmount }}</td>
+                                    <td data-value="{{ categorySummary[category.id].spent }}"
+                                        style="text-align: right;">{{ categorySummary[category.id].spent|formatAmount }}</td>
                                 {% else %}
                                     <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
                                 {% endif %}

resources/views/reports/default/month.twig

@@ -94,7 +94,6 @@
             </div>
 
 
-
         </div>
         <div class="col-lg-4 col-md-4 col-sm-12">
             <div class="box">

resources/views/reports/partials/accounts.twig

@@ -15,7 +15,8 @@
             </td>
             <td class="hidden-xs" data-value="{{ account.start_balance }}" style="text-align: right;">{{ account.start_balance|formatAmount }}</td>
             <td class="hidden-xs" data-value="{{ account.end_balance }}" style="text-align: right;">{{ account.end_balance|formatAmount }}</td>
-            <td style="text-align: right;" data-value="{{ (account.end_balance - account.start_balance) }}">{{ (account.end_balance - account.start_balance)|formatAmount }}</td>
+            <td style="text-align: right;"
+                data-value="{{ (account.end_balance - account.start_balance) }}">{{ (account.end_balance - account.start_balance)|formatAmount }}</td>
         </tr>
     {% endfor %}
     </tbody>

resources/views/reports/tag/month.twig

@@ -107,7 +107,8 @@
                                     <a href="{{ route('tags.show', tag.id) }}" title="{{ tag.tag }}">{{ tag.tag }}</a>
                                 </td>
                                 {% if tagSummary[tag.id] %}
-                                    <td data-value="{{ tagSummary[tag.id].earned }}" style="text-align: right;">{{ tagSummary[tag.id].earned|formatAmount }}</td>
+                                    <td data-value="{{ tagSummary[tag.id].earned }}"
+                                        style="text-align: right;">{{ tagSummary[tag.id].earned|formatAmount }}</td>
                                 {% else %}
                                     <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
                                 {% endif %}

resources/views/transactions/convert.twig

@@ -5,7 +5,8 @@
 {% endblock %}
 
 {% block content %}
-    <form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, journal.id]) }}" accept-charset="UTF-8" class="form-horizontal" id="store"
+    <form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, journal.id]) }}" accept-charset="UTF-8"
+          class="form-horizontal" id="store"
           enctype="multipart/form-data">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <div class="row">
@@ -47,8 +48,7 @@
                                         sourceName: sourceAccount.name,
                                         destinationRoute: route('accounts.show', [destinationAccount.id]),
                                         destinationName: destinationAccount.name,
-                                    })|raw
+                                    })|raw }}
-                                    }}
                                 </em>
                             </p>
                             <p><em>
@@ -69,8 +69,7 @@
                                         sourceName: sourceAccount.name,
                                         destinationRoute: route('accounts.show', [destinationAccount.id]),
                                         destinationName: destinationAccount.name,
-                                    })|raw
+                                    })|raw }}
-                                    }}
                                 </em></p>
 
                             <p>
@@ -95,8 +94,7 @@
                                         sourceName: sourceAccount.name,
                                         destinationRoute: route('accounts.show', [destinationAccount.id]),
                                         destinationName: destinationAccount.name,
-                                    })|raw
+                                    })|raw }}
-                                    }}
                                 </em>
                             </p>
                             <p>
@@ -121,8 +119,7 @@
                                         sourceName: sourceAccount.name,
                                         destinationRoute: route('accounts.show', [destinationAccount.id]),
                                         destinationName: destinationAccount.name,
-                                    })|raw
+                                    })|raw }}
-                                    }}
                                 </em>
                             </p>
                             <p>
@@ -147,8 +144,7 @@
                                         sourceName: sourceAccount.name,
                                         destinationRoute: route('accounts.show', [destinationAccount.id]),
                                         destinationName: destinationAccount.name,
-                                    })|raw
+                                    })|raw }}
-                                    }}
                                 </em>
                             </p>
 
@@ -175,8 +171,7 @@
                                         sourceName: sourceAccount.name,
                                         destinationRoute: route('accounts.show', [destinationAccount.id]),
                                         destinationName: destinationAccount.name,
-                                    })|raw
+                                    })|raw }}
-                                    }}
                                 </em>
                             </p>
 

resources/views/transactions/mass/edit.twig

@@ -69,7 +69,8 @@
                                                 </select>
                                             {% else %}
                                                 {# SOURCE ACCOUNT NAME FOR DEPOSIT #}
-                                                <input class="form-control input-sm" placeholder="{{ journal.source_account_name }}" name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}">
+                                                <input class="form-control input-sm" placeholder="{{ journal.source_account_name }}"
+                                                       name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}">
                                             {% endif %}
                                         </td>
                                         <td>
@@ -83,12 +84,15 @@
                                                 </select>
                                             {% else %}
                                                 {# DESTINATION ACCOUNT NAME FOR EXPENSE #}
-                                                <input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}" name="destination_account_name[{{ journal.id }}]" type="text" value="{{ journal.destination_account_name }}">
+                                                <input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}"
+                                                       name="destination_account_name[{{ journal.id }}]" type="text"
+                                                       value="{{ journal.destination_account_name }}">
                                             {% endif %}
                                         </td>
                                         {# category #}
                                         <td>
-                                            <input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}" name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}">
+                                            <input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}"
+                                                   name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}">
                                         </td>
                                         {# budget #}
                                         <td>
@@ -96,7 +100,8 @@
                                                 <select class="form-control input-sm" name="budget_id[{{ journal.id }}]">
                                                     <option value="0" label="(none)"
                                                             {% if journal.budgets.count == 0 %}selected="selected"{% endif %}
-                                                    >(none)</option>
+                                                    >(none)
+                                                    </option>
                                                     {% for budget in budgets %}
                                                         <option value="{{ budget.id }}"{% if budget.id==journal.budgets[0].id %} selected="selected"{% endif %}
                                                                 label="{{ budget.name }}">{{ budget.name }}</option>

tests/Feature/Controllers/BillControllerTest.php

@@ -139,7 +139,6 @@ class BillControllerTest extends TestCase
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(BillRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());

tests/Feature/Controllers/Chart/BudgetControllerTest.php

@@ -81,9 +81,6 @@ class BudgetControllerTest extends TestCase
      */
     public function testBudgetLimitWrongLimit()
     {
-        $repository = $this->mock(BudgetRepositoryInterface::class);
-        $generator  = $this->mock(GeneratorInterface::class);
-
         $this->be($this->user());
         $response = $this->get(route('chart.budget.budget-limit', [1, 8]));
         $response->assertStatus(500);

tests/Feature/Controllers/Chart/BudgetReportControllerTest.php

@@ -34,8 +34,6 @@ class BudgetReportControllerTest extends TestCase
     {
         $generator   = $this->mock(GeneratorInterface::class);
         $pieChart    = $this->mock(MetaPieChartInterface::class);
-        $collector   = $this->mock(JournalCollectorInterface::class);
-        $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
 
         $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf();
         $pieChart->shouldReceive('setBudgets')->once()->andReturnSelf();
@@ -57,8 +55,6 @@ class BudgetReportControllerTest extends TestCase
     {
         $generator   = $this->mock(GeneratorInterface::class);
         $pieChart    = $this->mock(MetaPieChartInterface::class);
-        $collector   = $this->mock(JournalCollectorInterface::class);
-        $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
 
         $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf();
         $pieChart->shouldReceive('setBudgets')->once()->andReturnSelf();
@@ -82,7 +78,6 @@ class BudgetReportControllerTest extends TestCase
     public function testMainChart()
     {
         $generator   = $this->mock(GeneratorInterface::class);
-        $pieChart    = $this->mock(MetaPieChartInterface::class);
         $collector   = $this->mock(JournalCollectorInterface::class);
         $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
 

tests/Feature/Controllers/CurrencyControllerTest.php

@@ -76,7 +76,6 @@ class CurrencyControllerTest extends TestCase
     public function testCannotCreate()
     {
         // mock stuff
-        $repository   = $this->mock(CurrencyRepositoryInterface::class);
         $userRepos    = $this->mock(UserRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
 
@@ -95,7 +94,6 @@ class CurrencyControllerTest extends TestCase
     public function testCreate()
     {
         // mock stuff
-        $repository   = $this->mock(CurrencyRepositoryInterface::class);
         $userRepos    = $this->mock(UserRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
 
@@ -115,8 +113,6 @@ class CurrencyControllerTest extends TestCase
     public function testDefaultCurrency()
     {
         // mock stuff
-        $repository   = $this->mock(CurrencyRepositoryInterface::class);
-        $userRepos    = $this->mock(UserRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
 
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
@@ -177,7 +173,6 @@ class CurrencyControllerTest extends TestCase
     public function testEdit()
     {
         // mock stuff
-        $repository   = $this->mock(CurrencyRepositoryInterface::class);
         $userRepos    = $this->mock(UserRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
 

tests/Feature/Controllers/ImportControllerTest.php

@@ -40,7 +40,6 @@ class ImportControllerTest extends TestCase
     public function testComplete()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -57,7 +56,6 @@ class ImportControllerTest extends TestCase
     public function testCompleteWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -75,7 +73,6 @@ class ImportControllerTest extends TestCase
     {
         $setup        = $this->mock(CsvSetup::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $setup->shouldReceive('setJob')->once();
@@ -97,7 +94,6 @@ class ImportControllerTest extends TestCase
     public function testConfigureWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -112,7 +108,6 @@ class ImportControllerTest extends TestCase
     public function testDownload()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -135,7 +130,6 @@ class ImportControllerTest extends TestCase
     public function testFinished()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -152,7 +146,6 @@ class ImportControllerTest extends TestCase
     public function testFinishedWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -168,7 +161,6 @@ class ImportControllerTest extends TestCase
     public function testIndex()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -182,7 +174,6 @@ class ImportControllerTest extends TestCase
     public function testJson()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -197,7 +188,6 @@ class ImportControllerTest extends TestCase
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $tagRepos     = $this->mock(TagRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $tag          = factory(Tag::class)->make();
 
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
@@ -214,7 +204,6 @@ class ImportControllerTest extends TestCase
     public function testJsonRunning()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -253,7 +242,6 @@ class ImportControllerTest extends TestCase
     public function testPostConfigureWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $data = [];
@@ -271,7 +259,6 @@ class ImportControllerTest extends TestCase
     public function testPostSettings()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $importer = $this->mock(CsvSetup::class);
@@ -293,7 +280,6 @@ class ImportControllerTest extends TestCase
     public function testPostSettingsWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $data = [];
@@ -333,7 +319,6 @@ class ImportControllerTest extends TestCase
     public function testSettingsUserSettings()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $importer = $this->mock(CsvSetup::class);
@@ -356,7 +341,6 @@ class ImportControllerTest extends TestCase
     public function testSettingsWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -373,7 +357,6 @@ class ImportControllerTest extends TestCase
     public function testSettingsWrongJobAgain()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -388,7 +371,6 @@ class ImportControllerTest extends TestCase
     public function testStart()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         /** @var ImportProcedureInterface $procedure */
@@ -409,7 +391,6 @@ class ImportControllerTest extends TestCase
     public function testStatus()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         // complete
@@ -426,7 +407,6 @@ class ImportControllerTest extends TestCase
     public function testStatusWrongJob()
     {
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(ImportJobRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         // complete

tests/Feature/Controllers/Popup/ReportControllerTest.php

@@ -91,7 +91,6 @@ class ReportControllerTest extends TestCase
      */
     public function testBalanceAmountDefaultNoBudget()
     {
-        $collector    = $this->mock(JournalCollectorInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $budgetRepos  = $this->mock(BudgetRepositoryInterface::class);
         $popupHelper  = $this->mock(PopupReportInterface::class);
@@ -126,7 +125,6 @@ class ReportControllerTest extends TestCase
      */
     public function testBalanceAmountDefaultRole()
     {
-        $collector    = $this->mock(JournalCollectorInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $budgetRepos  = $this->mock(BudgetRepositoryInterface::class);
         $popupHelper  = $this->mock(PopupReportInterface::class);
@@ -162,7 +160,6 @@ class ReportControllerTest extends TestCase
      */
     public function testBalanceAmountDiffRole()
     {
-        $collector    = $this->mock(JournalCollectorInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $budgetRepos  = $this->mock(BudgetRepositoryInterface::class);
         $popupHelper  = $this->mock(PopupReportInterface::class);
@@ -170,11 +167,6 @@ class ReportControllerTest extends TestCase
 
         $budget       = factory(Budget::class)->make();
         $account      = factory(Account::class)->make();
-        $one          = factory(Transaction::class)->make();
-        $two          = factory(Transaction::class)->make();
-        $tag          = factory(Tag::class)->make();
-        $tag->tagMode = 'balancingAct';
-        $two->transactionJournal->tags()->save($tag);
 
         $budgetRepos->shouldReceive('find')->andReturn($budget)->once()->withArgs([1]);
         $accountRepos->shouldReceive('find')->andReturn($account)->once()->withArgs([1]);
@@ -206,10 +198,8 @@ class ReportControllerTest extends TestCase
      */
     public function testBalanceAmountTagRole()
     {
-        $collector    = $this->mock(JournalCollectorInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $budgetRepos  = $this->mock(BudgetRepositoryInterface::class);
-        $popupHelper  = $this->mock(PopupReportInterface::class);
         $budget       = factory(Budget::class)->make();
         $account      = factory(Account::class)->make();
 
@@ -243,7 +233,6 @@ class ReportControllerTest extends TestCase
      */
     public function testBudgetSpentAmount()
     {
-        $collector   = $this->mock(JournalCollectorInterface::class);
         $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
         $popupHelper = $this->mock(PopupReportInterface::class);
         $budget      = factory(Budget::class)->make();
@@ -275,7 +264,6 @@ class ReportControllerTest extends TestCase
      */
     public function testCategoryEntry()
     {
-        $collector     = $this->mock(JournalCollectorInterface::class);
         $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
         $popupHelper   = $this->mock(PopupReportInterface::class);
         $category      = factory(Category::class)->make();
@@ -307,7 +295,6 @@ class ReportControllerTest extends TestCase
      */
     public function testExpenseEntry()
     {
-        $collector    = $this->mock(JournalCollectorInterface::class);
         $popupHelper  = $this->mock(PopupReportInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $account      = factory(Account::class)->make();
@@ -339,7 +326,6 @@ class ReportControllerTest extends TestCase
      */
     public function testIncomeEntry()
     {
-        $collector    = $this->mock(JournalCollectorInterface::class);
         $popupHelper  = $this->mock(PopupReportInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $account      = factory(Account::class)->make();
@@ -371,7 +357,6 @@ class ReportControllerTest extends TestCase
      */
     public function testWrongLocation()
     {
-        $popupHelper = $this->mock(PopupReportInterface::class);
         $this->be($this->user());
         $arguments = [
             'attributes' => [

tests/Feature/Controllers/ProfileControllerTest.php

@@ -166,7 +166,6 @@ class ProfileControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $repository = $this->mock(UserRepositoryInterface::class);
         $data       = [
             'password' => 'james2',
         ];

tests/Feature/Controllers/ReportControllerTest.php

@@ -120,7 +120,6 @@ class ReportControllerTest extends TestCase
      */
     public function testDefaultReportBadDate()
     {
-        $generator    = $this->mock(SYRG::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 

tests/Feature/Controllers/RuleGroupControllerTest.php

@@ -37,8 +37,6 @@ class RuleGroupControllerTest extends TestCase
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->be($this->user());
@@ -55,7 +53,6 @@ class RuleGroupControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('get')->andReturn(new Collection);
 
@@ -73,7 +70,6 @@ class RuleGroupControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('destroy');
 
@@ -93,7 +89,6 @@ class RuleGroupControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('moveDown');
 
@@ -110,8 +105,6 @@ class RuleGroupControllerTest extends TestCase
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
 
@@ -128,7 +121,6 @@ class RuleGroupControllerTest extends TestCase
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(RuleGroupRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal);
         $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection);
@@ -156,7 +148,6 @@ class RuleGroupControllerTest extends TestCase
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $repository   = $this->mock(RuleGroupRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection);
@@ -175,7 +166,6 @@ class RuleGroupControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $this->session(['rule-groups.create.uri' => 'http://localhost']);
@@ -202,7 +192,6 @@ class RuleGroupControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('moveUp');
 
@@ -220,7 +209,6 @@ class RuleGroupControllerTest extends TestCase
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $repository   = $this->mock(RuleGroupRepositoryInterface::class);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
         $data = [

tests/Feature/Controllers/TagControllerTest.php

@@ -36,7 +36,6 @@ class TagControllerTest extends TestCase
     public function testCreate()
     {
         // mock stuff
-        $repository   = $this->mock(TagRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
 
@@ -52,7 +51,6 @@ class TagControllerTest extends TestCase
     public function testDelete()
     {
         // mock stuff
-        $repository   = $this->mock(TagRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);