Merge branch 'laravel-10' of github.com:jeremykenedy/laravel-auth into laravel-10

jeremykenedy · jeremykenedy · commit 60c409d7ef45 · 2023-02-26T21:19:59.000-08:00
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -50,7 +50,6 @@ class Handler extends ExceptionHandler
     public function register(): void
     {
         $this->reportable(function (Throwable $e) {
-
             $enableEmailExceptions = config('exceptions.emailExceptionEnabled');
 
             if ($enableEmailExceptions === '') {
diff --git a/app/Http/Controllers/Auth/NewPasswordController.php b/app/Http/Controllers/Auth/NewPasswordController.php
@@ -30,8 +30,8 @@ public function create(Request $request): View
     public function store(Request $request): RedirectResponse
     {
         $request->validate([
-            'token' => ['required'],
-            'email' => ['required', 'email'],
+            'token'    => ['required'],
+            'email'    => ['required', 'email'],
             'password' => ['required', 'confirmed', Rules\Password::defaults()],
         ]);
 
@@ -42,7 +42,7 @@ public function store(Request $request): RedirectResponse
             $request->only('email', 'password', 'password_confirmation', 'token'),
             function ($user) use ($request) {
                 $user->forceFill([
-                    'password' => Hash::make($request->password),
+                    'password'       => Hash::make($request->password),
                     'remember_token' => Str::random(60),
                 ])->save();
 
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
@@ -17,7 +17,7 @@ public function update(Request $request): RedirectResponse
     {
         $validated = $request->validateWithBag('updatePassword', [
             'current_password' => ['required', 'current_password'],
-            'password' => ['required', Password::defaults(), 'confirmed'],
+            'password'         => ['required', Password::defaults(), 'confirmed'],
         ]);
 
         $request->user()->update([
diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -31,14 +31,14 @@ public function create(): View
     public function store(Request $request): RedirectResponse
     {
         $request->validate([
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class],
+            'name'     => ['required', 'string', 'max:255'],
+            'email'    => ['required', 'string', 'email', 'max:255', 'unique:'.User::class],
             'password' => ['required', 'confirmed', Rules\Password::defaults()],
         ]);
 
         $user = User::create([
-            'name' => $request->name,
-            'email' => $request->email,
+            'name'     => $request->name,
+            'email'    => $request->email,
             'password' => Hash::make($request->password),
         ]);
 
diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/Auth/LoginRequest.php
@@ -27,7 +27,7 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'email' => ['required', 'string', 'email'],
+            'email'    => ['required', 'string', 'email'],
             'password' => ['required', 'string'],
         ];
     }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -26,6 +26,7 @@ class EventServiceProvider extends ServiceProvider
             'SocialiteProviders\\LinkedIn\\LinkedInExtendSocialite@handle',
         ],
     ];
+
     /**
      * Register any events for your application.
      */
diff --git a/config/app.php b/config/app.php
@@ -5,12 +5,12 @@
 use Collective\Html\FormFacade;
 use Collective\Html\HtmlFacade;
 use Creativeorange\Gravatar\Facades\Gravatar;
-use Laravel\Socialite\Facades\Socialite;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redis;
 use Intervention\Image\Facades\Image;
 use jeremykenedy\Uuid\Uuid;
+use Laravel\Socialite\Facades\Socialite;
 
 return [
 
diff --git a/config/broadcasting.php b/config/broadcasting.php
@@ -31,16 +31,16 @@
     'connections' => [
 
         'pusher' => [
-            'driver' => 'pusher',
-            'key' => env('PUSHER_APP_KEY'),
-            'secret' => env('PUSHER_APP_SECRET'),
-            'app_id' => env('PUSHER_APP_ID'),
+            'driver'  => 'pusher',
+            'key'     => env('PUSHER_APP_KEY'),
+            'secret'  => env('PUSHER_APP_SECRET'),
+            'app_id'  => env('PUSHER_APP_ID'),
             'options' => [
-                'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
-                'port' => env('PUSHER_PORT', 443),
-                'scheme' => env('PUSHER_SCHEME', 'https'),
+                'host'      => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
+                'port'      => env('PUSHER_PORT', 443),
+                'scheme'    => env('PUSHER_SCHEME', 'https'),
                 'encrypted' => true,
-                'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
+                'useTLS'    => env('PUSHER_SCHEME', 'https') === 'https',
             ],
             'client_options' => [
                 // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
diff --git a/config/logging.php b/config/logging.php
@@ -32,7 +32,7 @@
 
     'deprecations' => [
         'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
-        'trace' => false,
+        'trace'   => false,
     ],
 
     /*
diff --git a/config/queue.php b/config/queue.php
@@ -35,39 +35,39 @@
         ],
 
         'database' => [
-            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
-            'retry_after' => 90,
+            'driver'       => 'database',
+            'table'        => 'jobs',
+            'queue'        => 'default',
+            'retry_after'  => 90,
             'after_commit' => false,
         ],
 
         'beanstalkd' => [
-            'driver' => 'beanstalkd',
-            'host' => 'localhost',
-            'queue' => 'default',
-            'retry_after' => 90,
-            'block_for' => 0,
+            'driver'       => 'beanstalkd',
+            'host'         => 'localhost',
+            'queue'        => 'default',
+            'retry_after'  => 90,
+            'block_for'    => 0,
             'after_commit' => false,
         ],
 
         'sqs' => [
-            'driver' => 'sqs',
-            'key' => env('AWS_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => env('SQS_QUEUE', 'default'),
-            'suffix' => env('SQS_SUFFIX'),
-            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'driver'       => 'sqs',
+            'key'          => env('AWS_ACCESS_KEY_ID'),
+            'secret'       => env('AWS_SECRET_ACCESS_KEY'),
+            'prefix'       => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
+            'queue'        => env('SQS_QUEUE', 'default'),
+            'suffix'       => env('SQS_SUFFIX'),
+            'region'       => env('AWS_DEFAULT_REGION', 'us-east-1'),
             'after_commit' => false,
         ],
 
         'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-            'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => 90,
-            'block_for' => null,
+            'driver'       => 'redis',
+            'connection'   => 'default',
+            'queue'        => env('REDIS_QUEUE', 'default'),
+            'retry_after'  => 90,
+            'block_for'    => null,
             'after_commit' => false,
         ],
 
@@ -92,9 +92,9 @@
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
+        'driver'   => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
         'database' => env('DB_CONNECTION', 'mysql'),
-        'table' => 'failed_jobs',
+        'table'    => 'failed_jobs',
     ],
 
 ];
diff --git a/config/sanctum.php b/config/sanctum.php
@@ -61,7 +61,7 @@
 
     'middleware' => [
         'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
-        'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class,
+        'encrypt_cookies'   => App\Http\Middleware\EncryptCookies::class,
     ],
 
 ];
diff --git a/config/services.php b/config/services.php
@@ -15,18 +15,18 @@
     */
 
     'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
+        'domain'   => env('MAILGUN_DOMAIN'),
+        'secret'   => env('MAILGUN_SECRET'),
         'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
-        'scheme' => 'https',
+        'scheme'   => 'https',
     ],
 
     'postmark' => [
         'token' => env('POSTMARK_TOKEN'),
     ],
 
     'ses' => [
-        'key' => env('AWS_ACCESS_KEY_ID'),
+        'key'    => env('AWS_ACCESS_KEY_ID'),
         'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -21,15 +21,15 @@ public function definition(): array
         $userRole = Role::whereName('User')->first();
 
         return [
-            'name'  => fake()->name(),
-            'first_name' => fake()->firstName,
-            'last_name'  => fake()->lastName,
-            'email' => fake()->unique()->safeEmail(),
-            'email_verified_at' => now(),
-            'password' => bcrypt('secret'),
-            'token'       => str_random(64),
-            'activated'   => true,
-            'remember_token' => Str::random(10),
+            'name'                           => fake()->name(),
+            'first_name'                     => fake()->firstName,
+            'last_name'                      => fake()->lastName,
+            'email'                          => fake()->unique()->safeEmail(),
+            'email_verified_at'              => now(),
+            'password'                       => bcrypt('secret'),
+            'token'                          => str_random(64),
+            'activated'                      => true,
+            'remember_token'                 => Str::random(10),
             'signup_ip_address'              => fake()->ipv4,
             'signup_confirmation_ip_address' => fake()->ipv4,
         ];
diff --git a/routes/web.php b/routes/web.php
@@ -57,7 +57,7 @@
     Route::get('/home', [
         'as'    => 'public.home',
         'uses'  => 'App\Http\Controllers\UserController@index',
-        'name'  => 'home'
+        'name'  => 'home',
     ]);
 
     // Show users profile - viewable by other users.
diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php
@@ -23,7 +23,7 @@ public function test_users_can_authenticate_using_the_login_screen(): void
         $user = User::factory()->create();
 
         $response = $this->post('/login', [
-            'email' => $user->email,
+            'email'    => $user->email,
             'password' => 'password',
         ]);
 
@@ -36,7 +36,7 @@ public function test_users_can_not_authenticate_with_invalid_password(): void
         $user = User::factory()->create();
 
         $this->post('/login', [
-            'email' => $user->email,
+            'email'    => $user->email,
             'password' => 'wrong-password',
         ]);
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ class Handler extends ExceptionHandler`
`50`	`50`	`public function register(): void`
`51`	`51`	`{`
`52`	`52`	`$this->reportable(function (Throwable $e) {`
`53`		`-`
`54`	`53`	`$enableEmailExceptions = config('exceptions.emailExceptionEnabled');`
`55`	`54`
`56`	`55`	`if ($enableEmailExceptions === '') {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function update(Request $request): RedirectResponse`
`17`	`17`	`{`
`18`	`18`	`$validated = $request->validateWithBag('updatePassword', [`
`19`	`19`	`'current_password' => ['required', 'current_password'],`
`20`		`- 'password' => ['required', Password::defaults(), 'confirmed'],`
	`20`	`+ 'password' => ['required', Password::defaults(), 'confirmed'],`
`21`	`21`	`]);`
`22`	`22`
`23`	`23`	`$request->user()->update([`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function authorize(): bool`
`27`	`27`	`public function rules(): array`
`28`	`28`	`{`
`29`	`29`	`return [`
`30`		`- 'email' => ['required', 'string', 'email'],`
	`30`	`+ 'email' => ['required', 'string', 'email'],`
`31`	`31`	`'password' => ['required', 'string'],`
`32`	`32`	`];`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace App\Providers;`
`4`	`4`
`5`		`-use Illuminate\Support\Facades\Gate;`
`6`	`5`	`use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;`
	`6`	`+use Illuminate\Support\Facades\Gate;`
`7`	`7`
`8`	`8`	`class AuthServiceProvider extends ServiceProvider`
`9`	`9`	`{`