Laravel 10 (#4706)

app/Http/Middleware/Activity/AccountSubject.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Activity;
 
-use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Facades\LogTarget;
 
@@ -12,7 +11,7 @@ class AccountSubject
      * Sets the actor and default subject for all requests passing through this
      * middleware to be the currently logged in user.
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, \Closure $next)
     {
         LogTarget::setActor($request->user());
         LogTarget::setSubject($request->user());

app/Http/Middleware/Activity/ServerSubject.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Activity;
 
-use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Facades\LogTarget;
@@ -17,7 +16,7 @@ class ServerSubject
      * If no server is found this is a no-op as the activity log service can always
      * set the user based on the authmanager response.
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, \Closure $next)
     {
         $server = $request->route()->parameter('server');
         if ($server instanceof Server) {

app/Http/Middleware/Activity/TrackAPIKey.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Activity;
 
-use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\ApiKey;
 use Pterodactyl\Facades\LogTarget;
@@ -15,7 +14,7 @@ class TrackAPIKey
      * request singleton so that all tracked activity log events are properly associated
      * with the given API key.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         if ($request->user()) {
             $token = $request->user()->currentAccessToken();

app/Http/Middleware/Admin/Servers/ServerInstalled.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Admin\Servers;
 
-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Pterodactyl\Models\Server;
@@ -14,7 +13,7 @@ class ServerInstalled
     /**
      * Checks that the server is installed before allowing access through the route.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         /** @var \Pterodactyl\Models\Server|null $server */
         $server = $request->route()->parameter('server');

app/Http/Middleware/AdminAuthenticate.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware;
 
-use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
@@ -13,7 +12,7 @@ class AdminAuthenticate
      *
      * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         if (!$request->user() || !$request->user()->root_admin) {
             throw new AccessDeniedHttpException();

app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Api\Application;
 
-use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
@@ -12,7 +11,7 @@ class AuthenticateApplicationUser
      * Authenticate that the currently authenticated user is an administrator
      * and should be allowed to proceed through the application API.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         /** @var \Pterodactyl\Models\User|null $user */
         $user = $request->user();

app/Http/Middleware/Api/AuthenticateIPAccess.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Api;
 
-use Closure;
 use IPTools\IP;
 use IPTools\Range;
 use Illuminate\Http\Request;
@@ -18,7 +17,7 @@ class AuthenticateIPAccess
      * @throws \Exception
      * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         /** @var \Laravel\Sanctum\TransientToken|\Pterodactyl\Models\ApiKey $token */
         $token = $request->user()->currentAccessToken();

app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Api\Client\Server;
 
-use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -27,7 +26,7 @@ class AuthenticateServerAccess
     /**
      * Authenticate that this server exists and is not suspended or marked as installing.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         /** @var \Pterodactyl\Models\User $user */
         $user = $request->user();

app/Http/Middleware/Api/Client/Server/ResourceBelongsToServer.php

@@ -2,11 +2,9 @@
 
 namespace Pterodactyl\Http\Middleware\Api\Client\Server;
 
-use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Task;
 use Pterodactyl\Models\User;
-use InvalidArgumentException;
 use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Subuser;
@@ -26,11 +24,11 @@ class ResourceBelongsToServer
      * server that is expected, and that we're not accessing a resource completely
      * unrelated to the server provided in the request.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         $params = $request->route()->parameters();
         if (is_null($params) || !$params['server'] instanceof Server) {
-            throw new InvalidArgumentException('This middleware cannot be used in a context that is missing a server in the parameters.');
+            throw new \InvalidArgumentException('This middleware cannot be used in a context that is missing a server in the parameters.');
         }
 
         /** @var \Pterodactyl\Models\Server $server */
@@ -79,7 +77,7 @@ class ResourceBelongsToServer
                 default:
                     // Don't return a 404 here since we want to make sure no one relies
                     // on this middleware in a context in which it will not work. Fail safe.
-                    throw new InvalidArgumentException('There is no handler configured for a resource of this type: ' . get_class($model));
+                    throw new \InvalidArgumentException('There is no handler configured for a resource of this type: ' . get_class($model));
             }
         }
 

app/Http/Middleware/Api/Client/SubstituteClientBindings.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Api\Client;
 
-use Closure;
 use Pterodactyl\Models\Server;
 use Illuminate\Routing\Middleware\SubstituteBindings;
 
@@ -11,7 +10,7 @@ class SubstituteClientBindings extends SubstituteBindings
     /**
      * @param \Illuminate\Http\Request $request
      */
-    public function handle($request, Closure $next): mixed
+    public function handle($request, \Closure $next): mixed
     {
         // Override default behavior of the model binding to use a specific table
         // column rather than the default 'id'.

app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Api\Daemon;
 
-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
@@ -32,7 +31,7 @@ class DaemonAuthenticate
      *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         if (in_array($request->route()->getName(), $this->except)) {
             return $next($request);

app/Http/Middleware/Api/IsValidJson.php

@@ -2,8 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware\Api;
 
-use Closure;
-use JsonException;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
@@ -14,12 +12,12 @@ class IsValidJson
      * parsing the data. This avoids confusing validation errors where every field is flagged and
      * it is not immediately clear that there is an issue with the JSON being passed.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         if ($request->isJson() && !empty($request->getContent())) {
             try {
                 json_decode($request->getContent(), true, 512, JSON_THROW_ON_ERROR);
-            } catch (JsonException $exception) {
+            } catch (\JsonException $exception) {
                 throw new BadRequestHttpException('The JSON data passed in the request appears to be malformed: ' . $exception->getMessage());
             }
         }

app/Http/Middleware/LanguageMiddleware.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware;
 
-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Foundation\Application;
 
@@ -18,7 +17,7 @@ class LanguageMiddleware
     /**
      * Handle an incoming request and set the user's preferred language.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         $this->app->setLocale($request->user()->language ?? config('app.locale', 'en'));
 

app/Http/Middleware/MaintenanceMiddleware.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware;
 
-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
@@ -18,7 +17,7 @@ class MaintenanceMiddleware
     /**
      * Handle an incoming request.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         /** @var \Pterodactyl\Models\Server $server */
         $server = $request->attributes->get('server');

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware;
 
-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Auth\AuthManager;
 
@@ -18,7 +17,7 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      */
-    public function handle(Request $request, Closure $next, string $guard = null): mixed
+    public function handle(Request $request, \Closure $next, string $guard = null): mixed
     {
         if ($this->authManager->guard($guard)->check()) {
             return redirect()->route('index');

app/Http/Middleware/RequireTwoFactorAuthentication.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware;
 
-use Closure;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Prologue\Alerts\AlertsMessageBag;
@@ -34,7 +33,7 @@ class RequireTwoFactorAuthentication
      *
      * @throws \Pterodactyl\Exceptions\Http\TwoFactorAuthRequiredException
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         /** @var \Pterodactyl\Models\User $user */
         $user = $request->user();

app/Http/Middleware/VerifyReCaptcha.php

@@ -2,8 +2,6 @@
 
 namespace Pterodactyl\Http\Middleware;
 
-use Closure;
-use stdClass;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -24,7 +22,7 @@ class VerifyReCaptcha
     /**
      * Handle an incoming request.
      */
-    public function handle(Request $request, Closure $next): mixed
+    public function handle(Request $request, \Closure $next): mixed
     {
         if (!$this->config->get('recaptcha.enabled')) {
             return $next($request);
@@ -61,7 +59,7 @@ class VerifyReCaptcha
     /**
      * Determine if the response from the recaptcha servers was valid.
      */
-    private function isResponseVerified(stdClass $result, Request $request): bool
+    private function isResponseVerified(\stdClass $result, Request $request): bool
     {
         if (!$this->config->get('recaptcha.verify_domain')) {
             return false;