Apply fixes from StyleCI

[ci skip] [skip ci]
laravolt · Jan 11, 2020 · 08f5faa · 08f5faa
1 parent ee122c3
commit 08f5faa
Show file tree

Hide file tree

Showing 25 changed files with 91 additions and 70 deletions.
diff --git a/resources/lang/en/label.php b/resources/lang/en/label.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'roles'                    => 'Roles',
     'users'                    => 'Users',

diff --git a/resources/lang/en/menu.php b/resources/lang/en/menu.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'epicentrum' => 'User Management',
     'account'    => 'Account',

diff --git a/resources/lang/id/label.php b/resources/lang/id/label.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'roles'                    => 'Roles',
     'permissions'              => 'Hak Akses',

diff --git a/resources/lang/id/menu.php b/resources/lang/id/menu.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'epicentrum' => 'Manajemen User',
     'account'    => 'Akun',

diff --git a/resources/lang/id/users.php b/resources/lang/id/users.php
@@ -17,7 +17,7 @@
     'pages'                              => [
         'index' => [
             'header' => 'Manage Users',
-        ]
+        ],
     ],
     'send_account_information_via_email' => 'Kirim informasi akun dan password via email',
     'change_password_on_first_login'     => 'Paksa untuk ganti password ketika pertama kali login',

diff --git a/routes/web.php b/routes/web.php
@@ -21,7 +21,7 @@ function ($router) {
 
         $router
             ->namespace('User')
-            ->middleware('can:' . \Laravolt\Platform\Enums\Permission::MANAGE_USER)
+            ->middleware('can:'.\Laravolt\Platform\Enums\Permission::MANAGE_USER)
             ->group(function ($router) {
                 $router->resource('users', 'UserController');
                 $router->resource('account', 'AccountController')->only('edit', 'update');
@@ -31,14 +31,14 @@ function ($router) {
             });
 
         $router
-            ->middleware('can:' . \Laravolt\Platform\Enums\Permission::MANAGE_ROLE)
+            ->middleware('can:'.\Laravolt\Platform\Enums\Permission::MANAGE_ROLE)
             ->resource('roles', 'RoleController');
 
         $router
-            ->middleware('can:' . \Laravolt\Platform\Enums\Permission::MANAGE_PERMISSION)
+            ->middleware('can:'.\Laravolt\Platform\Enums\Permission::MANAGE_PERMISSION)
             ->group(function ($router) {
-                $router->get('permissions', ['uses' => "PermissionController@edit", 'as' => 'permissions.edit']);
-                $router->put('permissions', ['uses' => "PermissionController@update", 'as' => 'permissions.update']);
+                $router->get('permissions', ['uses' => 'PermissionController@edit', 'as' => 'permissions.edit']);
+                $router->put('permissions', ['uses' => 'PermissionController@update', 'as' => 'permissions.update']);
             });
     }
 );
diff --git a/src/Epicentrum/Console/Commands/ManageRole.php b/src/Epicentrum/Console/Commands/ManageRole.php
@@ -37,7 +37,6 @@ public function handle()
         if ($role) {
             $this->chooseAction($role);
         }
-
     }
 
     protected function validateRole($identifier)
@@ -52,7 +51,7 @@ protected function validateRole($identifier)
             $role = app('laravolt.epicentrum.role')->whereName($identifier)->first();
         }
 
