Merge pull request laravel#4949 from laravel/revert-4904-modify-redirect-if-auth-middleware-to-allow-multiple-guards

taylorotwell · web-flow · commit b5b2341fd63d · 2019-02-24T18:51:21.000-06:00
Revert "[5.8] Modify RedirectIfAuthenticated middleware to accept multiple guards"
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -12,15 +12,13 @@ class RedirectIfAuthenticated
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @param  string[]  ...$guards
+     * @param  string|null  $guard
      * @return mixed
      */
-    public function handle($request, Closure $next, ...$guards)
+    public function handle($request, Closure $next, $guard = null)
     {
-        foreach ($guards as $guard) {
-            if (Auth::guard($guard)->check()) {
-                return redirect('/home');
-            }
+        if (Auth::guard($guard)->check()) {
+            return redirect('/home');
         }
 
         return $next($request);

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,13 @@ class RedirectIfAuthenticated`
`12`	`12`	`*`
`13`	`13`	`* @param \Illuminate\Http\Request $request`
`14`	`14`	`* @param \Closure $next`
`15`		`- * @param string[] ...$guards`
	`15`	`+ * @param string\|null $guard`
`16`	`16`	`* @return mixed`
`17`	`17`	`*/`
`18`		`- public function handle($request, Closure $next, ...$guards)`
	`18`	`+ public function handle($request, Closure $next, $guard = null)`
`19`	`19`	`{`
`20`		`- foreach ($guards as $guard) {`
`21`		`- if (Auth::guard($guard)->check()) {`
`22`		`- return redirect('/home');`
`23`		`- }`
	`20`	`+ if (Auth::guard($guard)->check()) {`
	`21`	`+ return redirect('/home');`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`return $next($request);`