From ff01448d9b780967c67686f3175ee195d36ae184 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Tue, 5 Jan 2021 07:43:25 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../Controllers/Auth/ActivateController.php | 1 - .../Controllers/Auth/RegisterController.php | 3 +- app/Http/Controllers/Controller.php | 4 +- app/Http/Controllers/ProfilesController.php | 18 +++++--- app/Http/Controllers/TasksController.php | 1 - .../ThemesManagementController.php | 6 ++- .../Controllers/UsersManagementController.php | 41 ++++++++++--------- app/Http/Middleware/Authenticate.php | 3 -- app/Mail/ExceptionOccured.php | 3 +- app/Models/Theme.php | 3 +- app/Providers/ComposerServiceProvider.php | 15 ++++--- config/debugbar.php | 2 +- routes/web.php | 3 +- 13 files changed, 60 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/Auth/ActivateController.php b/app/Http/Controllers/Auth/ActivateController.php index 573f27a..0629a2c 100755 --- a/app/Http/Controllers/Auth/ActivateController.php +++ b/app/Http/Controllers/Auth/ActivateController.php @@ -5,7 +5,6 @@ use App\Http\Controllers\Controller; use App\Models\Activation; use App\Models\Profile; -use App\Models\User; use App\Traits\ActivationTrait; use App\Traits\CaptureIpTrait; use Auth; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index e969371..49282dc 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -62,7 +62,8 @@ protected function validator(array $data) $data['captcha'] = true; } - return Validator::make($data, + return Validator::make( + $data, [ 'name' => 'required|max:255|unique:users', 'first_name' => '', diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index a0a2a8a..ce1176d 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -9,5 +9,7 @@ class Controller extends BaseController { - use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + use AuthorizesRequests; + use DispatchesJobs; + use ValidatesRequests; } diff --git a/app/Http/Controllers/ProfilesController.php b/app/Http/Controllers/ProfilesController.php index 428b1df..4af22ac 100755 --- a/app/Http/Controllers/ProfilesController.php +++ b/app/Http/Controllers/ProfilesController.php @@ -171,7 +171,8 @@ public function update($username, Request $request) if ($profile_validator->fails()) { $this->throwValidationException( - $request, $profile_validator + $request, + $profile_validator ); return redirect('profile/'.$user->name.'/edit')->withErrors($validator)->withInput(); @@ -257,7 +258,8 @@ public function updateUserAccount(Request $request, $id) if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); } @@ -290,7 +292,8 @@ public function updateUserPassword(Request $request, $id) $user = User::findOrFail($id); $ipAddress = new CaptureIpTrait(); - $validator = Validator::make($request->all(), + $validator = Validator::make( + $request->all(), [ 'password' => 'required|min:6|max:20|confirmed', 'password_confirmation' => 'required|same:password', @@ -304,7 +307,8 @@ public function updateUserPassword(Request $request, $id) if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); } @@ -426,7 +430,8 @@ public function deleteUserAccount(Request $request, $id) $user = User::findOrFail($id); $ipAddress = new CaptureIpTrait(); - $validator = Validator::make($request->all(), + $validator = Validator::make( + $request->all(), [ 'checkConfirmDelete' => 'required', ], @@ -437,7 +442,8 @@ public function deleteUserAccount(Request $request, $id) if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); } diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php index f67049d..8a77c46 100755 --- a/app/Http/Controllers/TasksController.php +++ b/app/Http/Controllers/TasksController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Models\Task; -use App\Models\User; use Auth; use Illuminate\Http\Request; use Illuminate\View\View; diff --git a/app/Http/Controllers/ThemesManagementController.php b/app/Http/Controllers/ThemesManagementController.php index 8e30179..fa6349e 100755 --- a/app/Http/Controllers/ThemesManagementController.php +++ b/app/Http/Controllers/ThemesManagementController.php @@ -59,7 +59,8 @@ public function store(Request $request) if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); return redirect('themes/create')->withErrors($validator)->withInput(); @@ -152,7 +153,8 @@ public function update(Request $request, $id) if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); return redirect('themes/'.$theme->id.'/edit')->withErrors($validator)->withInput(); diff --git a/app/Http/Controllers/UsersManagementController.php b/app/Http/Controllers/UsersManagementController.php index 7d22ed5..1306ec0 100755 --- a/app/Http/Controllers/UsersManagementController.php +++ b/app/Http/Controllers/UsersManagementController.php @@ -60,7 +60,8 @@ public function create() */ public function store(Request $request) { - $validator = Validator::make($request->all(), + $validator = Validator::make( + $request->all(), [ 'name' => 'required|max:255|unique:users', 'first_name' => '', @@ -86,22 +87,23 @@ public function store(Request $request) if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); } else { $ipAddress = new CaptureIpTrait(); $profile = new Profile(); $user = User::create([ - 'name' => $request->input('name'), - 'first_name' => $request->input('first_name'), - 'last_name' => $request->input('last_name'), - 'email' => $request->input('email'), - 'password' => bcrypt($request->input('password')), - 'token' => str_random(64), - 'admin_ip_address' => $ipAddress->getClientIp(), - 'activated' => 1, - ]); + 'name' => $request->input('name'), + 'first_name' => $request->input('first_name'), + 'last_name' => $request->input('last_name'), + 'email' => $request->input('email'), + 'password' => bcrypt($request->input('password')), + 'token' => str_random(64), + 'admin_ip_address' => $ipAddress->getClientIp(), + 'activated' => 1, + ]); $user->profile()->save($profile); $user->attachRole($request->input('role')); @@ -168,19 +170,20 @@ public function update(Request $request, $id) if ($emailCheck) { $validator = Validator::make($request->all(), [ - 'name' => 'required|max:255', - 'email' => 'email|max:255|unique:users', - 'password' => 'present|confirmed|min:6', - ]); + 'name' => 'required|max:255', + 'email' => 'email|max:255|unique:users', + 'password' => 'present|confirmed|min:6', + ]); } else { $validator = Validator::make($request->all(), [ - 'name' => 'required|max:255', - 'password' => 'nullable|confirmed|min:6', - ]); + 'name' => 'required|max:255', + 'password' => 'nullable|confirmed|min:6', + ]); } if ($validator->fails()) { $this->throwValidationException( - $request, $validator + $request, + $validator ); } else { $user->name = $request->input('name'); diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 68ec05a..49a3cdf 100755 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -35,10 +35,7 @@ public function __construct(Guard $auth) * * @param \Illuminate\Http\Request $request * @param \Closure $next - * - * //////////////// * @param $role - * //////////////// * * @return mixed */ diff --git a/app/Mail/ExceptionOccured.php b/app/Mail/ExceptionOccured.php index 6082eb4..4848789 100755 --- a/app/Mail/ExceptionOccured.php +++ b/app/Mail/ExceptionOccured.php @@ -8,7 +8,8 @@ class ExceptionOccured extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; private $content; diff --git a/app/Models/Theme.php b/app/Models/Theme.php index 5e7c151..36e0154 100755 --- a/app/Models/Theme.php +++ b/app/Models/Theme.php @@ -64,7 +64,8 @@ public static function rules($id = 0, $merge = []) 'notes' => 'max:500', 'status' => 'required', ], - $merge); + $merge + ); } /** diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 8c6a74f..55f458b 100755 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -14,31 +14,36 @@ class ComposerServiceProvider extends ServiceProvider */ public function boot() { - View::composer([ + View::composer( + [ '*', ], 'App\Http\ViewComposers\ThemeComposer' ); - View::composer([ + View::composer( + [ '*', ], 'App\Http\ViewComposers\UsersComposer' ); - View::composer([ + View::composer( + [ '*', ], 'App\Http\Controllers\TasksController@getAllTasks' ); - View::composer([ + View::composer( + [ '*', ], 'App\Http\Controllers\TasksController@getCompleteTasks' ); - View::composer([ + View::composer( + [ '*', ], 'App\Http\Controllers\TasksController@getIncompleteTasks' diff --git a/config/debugbar.php b/config/debugbar.php index 2a5b569..9889462 100755 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -2,7 +2,7 @@ return [ - /* + /* * Environment to show the debug bar on. */ 'enabled_environment' => env('DEBUG_BAR_ENVIRONMENT'), diff --git a/routes/web.php b/routes/web.php index 6b5479a..e1226f2 100755 --- a/routes/web.php +++ b/routes/web.php @@ -73,7 +73,8 @@ // User Profile and Account Routes Route::resource( 'profile', - 'ProfilesController', [ + 'ProfilesController', + [ 'only' => [ 'account', 'show',