[1.x] Allow redirect()->intended() responses to be resolved via the Container

src/FortifyServiceProvider.php

@@ -2,9 +2,11 @@
 
 namespace Laravel\Fortify;
 
+use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Fortify\Contracts\EmailVerificationNotificationSentResponse as EmailVerificationNotificationSentResponseContract;
@@ -73,6 +75,10 @@ public function register()
         $this->app->bind(StatefulGuard::class, function () {
             return Auth::guard(config('fortify.guard', null));
         });
+
+        $this->app->bind(PasswordBroker::class, function () {
+            return Password::broker(config('fortify.passwords'));
+        });
     }
 
     /**

src/Http/Controllers/EmailVerificationNotificationController.php

@@ -6,7 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Laravel\Fortify\Contracts\EmailVerificationNotificationSentResponse;
-use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Http\Responses\RedirectAsIntended;
 
 class EmailVerificationNotificationController extends Controller
 {
@@ -21,7 +21,7 @@ public function store(Request $request)
         if ($request->user()->hasVerifiedEmail()) {
             return $request->wantsJson()
                         ? new JsonResponse('', 204)
-                        : redirect()->intended(Fortify::redirects('email-verification'));
+                        : app(RedirectAsIntended::class, ['name' => 'email-verification']);
         }
 
         $request->user()->sendEmailVerificationNotification();

src/Http/Controllers/EmailVerificationPromptController.php

@@ -5,7 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Laravel\Fortify\Contracts\VerifyEmailViewResponse;
-use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Http\Responses\RedirectAsIntended;
 
 class EmailVerificationPromptController extends Controller
 {
@@ -18,7 +18,7 @@ class EmailVerificationPromptController extends Controller
     public function __invoke(Request $request)
     {
         return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(Fortify::redirects('email-verification'))
+                    ? app(RedirectAsIntended::class, ['name' => 'email-verification'])
                     : app(VerifyEmailViewResponse::class);
     }
 }

src/Http/Controllers/NewPasswordController.php

@@ -87,6 +87,6 @@ function ($user) use ($request) {
      */
     protected function broker(): PasswordBroker
     {
-        return Password::broker(config('fortify.passwords'));
+        return app(PasswordBroker::class);
     }
 }

src/Http/Controllers/PasswordResetLinkController.php

@@ -54,6 +54,6 @@ public function store(Request $request): Responsable
      */
     protected function broker(): PasswordBroker
     {
-        return Password::broker(config('fortify.passwords'));
+        return app(PasswordBroker::class);
     }
 }

src/Http/Responses/RedirectAsIntended.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Laravel\Fortify\Http\Responses;
+
+use Illuminate\Contracts\Support\Responsable;
+use Laravel\Fortify\Fortify;
+
+class RedirectAsIntended implements Responsable
+{
+    /**
+     * Create a new class instance.
+     *
+     * @param  string  $name
+     * @return void
+     */
+    public function __construct(public string $name)
+    {
+        //
+    }
+
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function toResponse($request)
+    {
+        return redirect()->intended(Fortify::redirects($this->name));
+    }
+}