Skip to content

Commit d8218f5

Browse files
bvipulbvipul
authored
Merge branch 'develop' into develop
2 parents 124c718 + 371a28e commit d8218f5

File tree

6 files changed

+41
-40
lines changed

6 files changed

+41
-40
lines changed

‎app/Http/Controllers/Backend/Access/Role/RoleController.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
namespace App\Http\Controllers\Backend\Access\Role;
44

5-
use App\Models\Access\Role\Role;
65
use App\Http\Controllers\Controller;
7-
use App\Http\Responses\ViewResponse;
8-
use App\Http\Responses\RedirectResponse;
9-
use App\Http\Responses\Backend\Access\Role\EditResponse;
10-
use App\Repositories\Backend\Access\Role\RoleRepository;
11-
use App\Http\Requests\Backend\Access\Role\EditRoleRequest;
12-
use App\Http\Responses\Backend\Access\Role\CreateResponse;
13-
use App\Http\Requests\Backend\Access\Role\StoreRoleRequest;
146
use App\Http\Requests\Backend\Access\Role\CreateRoleRequest;
157
use App\Http\Requests\Backend\Access\Role\DeleteRoleRequest;
8+
use App\Http\Requests\Backend\Access\Role\EditRoleRequest;
169
use App\Http\Requests\Backend\Access\Role\ManageRoleRequest;
10+
use App\Http\Requests\Backend\Access\Role\StoreRoleRequest;
1711
use App\Http\Requests\Backend\Access\Role\UpdateRoleRequest;
12+
use App\Http\Responses\Backend\Access\Role\CreateResponse;
13+
use App\Http\Responses\Backend\Access\Role\EditResponse;
14+
use App\Http\Responses\RedirectResponse;
15+
use App\Http\Responses\ViewResponse;
16+
use App\Models\Access\Role\Role;
1817
use App\Repositories\Backend\Access\Permission\PermissionRepository;
18+
use App\Repositories\Backend\Access\Role\RoleRepository;
1919

2020
/**
2121
* Class RoleController.
@@ -33,8 +33,8 @@ class RoleController extends Controller
3333
protected $permissions;
3434

3535
/**
36-
* @param \App\Repositories\Backend\Access\Role\RoleRepository $roles
37-
* @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
36+
* @param \App\Repositories\Backend\Access\Role\RoleRepository $roles
37+
* @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
3838
*/
3939
public function __construct(RoleRepository $roles, PermissionRepository $permissions)
4040
{
@@ -75,8 +75,8 @@ public function store(StoreRoleRequest $request)
7575
}
7676

7777
/**
78-
* @param \App\Models\Access\Role\Role $role
79-
* @param \App\Http\Requests\Backend\Access\Role\EditRoleRequest $request
78+
* @param \App\Models\Access\Role\Role $role
79+
* @param \App\Http\Requests\Backend\Access\Role\EditRoleRequest $request
8080
*
8181
* @return \App\Http\Responses\Backend\Access\Role\EditResponse
8282
*/
@@ -86,8 +86,8 @@ public function edit(Role $role, EditRoleRequest $request)
8686
}
8787

8888
/**
89-
* @param \App\Models\Access\Role\Role $role
90-
* @param \App\Http\Requests\Backend\Access\Role\UpdateRoleRequest $request
89+
* @param \App\Models\Access\Role\Role $role
90+
* @param \App\Http\Requests\Backend\Access\Role\UpdateRoleRequest $request
9191
*
9292
* @return \App\Http\Responses\RedirectResponse
9393
*/
@@ -99,8 +99,8 @@ public function update(Role $role, UpdateRoleRequest $request)
9999
}
100100

101101
/**
102-
* @param \App\Models\Access\Role\Role $role
103-
* @param \App\Http\Requests\Backend\Access\Role\DeleteRoleRequest $request
102+
* @param \App\Models\Access\Role\Role $role
103+
* @param \App\Http\Requests\Backend\Access\Role\DeleteRoleRequest $request
104104
*
105105
* @return \App\Http\Responses\RedirectResponse
106106
*/

‎app/Http/Controllers/Backend/Access/User/UserController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
namespace App\Http\Controllers\Backend\Access\User;
44

