@@ -35,15 +35,15 @@ |
||
| 35 | 35 | $fromSender = config('exceptions.emailExceptionFrom'); |
| 36 | 36 | $subject = config('exceptions.emailExceptionSubject'); |
| 37 | 37 | |
| 38 | - if ($emailsTo[0] == null) { |
|
| 38 | + if ($emailsTo[ 0 ] == null) { |
|
| 39 | 39 | $emailsTo = config('exceptions.emailExceptionsToDefault'); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - if ($ccEmails[0] == null) { |
|
| 42 | + if ($ccEmails[ 0 ] == null) { |
|
| 43 | 43 | $ccEmails = config('exceptions.emailExceptionCCtoDefault'); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - if ($bccEmails[0] == null) { |
|
| 46 | + if ($bccEmails[ 0 ] == null) { |
|
| 47 | 47 | $bccEmails = config('exceptions.emailExceptionBCCtoDefault'); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | * |
| 26 | 26 | * @var array |
| 27 | 27 | */ |
| 28 | - protected $guarded = ['id']; |
|
| 28 | + protected $guarded = [ 'id' ]; |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * The attributes that are mass assignable. |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | public function password(PasswordRequest $request) |
| 48 | 48 | { |
| 49 | - auth()->user()->update(['password' => Hash::make($request->get('password'))]); |
|
| 49 | + auth()->user()->update([ 'password' => Hash::make($request->get('password')) ]); |
|
| 50 | 50 | |
| 51 | 51 | return back()->withPasswordStatus(__('Password successfully updated.')); |
| 52 | 52 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function store(UserRequest $request, User $model) |
| 51 | 51 | { |
| 52 | - $newUser = $model->create($request->merge(['password' => Hash::make($request->get('password'))])->all()); |
|
| 52 | + $newUser = $model->create($request->merge([ 'password' => Hash::make($request->get('password')) ])->all()); |
|
| 53 | 53 | $role = config('roles.models.role')::find($request->role); |
| 54 | 54 | $newUser->attachRole($role); |
| 55 | 55 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function edit(User $user) |
| 67 | 67 | { |
| 68 | - $roles = []; |
|
| 68 | + $roles = [ ]; |
|
| 69 | 69 | $currentRole = ''; |
| 70 | 70 | $roles = config('roles.models.role')::all(); |
| 71 | 71 | |
@@ -93,8 +93,8 @@ discard block |
||
| 93 | 93 | public function update(UserRequest $request, User $user) |
| 94 | 94 | { |
| 95 | 95 | $user->update( |
| 96 | - $request->merge(['password' => Hash::make($request->get('password'))]) |
|
| 97 | - ->except([$request->get('password') ? '' : 'password'] |
|
| 96 | + $request->merge([ 'password' => Hash::make($request->get('password')) ]) |
|
| 97 | + ->except([ $request->get('password') ? '' : 'password' ] |
|
| 98 | 98 | )); |
| 99 | 99 | |
| 100 | 100 | $role = config('roles.models.role')::find($request->role); |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | protected function validator(array $data) |
| 51 | 51 | { |
| 52 | 52 | return Validator::make($data, [ |
| 53 | - 'name' => ['required', 'string', 'max:255'], |
|
| 54 | - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], |
|
| 55 | - 'password' => ['required', 'string', 'min:8', 'confirmed'], |
|
| 53 | + 'name' => [ 'required', 'string', 'max:255' ], |
|
| 54 | + 'email' => [ 'required', 'string', 'email', 'max:255', 'unique:users' ], |
|
| 55 | + 'password' => [ 'required', 'string', 'min:8', 'confirmed' ], |
|
| 56 | 56 | ]); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -66,9 +66,9 @@ discard block |
||
| 66 | 66 | protected function create(array $data) |
| 67 | 67 | { |
| 68 | 68 | return User::create([ |
| 69 | - 'name' => $data['name'], |
|
| 70 | - 'email' => $data['email'], |
|
| 71 | - 'password' => Hash::make($data['password']), |
|
| 69 | + 'name' => $data[ 'name' ], |
|
| 70 | + 'email' => $data[ 'email' ], |
|
| 71 | + 'password' => Hash::make($data[ 'password' ]), |
|
| 72 | 72 | ]); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -158,6 +158,6 @@ |
||
| 158 | 158 | |
| 159 | 159 | return redirect() |
| 160 | 160 | ->route('themes') |
| 161 | - ->withSuccess(trans('themes.theme_deleted', ['name' => $theme->name])); |
|
| 161 | + ->withSuccess(trans('themes.theme_deleted', [ 'name' => $theme->name ])); |
|
| 162 | 162 | } |
| 163 | 163 | } |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | public function rules() |
| 27 | 27 | { |
| 28 | 28 | return [ |
| 29 | - 'name' => ['required', 'min:3'], |
|
| 30 | - 'email' => ['required', 'email', Rule::unique((new User())->getTable())->ignore(auth()->id())], |
|
| 29 | + 'name' => [ 'required', 'min:3' ], |
|
| 30 | + 'email' => [ 'required', 'email', Rule::unique((new User())->getTable())->ignore(auth()->id()) ], |
|
| 31 | 31 | ]; |
| 32 | 32 | } |
| 33 | 33 | } |
@@ -25,9 +25,9 @@ |
||
| 25 | 25 | public function rules() |
| 26 | 26 | { |
| 27 | 27 | return [ |
| 28 | - 'old_password' => ['required', 'min:6', new CurrentPasswordCheckRule()], |
|
| 29 | - 'password' => ['required', 'min:6', 'confirmed', 'different:old_password'], |
|
| 30 | - 'password_confirmation' => ['required', 'min:6'], |
|
| 28 | + 'old_password' => [ 'required', 'min:6', new CurrentPasswordCheckRule() ], |
|
| 29 | + 'password' => [ 'required', 'min:6', 'confirmed', 'different:old_password' ], |
|
| 30 | + 'password_confirmation' => [ 'required', 'min:6' ], |
|
| 31 | 31 | ]; |
| 32 | 32 | } |
| 33 | 33 | |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | public static function getRandomTheme($theme) |
| 49 | 49 | { |
| 50 | 50 | $themes = collect(Theme::all()->pluck('id'))->toArray(); |
| 51 | - $themes = array_filter($themes, function ($v) use ($theme) { |
|
| 51 | + $themes = array_filter($themes, function($v) use ($theme) { |
|
| 52 | 52 | return $v != $theme->id; |
| 53 | 53 | }); |
| 54 | 54 | |