Skip to content

Commit 8dcb76e

Browse files
authored
Merge pull request #54 from jeremykenedy/analysis-zEwZKA
Apply fixes from StyleCI
2 parents d71dc1e + ebbdf2e commit 8dcb76e

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

src/App/Http/Controllers/Api/LaravelRolesApiController.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
namespace jeremykenedy\LaravelRoles\App\Http\Controllers\Api;
44

55
use App\Http\Controllers\Controller;
6-
use Illuminate\Http\Request;
76
use jeremykenedy\LaravelRoles\App\Http\Requests\StoreRoleRequest;
8-
use jeremykenedy\LaravelRoles\App\Http\Requests\UpdateRoleRequest;
9-
use jeremykenedy\LaravelRoles\App\Services\RoleFormFields;
107
use jeremykenedy\LaravelRoles\Traits\RolesAndPermissionsHelpersTrait;
118
use jeremykenedy\LaravelRoles\Traits\RolesUsageAuthTrait;
129

@@ -39,9 +36,9 @@ public function index()
3936
*/
4037
public function store(StoreRoleRequest $request)
4138
{
42-
$roleData = $request->roleFillData();
43-
$rolePermissions = $request->get('permissions');
44-
$role = $this->storeRoleWithPermissions($roleData, $rolePermissions);
39+
$roleData = $request->roleFillData();
40+
$rolePermissions = $request->get('permissions');
41+
$role = $this->storeRoleWithPermissions($roleData, $rolePermissions);
4542

4643
return response()->json([
4744
'code' => 201,
@@ -50,5 +47,4 @@ public function store(StoreRoleRequest $request)
5047
'role' => $role,
5148
], 201);
5249
}
53-
5450
}

src/App/Http/Controllers/LaravelpermissionsDeletedController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public function index()
3636
*/
3737
public function show($id)
3838
{
39-
$item = $this->getDeletedPermissionAndDetails($id);
40-
$typeDeleted = 'deleted';
39+
$item = $this->getDeletedPermissionAndDetails($id);
40+
$typeDeleted = 'deleted';
4141

4242
return view('laravelroles::laravelroles.crud.permissions.show', compact('item', 'typeDeleted'));
4343
}

src/Traits/RolesAndPermissionsHelpersTrait.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ public function getRolePermissionsIds($id)
360360
/**
361361
* Gets the role users.
362362
*
363-
* @param int $roleId The role identifier
363+
* @param int $roleId The role identifier
364364
*
365-
* @return array The role users.
365+
* @return array The role users.
366366
*/
367367
public function getRoleUsers($roleId)
368368
{
@@ -387,25 +387,25 @@ public function getRoleUsers($roleId)
387387
/**
388388
* Gets the deleted permission and details (Roles and Users).
389389
*
390-
* @param int $id The identifier
390+
* @param int $id The identifier
391391
*
392392
* @return Permission The permission and details.
393393
*/
394394
public function getDeletedPermissionAndDetails($id)
395395
{
396-
$permission = $this->getDeletedPermission($id);
397-
$users = $this->getAllUsersForPermission($permission);
398-
$permission['users'] = $users;
396+
$permission = $this->getDeletedPermission($id);
397+
$users = $this->getAllUsersForPermission($permission);
398+
$permission['users'] = $users;
399399

400400
return $permission;
401401
}
402402

403403
/**
404404
* Gets all users for permission.
405405
*
406-
* @param collection $permission The permission
406+
* @param collection $permission The permission
407407
*
408-
* @return collection All users for permission.
408+
* @return collection All users for permission.
409409
*/
410410
public function getAllUsersForPermission($permission)
411411
{

0 commit comments

Comments
 (0)