Code cleanup.

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -25,13 +25,13 @@ class ChartJsBillChartGenerator implements BillChartGenerator
         bcscale(2);
         $data = [
             [
-                'value'     => round($unpaid,2),
+                'value'     => round($unpaid, 2),
                 'color'     => 'rgba(53, 124, 165,0.7)',
                 'highlight' => 'rgba(53, 124, 165,0.9)',
                 'label'     => trans('firefly.unpaid'),
             ],
             [
-                'value'     => round($paid * -1,2), // paid is negative, must be positive.
+                'value'     => round($paid * -1, 2), // paid is negative, must be positive.
                 'color'     => 'rgba(0, 141, 76, 0.7)',
                 'highlight' => 'rgba(0, 141, 76, 0.9)',
                 'label'     => trans('firefly.paid'),

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -49,53 +49,13 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
         return $data;
     }
 
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries)
-    {
-        $data = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.spent'),
-                    'data'  => []
-                ]
-            ],
-        ];
-        foreach ($entries as $entry) {
-            if ($entry['sum'] != 0) {
-                $data['labels'][]              = $entry['name'];
-                $data['datasets'][0]['data'][] = round(($entry['sum'] * -1), 2);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @codeCoverageIgnore
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function period(Collection $entries)
-    {
-        return $this->all($entries);
-
-    }
-
     /**
      * @param Collection $categories
      * @param Collection $entries
      *
      * @return array
      */
-    public function spentInYear(Collection $categories, Collection $entries)
+    public function earnedInPeriod(Collection $categories, Collection $entries)
     {
 
         // language:
@@ -122,13 +82,90 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
 
     }
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries)
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => []
+                ]
+            ],
+        ];
+        foreach ($entries as $entry) {
+            if ($entry['sum'] != 0) {
+                $data['labels'][]              = $entry['name'];
+                $data['datasets'][0]['data'][] = round(($entry['sum'] * -1), 2);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries)
+    {
+        // dataset:
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        // get labels from one of the categories (assuming there's at least one):
+        $first = $entries->first();
+        foreach ($first['spent'] as $year => $noInterest) {
+            $data['labels'][] = strval($year);
+        }
+
+        // then, loop all entries and create datasets:
+        foreach ($entries as $entry) {
+            $name   = $entry['name'];
+            $spent  = $entry['spent'];
+            $earned = $entry['earned'];
+            if (array_sum(array_values($spent)) != 0) {
+                $data['datasets'][] = ['label' => 'Spent in category ' . $name, 'data' => array_values($spent)];
+            }
+            if (array_sum(array_values($earned)) != 0) {
+                $data['datasets'][] = ['label' => 'Earned in category ' . $name, 'data' => array_values($earned)];
+            }
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function period(Collection $entries)
+    {
+        return $this->all($entries);
+
+    }
+
     /**
      * @param Collection $categories
      * @param Collection $entries
      *
      * @return array
      */
-    public function earnedInPeriod(Collection $categories, Collection $entries)
+    public function spentInYear(Collection $categories, Collection $entries)
     {
 
         // language:
@@ -187,41 +224,4 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
         return $data;
 
     }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function multiYear(Collection $entries)
-    {
-        // dataset:
-        $data = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
-        // get labels from one of the categories (assuming there's at least one):
-        $first = $entries->first();
-        foreach ($first['spent'] as $year => $noInterest) {
-            $data['labels'][] = strval($year);
-        }
-
-        // then, loop all entries and create datasets:
-        foreach ($entries as $entry) {
-            $name   = $entry['name'];
-            $spent  = $entry['spent'];
-            $earned = $entry['earned'];
-            if (array_sum(array_values($spent)) != 0) {
-                $data['datasets'][] = ['label' => 'Spent in category ' . $name, 'data' => array_values($spent)];
-            }
-            if (array_sum(array_values($earned)) != 0) {
-                $data['datasets'][] = ['label' => 'Earned in category ' . $name, 'data' => array_values($earned)];
-            }
-        }
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-
-    }
 }

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -3,9 +3,7 @@
 namespace FireflyIII\Generator\Chart\PiggyBank;
 
 use Carbon\Carbon;
-use Config;
 use Illuminate\Support\Collection;
-use Preferences;
 
 
 /**

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -2,9 +2,7 @@
 
 namespace FireflyIII\Generator\Chart\Report;
 
-use Config;
 use Illuminate\Support\Collection;
-use Preferences;
 
 /**
  * Class ChartJsReportChartGenerator
@@ -14,40 +12,6 @@ use Preferences;
 class ChartJsReportChartGenerator implements ReportChartGenerator
 {
 
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function yearInOut(Collection $entries)
-    {
-        // language:
-        $format   = trans('config.month');
-
-        $data = [
-            'count'    => 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => []
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => []
-                ]
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized($format);
-            $data['datasets'][0]['data'][] = round($entry[1], 2);
-            $data['datasets'][1]['data'][] = round($entry[2], 2);
-        }
-
-        return $data;
-    }
-
     /**
      * Same as above but other translations.
      *
@@ -81,6 +45,71 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
         return $data;
     }
 
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function multiYearInOutSummarized($income, $expense, $count)
+    {
+        $data                          = [
+            'count'    => 2,
+            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => []
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => []
+                ]
+            ],
+        ];
+        $data['datasets'][0]['data'][] = round($income, 2);
+        $data['datasets'][1]['data'][] = round($expense, 2);
+        $data['datasets'][0]['data'][] = round(($income / $count), 2);
+        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries)
+    {
+        // language:
+        $format = trans('config.month');
+
+        $data = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => []
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => []
+                ]
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized($format);
+            $data['datasets'][0]['data'][] = round($entry[1], 2);
+            $data['datasets'][1]['data'][] = round($entry[2], 2);
+        }
+
+        return $data;
+    }
+
     /**
      * @param string $income
      * @param string $expense
@@ -112,35 +141,4 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
 
         return $data;
     }
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function multiYearInOutSummarized($income, $expense, $count)
-    {
-        $data                          = [
-            'count'    => 2,
-            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => []
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => []
-                ]
-            ],
-        ];
-        $data['datasets'][0]['data'][] = round($income, 2);
-        $data['datasets'][1]['data'][] = round($expense, 2);
-        $data['datasets'][0]['data'][] = round(($income / $count), 2);
-        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
-
-        return $data;
-    }
 }

app/Helpers/Report/ReportQuery.php

@@ -161,15 +161,15 @@ class ReportQuery implements ReportQueryInterface
                 }
             }
         );
-//        $data = $data->filter(
+        //        $data = $data->filter(
-//            function (TransactionJournal $journal) {
+        //            function (TransactionJournal $journal) {
-//                if ($journal->amount != 0) {
+        //                if ($journal->amount != 0) {
-//                    return $journal;
+        //                    return $journal;
-//                }
+        //                }
-//
+        //
-//                return null;
+        //                return null;
-//            }
+        //            }
-//        );
+        //        );
 
         return $data;
     }

app/Http/Controllers/Chart/BudgetController.php

@@ -252,7 +252,7 @@ class BudgetController extends Controller
                 $amount       = $budget->amount;
                 // smaller than 1 means spent MORE than budget allows.
                 $left      = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? 0 : bcadd($budget->amount, $expenses);
-                $spent     = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? ($amount*-1) : $expenses;
+                $spent     = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? ($amount * -1) : $expenses;
                 $overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : 0;
             }
 

app/Http/Controllers/Controller.php

@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Auth;
-use Config;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;

app/Http/Controllers/HomeController.php

@@ -1,15 +1,12 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Artisan;
-use Auth;
 use Carbon\Carbon;
 use Config;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
-use Log;
 use Preferences;
-use Route;
 use Session;
 use Steam;
 

app/Http/Controllers/ReportController.php

@@ -64,9 +64,12 @@ class ReportController extends Controller
         $accountList = join(',', $accountIds);
 
 
-        return view('reports.index', compact('months', 'accounts', 'start', 'accountList',
+        return view(
+            'reports.index', compact(
+            'months', 'accounts', 'start', 'accountList',
             'startOfMonth', 'endOfMonth', 'startOfYear', 'endOfYear'
-        ));
+        )
+        );
     }
 
     /**

app/Http/Middleware/Authenticate.php

@@ -4,7 +4,6 @@ use App;
 use Auth;
 use Carbon\Carbon;
 use Closure;
-use Config;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\Request;
 use Preferences;
@@ -61,9 +60,9 @@ class Authenticate
         }
 
         // if logged in, set user language:
-        $pref = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'));
+        $pref = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'));
         App::setLocale($pref->data);
-        Carbon::setLocale(substr($pref->data,0,2));
+        Carbon::setLocale(substr($pref->data, 0, 2));
         $locale = explode(',', trans('config.locale'));
         $locale = array_map('trim', $locale);
 

app/Models/Budget.php

@@ -78,7 +78,7 @@ class Budget extends Model
      */
     public function getDates()
     {
-        return ['created_at', 'updated_at', 'deleted_at','startdate','enddate'];
+        return ['created_at', 'updated_at', 'deleted_at', 'startdate', 'enddate'];
     }
 
     /**

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -108,6 +108,7 @@ interface BudgetRepositoryInterface
 
     /**
      * @deprecated
+     *
      * @param Budget $budget
      *
      * @return Carbon
@@ -116,6 +117,7 @@ interface BudgetRepositoryInterface
 
     /**
      * @deprecated
+     *
      * @param Budget $budget
      * @param Carbon $date
      *

app/Repositories/Category/CategoryRepository.php

@@ -53,7 +53,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
         $cache = new CacheProperties;
         $cache->addProperty('category-list');
 
-        if($cache->has()) {
+        if ($cache->has()) {
             return $cache->get();
         }
 

app/Repositories/Shared/ComponentRepository.php

@@ -46,7 +46,6 @@ class ComponentRepository
         }
 
 
-
         $entry  = $object->transactionjournals()
                          ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
                          ->before($end)

resources/twig/emails/registered-html.twig

@@ -60,6 +60,7 @@
 
 
 
+
 </script>
 
 </body>

resources/twig/form/amount.twig

@@ -5,7 +5,8 @@
         <div class="input-group">
             <div class="input-group-btn">
                 <button type="button"
-                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown" aria-expanded="false">
+                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown"
+                        aria-expanded="false">
                     <span id="currency_select_symbol_{{ name }}">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu currency-dropdown-menu" role="menu">

resources/twig/form/balance.twig

@@ -5,7 +5,8 @@
         <div class="input-group">
             <div class="input-group-btn">
                 <button type="button"
-                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown" aria-expanded="false">
+                        class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}" data-toggle="dropdown"
+                        aria-expanded="false">
                     <span id="currency_select_symbol_{{ name }}">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu currency-dropdown-menu" role="menu">