File reformatting.

app/Generator/Chart/Budget/BudgetChartGenerator.php

@@ -18,13 +18,6 @@ interface BudgetChartGenerator
      */
     public function budget(Collection $entries);
 
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function multiYear(Collection $entries);
-
     /**
      * @param Collection $entries
      *
@@ -39,6 +32,13 @@ interface BudgetChartGenerator
      */
     public function frontpage(Collection $entries);
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries);
+
     /**
      * @param Collection $budgets
      * @param Collection $entries

app/Generator/Chart/Category/CategoryChartGenerator.php

@@ -20,11 +20,12 @@ interface CategoryChartGenerator
     public function all(Collection $entries);
 
     /**
+     * @param Collection $categories
      * @param Collection $entries
      *
      * @return array
      */
-    public function multiYear(Collection $entries);
+    public function earnedInYear(Collection $categories, Collection $entries);
 
     /**
      * @param Collection $entries
@@ -38,8 +39,14 @@ interface CategoryChartGenerator
      *
      * @return array
      */
-    public function period(Collection $entries);
+    public function multiYear(Collection $entries);
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function period(Collection $entries);
 
     /**
      * @param Collection $categories
@@ -48,12 +55,4 @@ interface CategoryChartGenerator
      * @return array
      */
     public function spentInYear(Collection $categories, Collection $entries);
-
-    /**
-     * @param Collection $categories
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function earnedInYear(Collection $categories, Collection $entries);
 }

app/Generator/Chart/Report/ReportChartGenerator.php

@@ -16,25 +16,9 @@ interface ReportChartGenerator
      * @param Collection $entries
      *
      * @return array
- */
-    public function yearInOut(Collection $entries);
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
      */
     public function multiYearInOut(Collection $entries);
 
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function yearInOutSummarized($income, $expense, $count);
-
     /**
      * @param string $income
      * @param string $expense
@@ -44,4 +28,20 @@ interface ReportChartGenerator
      */
     public function multiYearInOutSummarized($income, $expense, $count);
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries);
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized($income, $expense, $count);
+
 }

app/Http/Controllers/Auth/AuthController.php

@@ -214,7 +214,8 @@ class AuthController extends Controller
     /**
      * @return array
      */
-    protected function getBlockedDomains() {
+    protected function getBlockedDomains()
+    {
         $set     = Config::get('mail.blocked_domains');
         $domains = [];
         foreach ($set as $entry) {
@@ -223,6 +224,7 @@ class AuthController extends Controller
                 $domains[] = $domain;
             }
         }
+
         return $domains;
     }
 
@@ -234,6 +236,7 @@ class AuthController extends Controller
         if (isset($parts[1]) && in_array($parts[1], $blocked)) {
             return true;
         }
+
         return false;
     }
 

app/Http/Controllers/Auth/PasswordController.php

@@ -1,13 +1,12 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyIII\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
 use FireflyIII\User;
+use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Password;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
 /**
  * Class PasswordController
  *
@@ -50,6 +49,7 @@ class PasswordController extends Controller
      * Send a reset link to the given user.
      *
      * @param  \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function postEmail(Request $request)
@@ -61,9 +61,11 @@ class PasswordController extends Controller
         if (!is_null($user) && intval($user->blocked) === 1) {
             $response = 'passwords.blocked';
         } else {
-            $response = Password::sendResetLink($request->only('email'), function (Message $message) {
+            $response = Password::sendResetLink(
+                $request->only('email'), function (Message $message) {
                 $message->subject($this->getEmailSubject());
-            });
+            }
+            );
         }
 
         switch ($response) {

app/Http/Middleware/Authenticate.php

@@ -1,13 +1,14 @@
 <?php namespace FireflyIII\Http\Middleware;
 
 use App;
+use Auth;
 use Carbon\Carbon;
 use Closure;
 use Config;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\Request;
 use Preferences;
-use Auth;
+
 /**
  * Class Authenticate
  *
@@ -55,6 +56,7 @@ class Authenticate
 
         if (intval($this->auth->user()->blocked) == 1) {
             Auth::logout();
+
             return redirect()->route('index');
         }
 

app/Models/TransactionType.php

@@ -36,22 +36,6 @@ class TransactionType extends Model
         return ['created_at', 'updated_at', 'deleted_at'];
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function transactionJournals()
-    {
-        return $this->hasMany('FireflyIII\Models\TransactionJournal');
-    }
-
-    /**
-     * @return bool
-     */
-    public function isWithdrawal()
-    {
-        return $this->type === TransactionType::WITHDRAWAL;
-    }
-
     /**
      * @return bool
      */
@@ -60,6 +44,14 @@ class TransactionType extends Model
         return $this->type === TransactionType::DEPOSIT;
     }
 
+    /**
+     * @return bool
+     */
+    public function isOpeningBalance()
+    {
+        return $this->type === TransactionType::OPENING_BALANCE;
+    }
+
     /**
      * @return bool
      */
@@ -71,8 +63,16 @@ class TransactionType extends Model
     /**
      * @return bool
      */
-    public function isOpeningBalance()
+    public function isWithdrawal()
     {
-        return $this->type === TransactionType::OPENING_BALANCE;
+        return $this->type === TransactionType::WITHDRAWAL;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function transactionJournals()
+    {
+        return $this->hasMany('FireflyIII\Models\TransactionJournal');
     }
 }

app/Repositories/Budget/BudgetRepository.php

@@ -14,7 +14,6 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Input;
-use Log;
 
 /**
  * Class BudgetRepository

app/Repositories/Category/CategoryRepository.php

@@ -478,6 +478,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
             ->transactionTypes([TransactionType::WITHDRAWAL])
             ->get(['transaction_journals.*'])
             ->sum('amount');
+
         return $sum;
 
     }
@@ -508,6 +509,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
             ->after($start)
             ->get(['transaction_journals.*'])
             ->sum('amount');
+
         return $sum;
 
     }

app/Repositories/Tag/TagRepository.php

@@ -77,7 +77,9 @@ class TagRepository implements TagRepositoryInterface
 
         /** @var Tag $tag */
         foreach ($tags as $tag) {
-            $journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(['transaction_journals.*']);
+            $journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(
+                ['transaction_journals.*']
+            );
 
             /** @var TransactionJournal $journal */
             foreach ($journals as $journal) {