Merge pull request #152 from viralsolani/analysis-q5QYVB

Apply fixes from StyleCI

app/Http/Controllers/Api/V1/PermissionController.php

@@ -8,7 +8,6 @@ use App\Repositories\Backend\Access\Permission\PermissionRepository;
 use Illuminate\Http\Request;
 use Validator;
 
-
 class PermissionController extends APIController
 {
     protected $repository;
@@ -50,7 +49,7 @@ class PermissionController extends APIController
     }
 
     /**
-     * Creates the Resourse for Role
+     * Creates the Resourse for Role.
      *
      * @param Request $request
      *
@@ -63,12 +62,12 @@ class PermissionController extends APIController
             return $this->throwValidation($validation->messages()->first());
         }
         $this->repository->create($request->all());
-        
+
         $permission = Permission::orderBy('created_at', 'desc')->first();
+
         return new PermissionResource($permission);
     }
 
-
     /**
      * @param Role              $role
      * @param UpdateRoleRequest $request
@@ -77,13 +76,12 @@ class PermissionController extends APIController
      */
     public function update(Request $request, Permission $permission)
     {
-      
         $validation = $this->valiatingRequest($request);
 
         if ($validation->fails()) {
             return $this->throwValidation($validation->messages()->first());
         }
-        
+
         $this->repository->update($permission, $request->all());
 
         $permission = Permission::findOrfail($permission->id);
@@ -93,13 +91,14 @@ class PermissionController extends APIController
 
     public function valiatingRequest(Request $request)
     {
-        $validation = Validator::make($request->all(),[
+        $validation = Validator::make($request->all(), [
             'name'         => 'required|max:191',
             'display_name' => 'required|max:191',
         ]);
 
         return $validation;
     }
+
     /**
      * @param Role              $role
      * @param DeleteRoleRequest $request
@@ -110,6 +109,6 @@ class PermissionController extends APIController
     {
         $this->repository->delete($permission);
 
-        return ["message"=>"success"];
+        return ['message'=>'success'];
     }
 }

app/Http/Controllers/Api/V1/RolesController.php

@@ -8,7 +8,6 @@ use App\Repositories\Backend\Access\Role\RoleRepository;
 use Illuminate\Http\Request;
 use Validator;
 
-
 class RolesController extends APIController
 {
     protected $repository;
@@ -50,7 +49,7 @@ class RolesController extends APIController
     }
 
     /**
-     * Creates the Resourse for Role
+     * Creates the Resourse for Role.
      *
      * @param Request $request
      *
@@ -65,11 +64,9 @@ class RolesController extends APIController
 
         $this->repository->create($request->all());
 
-        
         return new RoleResource(Role::orderBy('created_at', 'desc')->first());
     }
 
-
     /**
      * @param Role              $role
      * @param UpdateRoleRequest $request
@@ -78,7 +75,6 @@ class RolesController extends APIController
      */
     public function update(Request $request, Role $role)
     {
-      
         $validation = $this->valiatingRequest($request);
 
         if ($validation->fails()) {
@@ -87,7 +83,7 @@ class RolesController extends APIController
 
         $this->repository->update($role, $request->all());
 
-        $role= Role::findOrfail($role->id);
+        $role = Role::findOrfail($role->id);
 
         return new RoleResource($role);
     }
@@ -96,17 +92,18 @@ class RolesController extends APIController
     {
         $permissions = '';
 
-        if ($request->post("associated_permissions") != 'all') {
+        if ($request->post('associated_permissions') != 'all') {
             $permissions = 'required';
         }
 
         $validation = Validator::make($request->all(), [
-            'name' => 'required|max:191',
+            'name'        => 'required|max:191',
             'permissions' => $permissions,
         ]);
 
         return $validation;
     }
+
     /**
      * @param Role              $role
      * @param DeleteRoleRequest $request
@@ -117,6 +114,6 @@ class RolesController extends APIController
     {
         $this->repository->delete($role);
 
-        return ["message"=>"success"];
+        return ['message'=>'success'];
     }
 }

app/Http/Controllers/Api/V1/UsersController.php

@@ -6,7 +6,6 @@ use App\Http\Resources\UserResource;
 use App\Models\Access\User\User;
 use App\Repositories\Backend\Access\User\UserRepository;
 use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
 use Validator;
 
 class UsersController extends APIController
@@ -47,25 +46,24 @@ class UsersController extends APIController
     public function show(User $user)
     {
         $data = new UserResource($user);
-        $history["history"] = history()->renderEntity('User', $user->id);
+        $history['history'] = history()->renderEntity('User', $user->id);
         $maindata = $data->toArray($user);
         $maindata = array_merge($maindata, $history);
-       return $maindata;
-    }
 
-    
+        return $maindata;
+    }
 
     /**
      * Update the specified resource in storage.
      */
     public function update(Request $request, User $user)
     {
-        $validation = $this->valiatingRequest($request,"edit",$user->id);
+        $validation = $this->valiatingRequest($request, 'edit', $user->id);
 
         if ($validation->fails()) {
             return $this->throwValidation($validation->messages()->first());
         }
-        
+
         $this->repository->update($user, $request);
 
         $user = User::findOrfail($user->id);
@@ -84,28 +82,31 @@ class UsersController extends APIController
             return $this->throwValidation($validation->messages()->first());
         }
         $this->repository->create($request);
+
         return new UserResource(User::orderBy('created_at', 'desc')->first());
     }
+
     /**
-     * Validation function to validate user input
+     * Validation function to validate user input.
      */
-    public function valiatingRequest(Request $request,$string="",$id=0)
+    public function valiatingRequest(Request $request, $string = '', $id = 0)
     {
-        $password = ($string=="edit")?"":"required|min:6|confirmed";
+        $password = ($string == 'edit') ? '' : 'required|min:6|confirmed';
         $validation = Validator::make($request->all(), [
-            'first_name' => 'required|max:255',
-            'last_name' => 'required|max:255',
-            'email' => 'required|max:255|email|unique:users,email,'.$id,
-            'password' => $password,
+            'first_name'      => 'required|max:255',
+            'last_name'       => 'required|max:255',
+            'email'           => 'required|max:255|email|unique:users,email,'.$id,
+            'password'        => $password,
             'assignees_roles' => 'required',
-            'permissions' => 'required',
+            'permissions'     => 'required',
         ]);
 
         return $validation;
     }
 
     /**
-     * Api to delete the resource 
+     * Api to delete the resource.
+     *
      * @param Role              $role
      * @param DeleteRoleRequest $request
      *
@@ -115,6 +116,6 @@ class UsersController extends APIController
     {
         $this->repository->delete($user);
 
-        return ["message" => "success"];
+        return ['message' => 'success'];
     }
 }

app/Http/Resources/RoleResource.php

@@ -18,9 +18,9 @@ class RoleResource extends Resource
         return [
             'id'            => $this->id,
             'name'          => $this->name,
-            "permission"    => ($this->all)? "All": optional($this->permissions)->pluck("display_name"),
-            "noofuses"      => $this->users->count(),
-            "sort"          => $this->sort,
+            'permission'    => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'),
+            'noofuses'      => $this->users->count(),
+            'sort'          => $this->sort,
         ];
     }
 }

app/Http/Resources/UserResource.php

@@ -16,16 +16,15 @@ class UserResource extends Resource
     public function toArray($request)
     {
         return [
-            'id'            => $this->id,
-            'first_name'    => $this->first_name,
-            'last_name'     => $this->last_name,
-            'email'         => $this->email,
-            'confirmed'     => $this->confirmed,
-            'role'          => optional($this->roles()->first())->name,
-            'registered_at' => $this->created_at->toIso8601String(),
+            'id'              => $this->id,
+            'first_name'      => $this->first_name,
+            'last_name'       => $this->last_name,
+            'email'           => $this->email,
+            'confirmed'       => $this->confirmed,
+            'role'            => optional($this->roles()->first())->name,
+            'registered_at'   => $this->created_at->toIso8601String(),
             'last_updated_at' => $this->updated_at->toIso8601String(),
-            
-            
+
         ];
     }
 }

app/Repositories/Backend/Access/User/UserRepository.php

@@ -137,7 +137,7 @@ class UserRepository extends BaseRepository
         $data = $request->except('assignees_roles', 'permissions');
         $roles = $request->get('assignees_roles');
         $permissions = $request->get('permissions');
-       
+
         $this->checkUserByEmail($data, $user);
 
         DB::transaction(function () use ($user, $data, $roles, $permissions) {

routes/api.php

@@ -33,7 +33,7 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio
 
         // Roles
         Route::resource('roles', 'RolesController');
-         // Permission
+        // Permission
         Route::resource('permission', 'PermissionController');
     });
 });