formatting

laravel · Nov 2, 2023 · ad36c47 · ad36c47
1 parent 8184690
commit ad36c47
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 46 deletions.
diff --git a/src/Http/Middleware/CheckCredentials.php b/src/Http/Middleware/CheckCredentials.php
@@ -39,6 +39,21 @@ public function __construct(ResourceServer $server, TokenRepository $repository)
         $this->repository = $repository;
     }
 
+    /**
+     * Specify the scopes for the middleware.
+     *
+     * @param  array|string  $scopes
+     * @return string
+     */
+    public static function using(...$scopes)
+    {
+        if (is_array($scopes[0])) {
+            return static::class.':'.implode(',', $scopes[0]);
+        } else {
+            return static::class.':'.implode(',', $scopes);
+        }
+    }
+
     /**
      * Handle an incoming request.
      *
@@ -69,17 +84,6 @@ public function handle($request, Closure $next, ...$scopes)
         return $next($request);
     }
 
-    /**
-     * Generate a string representation of the middleware with specified scopes.
-     *
-     * @param  array|string  $scopes
-     * @return string
-     */
-    public static function using($scopes)
-    {
-        return static::class.':'.implode(',', func_get_args());
-    }
-
     /**
      * Validate the scopes and token on the incoming request.
      *

diff --git a/src/Http/Middleware/CheckForAnyScope.php b/src/Http/Middleware/CheckForAnyScope.php
@@ -7,6 +7,21 @@
 
 class CheckForAnyScope
 {
+    /**
+     * Specify the scopes for the middleware.
+     *
+     * @param  array|string  $scopes
+     * @return string
+     */
+    public static function using(...$scopes)
+    {
+        if (is_array($scopes[0])) {
+            return static::class.':'.implode(',', $scopes[0]);
+        } else {
+            return static::class.':'.implode(',', $scopes);
+        }
+    }
+
     /**
      * Handle the incoming request.
      *
@@ -31,15 +46,4 @@ public function handle($request, $next, ...$scopes)
 
         throw new MissingScopeException($scopes);
     }
-
-    /**
-     * Generate a string representation of the middleware with specified scopes.
-     *
-     * @param  array|string  $scopes
-     * @return string
-     */
-    public static function using($scopes)
-    {
-        return static::class.':'.implode(',', func_get_args());
-    }
 }
diff --git a/src/Http/Middleware/CheckScopes.php b/src/Http/Middleware/CheckScopes.php
@@ -7,6 +7,21 @@
 
 class CheckScopes
 {
+    /**
+     * Specify the scopes for the middleware.
+     *
+     * @param  array|string  $scopes
+     * @return string
+     */
+    public static function using(...$scopes)
+    {
+        if (is_array($scopes[0])) {
+            return static::class.':'.implode(',', $scopes[0]);
+        } else {
+            return static::class.':'.implode(',', $scopes);
+        }
+    }
+
     /**
      * Handle the incoming request.
      *
@@ -31,15 +46,4 @@ public function handle($request, $next, ...$scopes)
 
         return $next($request);
     }
-
-    /**
-     * Generate a string representation of the middleware with specified scopes.
-     *
-     * @param  array|string  $scopes
-     * @return string
-     */
-    public static function using($scopes)
-    {
-        return static::class.':'.implode(',', func_get_args());
-    }
 }
diff --git a/src/Http/Middleware/CreateFreshApiToken.php b/src/Http/Middleware/CreateFreshApiToken.php
@@ -35,6 +35,19 @@ public function __construct(ApiTokenCookieFactory $cookieFactory)
         $this->cookieFactory = $cookieFactory;
     }
 
+    /**
+     * Specify the guard for the middleware.
+     *
+     * @param  string|null  $guard
+     * @return string
+     */
+    public static function using($guard = null)
+    {
+        $guard = is_null($guard) ? '' : ':'.$guard;
+
+        return static::class.$guard;
+    }
+
     /**
      * Handle an incoming request.
      *
@@ -58,19 +71,6 @@ public function handle($request, Closure $next, $guard = null)
         return $response;
     }
 
-    /**
-     * Specify the guard for the middleware.
-     *
-     * @param  string|null  $guard
-     * @return string
-     */
-    public static function using($guard = null)
-    {
-        $args = is_null($guard) ? '' : ':'.$guard;
-
-        return static::class.$args;
-    }
-
     /**
      * Determine if the given request should receive a fresh token.
      *