Skip to content

Commit c2b186f

Browse files
jeremykenedyjeremykenedy
authored
Merge pull request #1 from jeremykenedy/analysis-YOoLdY
Apply fixes from StyleCI
2 parents 396154d + faadb51 commit c2b186f

29 files changed

+286
-290
lines changed

Diff for: ‎app/Http/Controllers/AuthController.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ class AuthController extends Controller
99
{
1010
public function Login(Request $request)
1111
{
12-
1312
$credentials = $request->validate([
14-
'email' => 'required|email',
15-
'password' => 'required'
13+
'email' => 'required|email',
14+
'password' => 'required',
1615
]);
1716

18-
if (!$this->guard()->attempt($credentials)) {
17+
if (! $this->guard()->attempt($credentials)) {
1918
return response()->json([
20-
'message' => 'The provided credentials are incorrect.'
19+
'message' => 'The provided credentials are incorrect.',
2120
], 401);
2221
}
2322
$this->guard()->attempt($credentials);
2423
$token = $this->guard()->user()->createToken('auth-token')->plainTextToken;
24+
2525
return response()->json([
2626
'access_token' => $token,
27-
'token_type' => 'Bearer',
27+
'token_type' => 'Bearer',
2828
], 200);
2929
}
3030

@@ -33,9 +33,10 @@ public function logout(Request $request)
3333
$user = $request->user();
3434
$user->tokens()->delete();
3535
$this->guard()->logout();
36+
3637
return response()->json([
3738
'status_code' => '200',
38-
'message' => 'logged out successfully'
39+
'message' => 'logged out successfully',
3940
]);
4041
}
4142

Diff for: ‎app/Http/Controllers/ForgotPasswordController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __invoke(Request $request)
1616
);
1717

1818
return response()->json([
19-
"message" => "If you've provided registered e-mail, you should get recovery e-mail shortly.",
19+
'message' => "If you've provided registered e-mail, you should get recovery e-mail shortly.",
2020
], 200);
2121
}
2222
}

Diff for: ‎app/Http/Controllers/PasswordController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ public function __invoke(Request $request)
1414
'password' => 'required|min:6|max:255|confirmed',
1515
]);
1616
$user->update(['password' => Hash::make($request->password)]);
17+
1718
return response()->json([
18-
'message' => 'Password Updated Successfully'
19+
'message' => 'Password Updated Successfully',
1920
], 200);
2021
}
2122
}

Diff for: ‎app/Http/Controllers/ProfileController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ public function __invoke(Request $request)
1212
$user = $request->user();
1313
$request->validate([
1414
'name' => 'required',
15-
'email' => 'required|email|unique:users,email,' . $user->id,
15+
'email' => 'required|email|unique:users,email,'.$user->id,
1616
'theme_dark' => 'boolean',
1717
]);
1818
$user->update($request->only('name', 'email', 'theme_dark'));
1919

2020
return response()->json([
2121
'user' => $user,
22-
'message' => 'profile updated successfully .'
22+
'message' => 'profile updated successfully .',
2323
], 200);
2424
}
2525
}

Diff for: ‎app/Http/Controllers/RegisterController.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function __invoke(Request $request)
1414
$data = $request->validate([
1515
'name' => 'required|min:3|max:255',
1616
'email' => 'required|email|unique:users,email',
17-
'password' => 'required|min:6|max:255|confirmed'
17+
'password' => 'required|min:6|max:255|confirmed',
1818
]);
1919

