Code cleanup.

app/Helpers/Csv/Specifix/SpecifixInterface.php

@@ -10,6 +10,7 @@ interface SpecifixInterface
 {
     const PRE_PROCESSOR  = 1;
     const POST_PROCESSOR = 2;
+
     /**
      * Implement bank and locale related fixes.
      */

app/Helpers/Report/BalanceReportHelper.php

@@ -78,7 +78,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         $balance->addBalanceLine($this->createEmptyBalanceLine($accounts, $spentData));
         $balance->addBalanceLine($this->createTagsBalanceLine($accounts, $start, $end));
         $balance->addBalanceLine($this->createDifferenceBalanceLine($accounts, $spentData, $start, $end));
-
         $balance->setBalanceHeader($header);
 
         return $balance;

app/Http/Controllers/Auth/AuthController.php

@@ -150,7 +150,6 @@ class AuthController extends Controller
 
             return redirect($this->redirectPath());
         }
-        // @codeCoverageIgnoreStart
         abort(500, 'Not a user!');
 
 

app/Http/Controllers/Chart/PiggyBankController.php

@@ -22,7 +22,7 @@ class PiggyBankController extends Controller
     protected $generator;
 
     /**
-     * @codeCoverageIgnore
+     *
      */
     public function __construct()
     {

app/Http/Controllers/Chart/ReportController.php

@@ -22,7 +22,7 @@ class ReportController extends Controller
     protected $generator;
 
     /**
-     * @codeCoverageIgnore
+     *
      */
     public function __construct()
     {
@@ -127,6 +127,7 @@ class ReportController extends Controller
      */
     protected function singleYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end)
     {
+        bcscale(2);
         $income  = '0';
         $expense = '0';
         $count   = 0;
@@ -156,6 +157,7 @@ class ReportController extends Controller
      */
     protected function multiYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end)
     {
+        bcscale(2);
         $income  = '0';
         $expense = '0';
         $count   = 0;

app/Http/Controllers/PreferencesController.php

@@ -16,7 +16,7 @@ class PreferencesController extends Controller
 {
 
     /**
-     * @codeCoverageIgnore
+     *
      */
     public function __construct()
     {

app/Http/Controllers/ReportController.php

@@ -5,6 +5,7 @@ use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
 use Illuminate\Support\Collection;
+use Log;
 use Preferences;
 use Session;
 use View;
@@ -25,7 +26,7 @@ class ReportController extends Controller
     protected $helper;
 
     /**
-     * @codeCoverageIgnore
+     *
      *
      * @param ReportHelperInterface $helper
      */
@@ -43,6 +44,32 @@ class ReportController extends Controller
 
     }
 
+    /**
+     * @param ARI $repository
+     *
+     * @return View
+     * @internal param ReportHelperInterface $helper
+     */
+    public function index(ARI $repository)
+    {
+        $start            = session('first');
+        $months           = $this->helper->listOfMonths($start);
+        $customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
+
+        // does the user have shared accounts?
+        $accounts = $repository->getAccounts(['Default account', 'Asset account']);
+        // get id's for quick links:
+        $accountIds = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $accountIds [] = $account->id;
+        }
+        $accountList = join(',', $accountIds);
+
+
+        return view('reports.index', compact('months', 'accounts', 'start', 'accountList', 'customFiscalYear'));
+    }
+
     /**
      * @param            $reportType
      * @param Carbon     $start
@@ -51,7 +78,59 @@ class ReportController extends Controller
      *
      * @return View
      */
-    public function defaultMonth($reportType, Carbon $start, Carbon $end, Collection $accounts)
+    public function report($reportType, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        // throw an error if necessary.
+        if ($end < $start) {
+
+            return view('error')->with('message', 'End date cannot be before start date, silly!');
+        }
+
+        // lower threshold
+        if ($start < session('first')) {
+            Log::debug('Start is ' . $start . ' but sessionfirst is ' . session('first'));
+            $start = session('first');
+        }
+
+        switch ($reportType) {
+            default:
+            case 'default':
+
+                View::share(
+                    'subTitle', trans(
+                                  'firefly.report_default',
+                                  [
+                                      'start' => $start->formatLocalized($this->monthFormat),
+                                      'end'   => $end->formatLocalized($this->monthFormat),
+                                  ]
+                              )
+                );
+                View::share('subTitleIcon', 'fa-calendar');
+
+                // more than one year date difference means year report.
+                if ($start->diffInMonths($end) > 12) {
+                    return $this->defaultMultiYear($reportType, $start, $end, $accounts);
+                }
+                // more than two months date difference means year report.
+                if ($start->diffInMonths($end) > 1) {
+                    return $this->defaultYear($reportType, $start, $end, $accounts);
+                }
+
+                return $this->defaultMonth($reportType, $start, $end, $accounts);
+        }
+
+
+    }
+
+    /**
+     * @param            $reportType
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return View
+     */
+    private function defaultMonth($reportType, Carbon $start, Carbon $end, Collection $accounts)
     {
         $incomeTopLength  = 8;
         $expenseTopLength = 8;
@@ -92,7 +171,7 @@ class ReportController extends Controller
      *
      * @return View
      */
-    public function defaultMultiYear($reportType, $start, $end, $accounts)
+    private function defaultMultiYear($reportType, $start, $end, $accounts)
     {
 
         $incomeTopLength  = 8;
@@ -129,7 +208,7 @@ class ReportController extends Controller
      *
      * @return View
      */
-    public function defaultYear($reportType, Carbon $start, Carbon $end, Collection $accounts)
+    private function defaultYear($reportType, Carbon $start, Carbon $end, Collection $accounts)
     {
         $incomeTopLength  = 8;
         $expenseTopLength = 8;
@@ -159,81 +238,5 @@ class ReportController extends Controller
         );
     }
 
-    /**
-     * @param ARI $repository
-     *
-     * @return View
-     * @internal param ReportHelperInterface $helper
-     */
-    public function index(ARI $repository)
-    {
-        $start            = Session::get('first');
-        $months           = $this->helper->listOfMonths($start);
-        $customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
-
-        // does the user have shared accounts?
-        $accounts = $repository->getAccounts(['Default account', 'Asset account']);
-        // get id's for quick links:
-        $accountIds = [];
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $accountIds [] = $account->id;
-        }
-        $accountList = join(',', $accountIds);
-
-
-        return view('reports.index', compact('months', 'accounts', 'start', 'accountList','customFiscalYear'));
-    }
-
-    /**
-     * @param            $reportType
-     * @param Carbon     $start
-     * @param Carbon     $end
-     * @param Collection $accounts
-     *
-     * @return View
-     */
-    public function report($reportType, Carbon $start, Carbon $end, Collection $accounts)
-    {
-        // throw an error if necessary.
-        if ($end < $start) {
-            return view('error')->with('message', 'End date cannot be before start date, silly!');
-        }
-
-        // lower threshold
-        if ($start < Session::get('first')) {
-            $start = Session::get('first');
-        }
-
-        switch ($reportType) {
-            default:
-            case 'default':
-
-                View::share(
-                    'subTitle', trans(
-                                  'firefly.report_default',
-                                  [
-                                      'start' => $start->formatLocalized($this->monthFormat),
-                                      'end'   => $end->formatLocalized($this->monthFormat),
-                                  ]
-                              )
-                );
-                View::share('subTitleIcon', 'fa-calendar');
-
-                // more than one year date difference means year report.
-                if ($start->diffInMonths($end) > 12) {
-                    return $this->defaultMultiYear($reportType, $start, $end, $accounts);
-                }
-                // more than two months date difference means year report.
-                if ($start->diffInMonths($end) > 1) {
-                    return $this->defaultYear($reportType, $start, $end, $accounts);
-                }
-
-                return $this->defaultMonth($reportType, $start, $end, $accounts);
-        }
-
-
-    }
-
 
 }

app/Http/Middleware/Authenticate.php

@@ -3,8 +3,9 @@
 namespace FireflyIII\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
 /**
  * Class Authenticate
  *

app/Http/Requests/AccountFormRequest.php

@@ -10,7 +10,7 @@ use Input;
 /**
  * Class AccountFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class AccountFormRequest extends Request

app/Http/Requests/AttachmentFormRequest.php

@@ -7,7 +7,7 @@ use Auth;
 /**
  * Class AttachmentFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class AttachmentFormRequest extends Request

app/Http/Requests/BillFormRequest.php

@@ -9,7 +9,7 @@ use Input;
 /**
  * Class BillFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class BillFormRequest extends Request

app/Http/Requests/BudgetFormRequest.php

@@ -9,7 +9,7 @@ use Input;
 /**
  * Class BudgetFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class BudgetFormRequest extends Request

app/Http/Requests/CategoryFormRequest.php

@@ -9,7 +9,7 @@ use Input;
 /**
  * Class CategoryFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class CategoryFormRequest extends Request

app/Http/Requests/CurrencyFormRequest.php

@@ -8,7 +8,7 @@ use Input;
 /**
  * Class BillFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class CurrencyFormRequest extends Request

app/Http/Requests/DeleteAccountFormRequest.php

@@ -7,7 +7,7 @@ use Auth;
 /**
  * Class DeleteAccountFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class DeleteAccountFormRequest extends Request

app/Http/Requests/JournalFormRequest.php

@@ -11,7 +11,7 @@ use Input;
 /**
  * Class JournalFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class JournalFormRequest extends Request

app/Http/Requests/NewUserFormRequest.php

@@ -7,7 +7,7 @@ use Auth;
 /**
  * Class NewUserFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class NewUserFormRequest extends Request

app/Http/Requests/PiggyBankFormRequest.php

@@ -8,7 +8,7 @@ use Input;
 /**
  * Class PiggyBankFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class PiggyBankFormRequest extends Request

app/Http/Requests/ProfileFormRequest.php

@@ -7,7 +7,7 @@ use Auth;
 /**
  * Class ProfileFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class ProfileFormRequest extends Request

app/Http/Requests/RuleFormRequest.php

@@ -17,7 +17,7 @@ use Input;
 /**
  * Class RuleFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class RuleFormRequest extends Request

app/Http/Requests/RuleGroupFormRequest.php

@@ -16,7 +16,7 @@ use Input;
 /**
  * Class RuleGroupFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class RuleGroupFormRequest extends Request

app/Http/Requests/TagFormRequest.php

@@ -8,7 +8,7 @@ use Input;
 /**
  * Class TagFormRequest
  *
- * @codeCoverageIgnore
+ *
  * @package FireflyIII\Http\Requests
  */
 class TagFormRequest extends Request

app/Support/Binder/Date.php

@@ -11,8 +11,8 @@ namespace FireflyIII\Support\Binder;
 
 use Auth;
 use Carbon\Carbon;
-use FireflyIII\Helpers\FiscalHelper;
 use Exception;
+use FireflyIII\Helpers\FiscalHelper;
 use Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;