chore(deps): bump laravel/fortify from 1.18.1 to 1.19.1 (#7072)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexis Saettler <[email protected]>
monicahq · Dec 25, 2023 · 89cf285 · 89cf285
1 parent 073781c
commit 89cf285
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/app/Actions/Fortify/PasswordValidationRules.php b/app/Actions/Fortify/PasswordValidationRules.php
@@ -2,8 +2,7 @@
 
 namespace App\Actions\Fortify;
 
-use Illuminate\Support\Facades\App;
-use Laravel\Fortify\Rules\Password;
+use Illuminate\Validation\Rules\Password;
 
 trait PasswordValidationRules
 {
@@ -12,21 +11,11 @@ trait PasswordValidationRules
      */
     protected function passwordRules(bool $confirmed = true): array
     {
-        $rules = (new Password)->length(4);
-
-        if (App::environment('production')) {
-            // @codeCoverageIgnoreStart
-            $rules->length(8)
-                ->requireUppercase()
-                ->requireNumeric();
-            // @codeCoverageIgnoreEnd
-        }
-
         return array_filter([
             'nullable',
             'string',
             $confirmed ? 'confirmed' : null,
-            $rules,
+            Password::default(),
         ]);
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -15,6 +15,7 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use Illuminate\Testing\TestResponse;
+use Illuminate\Validation\Rules\Password;
 use LaravelWebauthn\Facades\Webauthn;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
@@ -105,6 +106,18 @@ public function register()
      */
     public function boot()
     {
+        Password::defaults(function () {
+            return $this->app->environment('production')
+                // @codeCoverageIgnoreStart
+                ? Password::min(8)
+                    ->letters()
+                    ->mixedCase()
+                    ->numbers()
+                    ->symbols()
+                // @codeCoverageIgnoreEnd
+                : Password::min(4);
+        });
+
         RateLimiter::for('oauth2-socialite', function (Request $request) {
             return Limit::perMinute(5)->by(optional($request->user())->id ?: $request->ip());
         });

diff --git a/composer.lock b/composer.lock