2020
$user = User::create([
@@ -26,10 +26,11 @@ public function __invoke(Request $request)
2626
if ($user) {
2727
event(new Registered($user));
2828
$token = $user->createToken('access_token')->plainTextToken;
29+
2930
return response()->json([
30-
"token" => $token ,
31-
"type" => "Bearer",
32-
"user" => $user,
31+
'token' => $token,
32+
'type' => 'Bearer',
33+
'user' => $user,
3334
]);
3435
}
3536
}

Diff for: ‎app/Http/Controllers/ResetPasswordController.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ class ResetPasswordController extends Controller
1313
public function __invoke(Request $request)
1414
{
1515
$request->validate([
16-
'token' => 'required',
17-
'email' => 'required|email',
16+
'token' => 'required',
17+
'email' => 'required|email',
1818
'password' => 'required|min:8|confirmed',
1919
]);
2020

2121
$status = Password::reset(
2222
$request->only('email', 'password', 'password_confirmation', 'token'),
23-
function ($user, $password) use ($request) {
23+
function ($user, $password) {
2424
$user->forceFill([
25-
'password' => Hash::make($password)
25+
'password' => Hash::make($password),
2626
])->setRememberToken(Str::random(60));
2727
$user->save();
2828
event(new PasswordReset($user));
2929
}
3030
);
3131

3232
return response()->json([
33-
"message" => "Password successfully reset!",
33+
'message' => 'Password successfully reset!',
3434
], 200);
3535
}
3636
}

Diff for: ‎app/Http/Controllers/UserController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class UserController extends Controller
1010

1111
public function __invoke(Request $request)
1212
{
13-
if(auth("sanctum")->check()){
14-
return response()->json(auth("sanctum")->user());
13+
if (auth('sanctum')->check()) {
14+
return response()->json(auth('sanctum')->user());
1515
}
1616
}
1717
}

Diff for: ‎app/Http/Controllers/VerificationController.php

+6-10
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,18 @@ class VerificationController extends Controller
1313
* Mark the authenticated user's email address as verified.
1414
*
1515
* @param \Illuminate\Http\Request $request
16-
*
1716
*/
18-
1917
public function verify(Request $request)
2018
{
2119
$user = User::findOrFail($request->route('id'));
2220

2321
if (
24-
!hash_equals((string) $request->route('id'), (string) $user->getKey())
25-
|| !hash_equals((string) $request->route('hash'), sha1($user->getEmailForVerification()))
22+
! hash_equals((string) $request->route('id'), (string) $user->getKey())
23+
|| ! hash_equals((string) $request->route('hash'), sha1($user->getEmailForVerification()))
2624
) {
27-
2825
return response()->json(['message' => 'Verification error ! Try again'], 500);
2926
}
3027

31-
3228
if ($user->hasVerifiedEmail()) {
3329
return response()->json(['message' => 'already verified !'], 200);
3430
}
@@ -40,27 +36,27 @@ public function verify(Request $request)
4036
return response()->json(['verified' => true]);
4137
}
4238

43-
4439
/**
4540
* Resend the email verification notification.
4641
*
4742
* @param \Illuminate\Http\Request $request
4843
*/
4944
public function resend(Request $request)
5045
{
51-
5246
$this->validate($request, ['id' => 'required']);
5347

5448
$user = User::find($request->id);
5549

56-
if (!$user) return response()->json(['message' => 'Verification error '], 500);
57-
50+
if (! $user) {
51+
return response()->json(['message' => 'Verification error '], 500);
52+
}
5853

5954
if ($user->hasVerifiedEmail()) {
6055
return response()->json(['message' => 'already verified !'], 200);
6156
}
6257

6358
$user->sendEmailVerificationNotification();
59+
6460
return response()->json(['message' => 'verification email has been resent !', 200]);
6561
}
6662
}

Diff for: ‎app/Http/Kernel.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ class Kernel extends HttpKernel
5454
* @var array
5555
*/
5656
protected $routeMiddleware = [
57-
'auth' => \App\Http\Middleware\Authenticate::class,
58-
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
59-
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
60-
'can' => \Illuminate\Auth\Middleware\Authorize::class,
61-
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
57+
'auth' => \App\Http\Middleware\Authenticate::class,
58+
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
59+
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
60+
'can' => \Illuminate\Auth\Middleware\Authorize::class,
61+
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
6262
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
63-
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
64-
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
65-
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
63+
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
64+
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
65+
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
6666
];
6767
}

Diff for: ‎app/Http/Middleware/RedirectIfAuthenticated.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public function handle(Request $request, Closure $next, ...$guards)
2525
if (Auth::guard($guard)->check()) {
2626
if ($request->wantsJson()) {
2727
return redirect('/api/user');
28-
};
28+
}
29+
2930
return redirect(RouteServiceProvider::HOME);
3031
}
3132
}

Diff for: ‎app/Notifications/ResetPasswordNotification.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22

3-
43
namespace App\Notifications;
54

