Applied fixes from StyleCI

hbcrhythm · May 24, 2016 · e6794b4 · e6794b4
1 parent 7dbc3e3
commit e6794b4
Show file tree

Hide file tree

Showing 24 changed files with 134 additions and 127 deletions.
diff --git a/app/Http/Controllers/AngularController.php b/app/Http/Controllers/AngularController.php
@@ -5,7 +5,7 @@
 class AngularController extends Controller
 {
     /**
-     * Serve the angular application
+     * Serve the angular application.
      *
      * @return JSON
      */
@@ -15,7 +15,7 @@ public function serveApp()
     }
 
     /**
-     * Page for unsupported browsers
+     * Page for unsupported browsers.
      *
      * @return JSON
      */

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -2,31 +2,30 @@
 
 namespace App\Http\Controllers\Auth;
 
-use Auth;
-use JWTAuth;
-use App\User;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use Socialite;
+use App\User;
+use Auth;
 use Bican\Roles\Models\Role;
-use Bican\Roles\Models\Permission;
+use Illuminate\Http\Request;
+use JWTAuth;
 use Mail;
+use Socialite;
 
 class AuthController extends Controller
 {
     /**
-     * Get all roles and their corresponding permissions
+     * Get all roles and their corresponding permissions.
      *
-     * @return Array
+     * @return array
      */
     private function getRolesAbilities()
     {
-        $abilities = array();
+        $abilities = [];
         $roles = Role::all();
 
         foreach ($roles as $role) {
             if (!empty($role->slug)) {
-                $abilities[$role->slug] = array();
+                $abilities[$role->slug] = [];
                 $rolePermission = $role->permissions()->get();
 
                 foreach ($rolePermission as $permission) {
@@ -41,7 +40,7 @@ private function getRolesAbilities()
     }
 
     /**
-     * Get authenticated user details and auth credentials
+     * Get authenticated user details and auth credentials.
      *
      * @return JSON
      */
@@ -51,7 +50,7 @@ public function getAuthenticatedUser()
             $user = Auth::user();
             $token = JWTAuth::fromUser($user);
             $abilities = $this->getRolesAbilities();
-            $userRole = array();
+            $userRole = [];
 
             foreach ($user->Roles as $role) {
                 $userRole [] = $role->slug;
@@ -116,7 +115,7 @@ private function findOrCreateUser($oauthUser, $provider)
             'email' => $oauthUser->email,
             'oauth_provider' => $provider,
             'oauth_provider_id' => $oauthUser->getId(),
-            'avatar' => $oauthUser->avatar
+            'avatar' => $oauthUser->avatar,
         ]);
     }
 
@@ -143,7 +142,7 @@ public function postLogin(Request $request)
         }
 
         try {
-            if (! $token = JWTAuth::attempt($credentials)) {
+            if (!$token = JWTAuth::attempt($credentials)) {
                 return response()->error('Invalid credentials', 401);
             }
         } catch (\JWTException $e) {
@@ -153,7 +152,7 @@ public function postLogin(Request $request)
         $user = Auth::user();
         $token = JWTAuth::fromUser($user);
         $abilities = $this->getRolesAbilities();
-        $userRole = array();
+        $userRole = [];
 
         foreach ($user->Roles as $role) {
             $userRole [] = $role->slug;
@@ -192,7 +191,7 @@ public function postRegister(Request $request)
         ]);
 
         $verificationCode = str_random(40);
-        $user = new User;
+        $user = new User();
         $user->name = trim($request->name);
         $user->email = trim(strtolower($request->email));
         $user->password = bcrypt($request->password);

diff --git a/app/Http/Controllers/Auth/PasswordResetController.php b/app/Http/Controllers/Auth/PasswordResetController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
-use Mail;
-use App\User;
+use App\Http\Controllers\Controller;
 use App\PasswordReset;
+use App\User;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
+use Mail;
 
 class PasswordResetController extends Controller
 {
@@ -47,7 +47,7 @@ public function verify(Request $request)
         ->whereToken($request->token)
         ->first();
 
-        if (! $check) {
+        if (!$check) {
             return response()->error('Email does not exist', 422);
         }
 

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use Dingo\Api\Exception\ValidationHttpException;
 use Dingo\Api\Http\Request;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Dingo\Api\Exception\ValidationHttpException;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {