Merge branch 'develop' into matthewpi/security-keys-backport

2023-01-17 15:33:53 -07:00 · 2023-01-17 15:33:53 -07:00 · f631ac1946
commit f631ac1946
parent aa380d4c0d 0b237071f2
1153 changed files with 25099 additions and 37002 deletions
--- a/app/Http/Controllers/Auth/AbstractLoginController.php
+++ b/app/Http/Controllers/Auth/AbstractLoginController.php
@ -48,7 +48,9 @@ abstract class AbstractLoginController extends Controller
    /**
     * Get the failed login response instance.
     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @return never
+     *
+     * @throws DisplayException
     */
    protected function sendFailedLoginResponse(Request $request, Authenticatable $user = null, string $message = null)
    {