Merge branch 'develop' into develop

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

@@ -2,20 +2,20 @@
 
 namespace App\Http\Controllers\Backend\Access\Role;
 
-use App\Models\Access\Role\Role;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\Backend\Access\Role\EditResponse;
-use App\Repositories\Backend\Access\Role\RoleRepository;
-use App\Http\Requests\Backend\Access\Role\EditRoleRequest;
-use App\Http\Responses\Backend\Access\Role\CreateResponse;
-use App\Http\Requests\Backend\Access\Role\StoreRoleRequest;
 use App\Http\Requests\Backend\Access\Role\CreateRoleRequest;
 use App\Http\Requests\Backend\Access\Role\DeleteRoleRequest;
+use App\Http\Requests\Backend\Access\Role\EditRoleRequest;
 use App\Http\Requests\Backend\Access\Role\ManageRoleRequest;
+use App\Http\Requests\Backend\Access\Role\StoreRoleRequest;
 use App\Http\Requests\Backend\Access\Role\UpdateRoleRequest;
+use App\Http\Responses\Backend\Access\Role\CreateResponse;
+use App\Http\Responses\Backend\Access\Role\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\Access\Role\Role;
 use App\Repositories\Backend\Access\Permission\PermissionRepository;
+use App\Repositories\Backend\Access\Role\RoleRepository;
 
 /**
  * Class RoleController.
@@ -33,8 +33,8 @@ class RoleController extends Controller
     protected $permissions;
 
     /**
-     * @param \App\Repositories\Backend\Access\Role\RoleRepository              $roles
-     * @param \App\Repositories\Backend\Access\Permission\PermissionRepository  $permissions
+     * @param \App\Repositories\Backend\Access\Role\RoleRepository             $roles
+     * @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
      */
     public function __construct(RoleRepository $roles, PermissionRepository $permissions)
     {
@@ -75,8 +75,8 @@ class RoleController extends Controller
     }
 
     /**
-     * @param \App\Models\Access\Role\Role                              $role
-     * @param \App\Http\Requests\Backend\Access\Role\EditRoleRequest    $request
+     * @param \App\Models\Access\Role\Role                           $role
+     * @param \App\Http\Requests\Backend\Access\Role\EditRoleRequest $request
      *
      * @return \App\Http\Responses\Backend\Access\Role\EditResponse
      */
@@ -86,8 +86,8 @@ class RoleController extends Controller
     }
 
     /**
-     * @param \App\Models\Access\Role\Role                              $role
-     * @param \App\Http\Requests\Backend\Access\Role\UpdateRoleRequest  $request
+     * @param \App\Models\Access\Role\Role                             $role
+     * @param \App\Http\Requests\Backend\Access\Role\UpdateRoleRequest $request
      *
      * @return \App\Http\Responses\RedirectResponse
      */
@@ -99,8 +99,8 @@ class RoleController extends Controller
     }
 
     /**
-     * @param \App\Models\Access\Role\Role                              $role
-     * @param \App\Http\Requests\Backend\Access\Role\DeleteRoleRequest  $request
+     * @param \App\Models\Access\Role\Role                             $role
+     * @param \App\Http\Requests\Backend\Access\Role\DeleteRoleRequest $request
      *
      * @return \App\Http\Responses\RedirectResponse
      */

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

@@ -2,23 +2,23 @@
 
 namespace App\Http\Controllers\Backend\Access\User;
 
-use App\Models\Access\User\User;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Models\Access\Permission\Permission;
-use App\Http\Responses\Backend\Access\User\EditResponse;
-use App\Http\Responses\Backend\Access\User\ShowResponse;
-use App\Repositories\Backend\Access\Role\RoleRepository;
-use App\Repositories\Backend\Access\User\UserRepository;
-use App\Http\Requests\Backend\Access\User\EditUserRequest;
-use App\Http\Requests\Backend\Access\User\ShowUserRequest;
-use App\Http\Responses\Backend\Access\User\CreateResponse;
-use App\Http\Requests\Backend\Access\User\StoreUserRequest;
 use App\Http\Requests\Backend\Access\User\CreateUserRequest;
 use App\Http\Requests\Backend\Access\User\DeleteUserRequest;
+use App\Http\Requests\Backend\Access\User\EditUserRequest;
 use App\Http\Requests\Backend\Access\User\ManageUserRequest;
+use App\Http\Requests\Backend\Access\User\ShowUserRequest;
+use App\Http\Requests\Backend\Access\User\StoreUserRequest;
 use App\Http\Requests\Backend\Access\User\UpdateUserRequest;
+use App\Http\Responses\Backend\Access\User\CreateResponse;
+use App\Http\Responses\Backend\Access\User\EditResponse;
+use App\Http\Responses\Backend\Access\User\ShowResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\Access\Permission\Permission;
+use App\Models\Access\User\User;
+use App\Repositories\Backend\Access\Role\RoleRepository;
+use App\Repositories\Backend\Access\User\UserRepository;
 
 /**
  * Class UserController.

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

@@ -17,8 +17,8 @@ class CreateResponse implements Responsable
     protected $permissions;
 
     /**
-     * @param \App\Repositories\Backend\Access\Permission\PermissionRepository  $permissions
-     * @param \App\Repositories\Backend\Access\Role\RoleRepository              $roles
+     * @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
+     * @param \App\Repositories\Backend\Access\Role\RoleRepository             $roles
      */
     public function __construct($permissions, $roles)
     {

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

@@ -17,8 +17,8 @@ class EditResponse implements Responsable
     protected $permissions;
 
     /**
-     * @param \App\Models\Access\Role\Role                                      $role
-     * @param \App\Repositories\Backend\Access\Permission\PermissionRepository  $permissions
+     * @param \App\Models\Access\Role\Role                                     $role
+     * @param \App\Repositories\Backend\Access\Permission\PermissionRepository $permissions
      */
     public function __construct($role, $permissions)
     {
@@ -27,9 +27,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

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

@@ -32,9 +32,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/ViewResponse.php

@@ -7,18 +7,18 @@ use Illuminate\Contracts\Support\Responsable;
 class ViewResponse implements Responsable
 {
     /**
-     * @var String
+     * @var string
      */
     protected $view;
 
     /**
-     * @var Array
+     * @var array
      */
     protected $with;
 
     /**
-     * @param String    $view
-     * @param Array     $with
+     * @param string $view
+     * @param array  $with
      */
     public function __construct($view, $with = [])
     {
@@ -35,8 +35,7 @@ class ViewResponse implements Responsable
      */
     public function toResponse($request)
     {
-        if (!empty($this->with))
-        {
+        if (!empty($this->with)) {
             return view($this->view)->with($this->with);
         }