5-
use App\Models\Access\User\User;
65
use App\Http\Controllers\Controller;
7-
use App\Http\Responses\ViewResponse;
8-
use App\Http\Responses\RedirectResponse;
9-
use App\Models\Access\Permission\Permission;
10-
use App\Http\Responses\Backend\Access\User\EditResponse;
11-
use App\Http\Responses\Backend\Access\User\ShowResponse;
12-
use App\Repositories\Backend\Access\Role\RoleRepository;
13-
use App\Repositories\Backend\Access\User\UserRepository;
14-
use App\Http\Requests\Backend\Access\User\EditUserRequest;
15-
use App\Http\Requests\Backend\Access\User\ShowUserRequest;
16-
use App\Http\Responses\Backend\Access\User\CreateResponse;
17-
use App\Http\Requests\Backend\Access\User\StoreUserRequest;
186
use App\Http\Requests\Backend\Access\User\CreateUserRequest;
197
use App\Http\Requests\Backend\Access\User\DeleteUserRequest;
8+
use App\Http\Requests\Backend\Access\User\EditUserRequest;
209
use App\Http\Requests\Backend\Access\User\ManageUserRequest;
10+
use App\Http\Requests\Backend\Access\User\ShowUserRequest;
11+
use App\Http\Requests\Backend\Access\User\StoreUserRequest;
2112
use App\Http\Requests\Backend\Access\User\UpdateUserRequest;
13+
use App\Http\Responses\Backend\Access\User\CreateResponse;
14+
use App\Http\Responses\Backend\Access\User\EditResponse;
15+
use App\Http\Responses\Backend\Access\User\ShowResponse;
16+
use App\Http\Responses\RedirectResponse;
17+
use App\Http\Responses\ViewResponse;
18+
use App\Models\Access\Permission\Permission;
19+
use App\Models\Access\User\User;
20+
use App\Repositories\Backend\Access\Role\RoleRepository;
21+
use App\Repositories\Backend\Access\User\UserRepository;
2222

2323
/**
2424
* Class UserController.

‎app/Http/Responses/Backend/Access/Role/CreateResponse.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class CreateResponse implements Responsable
1717
protected $permissions;
1818

1919
/**
20-
* @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
21-
* @param \App\Repositories\Backend\Access\Role\RoleRepository $roles
20+
* @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
21+
* @param \App\Repositories\Backend\Access\Role\RoleRepository $roles
2222
*/
2323
public function __construct($permissions, $roles)
2424
{

‎app/Http/Responses/Backend/Access/Role/EditResponse.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class EditResponse implements Responsable
1717
protected $permissions;
1818

1919
/**
20-
* @param \App\Models\Access\Role\Role $role
21-
* @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
20+
* @param \App\Models\Access\Role\Role $role
21+
* @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
2222
*/
2323
public function __construct($role, $permissions)
2424
{
@@ -27,9 +27,10 @@ public function __construct($role, $permissions)
2727
}
2828

2929
/**
30-
* toReponse
30+
* toReponse.
3131
*
3232
* @param \Illuminate\Http\Request $request
33+
*
3334
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
3435
*/
3536
public function toResponse($request)

‎app/Http/Responses/Backend/Access/User/EditResponse.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ public function __construct($user, $roles, $permissions)
3232
}
3333

3434
/**
35-
* toReponse
35+
* toReponse.
3636
*
3737
* @param \Illuminate\Http\Request $request
38+
*
3839
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
3940
*/
4041
public function toResponse($request)

‎app/Http/Responses/ViewResponse.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
class ViewResponse implements Responsable
88
{
99
/**
10-
* @var String
10+
* @var string
1111
*/
1212
protected $view;
1313

1414
/**
15-
* @var Array
15+
* @var array
1616
*/
1717
protected $with;
1818

1919
/**
20-
* @param String $view
21-
* @param Array $with
20+
* @param string $view
21+
* @param array $with
2222
*/
2323
public function __construct($view, $with = [])
2424
{
@@ -35,8 +35,7 @@ public function __construct($view, $with = [])
3535
*/
3636
public function toResponse($request)
3737
{
38-
if (!empty($this->with))
39-
{
38+
if (!empty($this->with)) {
4039
return view($this->view)->with($this->with);
4140
}
4241

0 commit comments

Comments
 (0)