Skip to content

Commit

Permalink
Merge pull request #54 from jeremykenedy/analysis-zEwZKA
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
jeremykenedy authored May 28, 2019
2 parents d71dc1e + ebbdf2e commit 8dcb76e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
10 changes: 3 additions & 7 deletions src/App/Http/Controllers/Api/LaravelRolesApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
namespace jeremykenedy\LaravelRoles\App\Http\Controllers\Api;

use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use jeremykenedy\LaravelRoles\App\Http\Requests\StoreRoleRequest;
use jeremykenedy\LaravelRoles\App\Http\Requests\UpdateRoleRequest;
use jeremykenedy\LaravelRoles\App\Services\RoleFormFields;
use jeremykenedy\LaravelRoles\Traits\RolesAndPermissionsHelpersTrait;
use jeremykenedy\LaravelRoles\Traits\RolesUsageAuthTrait;

Expand Down Expand Up @@ -39,9 +36,9 @@ public function index()
*/
public function store(StoreRoleRequest $request)
{
$roleData = $request->roleFillData();
$rolePermissions = $request->get('permissions');
$role = $this->storeRoleWithPermissions($roleData, $rolePermissions);
$roleData = $request->roleFillData();
$rolePermissions = $request->get('permissions');
$role = $this->storeRoleWithPermissions($roleData, $rolePermissions);

return response()->json([
'code' => 201,
Expand All @@ -50,5 +47,4 @@ public function store(StoreRoleRequest $request)
'role' => $role,
], 201);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public function index()
*/
public function show($id)
{
$item = $this->getDeletedPermissionAndDetails($id);
$typeDeleted = 'deleted';
$item = $this->getDeletedPermissionAndDetails($id);
$typeDeleted = 'deleted';

return view('laravelroles::laravelroles.crud.permissions.show', compact('item', 'typeDeleted'));
}
Expand Down
16 changes: 8 additions & 8 deletions src/Traits/RolesAndPermissionsHelpersTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ public function getRolePermissionsIds($id)
/**
* Gets the role users.
*
* @param int $roleId The role identifier
* @param int $roleId The role identifier
*
* @return array The role users.
* @return array The role users.
*/
public function getRoleUsers($roleId)
{
Expand All @@ -387,25 +387,25 @@ public function getRoleUsers($roleId)
/**
* Gets the deleted permission and details (Roles and Users).
*
* @param int $id The identifier
* @param int $id The identifier
*
* @return Permission The permission and details.
*/
public function getDeletedPermissionAndDetails($id)
{
$permission = $this->getDeletedPermission($id);
$users = $this->getAllUsersForPermission($permission);
$permission['users'] = $users;
$permission = $this->getDeletedPermission($id);
$users = $this->getAllUsersForPermission($permission);
$permission['users'] = $users;

return $permission;
}

/**
* Gets all users for permission.
*
* @param collection $permission The permission
* @param collection $permission The permission
*
* @return collection All users for permission.
* @return collection All users for permission.
*/
public function getAllUsersForPermission($permission)
{
Expand Down

0 comments on commit 8dcb76e

Please sign in to comment.