[10.x] Named static methods for middleware (#46362)

* wip * Standardise of `using` for Authorization middleware * Update ValidateSignature.php * Update ThrottleRequests.php * Update ThrottleRequests.php * Update RequirePassword.php --------- Co-authored-by: Taylor Otwell <taylor@laravel.com>
illuminate · Apr 24, 2023 · 3fb38d0 · 3fb38d0
1 parent 107f5de
commit 3fb38d0
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 2 deletions.
diff --git a/Middleware/Authenticate.php b/Middleware/Authenticate.php
@@ -28,6 +28,18 @@ public function __construct(Auth $auth)
         $this->auth = $auth;
     }
 
+    /**
+     * Specify the guards for the middleware.
+     *
+     * @param  string  $guard
+     * @param  string  $others
+     * @return string
+     */
+    public static function using($guard, ...$others)
+    {
+        return static::class.':'.implode(',', [$guard, ...$others]);
+    }
+
     /**
      * Handle an incoming request.
      *

diff --git a/Middleware/AuthenticateWithBasicAuth.php b/Middleware/AuthenticateWithBasicAuth.php
@@ -25,6 +25,20 @@ public function __construct(AuthFactory $auth)
         $this->auth = $auth;
     }
 
+    /**
+     * Specify the guard and field for the middleware.
+     *
+     * @param  string|null  $guard
+     * @param  string|null  $field
+     * @return string
+     *
+     * @named-arguments-supported
+     */
+    public static function using($guard = null, $field = null)
+    {
+        return static::class.':'.implode(',', func_get_args());
+    }
+
     /**
      * Handle an incoming request.
      *

diff --git a/Middleware/Authorize.php b/Middleware/Authorize.php
@@ -26,6 +26,18 @@ public function __construct(Gate $gate)
         $this->gate = $gate;
     }
 
+    /**
+     * Specify the ability and models for the middleware.
+     *
+     * @param  string  $ability
+     * @param  string  ...$models
+     * @return string
+     */
+    public static function using($ability, ...$models)
+    {
+        return static::class.':'.implode(',', [$ability, ...$models]);
+    }
+
     /**
      * Handle an incoming request.
      *

diff --git a/Middleware/EnsureEmailIsVerified.php b/Middleware/EnsureEmailIsVerified.php
@@ -9,6 +9,17 @@
 
 class EnsureEmailIsVerified
 {
+    /**
+     * Specify the redirect route for the middleware.
+     *
+     * @param  string  $route
+     * @return string
+     */
+    public static function redirectTo($route)
+    {
+        return static::class.':'.$route;
+    }
+
     /**
      * Handle an incoming request.
      *

diff --git a/Middleware/RequirePassword.php b/Middleware/RequirePassword.php
@@ -44,13 +44,27 @@ public function __construct(ResponseFactory $responseFactory, UrlGenerator $urlG
         $this->passwordTimeout = $passwordTimeout ?: 10800;
     }
 
+    /**
+     * Specify the redirect route and timeout for the middleware.
+     *
+     * @param  string|null  $redirectToRoute
+     * @param  string|null  $passwordTimeoutSeconds
+     * @return string
+     *
+     * @named-arguments-supported
+     */
+    public static function using($redirectToRoute = null, $passwordTimeoutSeconds = null)
+    {
+        return static::class.':'.implode(',', func_get_args());
+    }
+
     /**
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @param  string|null  $redirectToRoute
-     * @param  int|null  $passwordTimeoutSeconds
+     * @param  string|int|null  $passwordTimeoutSeconds
      * @return mixed
      */
     public function handle($request, Closure $next, $redirectToRoute = null, $passwordTimeoutSeconds = null)
@@ -63,7 +77,7 @@ public function handle($request, Closure $next, $redirectToRoute = null, $passwo
             }
 
             return $this->responseFactory->redirectGuest(
-                $this->urlGenerator->route($redirectToRoute ?? 'password.confirm')
+                $this->urlGenerator->route($redirectToRoute ?: 'password.confirm')
             );
         }