65
use Illuminate\Auth\Notifications\ResetPassword as Notification;
@@ -15,14 +14,13 @@ class ResetPasswordNotification extends Notification
1514
* @param string $url
1615
* @return \Illuminate\Notifications\Messages\MailMessage
1716
*/
18-
1917
public function toMail($notifiable)
2018
{
2119
return (new MailMessage)
2220
->subject(Lang::get('Reset Password Notification'))
2321
->line(Lang::get('You are receiving this email because we received a password reset request for your account.'))
24-
->action(Lang::get('Reset Password'), url(config('app.url') . '/reset-password/' . $this->token) . '?email=' . urlencode($notifiable->email))
25-
->line(Lang::get('This password reset link will expire in :count minutes.', ['count' => config('auth.passwords.' . config('auth.defaults.passwords') . '.expire')]))
22+
->action(Lang::get('Reset Password'), url(config('app.url').'/reset-password/'.$this->token).'?email='.urlencode($notifiable->email))
23+
->line(Lang::get('This password reset link will expire in :count minutes.', ['count' => config('auth.passwords.'.config('auth.defaults.passwords').'.expire')]))
2624
->line(Lang::get('If you did not request a password reset, no further action is required.'));
2725
}
2826
}

Diff for: ‎app/Notifications/VerifyEmailNotification.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class VerifyEmailNotification extends verifyEmail implements ShouldQueue
1616
{
1717
use Queueable;
1818

19-
2019
/**
2120
* Get the verification URL for the given notifiable.
2221
*
@@ -29,7 +28,7 @@ protected function verificationUrl($notifiable)
2928
'verify',
3029
Carbon::now()->addMinutes(60),
3130
[
32-
'id' => $notifiable->getKey(),
31+
'id' => $notifiable->getKey(),
3332
'hash' => sha1($notifiable->getEmailForVerification()),
3433
]
3534
);

Diff for: ‎config/auth.php

+7-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
'defaults' => [
17-
'guard' => 'web',
17+
'guard' => 'web',
1818
'passwords' => 'users',
1919
],
2020

@@ -37,14 +37,14 @@
3737

3838
'guards' => [
3939
'web' => [
40-
'driver' => 'session',
40+
'driver' => 'session',
4141
'provider' => 'users',
4242
],
4343

4444
'api' => [
45-
'driver' => 'token',
45+
'driver' => 'token',
4646
'provider' => 'users',
47-
'hash' => false,
47+
'hash' => false,
4848
],
4949
],
5050

@@ -68,7 +68,7 @@
6868
'providers' => [
6969
'users' => [
7070
'driver' => 'eloquent',
71-
'model' => App\Models\User::class,
71+
'model' => App\Models\User::class,
7272
],
7373

7474
// 'users' => [
@@ -95,8 +95,8 @@
9595
'passwords' => [
9696
'users' => [
9797
'provider' => 'users',
98-
'table' => 'password_resets',
99-
'expire' => 60,
98+
'table' => 'password_resets',
99+
'expire' => 60,
100100
'throttle' => 60,
101101
],
102102
],
@@ -114,5 +114,4 @@
114114

115115
'password_timeout' => 10800,
116116

117-
118117
];

Diff for: ‎config/broadcasting.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
'connections' => [
3232

3333
'pusher' => [
34-
'driver' => 'pusher',
35-
'key' => env('PUSHER_APP_KEY'),
36-
'secret' => env('PUSHER_APP_SECRET'),
37-
'app_id' => env('PUSHER_APP_ID'),
34+
'driver' => 'pusher',
35+
'key' => env('PUSHER_APP_KEY'),
36+
'secret' => env('PUSHER_APP_SECRET'),
37+
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
3939
'cluster' => env('PUSHER_APP_CLUSTER'),
40-
'useTLS' => true,
40+
'useTLS' => true,
4141
],
4242
'client_options' => [
4343
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
@@ -46,11 +46,11 @@
4646

4747
'ably' => [
4848
'driver' => 'ably',
49-
'key' => env('ABLY_KEY'),
49+
'key' => env('ABLY_KEY'),
5050
],
5151

5252
'redis' => [
53-
'driver' => 'redis',
53+
'driver' => 'redis',
5454
'connection' => 'default',
5555
],
5656

0 commit comments

Comments
 (0)