Applied fixes from StyleCI (#2)

app/Console/Kernel.php

@@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
+     *
      * @return void
      */
     protected function schedule(Schedule $schedule)

app/Exceptions/Handler.php

@@ -3,11 +3,11 @@
 namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Validation\ValidationException;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Handler extends ExceptionHandler
 {
@@ -28,7 +28,8 @@ class Handler extends ExceptionHandler
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  \Exception  $e
+     * @param \Exception $e
+     *
      * @return void
      */
     public function report(Exception $e)
@@ -39,8 +40,9 @@ public function report(Exception $e)
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $e
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $e
+     *
      * @return \Illuminate\Http\Response
      */
     public function render($request, Exception $e)

app/Http/Controllers/Auth/AuthController.php

@@ -2,16 +2,16 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Http\Controllers\Controller;
 use App\User;
 use Auth;
 use Authy;
 use FlashAlert;
-use Validator;
-use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Http\Request;
-use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
+use Illuminate\Http\Request;
+use Validator;
 
 class AuthController extends Controller
 {
@@ -48,8 +48,9 @@ public function __construct()
     /**
      * Send the post-authentication response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param \Illuminate\Http\Request                   $request
+     * @param \Illuminate\Contracts\Auth\Authenticatable $user
+     *
      * @return \Illuminate\Http\Response
      */
     protected function authenticated(Request $request, Authenticatable $user)
@@ -66,7 +67,8 @@ protected function authenticated(Request $request, Authenticatable $user)
     /**
      * Handle a registration request for the application.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function register(Request $request)
@@ -87,7 +89,7 @@ public function register(Request $request)
     }
 
     /**
-     * Show two-factor authentication page
+     * Show two-factor authentication page.
      *
      * @return \Illuminate\Http\Response|\Illuminate\View\View
      */
@@ -99,21 +101,22 @@ public function getToken()
     /**
      * Verify the two-factor authentication token.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function postToken(Request $request)
     {
         $this->validate($request, ['token' => 'required']);
-        if (! session('authy:auth:id')) {
+        if (!session('authy:auth:id')) {
             return redirect(url('login'));
         }
 
         $guard = config('auth.defaults.guard');
-        $provider = config('auth.guards.' . $guard . '.provider');
-        $model = config('auth.providers.' . $provider . '.model');
+        $provider = config('auth.guards.'.$guard.'.provider');
+        $model = config('auth.providers.'.$provider.'.model');
 
-        $user = (new $model)->findOrFail(
+        $user = (new $model())->findOrFail(
             $request->session()->pull('authy:auth:id')
         );
 
@@ -133,8 +136,9 @@ public function postToken(Request $request)
     /**
      * Generate a redirect response to the two-factor token screen.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param \Illuminate\Http\Request                   $request
+     * @param \Illuminate\Contracts\Auth\Authenticatable $user
+     *
      * @return \Illuminate\Http\Response
      */
     protected function logoutAndRedirectToTokenScreen(Request $request, Authenticatable $user)
@@ -163,29 +167,31 @@ public function logout()
     /**
      * Get a validator for an incoming registration request.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
+            'name'     => 'required|max:255',
+            'email'    => 'required|email|max:255|unique:users',
             'password' => 'required|min:6|confirmed',
         ]);
     }
 
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return User
      */
     protected function create(array $data)
     {
         return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
+            'name'     => $data['name'],
+            'email'    => $data['email'],
             'password' => bcrypt($data['password']),
         ]);
     }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -2,14 +2,13 @@
 
 namespace App\Http\Controllers\Auth;
 
-use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use Auth;
 use Authy;
 use Exception;
 use FlashAlert;
+use Illuminate\Http\Request;
 use Validator;
-use App\Http\Requests;
-use App\Http\Controllers\Controller;
 
 class TwoFactorController extends Controller
 {
@@ -19,14 +18,15 @@ public function __construct()
     }
 
     /**
-     * Enable two-factor authentication
+     * Enable two-factor authentication.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|null
      */
     public function postEnable(Request $request)
     {
-        if (! is_null($response = $this->validateEnablingTwoFactorAuth($request))) {
+        if (!is_null($response = $this->validateEnablingTwoFactorAuth($request))) {
             return redirect(url('home'))->withErrors($response);
         }
 
@@ -40,8 +40,9 @@ public function postEnable(Request $request)
 
         // Check if the user wants to receive token via SMS
         $sms = false;
-        if (!empty($input['sms']))
+        if (!empty($input['sms'])) {
             $sms = true;
+        }
 
         try {
             Authy::getProvider()->register($user, $sms);
@@ -61,7 +62,8 @@ public function postEnable(Request $request)
     /**
      * Validate an incoming request to enable two-factor authentication.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response|null
      */
     protected function validateEnablingTwoFactorAuth(Request $request)
@@ -73,7 +75,7 @@ protected function validateEnablingTwoFactorAuth(Request $request)
         }
 
         $validator = Validator::make($input, [
-            'country-code' => 'required|numeric|integer',
+            'country-code'    => 'required|numeric|integer',
             'authy-cellphone' => 'required|numeric',
         ]);
 
@@ -83,9 +85,10 @@ protected function validateEnablingTwoFactorAuth(Request $request)
     }
 
     /**
-     * Disable two-factor authentication
+     * Disable two-factor authentication.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|nul
      */
     public function postDisable(Request $request)

app/Http/Controllers/Controller.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesResources;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {

app/Http/Controllers/HomeController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests;
 use Auth;
 use Authy;
 use Illuminate\Http\Request;
@@ -23,6 +22,7 @@ public function __construct()
      * Show the application dashboard.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function index(Request $request)

app/Http/Kernel.php

@@ -44,10 +44,10 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth'       => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'can'        => \Illuminate\Foundation\Http\Middleware\Authorize::class,
+        'guest'      => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
     ];
 }

app/Http/Middleware/Authenticate.php

@@ -10,9 +10,10 @@ class Authenticate
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @param string|null              $guard
+     *
      * @return mixed
      */
     public function handle($request, Closure $next, $guard = null)

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -10,9 +10,10 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @param string|null              $guard
+     *
      * @return mixed
      */
     public function handle($request, Closure $next, $guard = null)

app/Http/routes.php

@@ -17,9 +17,9 @@
 
 Route::auth();
 
-Route::get('auth/token','Auth\AuthController@getToken');
-Route::post('auth/token','Auth\AuthController@postToken');
-Route::post('auth/twofactor/enable','Auth\TwoFactorController@postEnable');
-Route::post('auth/twofactor/disable','Auth\TwoFactorController@postDisable');
+Route::get('auth/token', 'Auth\AuthController@getToken');
+Route::post('auth/token', 'Auth\AuthController@postToken');
+Route::post('auth/twofactor/enable', 'Auth\TwoFactorController@postEnable');
+Route::post('auth/twofactor/disable', 'Auth\TwoFactorController@postDisable');
 
 Route::get('/home', 'HomeController@index');

app/Providers/AuthServiceProvider.php

@@ -19,7 +19,8 @@ class AuthServiceProvider extends ServiceProvider
     /**
      * Register any application authentication / authorization services.
      *
-     * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
+     * @param \Illuminate\Contracts\Auth\Access\Gate $gate
+     *
      * @return void
      */
     public function boot(GateContract $gate)

app/Providers/EventServiceProvider.php

@@ -21,7 +21,8 @@ class EventServiceProvider extends ServiceProvider
     /**
      * Register any other events for your application.
      *
-     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
+     *
      * @return void
      */
     public function boot(DispatcherContract $events)