-        if(!$role) {
+        if (!$role) {
             $createNew = $this->confirm('Role not found, do you want to create a new role named '.$identifier);
 
             if ($createNew) {
@@ -91,6 +90,5 @@ protected function actionChangePermission($role)
 
     protected function actionChangePassword()
     {
-
     }
 }
diff --git a/src/Epicentrum/Http/Controllers/My/PasswordController.php b/src/Epicentrum/Http/Controllers/My/PasswordController.php
@@ -20,6 +20,7 @@ class PasswordController extends Controller
 
     /**
      * PasswordController constructor.
+     *
      * @param UserRepositoryEloquent $repository
      */
     public function __construct(RepositoryInterface $repository)
@@ -31,7 +32,8 @@ public function __construct(RepositoryInterface $repository)
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit()
@@ -45,10 +47,10 @@ public function update(Update $request)
     {
         if (app('hash')->check($request->password_current, auth()->user()->password)) {
             auth()->user()->setPassword($request->password);
+
             return redirect()->back()->withSuccess(trans('laravolt::message.password_updated'));
         } else {
             return redirect()->back()->withError(trans('laravolt::message.current_password_mismatch'));
         }
-
     }
 }
diff --git a/src/Epicentrum/Http/Controllers/My/ProfileController.php b/src/Epicentrum/Http/Controllers/My/ProfileController.php
@@ -20,7 +20,7 @@ class ProfileController extends Controller
      * PasswordController constructor.
      *
      * @param RepositoryInterface $repository
-     * @param TimezoneRepository $timezone
+     * @param TimezoneRepository  $timezone
      */
     public function __construct(RepositoryInterface $repository, TimezoneRepository $timezone)
     {
@@ -30,6 +30,7 @@ public function __construct(RepositoryInterface $repository, TimezoneRepository
 
     /**
      * Show the form for editing the specified resource.
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit()

diff --git a/src/Epicentrum/Http/Controllers/RoleController.php b/src/Epicentrum/Http/Controllers/RoleController.php
@@ -17,7 +17,8 @@ class RoleController extends Controller
 
     /**
      * UserController constructor.
-     * @param  RoleRepository  $repository
+     *
+     * @param RoleRepository $repository
      */
     public function __construct(RoleRepositoryInterface $repository)
     {
@@ -51,7 +52,8 @@ public function create()
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Store $request)
@@ -69,7 +71,8 @@ public function show($id)
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit($id)
@@ -84,8 +87,9 @@ public function edit($id)
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  int                      $id
+     * @param \Illuminate\Http\Request $request
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Update $request, $id)
@@ -98,7 +102,8 @@ public function update(Update $request, $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy($id)

diff --git a/src/Epicentrum/Http/Controllers/User/AccountController.php b/src/Epicentrum/Http/Controllers/User/AccountController.php
@@ -9,7 +9,8 @@ class AccountController extends UserController
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit($id)
@@ -27,8 +28,9 @@ public function edit($id)
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  int $id
+     * @param \Illuminate\Http\Request $request
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Update $request, $id)

diff --git a/src/Epicentrum/Http/Controllers/User/Password/PasswordController.php b/src/Epicentrum/Http/Controllers/User/Password/PasswordController.php
@@ -14,7 +14,8 @@ class PasswordController extends Controller
 
     /**
      * PasswordController constructor.
-     * @param  UserRepositoryEloquent  $repository
+     *
+     * @param UserRepositoryEloquent $repository
      */
     public function __construct(RepositoryInterface $repository)
     {
@@ -24,7 +25,8 @@ public function __construct(RepositoryInterface $repository)
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit($id)

diff --git a/src/Epicentrum/Http/Controllers/User/UserController.php b/src/Epicentrum/Http/Controllers/User/UserController.php
@@ -5,13 +5,13 @@
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Mail;
 use Laravolt\Epicentrum\Contracts\Requests\Account\Delete;
 use Laravolt\Epicentrum\Contracts\Requests\Account\Store;
 use Laravolt\Epicentrum\Mail\AccountInformation;
 use Laravolt\Epicentrum\Repositories\RepositoryInterface;
-use Illuminate\Support\Facades\Mail;
-use Laravolt\Support\Contracts\TimezoneRepository;
 use Laravolt\Suitable\TableView;
+use Laravolt\Support\Contracts\TimezoneRepository;
 
 class UserController extends Controller
 {
@@ -27,8 +27,9 @@ class UserController extends Controller
 
     /**
      * UserController constructor.
-     * @param  UserRepositoryEloquent  $repository
-     * @param  TimezoneRepositoryArray  $timezone
+     *
+     * @param UserRepositoryEloquent  $repository
+     * @param TimezoneRepositoryArray $timezone
      */
     public function __construct(RepositoryInterface $repository, TimezoneRepository $timezone)
     {
@@ -39,8 +40,9 @@ public function __construct(RepositoryInterface $repository, TimezoneRepository
     /**
      * Display a listing of the resource.
      *
-     * @return Response
      * @throws \Exception
+     *
+     * @return Response
      */
     public function index(Request $request)
     {
@@ -71,7 +73,8 @@ public function create()
     /**
      * Store the specified resource.
      *
-     * @param  Store  $request
+     * @param Store $request
+     *
      * @return Response
      */
     public function store(Store $request)
@@ -92,7 +95,8 @@ public function store(Store $request)
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return Response
      */
     public function edit($id)

diff --git a/src/Epicentrum/Http/Requests/Account/Delete.php b/src/Epicentrum/Http/Requests/Account/Delete.php
@@ -8,6 +8,7 @@ class Delete extends FormRequest implements \Laravolt\Epicentrum\Contracts\Reque
 {
     /**
      * Determine if the user is authorized to make this request.
+     *
      * @return bool
      */
     public function authorize()
@@ -22,6 +23,7 @@ public function authorize()
 
     /**
      * Get the validation rules that apply to the request.
+     *
      * @return array
      */
     public function rules()

diff --git a/src/Epicentrum/Http/Requests/Account/Store.php b/src/Epicentrum/Http/Requests/Account/Store.php
@@ -27,7 +27,7 @@ public function rules()
             'name'     => 'required|max:255',
             'email'    => 'required|email|unique:users',
             'password' => 'required|min:6|max:255',
-            'status'   => 'required'
+            'status'   => 'required',
         ];
     }
 }
diff --git a/src/Epicentrum/Http/Requests/Account/Update.php b/src/Epicentrum/Http/Requests/Account/Update.php
@@ -25,12 +25,13 @@ public function authorize()
     public function rules()
     {
         $id = request()->route('account');
+
         return [
             'name'     => 'required|max:255',
             'email'    => [
                 'required',
                 'email',
-                Rule::unique(auth()->user()->getTable())->ignore($id)
+                Rule::unique(auth()->user()->getTable())->ignore($id),
             ],
             'status'   => 'required',
             'timezone' => 'required',

diff --git a/src/Epicentrum/Http/Requests/AdminEditProfile.php b/src/Epicentrum/Http/Requests/AdminEditProfile.php
@@ -25,8 +25,8 @@ public function rules()
     {
         return [
             'name'   => 'required|max:255',
-            'email'  => 'required|email|unique:users,id,' . auth()->user()->getAuthIdentifier(),
-            'status' => 'required'
+            'email'  => 'required|email|unique:users,id,'.auth()->user()->getAuthIdentifier(),
+            'status' => 'required',
         ];
     }
 }
diff --git a/src/Epicentrum/Http/Requests/My/Profile/Update.php b/src/Epicentrum/Http/Requests/My/Profile/Update.php
@@ -8,6 +8,7 @@ class Update extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
+     *
      * @return bool
      */
     public function authorize()
@@ -17,6 +18,7 @@ public function authorize()
 
     /**
      * Get the validation rules that apply to the request.
+     *
      * @return array
      */
     public function rules()

diff --git a/src/Epicentrum/Http/Requests/Role/Update.php b/src/Epicentrum/Http/Requests/Role/Update.php
@@ -3,7 +3,6 @@
 namespace Laravolt\Epicentrum\Http\Requests\Role;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class Update extends FormRequest
 {

diff --git a/src/Epicentrum/Mail/AccountInformation.php b/src/Epicentrum/Mail/AccountInformation.php
@@ -5,12 +5,11 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class AccountInformation extends Mailable
 {
-    use Queueable, SerializesModels;
-
+    use Queueable;
+    use SerializesModels;
     public $user;
 
     public $plainPassword;